ddraw: Forbid applying 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 applying a stateblock while recording.
5fd14a4e · Zebediah Figura · Alexandre Julliard · 90af51d0 · 5fd14a4e · 5fd14a4e
Commit 5fd14a4e 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 2 deletions

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

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

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

    wined3d_mutex_lock();
+    if (device->recording)
+    {
+        wined3d_mutex_unlock();
+        WARN("Trying to apply 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
@@ -15866,7 +15866,7 @@ static void test_begin_end_state_block(void)
    ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr);

    hr = IDirect3DDevice7_ApplyStateBlock(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_CaptureStateBlock(device, stateblock);
    todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr);
@@ -15886,7 +15886,7 @@ static void test_begin_end_state_block(void)

    hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value);
    ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
-    todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value);
+    ok(value == TRUE, "Got unexpected value %#x.\n", value);

    refcount = IDirect3DDevice7_Release(device);
    ok(!refcount, "Device has %u references left.\n", refcount);