André Hentschel : shlwapi/tests: Use todo_wine_if() in tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: dbc043c3d8eff2be3e1509b72cbb5089f7a47c4a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dbc043c3d8eff2be3e1509b72c...

Author: André Hentschel 
Date:   Fri Feb 19 23:12:24 2016 +0100

shlwapi/tests: Use todo_wine_if() in tests.

Signed-off-by: André Hentschel 
Signed-off-by: Alexandre Julliard

---

dlls/shlwapi/tests/path.c | 12 +++---------
 dlls/shlwapi/tests/url.c  |  5 +----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c
index 03079a3..f780a78 100644
--- a/dlls/shlwapi/tests/path.c
+++ b/dlls/shlwapi/tests/path.c
@@ -286,9 +286,7 @@ static void test_PathCreateFromUrl(void)
     for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) {
         len = INTERNET_MAX_URL_LENGTH;
         ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0);
-        if (!(TEST_PATHFROMURL[i].todo & 0x1))
-            ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url);
-        else todo_wine
+        todo_wine_if (TEST_PATHFROMURL[i].todo & 0x1)
             ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url);
         if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) {
             if(!(TEST_PATHFROMURL[i].todo & 0x2)) {
@@ -305,9 +303,7 @@ static void test_PathCreateFromUrl(void)
             urlW = GetWideString(TEST_PATHFROMURL[i].url);
             ret = pPathCreateFromUrlW(urlW, ret_pathW, &len, 0);
             WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),NULL,NULL);
-            if (!(TEST_PATHFROMURL[i].todo & 0x1))
-                ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L"%s"\n", ret, TEST_PATHFROMURL[i].url);
-            else todo_wine
+            todo_wine_if (TEST_PATHFROMURL[i].todo & 0x1)
                 ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L"%s"\n", ret, TEST_PATHFROMURL[i].url);
             if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) {
                 if(!(TEST_PATHFROMURL[i].todo & 0x2)) {
@@ -326,9 +322,7 @@ static void test_PathCreateFromUrl(void)
                 len2 = 2;
                 ret = pPathCreateFromUrlW(urlW, ret_pathW, &len2, 0);
                 ok(ret == E_POINTER, "ret %08x, expected E_POINTER from url %s\n", ret, TEST_PATHFROMURL[i].url);
-                if(!(TEST_PATHFROMURL[i].todo & 0x4))
-                    ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url);
-                else todo_wine
+                todo_wine_if (TEST_PATHFROMURL[i].todo & 0x4)
                     ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url);
             }

diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c
index 85da922..c89b044 100644
--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -838,10 +838,7 @@ static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, H
     ok(ret == dwExpectReturn || ret == dwExpectReturnAlt,
        "UrlCanonicalizeA failed: expected=0x%08x or 0x%08x, got=0x%08x, index %d\n",
        dwExpectReturn, dwExpectReturnAlt, ret, index);
-    if (todo)
-        todo_wine
-        ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected "%s", but got "%s", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index);
-    else
+    todo_wine_if (todo)
         ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected "%s", but got "%s", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index);

if (pUrlCanonicalizeW) {