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/updater.cpp | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

(limited to 'updater/updater.cpp')

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 );
-- 
cgit v1.2.3