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

ddraw: Forbid creating a stateblock while recording. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Zebediah Figura 2019-04-04 18:38:00 -05:00 committed by Alexandre Julliard
parent 0da6f2a66a
commit 1879a17ec4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/ddraw/device.c
View File

@ -6018,6 +6018,13 @@ static HRESULT d3d_device7_CreateStateBlock(IDirect3DDevice7 *iface,
wined3d_mutex_lock();
if (device->recording)
{
wined3d_mutex_unlock();
WARN("Trying to apply a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n");
return D3DERR_INBEGINSTATEBLOCK;
}
/* The D3DSTATEBLOCKTYPE enum is fine here. */
hr = wined3d_stateblock_create(device->wined3d_device, type, &wined3d_sb);
if (FAILED(hr))

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

@ -15872,7 +15872,7 @@ static void test_begin_end_state_block(void)
ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_ALL, &stateblock2);
todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr);
ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);