Alex Henrie : urlmon/tests: Work around broken Win10 in test_CoInternetCombineUrlEx.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bcfd32edad0812e26dcf3ac6d17a43dfe1ca3ce5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=bcfd32edad0812e26dcf3ac6d...

Author: Alex Henrie <alexhenrie24(a)gmail.com>
Date:   Wed Aug 19 21:54:12 2020 -0600

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

---

 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 b1390a35bf..b6d2182a27 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) {