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 <alexhenrie24@gmail.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

urlmon/tests: Work around broken Win10 in test_CoInternetCombineUrlEx.
bcfd32ed · Alex Henrie · Alexandre Julliard · 13ea90d8 · bcfd32ed
Commit bcfd32ed authored Aug 19, 2020 by Alex Henrie Committed by Alexandre Julliard Aug 21, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

uri.c dlls/urlmon/tests/uri.c +3 -2

No files found.
--- 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) {