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

d3d9: Validate surface parameter in d3d9_device_ColorFill(). 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46482
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Józef Kucia 2019-01-24 12:31:22 +01:00 committed by Alexandre Julliard
parent 6bb73652de
commit ac36e446c3
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/d3d9/device.c
View File

@ -1757,6 +1757,9 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface,
TRACE("iface %p, surface %p, rect %p, color 0x%08x.\n", iface, surface, rect, color);
if (!surface)
return D3DERR_INVALIDCALL;
wined3d_mutex_lock();
if (FAILED(wined3d_texture_get_sub_resource_desc(surface_impl->wined3d_texture,

3
dlls/d3d9/tests/visual.c
View File

@ -1529,6 +1529,9 @@ static void color_fill_test(void)
goto done;
}
hr = IDirect3DDevice9_ColorFill(device, NULL, NULL, 0);
ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
/* Test ColorFill on a the backbuffer (should pass) */
hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surface);
ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr);