set update url based on miranda's unicode status

allow ansi ver to read unicode dat file
allow download of either version to replace either version (plugin name aliases)

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@305 4f64403b-2f21-0410-a795-97e2b3489a10

1 files changed, 25 insertions, 24 deletions

diff --git a/updater/updater.cpp b/updater/updater.cpp
index c5d19a7..2dfc984 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -10,7 +10,7 @@ DWORD mainThreadId;
 HANDLE mainThread;

 

 bool is_idle = false;

-

+bool unicode_system;

 //#define TESTING			// defined here to reduce build time blowout caused by changing common.h

 

 PLUGININFOEX pluginInfo={

@@ -145,38 +145,37 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
 	update.cpbVersion = strlen((char *)update.pbVersion);

 

 	

-#ifdef _UNICODE

+	if(unicode_system) {

 

 #ifdef REGISTER_AUTO

-	update.szUpdateURL = UPDATER_AUTOREGISTER;

+		update.szUpdateURL = UPDATER_AUTOREGISTER;

 #else //!REGISTER_AUTO

-	update.szUpdateURL = MIM_DOWNLOAD_URL_PREFIX "2596";

-	update.szVersionURL = MIM_VIEW_URL_PREFIX "2596";

-	update.pbVersionPrefix = (BYTE *)"<span class=\"fileNameHeader\">Updater (Unicode) ";

-	update.cpbVersionPrefix = strlen((char *)update.pbVersionPrefix);

+		update.szUpdateURL = MIM_DOWNLOAD_URL_PREFIX "2596";

+		update.szVersionURL = MIM_VIEW_URL_PREFIX "2596";

+		update.pbVersionPrefix = (BYTE *)"<span class=\"fileNameHeader\">Updater (Unicode) ";

+		update.cpbVersionPrefix = strlen((char *)update.pbVersionPrefix);

 #endif //REGISTER_AUTO

 

-	update.szBetaUpdateURL = BETA_HOST_URL_PREFIX "/updater_unicode.zip";

-	update.szBetaVersionURL = BETA_HOST_URL_PREFIX "/ver_updater_unicode.html";

-	update.pbBetaVersionPrefix = (BYTE *)"Updater (Unicode) version ";

-	update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);

-#else //!_UNICODE

+		update.szBetaUpdateURL = BETA_HOST_URL_PREFIX "/updater_unicode.zip";

+		update.szBetaVersionURL = BETA_HOST_URL_PREFIX "/ver_updater_unicode.html";

+		update.pbBetaVersionPrefix = (BYTE *)"Updater (Unicode) version ";

+		update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);

+	} else {

 

 #ifdef REGISTER_AUTO

-	update.szUpdateURL = UPDATER_AUTOREGISTER;

+		update.szUpdateURL = UPDATER_AUTOREGISTER;

 #else //!REGISTER_AUTO

-	update.szUpdateURL = MIM_DOWNLOAD_URL_PREFIX "2254";

-	update.szVersionURL = MIM_VIEW_URL_PREFIX "2254";

-	update.pbVersionPrefix = (BYTE *)"<span class=\"fileNameHeader\">Updater ";

-	update.cpbVersionPrefix = strlen((char *)update.pbVersionPrefix);

+		update.szUpdateURL = MIM_DOWNLOAD_URL_PREFIX "2254";

+		update.szVersionURL = MIM_VIEW_URL_PREFIX "2254";

+		update.pbVersionPrefix = (BYTE *)"<span class=\"fileNameHeader\">Updater ";

+		update.cpbVersionPrefix = strlen((char *)update.pbVersionPrefix);

 #endif //REGISTER_AUTO

 

-	update.szBetaUpdateURL = BETA_HOST_URL_PREFIX "/updater.zip";

-	update.szBetaVersionURL = BETA_HOST_URL_PREFIX "/ver_updater.html";

-	update.pbBetaVersionPrefix = (BYTE *)"Updater version ";

-	update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);

-#endif //_UNICODE

-

+		update.szBetaUpdateURL = BETA_HOST_URL_PREFIX "/updater.zip";

+		update.szBetaVersionURL = BETA_HOST_URL_PREFIX "/ver_updater.html";

+		update.pbBetaVersionPrefix = (BYTE *)"Updater version ";

+		update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);

+	}

 

 	CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);

 #else // !REGISTER_BETA

@@ -223,7 +222,8 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	pluginLink = link;

 

 	char szVer[128];

-	bool unicode_system = (CallService(MS_SYSTEM_GETVERSIONTEXT, (WPARAM)sizeof(szVer), (LPARAM)szVer) == 0 && strstr(szVer, "Unicode"));

+	unicode_system = (CallService(MS_SYSTEM_GETVERSIONTEXT, (WPARAM)sizeof(szVer), (LPARAM)szVer) == 0 && strstr(szVer, "Unicode"));

+	/*

 #ifdef _UNICODE

 	if(!unicode_system) {

 		TCHAR fp[256], *fn;

@@ -243,6 +243,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 		return 1;

 	}

 #endif

+	*/

 

 	mainThreadId = GetCurrentThreadId();

 	DuplicateHandle( GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &mainThread, THREAD_SET_CONTEXT, FALSE, 0 );