Mercurial > pidgin.yaz

changeset 11555:4da9e0d4e8d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 13815] Look at the current user registry keys to find GTK+ first, then fall back to the system registry (switched precedence). Pay no attention to the mass of changes, it is mostly whitespace fixes that were irritating me. committer: Tailor Script <tailor@pidgin.im>
author Daniel Atallah <daniel.atallah@gmail.com>
date Sat, 17 Sep 2005 22:28:18 +0000
parents f8443218b7fe
children 7fbf5e4e8f5f
files src/win_gaim.c
diffstat 1 files changed, 203 insertions(+), 196 deletions(-) [+]
line wrap: on
line diff
--- a/src/win_gaim.c	Sat Sep 17 03:45:07 2005 +0000
+++ b/src/win_gaim.c	Sat Sep 17 22:28:18 2005 +0000
@@ -78,23 +78,28 @@
 				sub_key, retv, szBuf);
 	}
 
-        return ret;
+	return ret;
 }
 
 static void dll_prep() {
-        char gtkpath[MAX_PATH + 1];
-        char path[MAX_PATH + 1];
-        DWORD plen;
-        BOOL gotreg = FALSE;
-        HKEY hkey;
-        HMODULE hmod;
+	char gtkpath[MAX_PATH + 1];
+	char path[MAX_PATH + 1];
+	DWORD plen;
+	HKEY hkey;
+	HMODULE hmod;
 
 	plen = sizeof(gtkpath);
-        if(!(gotreg = read_reg_string((hkey=HKEY_LOCAL_MACHINE), "SOFTWARE\\GTK\\2.0", "Path", (LPBYTE)&gtkpath, &plen)))
-                gotreg = read_reg_string((hkey=HKEY_CURRENT_USER), "SOFTWARE\\GTK\\2.0", "Path", (LPBYTE)&gtkpath, &plen);
-
-        if(!gotreg)
-                return;
+	hkey = HKEY_CURRENT_USER;
+	if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "Path",
+			(LPBYTE) &gtkpath, &plen)) {
+		hkey = HKEY_LOCAL_MACHINE;
+		if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "Path",
+				(LPBYTE) &gtkpath, &plen)) {
+			printf("GTK+ Path Registry Key not found. "
+				"Assuming GTK+ is in the PATH.\n");
+			return;
+		}
+	}
 
 	/* this value is replaced during a successful RegQueryValueEx() */
 	plen = sizeof(path);
@@ -105,126 +110,123 @@
 		strcat(path, "\\bin");
 	}
 
-        printf("GTK+ path found: %s\n", path);
+	printf("GTK+ path found: %s\n", path);
 
-        if((hmod=GetModuleHandle("kernel32.dll"))) {
-                MySetDllDirectory = (LPFNSETDLLDIRECTORY)GetProcAddress(hmod, "SetDllDirectoryA");
-                if(!MySetDllDirectory)
-                        printf("SetDllDirectory not supported\n");
-        }
-        else
-                printf("Error getting kernel32.dll module handle\n");
+	if ((hmod = GetModuleHandle("kernel32.dll"))) {
+		MySetDllDirectory = (LPFNSETDLLDIRECTORY) GetProcAddress(
+			hmod, "SetDllDirectoryA");
+		if (!MySetDllDirectory)
+			printf("SetDllDirectory not supported\n");
+	} else
+		printf("Error getting kernel32.dll module handle\n");
 
-        /* For Windows XP SP1+ / Server 2003 we use SetDllDirectory to avoid dll hell */
-        if(MySetDllDirectory) {
-                printf("Using SetDllDirectory\n");
-                MySetDllDirectory(path);
-        }
+	/* For Windows XP SP1+ / Server 2003 we use SetDllDirectory to avoid dll hell */
+	if (MySetDllDirectory) {
+		printf("Using SetDllDirectory\n");
+		MySetDllDirectory(path);
+	}
 
