From 7d2426dbfc3cf59ae481ad2a88199e8a23cb2f67 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10> Date: Sun, 14 Nov 2010 17:42:50 +0000 Subject: Reduced dll size git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@566 4f64403b-2f21-0410-a795-97e2b3489a10 --- updater/options.cpp | 5 ++--- updater/popups.cpp | 6 ++---- updater/services.cpp | 10 ++++------ updater/updater.cpp | 31 +++---------------------------- updater/updater.dsp | 18 ++++++++++-------- updater/xmldata.cpp | 6 +++--- 6 files changed, 24 insertions(+), 52 deletions(-) diff --git a/updater/options.cpp b/updater/options.cpp index d739831..312adbd 100644 --- a/updater/options.cpp +++ b/updater/options.cpp @@ -4,11 +4,10 @@ Options options; -HWND hwndOptions = 0; +HWND hwndOptions; HANDLE hMainMenuItemRestart, hMainMenuItemUpdateAndExit; - -HANDLE hBackupPath = 0, hDataPath = 0, hArchivePath = 0; +HANDLE hBackupPath, hDataPath, hArchivePath; void add_restart_menu_item() { CLISTMENUITEM menu = {0}; diff --git a/updater/popups.cpp b/updater/popups.cpp index c4e2edf..079254b 100644 --- a/updater/popups.cpp +++ b/updater/popups.cpp @@ -1,12 +1,10 @@ #include "common.h" #include "popups.h" -bool bPopupsEnabled; - -HWND hwndPop = 0; - +HWND hwndPop; HANDLE hEventPop; bool pop_cancelled; +bool bPopupsEnabled; typedef struct { diff --git a/updater/services.cpp b/updater/services.cpp index 43b86c8..feac2c1 100644 --- a/updater/services.cpp +++ b/updater/services.cpp @@ -4,16 +4,14 @@ UpdateList update_list; CRITICAL_SECTION list_cs; -DWORD daily_timer_id = 0, startup_timer_id = 0; - +DWORD daily_timer_id, startup_timer_id; HANDLE hMainMenuItem, hGroupMenuItem; +HANDLE hStartupDone; -HANDLE hStartupDone = 0; - -bool checking = false; +bool checking; #define NUM_SERVICES 13 -HANDLE hService[NUM_SERVICES] = {0}; +HANDLE hService[NUM_SERVICES]; int CompareFileNameStruct(const FileNameStruct *p1, const FileNameStruct *p2) { diff --git a/updater/updater.cpp b/updater/updater.cpp index 3ab7eea..855659d 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -13,7 +13,6 @@ UTF8_INTERFACE utfi; LIST_INTERFACE li; bool is_idle = false; -bool unicode_system; //#define TESTING // defined here to reduce build time blowout caused by changing common.h PLUGININFOEX pluginInfo={ @@ -141,7 +140,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { update.szBetaChangelogURL = "https://server.scottellis.com.au/wsvn/mim_plugs/updater/?op=log&rev=0&sc=0&isdir=1"; - if(unicode_system) { +#ifdef _UNICODE #ifdef REGISTER_AUTO update.szUpdateURL = UPDATER_AUTOREGISTER; @@ -156,7 +155,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { update.szBetaVersionURL = BETA_HOST_URL_PREFIX "/ver_updater_unicode.html"; update.pbBetaVersionPrefix = (BYTE *)"Updater (Unicode) version "; update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix); - } else { +#else #ifdef REGISTER_AUTO update.szUpdateURL = UPDATER_AUTOREGISTER; @@ -175,7 +174,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { update.szBetaVersionURL = BETA_HOST_URL_PREFIX "/ver_updater.html"; update.pbBetaVersionPrefix = (BYTE *)"Updater version "; update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix); - } +#endif CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update); #else // !REGISTER_BETA @@ -236,30 +235,6 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) { pluginLink = link; - char szVer[128]; - unicode_system = (CallService(MS_SYSTEM_GETVERSIONTEXT, (WPARAM)sizeof(szVer), (LPARAM)szVer) == 0 && strstr(szVer, "Unicode")); - /* -#ifdef _UNICODE - if(!unicode_system) { - TCHAR fp[256], *fn; - GetModuleFileName(hInst, fp, 256); - fn = _tcsrchr(fp, '\\'); - if(fn) fn++; - MessageBox(0, TranslateT("You are using the wrong version of this plugin.\nPlease download the NON-UNICODE version.\nPlugin disabled."), fn, MB_OK); - return 1; - } -#else - if(unicode_system) { - TCHAR fp[256], *fn; - GetModuleFileName(hInst, fp, 256); - fn = _tcsrchr(fp, '\\'); - if(fn) fn++; - MessageBox(0, TranslateT("You are using the wrong version of this plugin.\nPlease download the UNICODE version.\nPlugin disabled."), fn, MB_OK); - return 1; - } -#endif - */ - mir_getLI( &li ); mir_getMMI( &mmi ); mir_getUTFI( &utfi ); diff --git a/updater/updater.dsp b/updater/updater.dsp index 8049822..f2d047c 100644 --- a/updater/updater.dsp +++ b/updater/updater.dsp @@ -45,7 +45,8 @@ RSC=rc.exe # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UPDATER_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O1 /I "../../include" /I "../../../include" /I "zbin" /I "zbin/minizip" /I "bzip2-1.0.3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BZ_NO_STDIO" /D "UPDATER_EXPORTS" /FR /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX- /O1 /I "../../include" /I "../../../include" /I "zbin" /I "zbin/minizip" /I "bzip2-1.0.3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BZ_NO_STDIO" /D "UPDATER_EXPORTS" /YX /FD /c +# SUBTRACT CPP /Fr # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -55,8 +56,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib zlib.lib /nologo /base:"0x22000000" /dll /machine:I386 /out:"../../bin/release/plugins/updater.dll" /libpath:"zbin\x32" -# SUBTRACT LINK32 /nodefaultlib +# ADD LINK32 comctl32.lib kernel32.lib user32.lib shell32.lib ole32.lib zlib.lib /nologo /base:"0x22000000" /dll /machine:I386 /out:"../../bin/release/plugins/updater.dll" /libpath:"zbin\x32" /filealign:0x200 +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "updater - Win32 Debug" @@ -94,12 +95,13 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "updater___Win32_Release_Unicode" -# PROP Intermediate_Dir "updater___Win32_Release_Unicode" +# PROP Output_Dir "Release_Unicode" +# PROP Intermediate_Dir "Release_Unicode" # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O1 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UPDATER_EXPORTS" /FR /YX /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O1 /I "../../include" /I "../../../include" /I "zbin" /I "zbin/minizip" /I "bzip2-1.0.3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "BZ_NO_STDIO" /D "_UNICODE" /D "UNICODE" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /O1 /I "../../include" /I "../../../include" /I "zbin" /I "zbin/minizip" /I "bzip2-1.0.3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "BZ_NO_STDIO" /D "_UNICODE" /D "UNICODE" /YX /FD /c +# SUBTRACT CPP /Z /Fr # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0xc09 /d "NDEBUG" @@ -110,8 +112,8 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /base:"0x22000000" /dll /machine:I386 /out:"../../bin/release/plugins/updater.dll" # SUBTRACT BASE LINK32 /nodefaultlib -# ADD LINK32 comctl32.lib kernel32.lib user32.lib shell32.lib ole32.lib wsock32.lib zlib.lib /nologo /base:"0x22000000" /dll /debug /machine:I386 /out:"../../bin/Release Unicode/plugins/updater.dll" /libpath:"zbin\x32" -# SUBTRACT LINK32 /nodefaultlib +# ADD LINK32 comctl32.lib kernel32.lib user32.lib ole32.lib shell32.lib zlib.lib /nologo /base:"0x22000000" /dll /machine:I386 /out:"../../bin/Release Unicode/plugins/updater.dll" /libpath:"zbin\x32" /filealign:0x200 +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "updater - Win32 Debug Unicode" diff --git a/updater/xmldata.cpp b/updater/xmldata.cpp index e98fd51..02017d7 100644 --- a/updater/xmldata.cpp +++ b/updater/xmldata.cpp @@ -3,9 +3,9 @@ const char *category_files[] = { "category_plugins", "category_localisation" }; -BYTE *pData[NUM_CATEGORIES] = {0}; -int dataLength[NUM_CATEGORIES] = {0}; -ezxml_t doc[NUM_CATEGORIES] = {0}; +BYTE *pData[NUM_CATEGORIES]; +int dataLength[NUM_CATEGORIES]; +ezxml_t doc[NUM_CATEGORIES]; bool XMLDataAvailable(const Category cat) { return (pData[cat] && dataLength[cat]); -- cgit v1.2.3