[PATCH v2 4/4] ddraw: Don't write out if a ddraw7 surface of size 0 is requested.

[Alex Henrie]

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 dlls/ddraw/ddraw.c        | 3 ---
 dlls/ddraw/tests/ddraw7.c | 8 +++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index b7b917de7d..45647aac1a 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -2813,10 +2813,7 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 *
     hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 7);
     wined3d_mutex_unlock();
     if (FAILED(hr))
-    {
-        *surface = NULL;
         return hr;
-    }
 
     *surface = &impl->IDirectDrawSurface7_iface;
     IDirectDraw7_AddRef(iface);
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index d802a5922d..b7400d28f8 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -1964,7 +1964,7 @@ static void test_surface_qi(void)
         {&IID_IUnknown,                 &IID_IDirectDrawSurface,        S_OK         },
     };
 
-    IDirectDrawSurface7 *surface;
+    IDirectDrawSurface7 *surface = (IDirectDrawSurface7 *)0xdeadbeef;
     DDSURFACEDESC2 surface_desc;
     IDirect3DDevice7 *device;
     IDirectDraw7 *ddraw;
@@ -1992,6 +1992,12 @@ static void test_surface_qi(void)
     surface_desc.dwSize = sizeof(surface_desc);
     surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
     surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
+
+    hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL);
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+    ok(surface == (IDirectDrawSurface7 *)0xdeadbeef || broken(!surface) /* 32-bit on Win8/10 */,
+            "Got unexpected surface %p.\n", surface);
+
     surface_desc.dwWidth = 512;
     surface_desc.dwHeight = 512;
     hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL);
-- 
2.11.0