[PATCH 2/5] ddraw/tests: Skip the ddraw7 primary palette test if 8 bpp mode doesn't work.
Stefan Dösinger
stefan at codeweavers.com
Mon Apr 28 08:21:55 CDT 2014
For some reason 5e772480 only made this fix to ddraw1-4. If this was
deliberate please ignore this patch.
---
dlls/ddraw/tests/ddraw7.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index a64f18a..bed5cb8 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -5598,7 +5598,13 @@ static void test_primary_palette(void)
0, 0, 640, 480, 0, 0, 0, 0);
ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n");
- hr = IDirectDraw7_SetDisplayMode(ddraw, 640, 480, 8, 0, 0);
+ if (FAILED(hr = IDirectDraw7_SetDisplayMode(ddraw, 640, 480, 8, 0, 0)))
+ {
+ win_skip("Failed to set 8 bpp display mode, skipping test.\n");
+ IDirectDraw7_Release(ddraw);
+ DestroyWindow(window);
+ return;
+ }
ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr);
hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
--
1.8.3.2
More information about the wine-patches
mailing list