Hans Leidekker : winhttp/tests: Fix test failures on Windows XP.
Alexandre Julliard
julliard at winehq.org
Wed Nov 16 17:39:19 CST 2016
Module: wine
Branch: master
Commit: bfa0e4b840075857e1c6850aa6a99b98e052e6cf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa0e4b840075857e1c6850aa6a99b98e052e6cf
Author: Hans Leidekker <hans at codeweavers.com>
Date: Wed Nov 16 16:46:57 2016 -0600
winhttp/tests: Fix test failures on Windows XP.
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winhttp/tests/winhttp.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c
index e5a8be3..61c4acf 100644
--- a/dlls/winhttp/tests/winhttp.c
+++ b/dlls/winhttp/tests/winhttp.c
@@ -995,7 +995,10 @@ static void test_secure_connection(void)
ok(req != NULL, "failed to open a request %u\n", GetLastError());
ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0);
- ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "setting client cert context returned %x (%u)\n", ret, GetLastError());
+ err = GetLastError();
+ ok(!ret, "unexpected success\n");
+ ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_STATE || broken(err == ERROR_INVALID_PARAMETER) /* winxp */,
+ "setting client cert context returned %u\n", err);
ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0);
err = GetLastError();
@@ -1021,7 +1024,8 @@ static void test_secure_connection(void)
ok(req != NULL, "failed to open a request %u\n", GetLastError());
ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0);
- ok(ret, "failed to set client cert context %u\n", GetLastError());
+ err = GetLastError();
+ ok(ret || broken(!ret && err == ERROR_INVALID_PARAMETER) /* winxp */, "failed to set client cert context %u\n", err);
WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0);
More information about the wine-cvs
mailing list