Mercurial > pidgin.yaz
view src/win_gaim.c @ 7652:ac6b2b3a9a1f
[gaim-migrate @ 8296]
Bj?rn Voigt (bjoernv) writes:
" I found a small problem in Gaim's proxy settings. There
is an option "Use Environmental Settings". This option
does not work as expected.
Gaim reads the environment variables http_proxy (or
HTTP_PROXY or HTTPPROXY) and http_proxy_port (or
HTTP_PROXY_PORT or HTTPPROXYPORT) and variables for
proxy user and proxy password. Gaim expects the
following format:
export http_proxy=your.proxy.server
export http_proxy_port=8080
As far as I know this is a unusual format. Probably
there is no
standard document, which describes the correct format
of proxy
variables, but browsers like Konqueror, Amaya, Lynx and
others use a pseudo standard format:
export http_proxy="http://your.proxy.server:8080/"
The port number defaults to 80. The variable
http_proxy_port is
unknown. The proxy variable format is described in some
W3C pages, for instance:
http://www.w3.org/Daemon/User/Proxies/ProxyClients.html
http://www.w3.org/Library/User/Using/Proxy.html
http://www.w3.org/Amaya/User/Proxy.html
Solution
--------
My patch fixes the proxy environment variable parsing
in src/proxy.c:1626: gaim_proxy_connect(). The patch
removes
http_proxy_port and uses gaim_url_parse() from
src/util.c to parse the http_proxy variable.
Remaining problems
------------------
If a user has adjusted his proxy settings to Gaim's old
proxy variable format, he gets an error. I don't think,
that this is a big problem, as not much users set their
proxy variables only for one program (old proxy
variables where incompatible with browsers like Lynx,
Konqueror,
...).
Gaim still doesn't look at the no_proxy variable. This
variables
defines hosts and domains, which should be connected
directly:
export
no_proxy="cern.ch,ncsa.uiuc.edu,some.host:8080"
For example, one user may want to connect to Yahoo!
over a proxy and to an internal Jabber server without a
proxy. But the user can define individual proxy
variables for each account."
he continues:
"Nathan Walp <faceprint@faceprint.com> wrote:
> Why not have your patch check to see if the http_proxy var
starts with
> "http://", and if so, parse it, otherwise fall
back on the
old behavior.
Ok, the function gaim_url_parse() automatically detects
hostnames and port numbers, if the http_proxy URL does not
start with http://.
My new patch also checks for http_proxy_port. Now my patch
(file proxy2.patch) is fully backward compatible and tested."
given how rarely the current proxy code works, i don't see how this could
possibly make things worse, so i'm taking a chance since it compiles.
someone please test this.
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Sat, 29 Nov 2003 03:46:24 +0000 |
parents | 07156f873116 |
children | f1d2907db5be |
line wrap: on
line source
/* * win_gaim.c * * Date: June, 2002 * Description: Entry point for win32 gaim, and various win32 dependant * routines. * * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ #include <windows.h> #include <fcntl.h> #include <stdlib.h> #include <string.h> #include <stdio.h> typedef int (CALLBACK* LPFNGAIMMAIN)(HINSTANCE, int, char**); typedef void (CALLBACK* LPFNSETDLLDIRECTORY)(LPCTSTR); /* * PROTOTYPES */ static LPFNGAIMMAIN gaim_main = NULL; static LPFNSETDLLDIRECTORY MySetDllDirectory = NULL; static BOOL read_reg_string(HKEY key, char* sub_key, char* val_name, LPBYTE data, LPDWORD data_len) { HKEY hkey; BOOL ret = FALSE; int retv; if(ERROR_SUCCESS == RegOpenKeyEx(key, sub_key, 0, KEY_QUERY_VALUE, &hkey)) { if(ERROR_SUCCESS == (retv=RegQueryValueEx(hkey, val_name, 0, NULL, data, data_len))) ret = TRUE; else printf("Could not read reg key '%s' subkey '%s' value: '%s'\nError: %u\n", ((key == HKEY_LOCAL_MACHINE) ? "HKLM" : (key == HKEY_CURRENT_USER) ? "HKCU" : "???"), sub_key, val_name, (UINT)GetLastError()); RegCloseKey(key); } else printf("Could not open reg subkey: %s\nError: %u\n", sub_key, (UINT)GetLastError()); return ret; } static void dll_prep() { char gtkpath[MAX_PATH]; char path[MAX_PATH]; DWORD plen = MAX_PATH; int gotreg=FALSE; HKEY hkey; HMODULE hmod; if(!(gotreg = read_reg_string((hkey=HKEY_LOCAL_MACHINE), "SOFTWARE\\GTK\\2.0", "Path", (LPBYTE)>kpath, &plen))) gotreg = read_reg_string((hkey=HKEY_CURRENT_USER), "SOFTWARE\\GTK\\2.0", "Path", (LPBYTE)>kpath, &plen); if(!gotreg) return; /* Determine GTK+ dll path .. */ if(!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "DllPath", (LPBYTE)&path, &plen)) { char version[10]; char inst[10]; DWORD len = 10; strcpy(path, gtkpath); if(read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "Version", (LPBYTE)&version, &len) && read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "Installer", (LPBYTE)&inst, &len)) { if(strcmp(version, "2.2.2") >= 0 && strcmp(inst, "NSIS") == 0) { strcat(path, "\\bin"); } else strcat(path, "\\lib"); } else strcat(path, "\\lib"); } printf("GTK+ path found: %s\n", path); if((hmod=GetModuleHandle("kernel32.dll"))) { MySetDllDirectory = (LPFNSETDLLDIRECTORY)GetProcAddress(hmod, "SetDllDirectory"); 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 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("Using Win2k (SP3+) / WinXP (No SP).. Checking SafeDllSearch\n"); read_reg_string(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Session Manager", "SafeDllSearchMode", (LPBYTE)®val, ®len); 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) ®val, 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 1027: return "ca"; /* catalan */ case 1050: return "hr"; /* croation */ case 1029: return "cs"; /* czech */ case 1030: return "da"; /* danaish */ case 1043: return "nl"; /* dutch - netherlands */ case 1033: return "en"; /* english - us */ case 1035: return "fi"; /* finish */ case 1036: return "fr"; /* french - france */ case 1031: return "de"; /* german - germany */ case 1032: return "el"; /* greek */ case 1037: return "he"; /* hebrew */ 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 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 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 */ default: return NULL; } } /* Determine and set Gaim locale as follows (in order of priority): - Check LANG env var - Check NSIS Installer Language reg value - Use default user locale */ static void wgaim_set_locale() { char data[10]; DWORD datalen = 10; char* locale=NULL; char envstr[25]; LCID lcid; /* Check if user set LANG env var */ if((locale = (char*)getenv("LANG"))) { goto finish; } if(read_reg_string(HKEY_CURRENT_USER, "SOFTWARE\\gaim", "Installer Language", (LPBYTE)&data, &datalen)) { if((locale = wgaim_lcid_to_posix(atoi(data)))) goto finish; } lcid = GetUserDefaultLCID(); if((locale = wgaim_lcid_to_posix(lcid))) goto finish; finish: if(!locale) locale = "en"; snprintf(envstr, 25, "LANG=%s", locale); printf("Setting locale: %s\n", envstr); putenv(envstr); } #ifdef __GNUC__ # ifndef _stdcall # define _stdcall __attribute__((stdcall)) # endif #endif int _stdcall WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance, char *lpszCmdLine, int nCmdShow) { char errbuf[512]; char gaimdir[MAX_PATH]; HMODULE hmod; /* 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+=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(!getenv("GAIM_NO_DLL_CHECK")) dll_prep(); wgaim_set_locale(); /* 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); }