From: Alex Henrie Subject: [PATCH 2/4] ddraw: Don't write out if a ddraw2 surface of size 0 is requested. Message-Id: <20170106070800.2430-2-alexhenrie24@gmail.com> Date: Fri, 6 Jan 2017 00:07:28 -0700 In-Reply-To: <20170106070800.2430-1-alexhenrie24@gmail.com> References: <20170106070800.2430-1-alexhenrie24@gmail.com> Signed-off-by: Alex Henrie --- dlls/ddraw/ddraw.c | 3 --- dlls/ddraw/tests/ddraw2.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d0fa8c7e72..e5eed34f7c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2923,10 +2923,7 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 2); wined3d_mutex_unlock(); if (FAILED(hr)) - { - *surface = NULL; return hr; - } *surface = &impl->IDirectDrawSurface_iface; impl->ifaceToRelease = NULL; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 611ccac3aa..bdca404479 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2063,6 +2063,10 @@ 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 = IDirectDraw2_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); -- 2.11.0