From 3e87746eb7b56619298ad18e2c04c9efea24406b Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Tue, 2 Apr 2019 12:42:47 -0500 Subject: [PATCH] d3d9: Forbid capturing a stateblock while recording. Signed-off-by: Zebediah Figura Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/d3d9/stateblock.c | 8 ++++++++ dlls/d3d9/tests/device.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 124e1efeb77..75f97487681 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -96,10 +96,18 @@ static HRESULT WINAPI d3d9_stateblock_GetDevice(IDirect3DStateBlock9 *iface, IDi static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); + struct d3d9_device *device; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); + device = impl_from_IDirect3DDevice9Ex(stateblock->parent_device); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to capture stateblock while recording, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } wined3d_stateblock_capture(stateblock->wined3d_stateblock); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 639c26d4f38..40ccdc46259 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -10599,7 +10599,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DStateBlock9_Capture(stateblock); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);