marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Don't crash if writing out a new ddraw2 surface segfaults. 

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Alex Henrie 2017-01-28 15:34:04 -07:00 committed by Alexandre Julliard
parent d9f2b4627a
commit f6997e8fe0
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/ddraw/ddraw.c
View File

@ -2924,14 +2924,22 @@ 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;
__TRY
{
if (FAILED(hr))
{
*surface = NULL;
break;
}
*surface = &impl->IDirectDrawSurface_iface;
impl->ifaceToRelease = NULL;
}
__EXCEPT_PAGE_FAULT
{
hr = E_INVALIDARG;
}
__ENDTRY;
return hr;
}

2
dlls/ddraw/tests/ddraw2.c
View File

@ -2119,6 +2119,8 @@ static void test_surface_qi(void)
surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
surface_desc.dwWidth = 512;
surface_desc.dwHeight = 512;
hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface **)0xdeadbeef, NULL);
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);