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>

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

Showing with 8 additions and 1 deletion

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

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

No files found.
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -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))

--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -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);