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 <fgouget@free.fr>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francois Gouget 2019-11-22 12:56:17 +01:00 committed by Alexandre Julliard
parent d729df0bb8
commit 7786d37649

View file

@ -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) {