Henri Verbeet : d3d9/tests: Use a separate device for depth_blit_test().

Alexandre Julliard julliard at winehq.org
Tue Mar 18 14:15:06 CDT 2014


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Mar 18 09:37:52 2014 +0100

d3d9/tests: Use a separate device for depth_blit_test().

---

 dlls/d3d9/tests/visual.c |   23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index f970c34..3065614 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -11963,7 +11963,7 @@ static void depth_buffer2_test(IDirect3DDevice9 *device)
     IDirect3DSurface9_Release(rt1);
 }
 
-static void depth_blit_test(IDirect3DDevice9 *device)
+static void depth_blit_test(void)
 {
     static const struct vertex quad1[] =
     {
@@ -11988,12 +11988,26 @@ static void depth_blit_test(IDirect3DDevice9 *device)
     };
 
     IDirect3DSurface9 *backbuffer, *ds1, *ds2, *ds3;
+    IDirect3DDevice9 *device;
     RECT src_rect, dst_rect;
     unsigned int i, j;
     D3DVIEWPORT9 vp;
+    IDirect3D9 *d3d;
     D3DCOLOR color;
+    ULONG refcount;
+    HWND window;
     HRESULT hr;
 
+    window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+            0, 0, 640, 480, NULL, NULL, NULL, NULL);
+    d3d = Direct3DCreate9(D3D_SDK_VERSION);
+    ok(!!d3d, "Failed to create a D3D object.\n");
+    if (!(device = create_device(d3d, window, window, TRUE)))
+    {
+        skip("Failed to create a D3D device, skipping tests.\n");
+        goto done;
+    }
+
     vp.X = 0;
     vp.Y = 0;
     vp.Width = 640;
@@ -12097,6 +12111,11 @@ static void depth_blit_test(IDirect3DDevice9 *device)
     IDirect3DSurface9_Release(ds3);
     IDirect3DSurface9_Release(ds2);
     IDirect3DSurface9_Release(ds1);
+    refcount = IDirect3DDevice9_Release(device);
+    ok(!refcount, "Device has %u references left.\n", refcount);
+done:
+    IDirect3D9_Release(d3d);
+    DestroyWindow(window);
 }
 
 static void intz_test(void)
@@ -15633,11 +15652,11 @@ START_TEST(visual)
     dp3_alpha_test(device_ptr);
     depth_buffer_test(device_ptr);
     depth_buffer2_test(device_ptr);
-    depth_blit_test(device_ptr);
 
     cleanup_device(device_ptr);
     device_ptr = NULL;
 
+    depth_blit_test();
     intz_test();
     shadow_test();
     fp_special_test();




More information about the wine-cvs mailing list