Francois Gouget : urlmon/tests: Fix CoInternetCombineIUri tests on Windows 10 1607 to 1709.

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Fri Nov 22 12:56:17 2019 +0100

urlmon/tests: Fix CoInternetCombineIUri tests on Windows 10 1607 to 1709.

It does not check the relative path and thus will accept non-sensical %
codes. This is fixed in Windows 10 1809.

Signed-off-by: Francois Gouget 
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 9069a9c176..29a70ad481 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -10584,10 +10584,11 @@ static void test_CoInternetCombineIUri(void) {

hr = pCoInternetCombineIUri(base, relative, 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: CoInternetCombineIUri 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) {