[PATCH] urlmon/tests: CoInternetCombineIUri() is buggy on Windows 10 1607 to 1709.

[Francois Gouget]

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 <fgouget(a)free.fr>
---
 dlls/urlmon/tests/uri.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index 9d6af349dcc..017bc3e1956 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -10584,7 +10584,8 @@ 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) && uri_combine_tests[i].expected) {
-- 
2.20.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=60600

Your paranoid android.


=== build (build log) ===

error: patch failed: dlls/urlmon/tests/uri.c:10584
Task: Patch failed to apply

=== debian10 (build log) ===

error: patch failed: dlls/urlmon/tests/uri.c:10584
Task: Patch failed to apply

=== debian10 (build log) ===

error: patch failed: dlls/urlmon/tests/uri.c:10584
Task: Patch failed to apply