-        /* For the rest, we set the current directory and make sure SafeDllSearch is set
-           to 0 where needed. */
-        else {
-                OSVERSIONINFO osinfo;
+	/* For the rest, we set the current directory and make sure
+	 * SafeDllSearch is set to 0 where needed. */
+	else {
+		OSVERSIONINFO osinfo;
 
-                printf("Setting current directory to GTK+ dll directory\n");
-                SetCurrentDirectory(path);
-                /* For Windows 2000 (SP3+) / WinXP (No SP):
-                 * If SafeDllSearchMode is set to 1, Windows system directories are
-                 * searched for dlls before the current directory. Therefore we set it
-                 * to 0.
-                 */
-                osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-                GetVersionEx(&osinfo);
-                if((osinfo.dwMajorVersion == 5 &&
-                    osinfo.dwMinorVersion == 0 &&
-                    strcmp(osinfo.szCSDVersion, "Service Pack 3") >= 0) ||
-                   (osinfo.dwMajorVersion == 5 &&
-                    osinfo.dwMinorVersion == 1 &&
-                    strcmp(osinfo.szCSDVersion, "") >= 0)
-                   ) {
-                        DWORD regval = 1;
-                        DWORD reglen = sizeof(DWORD);
+		printf("Setting current directory to GTK+ dll directory\n");
+		SetCurrentDirectory(path);
+		/* For Windows 2000 (SP3+) / WinXP (No SP):
+		 * If SafeDllSearchMode is set to 1, Windows system directories are
+		 * searched for dlls before the current directory. Therefore we set it
+		 * to 0.
+		 */
+		osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+		GetVersionEx(&osinfo);
+		if ((osinfo.dwMajorVersion == 5 &&
+			osinfo.dwMinorVersion == 0 &&
+			strcmp(osinfo.szCSDVersion, "Service Pack 3") >= 0) ||
+			(osinfo.dwMajorVersion == 5 &&
+			osinfo.dwMinorVersion == 1 &&
+			strcmp(osinfo.szCSDVersion, "") >= 0)
+		) {
+			DWORD regval = 1;
+			DWORD reglen = sizeof(DWORD);
 
-                        printf("Using Win2k (SP3+) / WinXP (No SP).. Checking SafeDllSearch\n");
-                        read_reg_string(HKEY_LOCAL_MACHINE,
-                                        "System\\CurrentControlSet\\Control\\Session Manager",
-                                        "SafeDllSearchMode",
-                                        (LPBYTE)&regval,
-                                        &reglen);
+			printf("Using Win2k (SP3+) / WinXP (No SP).. Checking SafeDllSearch\n");
+			read_reg_string(HKEY_LOCAL_MACHINE,
+				"System\\CurrentControlSet\\Control\\Session Manager",
+				"SafeDllSearchMode",
+				(LPBYTE) &regval,
+				&reglen);
 
-                        if(regval != 0) {
-                                printf("Trying to set SafeDllSearchMode to 0\n");
-                                regval = 0;
-                                if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, 
-                                                "System\\CurrentControlSet\\Control\\Session Manager", 
-                                                0,  KEY_SET_VALUE, &hkey) == ERROR_SUCCESS) {
-                                        if(RegSetValueEx(hkey, 
-                                                         "SafeDllSearchMode",
-                                                         0,
-                                                         REG_DWORD,
-                                                         (LPBYTE) &regval,
-                                                         sizeof(DWORD)) != ERROR_SUCCESS)
-                                                printf("Error writing SafeDllSearchMode. Error: %u\n",
-                                                       (UINT)GetLastError());
-                                        RegCloseKey(hkey);
-                                }
-                                else
-                                        printf("Error opening Session Manager key for writing. Error: %u\n",
-                                               (UINT)GetLastError());
-                        }
-                        else
-                                printf("SafeDllSearchMode is set to 0\n");
-                }/*end else*/
-        }
+			if (regval != 0) {
+				printf("Trying to set SafeDllSearchMode to 0\n");
+				regval = 0;
+				if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+					"System\\CurrentControlSet\\Control\\Session Manager", 
+					0,  KEY_SET_VALUE, &hkey
+				) == ERROR_SUCCESS) {
+					if (RegSetValueEx(hkey,
+						"SafeDllSearchMode", 0,
+						REG_DWORD, (LPBYTE) &regval,
+						sizeof(DWORD)
+					) != ERROR_SUCCESS)
+						printf("Error writing SafeDllSearchMode. Error: %u\n",
+						(UINT) GetLastError());
+					RegCloseKey(hkey);
+				} else
+					printf("Error opening Session Manager key for writing. Error: %u\n",
+						(UINT) GetLastError());
+			} else
+				printf("SafeDllSearchMode is set to 0\n");
+		}/*end else*/
+	}
 }
 
 static char* wgaim_lcid_to_posix(LCID lcid) {
-        switch(lcid) {
-        case 1026: return "bg"; /* bulgarian */
-        case 2125: return "my_MM"; /* burmese (Myanmar) */
-        case 1027: return "ca"; /* catalan */
-        case 1050: return "hr"; /* croatian */
-        case 1029: return "cs"; /* czech */
-        case 1030: return "da"; /* danish */
-        case 1043: return "nl"; /* dutch - netherlands */
-        case 1033: return "en"; /* english - us */
-        case 3081: return "en_AU"; /* english - australia */
-        case 4105: return "en_CA"; /* english - canada */
-        case 2057: return "en_GB"; /* english - great britain */
-        case 1035: return "fi"; /* finnish */
-        case 1036: return "fr"; /* french - france */
-        case 1031: return "de"; /* german - germany */
-        case 1032: return "el"; /* greek */
-        case 1037: return "he"; /* hebrew */
-        case 1081: return "hi"; /* hindi */
-        case 1038: return "hu"; /* hungarian */
-        case 1040: return "it"; /* italian - italy */
-        case 1041: return "ja"; /* japanese */
-        case 1042: return "ko"; /* korean */
-        case 1063: return "lt"; /* lithuanian */
-        case 1071: return "mk"; /* macedonian */
-        case 1044: return "no"; /* norwegian */
-        case 1045: return "pl"; /* polish */
-        case 2070: return "pt"; /* portuguese - portugal */
-        case 1046: return "pt_BR"; /* portuguese - brazil */
-        case 1048: return "ro"; /* romanian - romania */
-        case 1049: return "ru"; /* russian - russia */
-        case 2074: return "sr@Latn"; /* serbian - latin */
-        case 3098: return "sr"; /* serbian - cyrillic */
-        case 2052: return "zh_CN"; /* chinese - china (simple) */
-        case 1051: return "sk"; /* slovak */
-        case 1060: return "sl"; /* slovenian */
-        case 1034: return "es"; /* spanish */
-        case 1052: return "sq"; /* albanian */
-        case 1053: return "sv"; /* swedish */
-        case 1054: return "th"; /* thai */
-        case 1028: return "zh_TW"; /* chinese - taiwan (traditional) */
-        case 1055: return "tr"; /* turkish */
-        case 1058: return "uk"; /* ukrainian */
-        case 1066: return "vi"; /* vietnamese */
-        default:
-                return NULL;
-        }
+	switch(lcid) {
+		case 1026: return "bg"; /* bulgarian */
+		case 2125: return "my_MM"; /* burmese (Myanmar) */
+		case 1027: return "ca"; /* catalan */
+		case 1050: return "hr"; /* croatian */
+		case 1029: return "cs"; /* czech */
+		case 1030: return "da"; /* danish */
+		case 1043: return "nl"; /* dutch - netherlands */
+		case 1033: return "en"; /* english - us */
+		case 3081: return "en_AU"; /* english - australia */
+		case 4105: return "en_CA"; /* english - canada */
+		case 2057: return "en_GB"; /* english - great britain */
+		case 1035: return "fi"; /* finnish */
+		case 1036: return "fr"; /* french - france */
+		case 1031: return "de"; /* german - germany */
+		case 1032: return "el"; /* greek */
+		case 1037: return "he"; /* hebrew */
+		case 1081: return "hi"; /* hindi */
+		case 1038: return "hu"; /* hungarian */
+		case 1040: return "it"; /* italian - italy */
+		case 1041: return "ja"; /* japanese */
+		case 1042: return "ko"; /* korean */
+		case 1063: return "lt"; /* lithuanian */
+		case 1071: return "mk"; /* macedonian */
+		case 1044: return "no"; /* norwegian */
+		case 1045: return "pl"; /* polish */
+		case 2070: return "pt"; /* portuguese - portugal */
+		case 1046: return "pt_BR"; /* portuguese - brazil */
+		case 1048: return "ro"; /* romanian - romania */
+		case 1049: return "ru"; /* russian - russia */
+		case 2074: return "sr@Latn"; /* serbian - latin */
+		case 3098: return "sr"; /* serbian - cyrillic */
+		case 2052: return "zh_CN"; /* chinese - china (simple) */
+		case 1051: return "sk"; /* slovak */
+		case 1060: return "sl"; /* slovenian */
+		case 1034: return "es"; /* spanish */
+		case 1052: return "sq"; /* albanian */
+		case 1053: return "sv"; /* swedish */
+		case 1054: return "th"; /* thai */
+		case 1028: return "zh_TW"; /* chinese - taiwan (traditional) */
+		case 1055: return "tr"; /* turkish */
+		case 1058: return "uk"; /* ukrainian */
+		case 1066: return "vi"; /* vietnamese */
+		default: return NULL;
+	}
 }
 
 /* Determine and set Gaim locale as follows (in order of priority):
@@ -232,45 +234,48 @@
    - Check NSIS Installer Language reg value
    - Use default user locale
 */
