[PATCH 0/1] MR9964: winhttp/tests: Add broken in test_WinHttpGetProxyForUrl.
Followup of: 421b5439 Windows 10 1607 and before return `ERROR_INVALID_PARAMETER`. This patch just adds a broken and leaves the function in that case. [Test pattern page](https://test.winehq.org/data/patterns.html#winhttp:winhttp) [Testbot run with this patch](https://testbot.winehq.org/JobDetails.pl?Key=161574) CC: @TobiX -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9964
From: Bernhard Übelacker <bernhardu@mailbox.org> Followup of: 421b5439 --- dlls/winhttp/tests/winhttp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 600fbd8f107..6782c843123 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -5771,7 +5771,12 @@ static void test_WinHttpGetProxyForUrl(int port) options.dwFlags = WINHTTP_AUTOPROXY_ALLOW_STATIC|WINHTTP_AUTOPROXY_AUTO_DETECT; options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP|WINHTTP_AUTO_DETECT_TYPE_DNS_A; ret = WinHttpGetProxyForUrl( session, L"http://winehq.com/", &options, &info); - ok(ret, "expected success\n" ); + ok(ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* <= Win10 1607 */, "expected success\n" ); + if (!ret) + { + WinHttpCloseHandle( session ); + return; + } ok(info.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY, "info.dwAccessType = %lu\n", info.dwAccessType); ok(!info.lpszProxy, "info.Proxy = %s\n", wine_dbgstr_w(info.lpszProxy)); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9964
Dmitry Timoshkov (@dmitry) commented about dlls/winhttp/tests/winhttp.c:
options.dwFlags = WINHTTP_AUTOPROXY_ALLOW_STATIC|WINHTTP_AUTOPROXY_AUTO_DETECT; options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP|WINHTTP_AUTO_DETECT_TYPE_DNS_A; ret = WinHttpGetProxyForUrl( session, L"http://winehq.com/", &options, &info); - ok(ret, "expected success\n" ); + ok(ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* <= Win10 1607 */, "expected success\n" ); + if (!ret) + { + WinHttpCloseHandle( session ); + return; + }
Should win_skip() be added in this case? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9964#note_127948
participants (3)
-
Bernhard Übelacker -
Bernhard Übelacker (@bernhardu) -
Dmitry Timoshkov (@dmitry)