Module: wine Branch: master Commit: 12b9d37120f72e701c558c8420d852e8e23c3c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12b9d37120f72e701c558c8420...
Author: Huw Davies huw@codeweavers.com Date: Wed Dec 3 17:00:40 2008 +0000
d3d9/tests: Skip tests if we can't create the D3D9 object.
---
dlls/d3d9/tests/d3d9ex.c | 7 +++++-- dlls/d3d9/tests/device.c | 8 ++++++++ dlls/d3d9/tests/shader.c | 7 +++++-- dlls/d3d9/tests/stateblock.c | 7 +++++-- dlls/d3d9/tests/surface.c | 7 +++++-- dlls/d3d9/tests/texture.c | 7 +++++-- dlls/d3d9/tests/vertexdeclaration.c | 7 +++++-- dlls/d3d9/tests/visual.c | 7 +++++-- dlls/d3d9/tests/volume.c | 7 +++++-- 9 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 9b2fd06..c5d83b0 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -58,8 +58,11 @@ static void test_qi_base_to_ex(void) HWND window = create_window(); D3DPRESENT_PARAMETERS present_parameters;
- ok( d3d9 != NULL, "Failed to create D3D9 object\n" ); - if (!d3d9) return; + if (!d3d9) + { + skip("Direct3D9 is not available\n"); + return; + }
hr = IDirect3D9_QueryInterface(d3d9, &IID_IDirect3D9Ex, (void **) &d3d9ex); ok(hr == E_NOINTERFACE, diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b90d005..a934974 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2153,6 +2153,14 @@ START_TEST(device) ok(pDirect3DCreate9 != NULL, "Failed to get address of Direct3DCreate9\n"); if (pDirect3DCreate9) { + IDirect3D9 *d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); + if(!d3d9) + { + skip("could not create D3D9 object\n"); + return; + } + IDirect3D9_Release(d3d9); + test_display_formats(); test_display_modes(); test_swapchain(); diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 07318e3..dcf8851 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -46,8 +46,11 @@ static IDirect3DDevice9 *init_d3d9(void) if (!d3d9_create) return NULL;
d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return NULL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + }
ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE; diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index e5d7ab2..d2bfcba 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -50,8 +50,11 @@ static HRESULT init_d3d9( if (!d3d9_create) return E_FAIL;
d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return E_FAIL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return E_FAIL; + }
window = create_window();
diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 69016f5..eed45c3 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -43,8 +43,11 @@ static IDirect3DDevice9 *init_d3d9(HMODULE d3d9_handle) if (!d3d9_create) return NULL;
d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return NULL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + }
ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE; diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index 515820b..ede9467 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -43,8 +43,11 @@ static IDirect3DDevice9 *init_d3d9(HMODULE d3d9_handle) if (!d3d9_create) return NULL;
d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return NULL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + }
ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE; diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index ad7b873..e0b2820 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -51,8 +51,11 @@ static IDirect3DDevice9 *init_d3d9(void) if (!d3d9_create) return NULL;
d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return NULL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + }
ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE; diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d9399fe..fdf341f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -161,8 +161,11 @@ static IDirect3DDevice9 *init_d3d9(void) if (!d3d9_create) return NULL;
d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return NULL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + }
ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = FALSE; diff --git a/dlls/d3d9/tests/volume.c b/dlls/d3d9/tests/volume.c index 31066a6..8b07072 100644 --- a/dlls/d3d9/tests/volume.c +++ b/dlls/d3d9/tests/volume.c @@ -43,8 +43,11 @@ static IDirect3DDevice9 *init_d3d9(HMODULE d3d9_handle) if (!d3d9_create) return NULL;
d3d9_ptr = d3d9_create(D3D_SDK_VERSION); - ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); - if (!d3d9_ptr) return NULL; + if (!d3d9_ptr) + { + skip("could not create D3D9\n"); + return NULL; + }
ZeroMemory(&present_parameters, sizeof(present_parameters)); present_parameters.Windowed = TRUE;
-
Alexandre Julliard