Michael Stefaniuc : gdiplus/tests: Make use of todo_wine_if().

[Alexandre Julliard]

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

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Thu Aug  4 23:44:31 2016 +0200

gdiplus/tests: Make use of todo_wine_if().

Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
Signed-off-by: Vincent Povirk <vincent at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/gdiplus/tests/graphics.c | 4 +---
 dlls/gdiplus/tests/image.c    | 7 +------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c
index e82db16..56be8eb 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -3763,10 +3763,8 @@ todo_wine
         expected_width = base_cx * pt.Y;
         expected_height = base_cy * pt.Y;
 
-        if (td[i].unit == UnitDisplay || td[i].unit == UnitPixel)
+        todo_wine_if(td[i].unit != UnitDisplay && td[i].unit != UnitPixel)
             ok(fabs(expected_width - bounds.Width) <= 0.001, "%u: expected %f, got %f\n", i, expected_width, bounds.Width);
-        else
-            todo_wine ok(fabs(expected_width - bounds.Width) <= 0.001, "%u: expected %f, got %f\n", i, expected_width, bounds.Width);
         ok(fabs(expected_height - bounds.Height) <= 0.001, "%u: expected %f, got %f\n", i, expected_height, bounds.Height);
 
         GdipDeleteGraphics(graphics);
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index be93a20..ad84feb 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -3167,12 +3167,7 @@ static void test_image_properties(void)
 
         status = GdipGetPropertyCount(image, &prop_count);
         ok(status == Ok, "%u: GdipGetPropertyCount error %d\n", i, status);
-        if (td[i].image_data == pngimage || td[i].image_data == jpgimage)
-        todo_wine
-        ok(td[i].prop_count == prop_count || td[i].prop_count2 == prop_count,
-           " %u: expected property count %u or %u, got %u\n",
-           i, td[i].prop_count, td[i].prop_count2, prop_count);
-        else
+        todo_wine_if(td[i].image_data == pngimage || td[i].image_data == jpgimage)
         ok(td[i].prop_count == prop_count || td[i].prop_count2 == prop_count,
            " %u: expected property count %u or %u, got %u\n",
            i, td[i].prop_count, td[i].prop_count2, prop_count);