Huw Davies : d3d8/tests: Skip tests if we can't create the D3D8 object.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 855ce5bd86933bcd36cfcbe79c11e937f158d631
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=855ce5bd86933bcd36cfcbe79c...

Author: Huw Davies 
Date:   Wed Dec  3 17:00:24 2008 +0000

d3d8/tests: Skip tests if we can't create the D3D8 object.

---

dlls/d3d8/tests/device.c  |    9 +++++++++
 dlls/d3d8/tests/surface.c |    7 +++++--
 dlls/d3d8/tests/texture.c |    7 +++++--
 dlls/d3d8/tests/visual.c  |    7 +++++--
 dlls/d3d8/tests/volume.c  |    7 +++++--
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index cb60d7c..717f79c 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -1365,6 +1365,15 @@ START_TEST(device)
     ok(pDirect3DCreate8 != NULL, "Failed to get address of Direct3DCreate8\n");
     if (pDirect3DCreate8)
     {
+        IDirect3D8 *d3d8;
+        d3d8 = pDirect3DCreate8( D3D_SDK_VERSION );
+        if(!d3d8)
+        {
+            skip("could not create D3D8\n");
+            return;
+        }
+        IDirect3D8_Release(d3d8);
+
         test_display_modes();
         test_shader_versions();
         test_swapchain();
diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c
index 86fb884..e1e65b0 100644
--- a/dlls/d3d8/tests/surface.c
+++ b/dlls/d3d8/tests/surface.c
@@ -44,8 +44,11 @@ static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle)
     if (!d3d8_create) return NULL;

d3d8_ptr = d3d8_create(D3D_SDK_VERSION);
-    ok(d3d8_ptr != NULL, "Failed to create IDirect3D8 object\n");
-    if (!d3d8_ptr) return NULL;
+    if (!d3d8_ptr)
+    {
+        skip("could not create D3D8\n");
+        return NULL;
+    }

IDirect3D8_GetAdapterDisplayMode(d3d8_ptr, D3DADAPTER_DEFAULT, &d3ddm );
     ZeroMemory(&present_parameters, sizeof(present_parameters));
diff --git a/dlls/d3d8/tests/texture.c b/dlls/d3d8/tests/texture.c
index a002763..fd97eac 100644
--- a/dlls/d3d8/tests/texture.c
+++ b/dlls/d3d8/tests/texture.c
@@ -44,8 +44,11 @@ static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle)
     if (!d3d8_create) return NULL;

d3d8_ptr = d3d8_create(D3D_SDK_VERSION);
-    ok(d3d8_ptr != NULL, "Failed to create IDirect3D8 object\n");
-    if (!d3d8_ptr) return NULL;
+    if (!d3d8_ptr)
+    {
+        skip("could not create D3D8\n");
+        return NULL;
+    }

IDirect3D8_GetAdapterDisplayMode(d3d8_ptr, D3DADAPTER_DEFAULT, &d3ddm );
     ZeroMemory(&present_parameters, sizeof(present_parameters));
diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c
index efead14..8f853c1 100644
--- a/dlls/d3d8/tests/visual.c
+++ b/dlls/d3d8/tests/visual.c
@@ -117,8 +117,11 @@ static IDirect3DDevice8 *init_d3d8(void)
     if (!d3d8_create) return NULL;

d3d8_ptr = d3d8_create(D3D_SDK_VERSION);
-    ok(d3d8_ptr != NULL, "Failed to create IDirect3D8 object\n");
-    if (!d3d8_ptr) return NULL;
+    if (!d3d8_ptr)
+    {
+        skip("could not create D3D8\n");
+        return NULL;
+    }

ZeroMemory(&present_parameters, sizeof(present_parameters));
     present_parameters.Windowed = FALSE;
diff --git a/dlls/d3d8/tests/volume.c b/dlls/d3d8/tests/volume.c
index aee0c3a..ee43140 100644
--- a/dlls/d3d8/tests/volume.c
+++ b/dlls/d3d8/tests/volume.c
@@ -44,8 +44,11 @@ static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle)
     if (!d3d8_create) return NULL;

d3d8_ptr = d3d8_create(D3D_SDK_VERSION);
-    ok(d3d8_ptr != NULL, "Failed to create IDirect3D8 object\n");
-    if (!d3d8_ptr) return NULL;
+    if (!d3d8_ptr)
+    {
+        skip("could not create D3D8\n");
+        return NULL;
+    }

IDirect3D8_GetAdapterDisplayMode(d3d8_ptr, D3DADAPTER_DEFAULT, &d3ddm );
     ZeroMemory(&present_parameters, sizeof(present_parameters));