From bcfd32edad0812e26dcf3ac6d17a43dfe1ca3ce5 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Wed, 19 Aug 2020 21:54:12 -0600 Subject: [PATCH] urlmon/tests: Work around broken Win10 in test_CoInternetCombineUrlEx. The exact same workaround was already being used in test_CoInternetCombineIUri. Signed-off-by: Alex Henrie Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/urlmon/tests/uri.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b1390a35bf4..b6d2182a270 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10899,10 +10899,11 @@ static void test_CoInternetCombineUrlEx(void) { hr = pCoInternetCombineUrlEx(base, relativeW, uri_combine_tests[i].combine_flags, &result, 0); todo_wine_if(uri_combine_tests[i].todo) - ok(hr == uri_combine_tests[i].expected, + ok(hr == uri_combine_tests[i].expected || + broken(hr == S_OK && uri_combine_tests[i].expected == E_INVALIDARG) /* win10 1607 to 1709 */, "Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].\n", hr, uri_combine_tests[i]. expected, i); - if(SUCCEEDED(hr)) { + if(SUCCEEDED(hr) && SUCCEEDED(uri_combine_tests[i].expected)) { DWORD j; for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].str_props); ++j) {