From c5117dab68a75f6687c473424e66189f390b7591 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20D=C3=B6singer?= Date: Mon, 10 Mar 2008 22:24:13 +0100 Subject: [PATCH] wined3d: Set the fullscreen flag before the display Mode. --- dlls/wined3d/device.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b4d508e71af..158791f72c9 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 -- 2.11.4.GIT