Stefan Dösinger : wined3d: Set the fullscreen flag before the display Mode.

[Alexandre Julliard]

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

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Mon Mar 10 22:24:13 2008 +0100

wined3d: Set the fullscreen flag before the display Mode.

---

 dlls/wined3d/device.c |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index b4d508e..158791f 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -7096,18 +7096,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE
        (swapchain->presentParms.Windowed && !pPresentationParameters->Windowed) ||
         DisplayModeChanged) {
 
-        /* Switching to fullscreen? Change to fullscreen mode, THEN change the screen res */
-        if(!pPresentationParameters->Windowed) {
-            IWineD3DDevice_SetFullscreen(iface, TRUE);
-        }
-
-        IWineD3DDevice_SetDisplayMode(iface, 0, &mode);
-
-        /* Switching out of fullscreen mode? First set the original res, then change the window */
-        if(pPresentationParameters->Windowed) {
-            IWineD3DDevice_SetFullscreen(iface, FALSE);
-        }
+        IWineD3DDevice_SetFullscreen(iface, !pPresentationParameters->Windowed);
         swapchain->presentParms.Windowed = pPresentationParameters->Windowed;
+        IWineD3DDevice_SetDisplayMode(iface, 0, &mode);
     } else if(!pPresentationParameters->Windowed) {
         DWORD style = This->style, exStyle = This->exStyle;
         /* If we're in fullscreen, and the mode wasn't changed, we have to get the window back into