[PATCH 0/2] MR6106: winhttp test fixes

[PATCH 1/2] winhttp/tests: Mark a test as broken on old Windows versions.

[Hans Leidekker]

From: Hans Leidekker

---
 dlls/winhttp/tests/winhttp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c
index 2e086222aba..89497c9ebd7 100644
--- a/dlls/winhttp/tests/winhttp.c
+++ b/dlls/winhttp/tests/winhttp.c
@@ -5795,7 +5795,9 @@ static void test_max_http_automatic_redirects (void)
     size = sizeof(url);
     ret = WinHttpQueryOption(request, WINHTTP_OPTION_URL, url, &size);
     ok(ret, "got %lu\n", GetLastError());
-    ok(!wcscmp(url, L"http://test.winehq.org/tests/redirecttest.php?id=2&max=3"), "got %s\n", wine_dbgstr_w(url));
+    ok(!wcscmp(url, L"http://test.winehq.org/tests/redirecttest.php?id=2&max=3") ||
+       broken(!wcscmp(url, L"http://test.winehq.org/tests/redirecttest.php?id=1&max=3")) /* < Win10 1809 */,
+       "got %s\n", wine_dbgstr_w(url));

done:
     ret = WinHttpCloseHandle(request);

[PATCH 2/2] winhttp/tests: Fix test failures introduced by the server upgrade.

[Hans Leidekker]

From: Hans Leidekker

---
 dlls/winhttp/tests/winhttp.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c
index 89497c9ebd7..7d89277abe1 100644
--- a/dlls/winhttp/tests/winhttp.c
+++ b/dlls/winhttp/tests/winhttp.c
@@ -6053,7 +6053,6 @@ static const BYTE pfxdata[] =
 static void test_client_cert_authentication(void)
 {
     HINTERNET ses, req, con;
-    DWORD protocols;
     BOOL ret;
     CRYPT_DATA_BLOB pfx;
     HCERTSTORE store;
@@ -6062,16 +6061,6 @@ static void test_client_cert_authentication(void)
     ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 );
     ok( ses != NULL, "failed to open session %lu\n", GetLastError() );

-    protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1;
-    ret = WinHttpSetOption( ses, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols) );
-    if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) /* vista */
-    {
-        win_skip( "can't set secure protocols\n" );
-        WinHttpCloseHandle( ses );
-        return;
-    }
-    ok( ret, "failed to set protocols %lu\n", GetLastError() );
-
     con = WinHttpConnect( ses, L"test.winehq.org", 443, 0 );
     ok( con != NULL, "failed to open a connection %lu\n", GetLastError() );

@@ -6104,7 +6093,7 @@ static void test_client_cert_authentication(void)
     ret = WinHttpReceiveResponse( req, NULL );
     todo_wine {
     ok( !ret, "unexpected success\n" );
-    ok( GetLastError() == SEC_E_CERT_EXPIRED, "got %lu\n", GetLastError() );
+    ok( GetLastError() == ERROR_WINHTTP_SECURE_FAILURE, "got %lu\n", GetLastError() );
     }

CertFreeCertificateContext( cert );

[PATCH 2/2] winhttp/tests: Fix test failures introduced by the server upgrade.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=147173

Your paranoid android.

=== w8 (32 bit report) ===

winhttp:
winhttp.c:6096: Test failed: got 2148074280

=== w8adm (32 bit report) ===

winhttp:
winhttp.c:6096: Test failed: got 2148074280

=== w864 (32 bit report) ===

winhttp:
winhttp.c:6096: Test failed: got 2148074280

=== w1064v1507 (32 bit report) ===

winhttp:
winhttp.c:6096: Test failed: got 2148074280

=== w864 (64 bit report) ===

winhttp:
winhttp.c:6096: Test failed: got 2148074280

=== w1064v1507 (64 bit report) ===

winhttp:
winhttp.c:6096: Test failed: got 2148074280