d3d11: Make SwapDeviceContextState truly no-op when state is NULL.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3d11: Make SwapDeviceContextState truly no-op when state is NULL.
bde070fc · Rémi Bernon · Alexandre Julliard · edbddef5 · bde070fc · bde070fc
Commit bde070fc authored Feb 16, 2021 by Rémi Bernon Committed by Alexandre Julliard Feb 17, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

device.c dlls/d3d11/device.c +3 -0

d3d11.c dlls/d3d11/tests/d3d11.c +1 -2

No files found.
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -2761,6 +2761,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3

    FIXME("iface %p, state %p, prev_state %p semi-stub!\n", iface, state, prev_state);

+    if (prev_state) *prev_state = NULL;
+    if (!state) return;
+
    wined3d_mutex_lock();
    if (prev_state)
    {

--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -7078,8 +7078,7 @@ static void test_device_context_state(void)

    previous_context_state = (ID3DDeviceContextState *)0xdeadbeef;
    ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state);
-    todo_wine ok(previous_context_state == NULL, "Got unexpected state pointer.\n");
-    if (previous_context_state) ID3DDeviceContextState_Release(previous_context_state);
+    ok(previous_context_state == NULL, "Got unexpected state pointer.\n");
    previous_context_state = NULL;
    ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state);
    ok(previous_context_state != NULL, "Failed to get previous context state\n");