ddraw: Forbid capturing 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>

ddraw: Forbid capturing a stateblock while recording.
0da6f2a6 · Zebediah Figura · Alexandre Julliard · 5fd14a4e · 0da6f2a6 · 0da6f2a6
Commit 0da6f2a6 authored Apr 04, 2019 by Zebediah Figura Committed by Alexandre Julliard Apr 05, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

device.c dlls/ddraw/device.c +6 -0

ddraw7.c dlls/ddraw/tests/ddraw7.c +1 -1

No files found.
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -5882,6 +5882,12 @@ static HRESULT d3d_device7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD stat
    TRACE("iface %p, stateblock %#x.\n", iface, stateblock);

    wined3d_mutex_lock();
+    if (device->recording)
+    {
+        wined3d_mutex_unlock();
+        WARN("Trying to capture a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n");
+        return D3DERR_INBEGINSTATEBLOCK;
+    }
    wined3d_sb = ddraw_get_object(&device->handle_table, stateblock - 1, DDRAW_HANDLE_STATEBLOCK);
    if (!wined3d_sb)
    {

--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -15869,7 +15869,7 @@ static void test_begin_end_state_block(void)
    ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr);

    hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock);
-    todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr);
+    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);