[PATCH 1/5] wined3d: Don't touch the window's focus or wndproc for windowed devices.
Henri Verbeet
hverbeet at codeweavers.com
Mon Dec 28 10:38:01 CST 2009
---
dlls/wined3d/device.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 31b3187..67eab83 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1395,12 +1395,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface,
if(This->d3d_initialized) return WINED3DERR_INVALIDCALL;
if(!This->adapter->opengl) return WINED3DERR_INVALIDCALL;
- This-> focus_window = This->createParms.hFocusWindow;
- if (!This->focus_window) This->focus_window = pPresentationParameters->hDeviceWindow;
- if (!wined3d_register_window(This->focus_window, This))
+ if (!pPresentationParameters->Windowed)
{
- ERR("Failed to register window %p.\n", This->focus_window);
- return E_FAIL;
+ This->focus_window = This->createParms.hFocusWindow;
+ if (!This->focus_window) This->focus_window = pPresentationParameters->hDeviceWindow;
+ if (!wined3d_register_window(This->focus_window, This))
+ {
+ ERR("Failed to register window %p.\n", This->focus_window);
+ return E_FAIL;
+ }
}
TRACE("(%p) : Creating stateblock\n", This);
@@ -1456,7 +1459,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface,
}
}
- SetFocus(This->focus_window);
+ if (This->focus_window) SetFocus(This->focus_window);
/* Setup the implicit swapchain. This also initializes a context. */
TRACE("Creating implicit swapchain\n");
@@ -1592,7 +1595,7 @@ err_out:
if (This->shader_priv) {
This->shader_backend->shader_free_private(iface);
}
- wined3d_unregister_window(This->focus_window);
+ if (This->focus_window) wined3d_unregister_window(This->focus_window);
return hr;
}
@@ -1783,7 +1786,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface,
This->d3d_initialized = FALSE;
- wined3d_unregister_window(This->focus_window);
+ if (This->focus_window) wined3d_unregister_window(This->focus_window);
return WINED3D_OK;
}
--
1.6.4.4
More information about the wine-patches
mailing list