[PATCH v2 4/4] ddraw: Update state if d3d_device2_SwapTextureHandles() results in texture change.

[Paul Gofman]

From: Paul Gofman

---
 dlls/ddraw/device.c       | 9 ++++++++-
 dlls/ddraw/tests/ddraw2.c | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index c50f3ffad52..399857adf9d 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -564,13 +564,17 @@ static HRESULT WINAPI d3d_device2_SwapTextureHandles(IDirect3DDevice2 *iface,
 {
     struct ddraw_surface *surf1 = unsafe_impl_from_IDirect3DTexture2(tex1);
     struct ddraw_surface *surf2 = unsafe_impl_from_IDirect3DTexture2(tex2);
-    DWORD h1, h2;
+    DWORD h1, h2, h;
+    HRESULT hr;

TRACE("iface %p, tex1 %p, tex2 %p.\n", iface, tex1, tex2);

if (!surf1->Handle || !surf2->Handle)
         return E_INVALIDARG;

+    if (FAILED(hr = IDirect3DDevice2_GetRenderState(iface, D3DRENDERSTATE_TEXTUREHANDLE, &h)))
+        return hr;
+
     wined3d_mutex_lock();

h1 = surf1->Handle - 1;
@@ -582,6 +586,9 @@ static HRESULT WINAPI d3d_device2_SwapTextureHandles(IDirect3DDevice2 *iface,

wined3d_mutex_unlock();

+    if ((h == surf1->Handle || h == surf2->Handle)
+            && FAILED(hr = IDirect3DDevice2_SetRenderState(iface, D3DRENDERSTATE_TEXTUREHANDLE, h)))
+        return hr;
     return D3D_OK;
 }

diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index aef8e5d5659..de4778e8d24 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -16645,7 +16645,7 @@ static void test_multiple_devices(void)
     ok(hr == S_OK, "got %#lx.\n", hr);
     hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_TEXTUREHANDLE, &texture_handle2);
     ok(hr == D3D_OK, "got %#lx.\n", hr);
-    todo_wine ok(texture_handle2 == texture_handle, "got different handles.\n");
+    ok(texture_handle2 == texture_handle, "got different handles.\n");

IDirect3DTexture2_Release(texture2);
     IDirect3DTexture2_Release(texture);