-static const char* wgaim_get_locale() {
-        const char* locale=NULL;
-        char data[10];
-        DWORD datalen = 10;
-        LCID lcid;
+static const char *wgaim_get_locale() {
+	const char *locale = NULL;
+	char data[10];
+	DWORD datalen = 10;
+	LCID lcid;
 
-        /* Check if user set GAIMLANG env var */
-        if((locale = getenv("GAIMLANG")))
-                return locale;
+	/* Check if user set GAIMLANG env var */
+	if ((locale = getenv("GAIMLANG")))
+		return locale;
 
-        if(read_reg_string(HKEY_CURRENT_USER, "SOFTWARE\\gaim", "Installer Language", (LPBYTE)&data, &datalen)) {
-                if((locale = wgaim_lcid_to_posix(atoi(data))))
-                        return locale;
-        }
+	if (read_reg_string(HKEY_CURRENT_USER, "SOFTWARE\\gaim",
+			"Installer Language", (LPBYTE) &data, &datalen)) {
+		if ((locale = wgaim_lcid_to_posix(atoi(data))))
+			return locale;
+	}
 
-        lcid = GetUserDefaultLCID();
-        if((locale = wgaim_lcid_to_posix(lcid)))
-                return locale;
+	lcid = GetUserDefaultLCID();
+	if ((locale = wgaim_lcid_to_posix(lcid)))
+		return locale;
 
-		return "en";
+	return "en";
 }
 
 static void wgaim_set_locale() {
-        const char* locale=NULL;
-        char envstr[25];
+	const char *locale = NULL;
+	char envstr[25];
 
-        locale = wgaim_get_locale();
+	locale = wgaim_get_locale();
 
-        snprintf(envstr, 25, "LANG=%s", locale);
-        printf("Setting locale: %s\n", envstr);
-        putenv(envstr);
+	snprintf(envstr, 25, "LANG=%s", locale);
+	printf("Setting locale: %s\n", envstr);
+	putenv(envstr);
 }
 
 static BOOL wgaim_set_running() {
 	HANDLE h;
 
-	if((h=CreateMutex(NULL, FALSE, "gaim_is_running"))) {
-		if(GetLastError() == ERROR_ALREADY_EXISTS) {
-			MessageBox(NULL, "An instance of Gaim is already running", NULL, MB_OK | MB_TOPMOST);
+	if ((h = CreateMutex(NULL, FALSE, "gaim_is_running"))) {
+		if (GetLastError() == ERROR_ALREADY_EXISTS) {
+			MessageBox(NULL,
+				"An instance of Gaim is already running",
+				NULL, MB_OK | MB_TOPMOST);
 			return FALSE;
 		}
 	}
@@ -286,17 +291,19 @@
 	if (getenv("HTTP_PROXY") || getenv("http_proxy") || getenv("HTTPPROXY"))
 		return;
 
-	if (read_reg_string(HKEY_CURRENT_USER, WIN32_PROXY_REGKEY, "ProxyEnable",
+	if (read_reg_string(HKEY_CURRENT_USER, WIN32_PROXY_REGKEY,
+				"ProxyEnable",
 				(LPBYTE) &regval, &reglen) && (regval & 1)) {
 		char proxy_server[2048];
 		char *c = NULL;
 		reglen = sizeof(proxy_server);
 
-		if (!read_reg_string(HKEY_CURRENT_USER, WIN32_PROXY_REGKEY , "ProxyServer",
-				(LPBYTE) &proxy_server, &reglen))
+		if (!read_reg_string(HKEY_CURRENT_USER, WIN32_PROXY_REGKEY,
+				"ProxyServer", (LPBYTE) &proxy_server, &reglen))
 			return;
 
-		if ((reglen > strlen("http=")) && (c = strstr(proxy_server, "http="))) {
+		if ((reglen > strlen("http="))
+				&& (c = strstr(proxy_server, "http="))) {
 			char *d;
 			c += strlen("http=");
 			d = strchr(c, ';');
@@ -309,7 +316,8 @@
 		if (c) {
 			const char envstr_prefix[] = "HTTP_PROXY=http://";
 			char envstr[sizeof(envstr_prefix) + strlen(c) + 1];
-			snprintf(envstr, sizeof(envstr), "%s%s", envstr_prefix, c);
+			snprintf(envstr, sizeof(envstr), "%s%s",
+				envstr_prefix, c);
 			printf("Setting HTTP Proxy: %s\n", envstr);
 			putenv(envstr);
 		}
@@ -324,14 +332,11 @@
 #endif
 
 int _stdcall
-WinMain (struct HINSTANCE__ *hInstance, 
-	 struct HINSTANCE__ *hPrevInstance,
-	 char               *lpszCmdLine,
-	 int                 nCmdShow)
-{
-        char errbuf[512];
-        char gaimdir[MAX_PATH];
-        HMODULE hmod;
+WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
+		char *lpszCmdLine, int nCmdShow) {
+	char errbuf[512];
+	char gaimdir[MAX_PATH];
+	HMODULE hmod;
 
 	/* If debug or help or version flag used, create console for output */
 	if (strstr(lpszCmdLine, "-d") || strstr(lpszCmdLine, "-h") || strstr(lpszCmdLine, "-v")) {
@@ -346,49 +351,51 @@
 			freopen("CONOUT$", "w", stdout);
 	}
 
-        /* Load exception handler if we have it */
-        if(GetModuleFileName(NULL, gaimdir, MAX_PATH) != 0) {
-                char *tmp = gaimdir;
-                char *prev = NULL;
+	/* Load exception handler if we have it */
+	if (GetModuleFileName(NULL, gaimdir, MAX_PATH) != 0) {
+		char *tmp = gaimdir;
+		char *prev = NULL;
+
+		while ((tmp = strchr(tmp, '\\'))) {
+			prev = tmp;
+			tmp++;
+		}
 
-                while((tmp=strchr(tmp, '\\'))) {
-                        prev = tmp;
-                        tmp+=1;
-                }
-                if(prev) {
-                        prev[0] = '\0';
-                        strcat(gaimdir, "\\exchndl.dll");
-                        if(LoadLibrary(gaimdir))
-                                printf("Loaded exchndl.dll\n");
-                }
-        }
-        else {
-                snprintf(errbuf, 512, "Error getting module filename. Error: %u", (UINT)GetLastError());
-                MessageBox(NULL, errbuf, NULL, MB_OK | MB_TOPMOST);
-        }
+		if (prev) {
+			prev[0] = '\0';
+			strcat(gaimdir, "\\exchndl.dll");
+			if (LoadLibrary(gaimdir))
+				printf("Loaded exchndl.dll\n");
+		}
+	} else {
+		snprintf(errbuf, 512,
+			"Error getting module filename. Error: %u",
+			(UINT) GetLastError());
+		MessageBox(NULL, errbuf, NULL, MB_OK | MB_TOPMOST);
+	}
 
-        if(!getenv("GAIM_NO_DLL_CHECK"))
-                dll_prep();
+	if (!getenv("GAIM_NO_DLL_CHECK"))
+		dll_prep();
 
 	wgaim_set_locale();
 	/* If help or version flag used, do not check Mutex */
-	if(!strstr(lpszCmdLine, "-h") && !strstr(lpszCmdLine, "-v"))
-		if(!getenv("GAIM_MULTI_INST") && !wgaim_set_running())
+	if (!strstr(lpszCmdLine, "-h") && !strstr(lpszCmdLine, "-v"))
+		if (!getenv("GAIM_MULTI_INST") && !wgaim_set_running())
 			return 0;
 
 	wgaim_set_proxy();
 
-        /* Now we are ready for Gaim .. */
-        if((hmod=LoadLibrary("gaim.dll"))) {
-                gaim_main = (LPFNGAIMMAIN)GetProcAddress(hmod, "gaim_main");
-        }
+	/* Now we are ready for Gaim .. */
+	if ((hmod = LoadLibrary("gaim.dll"))) {
+		gaim_main = (LPFNGAIMMAIN) GetProcAddress(hmod, "gaim_main");
+	}
 
-        if(!gaim_main) {
-                snprintf(errbuf, 512, "Error loading gaim.dll. Error: %u", (UINT)GetLastError());
-                MessageBox(NULL, errbuf, NULL, MB_OK | MB_TOPMOST);
-                return 0;
-        }
-        else
-                return gaim_main (hInstance, __argc, __argv);
+	if (!gaim_main) {
+		snprintf(errbuf, 512, "Error loading gaim.dll. Error: %u",
+			(UINT) GetLastError());
+		MessageBox(NULL, errbuf, NULL, MB_OK | MB_TOPMOST);
+		return 0;
+	}
+
+	return gaim_main (hInstance, __argc, __argv);
 }
-