marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: De-Hungarian proxyinfo_t.

oldstable
Juan Lang 2011-07-21 12:54:27 -07:00 committed by Alexandre Julliard
parent dbcbf0c45b
commit 027238f856
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
dlls/wininet/internet.c
View File

@ -105,9 +105,9 @@ static UINT_PTR handle_table_size;
typedef struct typedef struct
{ {
DWORD dwProxyEnabled; DWORD proxyEnabled;
LPWSTR lpszProxyServer; LPWSTR proxy;
LPWSTR lpszProxyBypass; LPWSTR proxyBypass;
} proxyinfo_t; } proxyinfo_t;
static const WCHAR szInternetSettings[] = static const WCHAR szInternetSettings[] =
@ -337,15 +337,15 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi )
if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key )))
return ret; return ret;
if ((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE*)&lpwpi->dwProxyEnabled, sizeof(DWORD)))) if ((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE*)&lpwpi->proxyEnabled, sizeof(DWORD))))
{ {
RegCloseKey( key ); RegCloseKey( key );
return ret; return ret;
} }
if (lpwpi->lpszProxyServer) if (lpwpi->proxy)
{ {
if ((ret = RegSetValueExW( key, szProxyServer, 0, REG_SZ, (BYTE*)lpwpi->lpszProxyServer, sizeof(WCHAR) * (lstrlenW(lpwpi->lpszProxyServer) + 1)))) if ((ret = RegSetValueExW( key, szProxyServer, 0, REG_SZ, (BYTE*)lpwpi->proxy, sizeof(WCHAR) * (lstrlenW(lpwpi->proxy) + 1))))
{ {
RegCloseKey( key ); RegCloseKey( key );
return ret; return ret;
@ -494,8 +494,8 @@ BOOL WINAPI DetectAutoProxyUrl(LPSTR lpszAutoProxyUrl,
static void FreeProxyInfo( proxyinfo_t *lpwpi ) static void FreeProxyInfo( proxyinfo_t *lpwpi )
{ {
heap_free(lpwpi->lpszProxyServer); heap_free(lpwpi->proxy);
heap_free(lpwpi->lpszProxyBypass); heap_free(lpwpi->proxyBypass);
} }
/*********************************************************************** /***********************************************************************
@ -520,17 +520,17 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi )
return ret; return ret;
len = sizeof(DWORD); len = sizeof(DWORD);
if (RegQueryValueExW( key, szProxyEnable, NULL, &type, (BYTE *)&lpwpi->dwProxyEnabled, &len ) || type != REG_DWORD) if (RegQueryValueExW( key, szProxyEnable, NULL, &type, (BYTE *)&lpwpi->proxyEnabled, &len ) || type != REG_DWORD)
{ {
lpwpi->dwProxyEnabled = 0; lpwpi->proxyEnabled = 0;
if((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE *)&lpwpi->dwProxyEnabled, sizeof(DWORD) ))) if((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE *)&lpwpi->proxyEnabled, sizeof(DWORD) )))
{ {
RegCloseKey( key ); RegCloseKey( key );
return ret; return ret;
} }
} }
if (!(envproxy = getenv( "http_proxy" )) || lpwpi->dwProxyEnabled) if (!(envproxy = getenv( "http_proxy" )) || lpwpi->proxyEnabled)
{ {
TRACE("Proxy is enabled.\n"); TRACE("Proxy is enabled.\n");
@ -557,14 +557,14 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi )
p = strchrW( szProxy, ' ' ); p = strchrW( szProxy, ' ' );
if (p) *p = 0; if (p) *p = 0;
lpwpi->lpszProxyServer = szProxy; lpwpi->proxy = szProxy;
TRACE("http proxy = %s\n", debugstr_w(lpwpi->lpszProxyServer)); TRACE("http proxy = %s\n", debugstr_w(lpwpi->proxy));
} }
else else
{ {
TRACE("No proxy server settings in registry.\n"); TRACE("No proxy server settings in registry.\n");
lpwpi->lpszProxyServer = NULL; lpwpi->proxy = NULL;
} }
} }
else if (envproxy) else if (envproxy)
@ -576,14 +576,14 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi )
return ERROR_OUTOFMEMORY; return ERROR_OUTOFMEMORY;
MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len );
lpwpi->dwProxyEnabled = 1; lpwpi->proxyEnabled = 1;
lpwpi->lpszProxyServer = envproxyW; lpwpi->proxy = envproxyW;
TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->lpszProxyServer)); TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy));
} }
RegCloseKey( key ); RegCloseKey( key );
lpwpi->lpszProxyBypass = NULL; lpwpi->proxyBypass = NULL;
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
@ -598,10 +598,10 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai )
if (INTERNET_LoadProxySettings( &wpi )) if (INTERNET_LoadProxySettings( &wpi ))
return FALSE; return FALSE;
if (wpi.dwProxyEnabled) if (wpi.proxyEnabled)
{ {
lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; lpwai->accessType = INTERNET_OPEN_TYPE_PROXY;
lpwai->proxy = wpi.lpszProxyServer; lpwai->proxy = wpi.proxy;
return TRUE; return TRUE;
} }
@ -2333,7 +2333,7 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *
switch (optionW->dwOption) { switch (optionW->dwOption) {
case INTERNET_PER_CONN_FLAGS: case INTERNET_PER_CONN_FLAGS:
if(pi.dwProxyEnabled) if(pi.proxyEnabled)
optionW->Value.dwValue = PROXY_TYPE_PROXY; optionW->Value.dwValue = PROXY_TYPE_PROXY;
else else
optionW->Value.dwValue = PROXY_TYPE_DIRECT; optionW->Value.dwValue = PROXY_TYPE_DIRECT;
@ -2341,16 +2341,16 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *
case INTERNET_PER_CONN_PROXY_SERVER: case INTERNET_PER_CONN_PROXY_SERVER:
if (unicode) if (unicode)
optionW->Value.pszValue = heap_strdupW(pi.lpszProxyServer); optionW->Value.pszValue = heap_strdupW(pi.proxy);
else else
optionA->Value.pszValue = heap_strdupWtoA(pi.lpszProxyServer); optionA->Value.pszValue = heap_strdupWtoA(pi.proxy);
break; break;
case INTERNET_PER_CONN_PROXY_BYPASS: case INTERNET_PER_CONN_PROXY_BYPASS:
if (unicode) if (unicode)
optionW->Value.pszValue = heap_strdupW(pi.lpszProxyBypass); optionW->Value.pszValue = heap_strdupW(pi.proxyBypass);
else else
optionA->Value.pszValue = heap_strdupWtoA(pi.lpszProxyBypass); optionA->Value.pszValue = heap_strdupWtoA(pi.proxyBypass);
break; break;
case INTERNET_PER_CONN_AUTOCONFIG_URL: case INTERNET_PER_CONN_AUTOCONFIG_URL:
@ -2669,18 +2669,18 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
switch (option->dwOption) { switch (option->dwOption) {
case INTERNET_PER_CONN_PROXY_SERVER: case INTERNET_PER_CONN_PROXY_SERVER:
heap_free(pi.lpszProxyServer); heap_free(pi.proxy);
pi.lpszProxyServer = heap_strdupW(option->Value.pszValue); pi.proxy = heap_strdupW(option->Value.pszValue);
break; break;
case INTERNET_PER_CONN_FLAGS: case INTERNET_PER_CONN_FLAGS:
if(option->Value.dwValue & PROXY_TYPE_PROXY) if(option->Value.dwValue & PROXY_TYPE_PROXY)
pi.dwProxyEnabled = 1; pi.proxyEnabled = 1;
else else
{ {
if(option->Value.dwValue != PROXY_TYPE_DIRECT) if(option->Value.dwValue != PROXY_TYPE_DIRECT)
FIXME("Unhandled flags: 0x%x\n", option->Value.dwValue); FIXME("Unhandled flags: 0x%x\n", option->Value.dwValue);
pi.dwProxyEnabled = 0; pi.proxyEnabled = 0;
} }
break; break;