Skip to content

W
wine-winehq
Commit 8946346f authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

winhttp: Fix a test failure on Windows 8 and conform to the more recent behavior.

parent 2b5888cc
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
dlls/winhttp/session.c
View file @ 8946346f
...@@ -1365,7 +1365,11 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) ...@@ -1365,7 +1365,11 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url )
FIXME("getaddrinfo not found at build time\n"); FIXME("getaddrinfo not found at build time\n");
#endif #endif
} }
if (!ret) set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED ); if (!ret)
{
set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED );
*url = NULL;
}
return ret; return ret;
} }
......
dlls/winhttp/tests/winhttp.c
View file @ 8946346f
...@@ -2759,7 +2759,7 @@ if (0) /* crashes on some win2k systems */ ...@@ -2759,7 +2759,7 @@ if (0) /* crashes on some win2k systems */
if (!ret) if (!ret)
{ {
ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error );
ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); ok( !url || broken(url == (WCHAR *)0xdeadbeef), "got %p\n", url );
} }
else else
{ {
...@@ -2774,7 +2774,7 @@ if (0) /* crashes on some win2k systems */ ...@@ -2774,7 +2774,7 @@ if (0) /* crashes on some win2k systems */
if (!ret) if (!ret)
{ {
ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error );
ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); ok( !url || broken(url == (WCHAR *)0xdeadbeef), "got %p\n", url );
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment