From b16b45e533093289c78fd9885c017450627747f0 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10> Date: Thu, 31 Mar 2011 09:02:52 +0000 Subject: Translation fixes and other minor stuff. git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@592 4f64403b-2f21-0410-a795-97e2b3489a10 --- metacontacts/meta_main.c | 4 --- metacontacts/meta_services.c | 62 +++++++++++++++++++++----------------------- metacontacts/metacontacts.h | 2 -- 3 files changed, 30 insertions(+), 38 deletions(-) diff --git a/metacontacts/meta_main.c b/metacontacts/meta_main.c index 5115c5b..7554992 100644 --- a/metacontacts/meta_main.c +++ b/metacontacts/meta_main.c @@ -108,8 +108,6 @@ PLUGININFOEX pluginInfo={ HINSTANCE hInstance; //!< Global reference to the application PLUGINLINK *pluginLink; //!< Link between Miranda and this plugin -HANDLE metaMainThread; //!< Duplicate of thread handle - /** Called by Miranda to get the information associated to this plugin. * It only returns the PLUGININFO structure, without any test on the version * @param mirandaVersion The version of the application calling this function @@ -147,7 +145,6 @@ __declspec(dllexport)int Unload(void) { // see also meta_services.c, Meta_PreShutdown Meta_CloseHandles(); - CloseHandle( metaMainThread ); //MessageBox(0, "Unload complete", "MC", MB_OK); return 0; } @@ -169,7 +166,6 @@ int __declspec(dllexport)Load(PLUGINLINK *link) DBVARIANT dbv; pluginLink=link; - DuplicateHandle( GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &metaMainThread, 0, FALSE, DUPLICATE_SAME_ACCESS ); mir_getMMI(&mmi); diff --git a/metacontacts/meta_services.c b/metacontacts/meta_services.c index b26c36e..bbf9177 100644 --- a/metacontacts/meta_services.c +++ b/metacontacts/meta_services.c @@ -676,7 +676,7 @@ int Meta_HandleACK(WPARAM wParam, LPARAM lParam) } // hiding contacts on "CList/UseGroups" setting changed can cause a crash - do it in a seperate thread during idle time -static DWORD CALLBACK sttHideContacts( LPVOID param ) +static DWORD sttHideContacts( BOOL param ) { Meta_HideMetaContacts((int)param); return 0; @@ -700,7 +700,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) && ((strcmp(dcws->szModule, "CList") == 0 && strcmp(dcws->szSetting, "UseGroups") == 0) || (strcmp(dcws->szModule, META_PROTO) == 0 && strcmp(dcws->szSetting, "Enabled") == 0))) { - QueueUserAPC((PAPCFUNC)sttHideContacts, metaMainThread, (ULONG)(!Meta_IsEnabled())); + sttHideContacts(!Meta_IsEnabled()); return 0; } @@ -1311,35 +1311,35 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam) menu.flags = CMIM_ALL; // main menu item - menu.pszName = (char *)Translate("Toggle MetaContacts Off"); - menu.pszService="MetaContacts/OnOff"; + menu.pszName = "Toggle MetaContacts Off"; + menu.pszService = "MetaContacts/OnOff"; menu.position = 500010000; hMenuOnOff = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&menu); // contact menu items menu.position = -200010; - menu.pszName = (char *)Translate("Convert to MetaContact"); - menu.pszService="MetaContacts/Convert"; + menu.pszName = "Convert to MetaContact"; + menu.pszService = "MetaContacts/Convert"; hMenuConvert = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&menu); menu.position = -200009; - menu.pszName = (char *)Translate("Add to existing MetaContact..."); - menu.pszService="MetaContacts/AddTo"; + menu.pszName = "Add to existing MetaContact..."; + menu.pszService = "MetaContacts/AddTo"; hMenuAdd = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&menu); menu.position = -200010; - menu.pszName = (char *)Translate("Edit MetaContact..."); - menu.pszService="MetaContacts/Edit"; + menu.pszName = "Edit MetaContact..."; + menu.pszService = "MetaContacts/Edit"; hMenuEdit = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&menu); menu.position = -200009; - menu.pszName = (char *)Translate("Set as MetaContact default"); - menu.pszService="MetaContacts/Default"; + menu.pszName = "Set as MetaContact default"; + menu.pszService = "MetaContacts/Default"; hMenuDefault = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&menu); menu.position = -200008; - menu.pszName = (char *)Translate("Delete MetaContact"); - menu.pszService="MetaContacts/Delete"; + menu.pszName = "Delete MetaContact"; + menu.pszService = "MetaContacts/Delete"; hMenuDelete = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&menu); - //menu.pszName = (char *)Translate("Force Default"); - //menu.pszService="MetaContacts/ForceDefault"; + //menu.pszName = "Force Default"; + //menu.pszService = "MetaContacts/ForceDefault"; //hMenuForceDefault = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&menu); menu.flags |= CMIF_HIDDEN; @@ -1384,7 +1384,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam) { // modify main menu item menu.flags = CMIM_NAME; - menu.pszName = (char *)Translate("Toggle MetaContacts On"); + menu.pszName = "Toggle MetaContacts On"; CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuOnOff, (LPARAM)&menu); Meta_HideMetaContacts(TRUE); @@ -1427,7 +1427,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam) return 0; } -static DWORD CALLBACK sttMenuThread( DWORD_PTR param ) +static VOID CALLBACK sttMenuThread( PVOID param ) { HMENU hMenu; TPMPARAMS tpmp; @@ -1443,8 +1443,6 @@ static DWORD CALLBACK sttMenuThread( DWORD_PTR param ) CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(menuRet), MPCF_CONTACTMENU), (LPARAM)param); DestroyMenu(hMenu); - - return 0; } INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam) { @@ -1480,7 +1478,7 @@ INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam) { } else if(options.menu_function == FT_MENU) { // show contact's context menu - QueueUserAPC(sttMenuThread, metaMainThread, (ULONG_PTR)hContact); + CallFunctionAsync(sttMenuThread, hContact); } else if(options.menu_function == FT_INFO) { // show user info for subcontact CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)hContact, 0); @@ -1855,23 +1853,23 @@ int Meta_OptInit(WPARAM wParam, LPARAM lParam) { odp.flags = ODPF_BOLDGROUPS; odp.pszTemplate = MAKEINTRESOURCE(IDD_OPTIONS); - odp.pszTitle = Translate("MetaContacts"); - odp.pszGroup = Translate("Contact List"); - odp.pszTab = Translate("General"); + odp.pszTitle = "MetaContacts"; + odp.pszGroup = "Contact List"; + odp.pszTab = "General"; odp.pfnDlgProc = DlgProcOpts; CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); odp.pszTemplate = MAKEINTRESOURCE(IDD_PRIORITIES); - odp.pszTitle = Translate("MetaContacts"); - odp.pszGroup = Translate("Contact List"); - odp.pszTab = Translate("Priorities"); + odp.pszTitle = "MetaContacts"; + odp.pszGroup = "Contact List"; + odp.pszTab = "Priorities"; odp.pfnDlgProc = DlgProcOptsPriorities; CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); odp.pszTemplate = MAKEINTRESOURCE(IDD_HISTORY); - odp.pszTitle = Translate("MetaContacts"); - odp.pszGroup = Translate("Contact List"); - odp.pszTab = Translate("History"); + odp.pszTitle = "MetaContacts"; + odp.pszGroup = "Contact List"; + odp.pszTab = "History"; odp.pfnDlgProc = DlgProcOpts; CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); return 0; @@ -1902,14 +1900,14 @@ INT_PTR Meta_OnOff(WPARAM wParam, LPARAM lParam) { // modify main menu item menu.flags = CMIM_NAME | CMIM_ICON; menu.hIcon = LoadIconEx(I_MENU); - menu.pszName = (char *)Translate("Toggle MetaContacts On"); + menu.pszName = "Toggle MetaContacts On"; CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuOnOff, (LPARAM)&menu); } else { DBWriteContactSettingByte(0, META_PROTO, "Enabled", 1); // modify main menu item menu.flags = CMIM_NAME | CMIM_ICON; menu.hIcon = LoadIconEx(I_MENUOFF); - menu.pszName = (char *)Translate("Toggle MetaContacts Off"); + menu.pszName = "Toggle MetaContacts Off"; CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuOnOff, (LPARAM)&menu); } ReleaseIconEx(menu.hIcon); diff --git a/metacontacts/metacontacts.h b/metacontacts/metacontacts.h index c9bb77a..c2131e4 100644 --- a/metacontacts/metacontacts.h +++ b/metacontacts/metacontacts.h @@ -116,8 +116,6 @@ extern HANDLE hMenuOnOff; extern DWORD nextMetaID; extern int mcStatus; -extern HANDLE metaMainThread; - INT_PTR Meta_Convert(WPARAM wParam,LPARAM lParam); INT_PTR Meta_AddTo(WPARAM wParam,LPARAM lParam); INT_PTR Meta_Edit(WPARAM wParam,LPARAM lParam); -- cgit v1.2.3