From 5ac26cff397836222eb8d51d866890f96321c601 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10> Date: Sun, 25 Apr 2010 15:57:51 +0000 Subject: Optimizations, removed redundant code, better compatibility with popup+ git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@512 4f64403b-2f21-0410-a795-97e2b3489a10 --- yapp/popups2.cpp | 79 +++++++++++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 41 deletions(-) (limited to 'yapp/popups2.cpp') diff --git a/yapp/popups2.cpp b/yapp/popups2.cpp index 845635b..2b7cdf1 100644 --- a/yapp/popups2.cpp +++ b/yapp/popups2.cpp @@ -8,12 +8,10 @@ #include "options.h" #include "popwin.h" #include "notify.h" -#include "str_utils.h" #include "popup_history.h" //to be able to update the renderer HMODULE hInst = 0; -HANDLE mainThread = 0; MNOTIFYLINK *notifyLink = 0; @@ -49,7 +47,10 @@ PLUGININFOEX pluginInfo={ #endif }; -PLUGINLINK *pluginLink = 0; +PLUGINLINK *pluginLink; + +MM_INTERFACE mmi; +LIST_INTERFACE li; extern "C" BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { @@ -64,12 +65,6 @@ extern "C" POPUPS2_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) return &pluginInfo; } -extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) -{ - pluginInfo.cbSize = sizeof(PLUGININFO); - return (PLUGININFO*)&pluginInfo; -} - static const MUUID interfaces[] = {MIID_POPUPS, MIID_LAST}; extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) { @@ -157,24 +152,24 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { { font_id_firstlinew.cbSize = sizeof(FontIDW); font_id_firstlinew.flags = FIDF_ALLOWEFFECTS; - t2w(TranslateT("Popups"), font_id_firstlinew.group, 64); - t2w(TranslateT("First line"), font_id_firstlinew.name, 64); + _tcscpy(font_id_firstlinew.group, _T("Popups")); + _tcscpy(font_id_firstlinew.name, _T("First line")); strcpy(font_id_firstlinew.dbSettingsGroup, MODULE); strcpy(font_id_firstlinew.prefix, "FontFirst"); font_id_firstlinew.order = 0; font_id_secondlinew.cbSize = sizeof(FontIDW); font_id_secondlinew.flags = FIDF_ALLOWEFFECTS; - t2w(TranslateT("Popups"), font_id_secondlinew.group, 64); - t2w(TranslateT("Second line"), font_id_secondlinew.name, 64); + _tcscpy(font_id_secondlinew.group, _T("Popups")); + _tcscpy(font_id_secondlinew.name, _T("Second line")); strcpy(font_id_secondlinew.dbSettingsGroup, MODULE); strcpy(font_id_secondlinew.prefix, "FontSecond"); font_id_secondlinew.order = 1; font_id_timew.cbSize = sizeof(FontIDW); font_id_timew.flags = FIDF_ALLOWEFFECTS; - t2w(TranslateT("Popups"), font_id_timew.group, 64); - t2w(TranslateT("Time"), font_id_timew.name, 64); + _tcscpy(font_id_timew.group, _T("Popups")); + _tcscpy(font_id_timew.name, _T("Time")); strcpy(font_id_timew.dbSettingsGroup, MODULE); strcpy(font_id_timew.prefix, "FontTime"); font_id_timew.order = 2; @@ -184,32 +179,32 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { CallService(MS_FONT_REGISTERW, (WPARAM)&font_id_timew, 0); colour_id_bgw.cbSize = sizeof(ColourIDW); - t2w(TranslateT("Popups"), colour_id_bgw.group, 64); - t2w(TranslateT("Background"), colour_id_bgw.name, 64); + _tcscpy(colour_id_bgw.group, _T("Popups")); + _tcscpy(colour_id_bgw.name, _T("Background")); strcpy(colour_id_bgw.dbSettingsGroup, MODULE); strcpy(colour_id_bgw.setting, "ColourBg"); colour_id_bgw.defcolour = GetSysColor(COLOR_3DSHADOW); colour_id_bgw.order = 0; colour_id_borderw.cbSize = sizeof(ColourIDW); - t2w(TranslateT("Popups"), colour_id_borderw.group, 64); - t2w(TranslateT("Border"), colour_id_borderw.name, 64); + _tcscpy(colour_id_borderw.group, _T("Popups")); + _tcscpy(colour_id_borderw.name, _T("Border")); strcpy(colour_id_borderw.dbSettingsGroup, MODULE); strcpy(colour_id_borderw.setting, "ColourBorder"); colour_id_borderw.defcolour = RGB(0, 0, 0); colour_id_borderw.order = 1; colour_id_sidebarw.cbSize = sizeof(ColourIDW); - t2w(TranslateT("Popups"), colour_id_sidebarw.group, 64); - t2w(TranslateT("Sidebar"), colour_id_sidebarw.name, 64); + _tcscpy(colour_id_sidebarw.group, _T("Popups")); + _tcscpy(colour_id_sidebarw.name, _T("Sidebar")); strcpy(colour_id_sidebarw.dbSettingsGroup, MODULE); strcpy(colour_id_sidebarw.setting, "ColourSidebar"); colour_id_sidebarw.defcolour = RGB(128, 128, 128); colour_id_sidebarw.order = 2; colour_id_titleunderlinew.cbSize = sizeof(ColourIDW); - t2w(TranslateT("Popups"), colour_id_titleunderlinew.group, 64); - t2w(TranslateT("Title underline"), colour_id_titleunderlinew.name, 64); + _tcscpy(colour_id_titleunderlinew.group, _T("Popups")); + _tcscpy(colour_id_titleunderlinew.name, _T("Title underline")); strcpy(colour_id_titleunderlinew.dbSettingsGroup, MODULE); strcpy(colour_id_titleunderlinew.setting, "ColourTitleUnderline"); colour_id_titleunderlinew.defcolour = GetSysColor(COLOR_3DSHADOW); @@ -223,27 +218,29 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { ReloadFont(0, 0); hEventReloadFont = HookEvent(ME_FONT_RELOAD, ReloadFont); - } else if(ServiceExists(MS_FONT_REGISTER)) { + } + else if(ServiceExists(MS_FONT_REGISTER)) + { font_id_firstline.cbSize = sizeof(FontID); font_id_firstline.flags = FIDF_ALLOWEFFECTS; - t2a(TranslateT("Popups"), font_id_firstline.group, 64); - t2a(TranslateT("First line"), font_id_firstline.name, 64); + strcpy(font_id_firstline.group, "Popups"); + strcpy(font_id_firstline.name, "First line"); strcpy(font_id_firstline.dbSettingsGroup, MODULE); strcpy(font_id_firstline.prefix, "FontFirst"); font_id_firstline.order = 0; font_id_secondline.cbSize = sizeof(FontID); font_id_secondline.flags = FIDF_ALLOWEFFECTS; - t2a(TranslateT("Popups"), font_id_secondline.group, 64); - t2a(TranslateT("Second line"), font_id_secondline.name, 64); + strcpy(font_id_secondline.group, "Popups"); + strcpy(font_id_secondline.name, "Second line"); strcpy(font_id_secondline.dbSettingsGroup, MODULE); strcpy(font_id_secondline.prefix, "FontSecond"); font_id_secondline.order = 1; font_id_time.cbSize = sizeof(FontID); font_id_time.flags = FIDF_ALLOWEFFECTS; - t2a(TranslateT("Popups"), font_id_time.group, 64); - t2a(TranslateT("Time"), font_id_time.name, 64); + strcpy(font_id_time.group, "Popups"); + strcpy(font_id_time.name, "Time"); strcpy(font_id_time.dbSettingsGroup, MODULE); strcpy(font_id_time.prefix, "FontTime"); font_id_time.order = 2; @@ -253,32 +250,32 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { CallService(MS_FONT_REGISTER, (WPARAM)&font_id_time, 0); colour_id_bg.cbSize = sizeof(ColourID); - t2a(TranslateT("Popups"), colour_id_bg.group, 64); - t2a(TranslateT("Background"), colour_id_bg.name, 64); + strcpy(colour_id_bg.group, "Popups"); + strcpy(colour_id_bg.name, "Background"); strcpy(colour_id_bg.dbSettingsGroup, MODULE); strcpy(colour_id_bg.setting, "ColourBg"); colour_id_bg.defcolour = GetSysColor(COLOR_3DSHADOW); colour_id_bg.order = 0; colour_id_border.cbSize = sizeof(ColourID); - t2a(TranslateT("Popups"), colour_id_border.group, 64); - t2a(TranslateT("Border"), colour_id_border.name, 64); + strcpy(colour_id_border.group, "Popups"); + strcpy(colour_id_border.name, "Border"); strcpy(colour_id_border.dbSettingsGroup, MODULE); strcpy(colour_id_border.setting, "ColourBorder"); colour_id_border.defcolour = RGB(0, 0, 0); colour_id_border.order = 1; colour_id_sidebar.cbSize = sizeof(ColourID); - t2a(TranslateT("Popups"), colour_id_sidebar.group, 64); - t2a(TranslateT("Sidebar"), colour_id_sidebar.name, 64); + strcpy(colour_id_sidebar.group, "Popups"); + strcpy(colour_id_sidebar.name, "Sidebar"); strcpy(colour_id_sidebar.dbSettingsGroup, MODULE); strcpy(colour_id_sidebar.setting, "ColourSidebar"); colour_id_sidebar.defcolour = RGB(128, 128, 128); colour_id_sidebar.order = 2; colour_id_titleunderline.cbSize = sizeof(ColourID); - t2a(TranslateT("Popups"), colour_id_titleunderline.group, 64); - t2a(TranslateT("Title underline"), colour_id_titleunderline.name, 64); + strcpy(colour_id_titleunderline.group, "Popups"); + strcpy(colour_id_titleunderline.name, "Title underline"); strcpy(colour_id_titleunderline.dbSettingsGroup, MODULE); strcpy(colour_id_titleunderline.setting, "ColourTitleUnderline"); colour_id_titleunderline.defcolour = GetSysColor(COLOR_3DSHADOW); @@ -328,9 +325,9 @@ HANDLE hEventPreShutdown, hEventModulesLoaded; extern "C" int POPUPS2_API Load(PLUGINLINK *link) { pluginLink = link; - DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &mainThread, 0, FALSE, DUPLICATE_SAME_ACCESS); - set_codepage(); + mir_getLI(&li); + mir_getMMI(&mmi); INITCOMMONCONTROLSEX icex; @@ -373,6 +370,6 @@ extern "C" int POPUPS2_API Unload() { DeleteObject(hFontSecondLine); DeleteObject(hFontTime); } // otherwise, no need to delete the handle - CloseHandle(mainThread); + return 0; } -- cgit v1.2.3