Francois Gouget : ddraw/tests: Better clean up when skipping the primary palette tests.

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Mon Feb 17 17:44:56 2014 +0100

ddraw/tests: Better clean up when skipping the primary palette tests.

---

dlls/ddraw/tests/ddraw1.c |    3 ++-
 dlls/ddraw/tests/ddraw2.c |    3 ++-
 dlls/ddraw/tests/ddraw4.c |    5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 7d97ec6..ba7589b 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -4080,7 +4080,8 @@ static void test_primary_palette(void)
     hr = IDirectDraw_SetDisplayMode(ddraw, 640, 480, 8);
     if (hr == E_NOTIMPL)
     {
-        win_skip("8bpp display mode is not supported\n");
+        win_skip("changing display mode is not supported (8bpp)\n");
+        IDirectDraw_Release(ddraw);
         DestroyWindow(window);
         return;
     }
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index ea9fc5c..f46c515 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -5177,7 +5177,8 @@ static void test_primary_palette(void)
     hr = IDirectDraw2_SetDisplayMode(ddraw, 640, 480, 8, 0, 0);
     if (hr == E_NOTIMPL)
     {
-        win_skip("8bpp display mode is not supported\n");
+        win_skip("changing display mode is not supported (8bpp)\n");
+        IDirectDraw2_Release(ddraw);
         DestroyWindow(window);
         return;
     }
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index c768a95..d5f9e7e 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -5771,13 +5771,14 @@ static void test_primary_palette(void)
     window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
             0, 0, 640, 480, 0, 0, 0, 0);
     hr = IDirectDraw4_SetDisplayMode(ddraw, 640, 480, 8, 0, 0);
-    ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr);
     if (hr == E_NOTIMPL)
     {
-        win_skip("8bpp display mode is not supported\n");
+        win_skip("changing display mode is not supported (8bpp)\n");
+        IDirectDraw4_Release(ddraw);
         DestroyWindow(window);
         return;
     }
+    ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr);
     hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
     ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);