Henri Verbeet : wined3d: The swapchain should always have a window handle.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Mon Mar 15 21:07:28 2010 +0100

wined3d: The swapchain should always have a window handle.

---

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

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 5dfc560..dc1cf29 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -6625,7 +6625,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE

IWineD3DDevice_SetDisplayMode(iface, 0, &mode);

-        if(swapchain->win_handle && !pPresentationParameters->Windowed) {
+        if (!pPresentationParameters->Windowed)
+        {
             if(swapchain->presentParms.Windowed) {
                 /* switch from windowed to fs */
                 swapchain_setup_fullscreen_window(swapchain, pPresentationParameters->BackBufferWidth,
@@ -6636,7 +6637,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE
                            pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight,
                            TRUE);
             }
-        } else if(swapchain->win_handle && !swapchain->presentParms.Windowed) {
+        }
+        else if (!swapchain->presentParms.Windowed)
+        {
             /* Fullscreen -> windowed switch */
             swapchain_restore_fullscreen_window(swapchain);
         }