[PATCH] urlmon/tests: Don't perform extra uri tests if a failure was expected.

[Francois Gouget]

When a failure is expected uri_combine_tests[] has no extra test data. 
So don't attempt to perform extra tests even if CoInternetCombineIUri() 
unexpectedly succeeds.

Signed-off-by: Francois Gouget <fgouget(a)free.fr>
---
 dlls/urlmon/tests/uri.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index 9069a9c1763..9d6af349dcc 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -10587,7 +10587,7 @@ static void test_CoInternetCombineIUri(void) {
                     ok(hr == uri_combine_tests[i].expected,
                         "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) && uri_combine_tests[i].expected) {
                     DWORD j;
 
                     for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].str_props); ++j) {
-- 
2.20.1

[Jacek Caban]

Hi Francois,

On 11/21/19 5:12 PM, Francois Gouget wrote:
> --- a/dlls/urlmon/tests/uri.c
> +++ b/dlls/urlmon/tests/uri.c
> @@ -10587,7 +10587,7 @@ static void test_CoInternetCombineIUri(void) {
>                       ok(hr == uri_combine_tests[i].expected,
>                           "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) && uri_combine_tests[i].expected) {

Note that 'expected' us a HRESULT, so in this case you check if it's not 
S_OK. I will send a fixed version.


Thanks,

Jacek