From 5408c5ea34e3329c9e6a582c08f19b298de11345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Mon, 16 Feb 2015 19:10:42 +0100
Subject: [PATCH] ddraw/tests: Create a device in test_surface_discard.

---
 dlls/ddraw/tests/ddraw1.c | 24 ++++++++++++++----------
 dlls/ddraw/tests/ddraw2.c | 24 ++++++++++++++----------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 3117d510aaf..a26fd6570cb 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -3951,10 +3951,11 @@ static void test_surface_lock(void)
 static void test_surface_discard(void)
 {
     IDirectDraw *ddraw;
+    IDirect3DDevice *device;
     HRESULT hr;
     HWND window;
     DDSURFACEDESC ddsd;
-    IDirectDrawSurface *surface, *primary;
+    IDirectDrawSurface *surface, *target;
     void *addr;
     static const struct
     {
@@ -3974,14 +3975,16 @@ static void test_surface_discard(void)
             0, 0, 640, 480, 0, 0, 0, 0);
     ddraw = create_ddraw();
     ok(!!ddraw, "Failed to create a ddraw object.\n");
-    hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
-    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+    if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
+    {
+        skip("Failed to create a 3D device, skipping test.\n");
+        IDirectDraw_Release(ddraw);
+        DestroyWindow(window);
+        return;
+    }
 
-    memset(&ddsd, 0, sizeof(ddsd));
-    ddsd.dwSize = sizeof(ddsd);
-    ddsd.dwFlags = DDSD_CAPS;
-    ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-    hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &primary, NULL);
+    hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&target);
+    ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
 
     for (i = 0; i < sizeof(tests) / sizeof(*tests); i++)
     {
@@ -4016,7 +4019,7 @@ static void test_surface_discard(void)
         hr = IDirectDrawSurface_Unlock(surface, NULL);
         ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
 
-        hr = IDirectDrawSurface_Blt(primary, NULL, surface, NULL, DDBLT_WAIT, NULL);
+        hr = IDirectDrawSurface_Blt(target, NULL, surface, NULL, DDBLT_WAIT, NULL);
         ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr);
 
         memset(&ddsd, 0, sizeof(ddsd));
@@ -4034,7 +4037,8 @@ static void test_surface_discard(void)
         ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i);
     }
 
-    IDirectDrawSurface_Release(primary);
+    IDirectDrawSurface_Release(target);
+    IDirect3DDevice_Release(device);
     IDirectDraw_Release(ddraw);
     DestroyWindow(window);
 }
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index f584971921b..090f73163e8 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -4622,10 +4622,11 @@ static void test_surface_lock(void)
 static void test_surface_discard(void)
 {
     IDirectDraw2 *ddraw;
+    IDirect3DDevice2 *device;
     HRESULT hr;
     HWND window;
     DDSURFACEDESC ddsd;
-    IDirectDrawSurface *surface, *primary;
+    IDirectDrawSurface *surface, *target;
     void *addr;
     static const struct
     {
@@ -4645,14 +4646,16 @@ static void test_surface_discard(void)
             0, 0, 640, 480, 0, 0, 0, 0);
     ddraw = create_ddraw();
     ok(!!ddraw, "Failed to create a ddraw object.\n");
-    hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
-    ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);
+    if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
+    {
+        skip("Failed to create a 3D device, skipping test.\n");
+        DestroyWindow(window);
+        IDirectDraw2_Release(ddraw);
+        return;
+    }
 
-    memset(&ddsd, 0, sizeof(ddsd));
-    ddsd.dwSize = sizeof(ddsd);
-    ddsd.dwFlags = DDSD_CAPS;
-    ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-    hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &primary, NULL);
+    hr = IDirect3DDevice2_GetRenderTarget(device, &target);
+    ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
 
     for (i = 0; i < sizeof(tests) / sizeof(*tests); i++)
     {
@@ -4687,7 +4690,7 @@ static void test_surface_discard(void)
         hr = IDirectDrawSurface_Unlock(surface, NULL);
         ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);
 
-        hr = IDirectDrawSurface_Blt(primary, NULL, surface, NULL, DDBLT_WAIT, NULL);
+        hr = IDirectDrawSurface_Blt(target, NULL, surface, NULL, DDBLT_WAIT, NULL);
         ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr);
 
         memset(&ddsd, 0, sizeof(ddsd));
@@ -4705,7 +4708,8 @@ static void test_surface_discard(void)
         ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i);
     }
 
-    IDirectDrawSurface_Release(primary);
+    IDirectDrawSurface_Release(target);
+    IDirect3DDevice2_Release(device);
     IDirectDraw2_Release(ddraw);
     DestroyWindow(window);
 }