Henri Verbeet : ddraw: Don't touch the window during mode setting if we' re not in exclusive mode.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f147c1e9289185cc3c523a0537c2bcee87744f49
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f147c1e9289185cc3c523a0537...

Author: Henri Verbeet 
Date:   Mon May 23 22:11:34 2011 +0200

ddraw: Don't touch the window during mode setting if we're not in exclusive mode.

---

dlls/ddraw/ddraw.c     |    9 +++++++--
 dlls/ddraw/tests/d3d.c |    2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 4a7e5ed..58eb452 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -883,8 +883,13 @@ static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD

/* TODO: Lose the primary surface */
     hr = wined3d_device_set_display_mode(ddraw->wined3d_device, 0, &Mode);
-    wined3d_device_restore_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window);
-    wined3d_device_setup_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window, Width, Height);
+
+    if (ddraw->cooperative_level & DDSCL_EXCLUSIVE)
+    {
+        wined3d_device_restore_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window);
+        wined3d_device_setup_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window, Width, Height);
+    }
+
     LeaveCriticalSection(&ddraw_cs);
     switch(hr)
     {
diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index ff208c7..9ac3ffa 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -4046,7 +4046,7 @@ static void test_coop_level_mode_set(void)
     ok(SUCCEEDED(hr), "SetDipslayMode failed, hr %#x.\n", hr);

GetWindowRect(window, &r);
-    todo_wine ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
+    ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
             fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom,
             r.left, r.top, r.right, r.bottom);