Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 00:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINHTTP] Sync with Wine Staging 3.9. CORE-14656

Browse source
This commit is contained in:
Amine Khaldi 2018-06-04 03:56:48 +01:00
parent da5f3d5a8c
commit 8317165d65
2 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
dll/win32/winhttp/session.c
View file

@ -225,7 +225,7 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe
return TRUE; return TRUE;
default: default:
FIXME("unimplemented option %u\n", option); FIXME("unimplemented option %u\n", option);
set_last_error( ERROR_INVALID_PARAMETER ); set_last_error( ERROR_WINHTTP_INVALID_OPTION );
return FALSE; return FALSE;
} }
} }
@ -1028,8 +1028,8 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe
return TRUE; return TRUE;
default: default:
FIXME("unimplemented option %u\n", option); FIXME("unimplemented option %u\n", option);
set_last_error( ERROR_INVALID_PARAMETER ); set_last_error( ERROR_WINHTTP_INVALID_OPTION );
return TRUE; return FALSE;
} }
} }
@ -1583,29 +1583,21 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
} }
if (!got_from_reg && (envproxy = getenv( "http_proxy" ))) if (!got_from_reg && (envproxy = getenv( "http_proxy" )))
{ {
char *colon, *http_proxy; char *colon, *http_proxy = NULL;
if ((colon = strchr( envproxy, ':' ))) if (!(colon = strchr( envproxy, ':' ))) http_proxy = envproxy;
else
{ {
if (*(colon + 1) == '/' && *(colon + 2) == '/') if (*(colon + 1) == '/' && *(colon + 2) == '/')
{ {
static const char http[] = "http://";
/* It's a scheme, check that it's http */ /* It's a scheme, check that it's http */
if (!strncmp( envproxy, http, strlen( http ) )) if (!strncmp( envproxy, "http://", 7 )) http_proxy = envproxy + 7;
http_proxy = envproxy + strlen( http ); else WARN("unsupported scheme in $http_proxy: %s\n", envproxy);
else
{
WARN("unsupported scheme in $http_proxy: %s\n", envproxy);
http_proxy = NULL;
}
} }
else else http_proxy = envproxy;
http_proxy = envproxy;
} }
else
http_proxy = envproxy; if (http_proxy && http_proxy[0])
if (http_proxy)
{ {
WCHAR *http_proxyW; WCHAR *http_proxyW;
int len; int len;
@ -1618,8 +1610,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY;
info->lpszProxy = http_proxyW; info->lpszProxy = http_proxyW;
info->lpszProxyBypass = NULL; info->lpszProxyBypass = NULL;
TRACE("http proxy (from environment) = %s\n", TRACE("http proxy (from environment) = %s\n", debugstr_w(info->lpszProxy));
debugstr_w(info->lpszProxy));
} }
} }
} }

2
media/doc/README.WINE
View file

@ -200,7 +200,7 @@ reactos/dll/win32/windowscodecs # Synced to WineStaging-3.9
reactos/dll/win32/windowscodecsext # Synced to WineStaging-2.9 reactos/dll/win32/windowscodecsext # Synced to WineStaging-2.9
reactos/dll/win32/winemp3.acm # Synced to WineStaging-3.3 reactos/dll/win32/winemp3.acm # Synced to WineStaging-3.3
reactos/dll/win32/wing32 # Synced to WineStaging-3.3 reactos/dll/win32/wing32 # Synced to WineStaging-3.3
reactos/dll/win32/winhttp # Synced to WineStaging-3.3 reactos/dll/win32/winhttp # Synced to WineStaging-3.9
reactos/dll/win32/wininet # Synced to WineStaging-3.3 reactos/dll/win32/wininet # Synced to WineStaging-3.3
reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm # Forked at Wine-20050628
reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628