[PATCH 1/3] wined3d: Conditionally update saved window state in fullscreen mode.

[Matteo Bruni]

From: Matteo Bruni

---
 dlls/wined3d/swapchain.c | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 1a010958a21..14c34b57c89 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -2101,6 +2101,25 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta
     }
     else
     {
+        if (FAILED(hr = wined3d_output_get_desc(state->desc.output, &output_desc)))
+        {
+            ERR("Failed to get output description, hr %#lx.\n", hr);
+            wined3d_mutex_unlock();
+            return hr;
+        }
+        width = output_desc.desktop_rect.right - output_desc.desktop_rect.left;
+        height = output_desc.desktop_rect.bottom - output_desc.desktop_rect.top;
+
+        GetWindowRect(window, &window_rect);
+        if (width != window_rect.right - window_rect.left || height != window_rect.bottom - window_rect.top)
+        {
+            TRACE("Update saved window state.\n");
+            /* Undo changes made by fullscreen_style(). */
+            state->style = GetWindowLongW(window, GWL_STYLE) & ~(WS_POPUP | WS_SYSMENU);
+            state->exstyle = GetWindowLongW(window, GWL_EXSTYLE);
+            state->original_window_rect = window_rect;
+        }
+
         if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH)
         {
             actual_mode = *mode;
@@ -2111,19 +2130,18 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta
                 wined3d_mutex_unlock();
                 return hr;
             }
-        }
+            if (FAILED(hr = wined3d_output_get_desc(state->desc.output, &output_desc)))
+            {
+                ERR("Failed to get output description, hr %#lx.\n", hr);
+                wined3d_mutex_unlock();
+                return hr;
+            }

-        if (FAILED(hr = wined3d_output_get_desc(state->desc.output, &output_desc)))
-        {
-            ERR("Failed to get output description, hr %#lx.\n", hr);
-            wined3d_mutex_unlock();
-            return hr;
+            width = output_desc.desktop_rect.right - output_desc.desktop_rect.left;
+            height = output_desc.desktop_rect.bottom - output_desc.desktop_rect.top;
         }
-
         x = output_desc.desktop_rect.left;
         y = output_desc.desktop_rect.top;
-        width = output_desc.desktop_rect.right - output_desc.desktop_rect.left;
-        height = output_desc.desktop_rect.bottom - output_desc.desktop_rect.top;
     }

wined3d_mutex_unlock();