Hans Leidekker : winhttp/tests: Get rid of workarounds for Windows 2000.
Alexandre Julliard
julliard at winehq.org
Thu Nov 22 17:00:31 CST 2018
Module: wine
Branch: master
Commit: 2a4d6273f586bf44db14a0eeccb2f9a4bf3b5dd8
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a4d6273f586bf44db14a0eeccb2f9a4bf3b5dd8
Author: Hans Leidekker <hans at codeweavers.com>
Date: Thu Nov 22 21:15:56 2018 +0100
winhttp/tests: Get rid of workarounds for Windows 2000.
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winhttp/tests/winhttp.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c
index 70d0b4c..4779cfd 100644
--- a/dlls/winhttp/tests/winhttp.c
+++ b/dlls/winhttp/tests/winhttp.c
@@ -1198,11 +1198,6 @@ static void test_request_parameter_defaults(void)
ok(ret, "failed to send request %u\n", GetLastError());
ret = WinHttpReceiveResponse(req, NULL);
- if (!ret && GetLastError() == ERROR_WINHTTP_INVALID_SERVER_RESPONSE) /* win2k */
- {
- win_skip("invalid response\n");
- goto done;
- }
ok(ret, "failed to receive response %u\n", GetLastError());
status = 0xdeadbeef;
@@ -4420,14 +4415,12 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void)
WCHAR *url;
DWORD error;
-if (0) /* crashes on some win2k systems */
-{
SetLastError(0xdeadbeef);
ret = WinHttpDetectAutoProxyConfigUrl( 0, NULL );
error = GetLastError();
ok( !ret, "expected failure\n" );
ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error );
-}
+
url = NULL;
SetLastError(0xdeadbeef);
ret = WinHttpDetectAutoProxyConfigUrl( 0, &url );
@@ -4435,14 +4428,12 @@ if (0) /* crashes on some win2k systems */
ok( !ret, "expected failure\n" );
ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error );
-if (0) /* crashes on some win2k systems */
-{
SetLastError(0xdeadbeef);
ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, NULL );
error = GetLastError();
ok( !ret, "expected failure\n" );
ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error );
-}
+
url = (WCHAR *)0xdeadbeef;
SetLastError(0xdeadbeef);
ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, &url );
More information about the wine-cvs
mailing list