From 6b702cc84cf20912202f27f82eaf6f3263953ddd Mon Sep 17 00:00:00 2001
From: Saulius Krasuckas <saulius.krasuckas@ieee.org>
Date: Tue, 23 Aug 2005 19:59:35 +0000
Subject: [PATCH] Skip testing on IDirect3D7::CreateDevice() failure.

---
 dlls/ddraw/tests/d3d.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index ba3bf234eb8..9d026bf02ad 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -41,7 +41,7 @@ static void init_function_pointers(void)
 }
 
 
-static void CreateDirect3D(void)
+static BOOL CreateDirect3D(void)
 {
     HRESULT rc;
     DDSURFACEDESC2 ddsd;
@@ -67,7 +67,13 @@ static void CreateDirect3D(void)
 
     rc = IDirect3D7_CreateDevice(lpD3D, &IID_IDirect3DTnLHalDevice, lpDDS,
         &lpD3DDevice);
-    ok(rc==D3D_OK, "CreateDevice returned: %lx\n", rc);
+    ok(rc==D3D_OK || rc==DDERR_NOPALETTEATTACHED, "CreateDevice returned: %lx\n", rc);
+    if (!lpD3DDevice) {
+        trace("IDirect3D7::CreateDevice() failed\n");
+        return FALSE;
+    }
+
+    return TRUE;
 }
 
 static void ReleaseDirect3D(void)
@@ -197,7 +203,10 @@ START_TEST(d3d)
         return;
     }
 
-    CreateDirect3D();
+    if(!CreateDirect3D()) {
+        trace("Skipping tests\n");
+        return;
+	}
     LightTest();
     ReleaseDirect3D();
 }
-- 
2.11.4.GIT