=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: ddraw/tests: Skip the ddraw7 primary palette test if 8 bpp mode doesn't work.
Alexandre Julliard
julliard at winehq.org
Tue Apr 29 13:36:13 CDT 2014
Module: wine
Branch: master
Commit: 8d1b66bee477ea5f18af1fd1b3ebfd475f81b187
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d1b66bee477ea5f18af1fd1b3ebfd475f81b187
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Mon Apr 28 15:21:55 2014 +0200
ddraw/tests: Skip the ddraw7 primary palette test if 8 bpp mode doesn't work.
---
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);
More information about the wine-cvs
mailing list