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

diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index cb60d7c44642f32b13a5a8fb7e58269ec5838aee..717f79c28399a0446c36e511baf07bda52b8a130 100644 (file)
--- 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 86fb884305096bcac9e0437c6b3c4494aefd730f..e1e65b0bf05f7675818f8cf1df18845063581948 100644 (file)
--- 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 a0027638725f9698ea936d5da248c5b4746f1c81..fd97eac8fb82bc22d4a7254ce396a59059426fd4 100644 (file)
--- 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 efead14d6db96ac63d818321ac743c14f8480fe8..8f853c179b413c05b841757c1607d6623c85cec7 100644 (file)
--- 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 aee0c3a4dcd8f5dbf2a889c1b22343a7b7ac0c36..ee431401bb1c91dcda1757cd4b54e1ddb0b24868 100644 (file)
--- 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));