d3d9: fix failing tests on windows,
when no 3d hardware acceleration is available
Louis. Lenders
xerox_xerox2000 at yahoo.co.uk
Mon Dec 25 16:22:51 CST 2006
Skipped content of type multipart/alternative-------------- next part --------------
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 7198155..1e1dde0 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2006 Vitaliy Margolen
- * Copyright (C) 2006 Stefan Dösinger(For CodeWeavers)
+ * Copyright (C) 2006 Stefan D�inger(For CodeWeavers)
* Copyright (C) 2006 Chris Robinson
*
* This library is free software; you can redistribute it and/or
@@ -725,8 +725,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..c1d76c8 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..6471df9 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..2f4b55d 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..aae2c29 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..ce18a77 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;
}
More information about the wine-patches
mailing list