Module: wine Branch: master Commit: 1d5670c7c45af92565e19973bbd9e2d7f16acbae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5670c7c45af92565e19973bb...
Author: Jacek Caban jacek@codeweavers.com Date: Tue May 17 19:16:21 2016 +0200
wininet: Removed maximum URL length assumption from get_proxy_autoconfig_url.
Also use correct encoding.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wininet/internet.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 371c3d0..78bea7c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2307,13 +2307,14 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return res == ERROR_SUCCESS; }
-static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) +static WCHAR *get_proxy_autoconfig_url(void) { #if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); + WCHAR *ret = NULL; + SIZE_T len; const void *ref; - BOOL ret = FALSE;
if (!settings) return FALSE;
@@ -2322,16 +2323,20 @@ static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) CFRelease( settings ); return FALSE; } - if (CFStringGetCString( ref, buf, buflen, kCFStringEncodingASCII )) + len = CFStringGetLength( ref ); + if (len) + ret = heap_alloc( (len+1) * sizeof(WCHAR) ); + if (ret) { - TRACE( "returning %s\n", debugstr_a(buf) ); - ret = TRUE; + CFStringGetCharacters( ref, CFRangeMake(0, len), ret ); + ret[len] = 0; } + TRACE( "returning %s\n", debugstr_w(ret) ); CFRelease( settings ); return ret; #else FIXME( "no support on this platform\n" ); - return FALSE; + return NULL; #endif }
@@ -2418,20 +2423,17 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u }
case INTERNET_OPTION_PER_CONNECTION_OPTION: { - char url[INTERNET_MAX_URL_LENGTH + 1]; + WCHAR *url; INTERNET_PER_CONN_OPTION_LISTW *con = buffer; INTERNET_PER_CONN_OPTION_LISTA *conA = buffer; DWORD res = ERROR_SUCCESS, i; proxyinfo_t pi; - BOOL have_url; LONG ret;
TRACE("Getting global proxy info\n"); if((ret = INTERNET_LoadProxySettings(&pi))) return ret;
- have_url = get_proxy_autoconfig_url(url, sizeof(url)); - FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n");
if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) { @@ -2439,6 +2441,8 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u return ERROR_INSUFFICIENT_BUFFER; }
+ url = get_proxy_autoconfig_url(); + for (i = 0; i < con->dwOptionCount; i++) { INTERNET_PER_CONN_OPTIONW *optionW = con->pOptions + i; INTERNET_PER_CONN_OPTIONA *optionA = conA->pOptions + i; @@ -2449,7 +2453,7 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u optionW->Value.dwValue = PROXY_TYPE_PROXY; else optionW->Value.dwValue = PROXY_TYPE_DIRECT; - if (have_url) + if (url) /* native includes PROXY_TYPE_DIRECT even if PROXY_TYPE_PROXY is set */ optionW->Value.dwValue |= PROXY_TYPE_DIRECT|PROXY_TYPE_AUTO_PROXY_URL; break; @@ -2469,12 +2473,12 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u break;
case INTERNET_PER_CONN_AUTOCONFIG_URL: - if (!have_url) + if (!url) optionW->Value.pszValue = NULL; else if (unicode) - optionW->Value.pszValue = heap_strdupAtoW(url); + optionW->Value.pszValue = heap_strdupW(url); else - optionA->Value.pszValue = heap_strdupA(url); + optionA->Value.pszValue = heap_strdupWtoA(url); break;
case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: @@ -2495,6 +2499,7 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u break; } } + heap_free(url); FreeProxyInfo(&pi);
return res;