Paul Vriens : ddraw/tests: Fix a test failure on a Win98 VMware box.
Alexandre Julliard
julliard at winehq.org
Fri Dec 12 07:04:09 CST 2008
Module: wine
Branch: master
Commit: 76b24fd9708bfbc926e5a7b2591b48501361c195
URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b24fd9708bfbc926e5a7b2591b48501361c195
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Thu Dec 11 17:07:44 2008 +0100
ddraw/tests: Fix a test failure on a Win98 VMware box.
---
dlls/ddraw/tests/refcount.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c
index 9038c57..b617648 100644
--- a/dlls/ddraw/tests/refcount.c
+++ b/dlls/ddraw/tests/refcount.c
@@ -48,7 +48,7 @@ static void test_ddraw_objects(void)
IDirectDraw2 *DDraw2;
IDirectDraw *DDraw1;
IDirectDrawPalette *palette;
- IDirectDrawSurface7 *surface;
+ IDirectDrawSurface7 *surface = NULL;
IDirectDrawSurface *surface1;
IDirectDrawSurface4 *surface4;
PALETTEENTRY Table[256];
@@ -94,6 +94,12 @@ static void test_ddraw_objects(void)
U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 8;
hr = IDirectDraw7_CreateSurface(DDraw7, &ddsd, &surface, NULL);
+ if (!surface)
+ {
+ win_skip("Could not create surface : %08x\n", hr);
+ IDirectDraw7_Release(DDraw7);
+ return;
+ }
ok(hr == DD_OK, "CreateSurface failed with %08x\n", hr);
/* DDraw refcount increased by 1 */
@@ -434,7 +440,7 @@ START_TEST(refcount)
init_function_pointers();
if(!pDirectDrawCreateEx)
{
- skip("function DirectDrawCreateEx not available\n");
+ win_skip("function DirectDrawCreateEx not available\n");
return;
}
test_ddraw_objects();
More information about the wine-cvs
mailing list