Stefan Dösinger : wined3d: Implement GetHWND and SetHWND.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Apr 19 06:03:49 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 04da3ce2d172e4240b44e97d90745b50d88f17f7
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04da3ce2d172e4240b44e97d90745b50d88f17f7
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Tue Apr 18 23:39:52 2006 +0200
wined3d: Implement GetHWND and SetHWND.
---
dlls/wined3d/device.c | 12 ++++++++----
dlls/wined3d/wined3d_private.h | 5 ++++-
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index dd2805c..93acc84 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4992,15 +4992,19 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetDis
}
HRESULT WINAPI IWineD3DDeviceImpl_SetHWND(IWineD3DDevice *iface, HWND hWnd) {
- FIXME("This is unimplemented for now(d3d7 merge)\n");
+ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
+ TRACE("(%p)->(%p)\n", This, hWnd);
- return WINED3DERR_INVALIDCALL;
+ This->ddraw_window = hWnd;
+ return WINED3D_OK;
}
HRESULT WINAPI IWineD3DDeviceImpl_GetHWND(IWineD3DDevice *iface, HWND *hWnd) {
- FIXME("This is unimplemented for now(d3d7 merge)\n");
+ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
+ TRACE("(%p)->(%p)\n", This, hWnd);
- return WINED3DERR_INVALIDCALL;
+ *hWnd = This->ddraw_window;
+ return WINED3D_OK;
}
/*****
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index afb769c..55a92f7 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -583,7 +583,10 @@ #define NEEDS_DI
/* process vertex shaders using software or hardware */
BOOL softwareVertexProcessing;
-
+
+ /* DirectDraw stuff */
+ HWND ddraw_window;
+
} IWineD3DDeviceImpl;
extern const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl;
More information about the wine-cvs
mailing list