d3d8: 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>

d3d8: Forbid creating a stateblock while recording.
a2c29deb · Zebediah Figura · Alexandre Julliard · 2e01e46a · a2c29deb · a2c29deb
Commit a2c29deb authored Apr 03, 2019 by Zebediah Figura Committed by Alexandre Julliard Apr 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

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

device.c dlls/d3d8/tests/device.c +1 -1

No files found.
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2027,6 +2027,12 @@ static HRESULT WINAPI d3d8_device_CreateStateBlock(IDirect3DDevice8 *iface,
    }

    wined3d_mutex_lock();
+    if (device->recording)
+    {
+        wined3d_mutex_unlock();
+        WARN("Trying to create a stateblock while recording, returning D3DERR_INVALIDCALL.\n");
+        return D3DERR_INVALIDCALL;
+    }
    hr = wined3d_stateblock_create(device->wined3d_device, (enum wined3d_stateblock_type)type, &stateblock);
    if (FAILED(hr))
    {

--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -7283,7 +7283,7 @@ static void test_begin_end_state_block(void)
    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);

    hr = IDirect3DDevice8_CreateStateBlock(device, D3DSBT_ALL, &stateblock2);
-    todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
+    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);

    hr = IDirect3DDevice8_GetRenderState(device, D3DRS_LIGHTING, &value);
    ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);