system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 23:24:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

urlmon/tests: Work around broken Win10 in test_CoInternetCombineUrlEx.

Browse source 
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>
This commit is contained in:
Alex Henrie 2020-08-19 21:54:12 -06:00 committed by Alexandre Julliard
parent 13ea90d80f
commit bcfd32edad
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dlls/urlmon/tests/uri.c
View file

@ -10899,10 +10899,11 @@ static void test_CoInternetCombineUrlEx(void) {
hr = pCoInternetCombineUrlEx(base, relativeW, uri_combine_tests[i].combine_flags, hr = pCoInternetCombineUrlEx(base, relativeW, uri_combine_tests[i].combine_flags,
&result, 0); &result, 0);
todo_wine_if(uri_combine_tests[i].todo) 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", "Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].\n",
hr, uri_combine_tests[i]. expected, i); hr, uri_combine_tests[i]. expected, i);
if(SUCCEEDED(hr)) { if(SUCCEEDED(hr) && SUCCEEDED(uri_combine_tests[i].expected)) {
DWORD j; DWORD j;
for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].str_props); ++j) { for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].str_props); ++j) {