Louis Lenders : d3d9: Fix failing tests on windows, when no 3d hardware acceleration is available.

[Alexandre Julliard]

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

Author: Louis Lenders 
Date:   Sun Dec 31 14:25:56 2006 +0000

d3d9: Fix failing tests on windows, when no 3d hardware acceleration is available.

---

dlls/d3d9/tests/device.c            |    8 ++++++--
 dlls/d3d9/tests/shader.c            |    7 ++++++-
 dlls/d3d9/tests/surface.c           |    7 ++++++-
 dlls/d3d9/tests/texture.c           |    7 ++++++-
 dlls/d3d9/tests/vertexdeclaration.c |    7 ++++++-
 dlls/d3d9/tests/volume.c            |    7 ++++++-
 6 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index d0347ca..88d1cf5 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -735,8 +735,12 @@ static void test_reset(void)

hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
                                   D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice );
-    ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr));
-    if (FAILED(hr)) goto cleanup;
+
+    if(FAILED(hr))
+    {
+        trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr);
+        goto cleanup;
+    }

width = GetSystemMetrics(SM_CXSCREEN);
     height = GetSystemMetrics(SM_CYSCREEN);
diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c
index c906f9e..2273673 100644
--- a/dlls/d3d9/tests/shader.c
+++ b/dlls/d3d9/tests/shader.c
@@ -55,7 +55,12 @@ static IDirect3DDevice9 *init_d3d9(void)
     present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD;

hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr);
-    ok(hres == D3D_OK, "IDirect3D_CreateDevice returned: 0x%x\n", hres);
+
+    if(FAILED(hres))
+    {
+        trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hres);
+        return NULL;
+    }

return device_ptr;
 }
diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c
index badfb3a..84ad723 100644
--- a/dlls/d3d9/tests/surface.c
+++ b/dlls/d3d9/tests/surface.c
@@ -54,7 +54,12 @@ static IDirect3DDevice9 *init_d3d9(HMODU

hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
             NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr);
-    ok(SUCCEEDED(hr), "IDirect3D_CreateDevice returned %#x\n", hr);
+
+    if(FAILED(hr))
+    {
+        trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr);
+        return NULL;
+    }

return device_ptr;
 }
diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c
index ac7c1ec..cc48206 100644
--- a/dlls/d3d9/tests/texture.c
+++ b/dlls/d3d9/tests/texture.c
@@ -53,7 +53,12 @@ static IDirect3DDevice9 *init_d3d9(HMODU

hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
             NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr);
-    ok(SUCCEEDED(hr), "IDirect3D_CreateDevice returned %#x\n", hr);
+
+    if(FAILED(hr))
+    {
+        trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr);
+        return NULL;
+    }

return device_ptr;
 }
diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c
index 643b744..eafd0a4 100644
--- a/dlls/d3d9/tests/vertexdeclaration.c
+++ b/dlls/d3d9/tests/vertexdeclaration.c
@@ -60,7 +60,12 @@ static IDirect3DDevice9 *init_d3d9(void)
     present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD;

hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr);
-    ok(hres == D3D_OK, "IDirect3D_CreateDevice returned: 0x%x\n", hres);
+
+    if(FAILED(hres))
+    {
+        trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hres);
+        return NULL;
+    }

return device_ptr;
 }
diff --git a/dlls/d3d9/tests/volume.c b/dlls/d3d9/tests/volume.c
index 8851c3a..61f3ee1 100644
--- a/dlls/d3d9/tests/volume.c
+++ b/dlls/d3d9/tests/volume.c
@@ -53,7 +53,12 @@ static IDirect3DDevice9 *init_d3d9(HMODU

hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
             NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr);
-    ok(SUCCEEDED(hr), "IDirect3D_CreateDevice returned %#x\n", hr);
+
+    if(FAILED(hr))
+    {
+        trace("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr);
+        return NULL;
+    }

return device_ptr;
 }