Andrey Turkin : atl: Implement AtlAxAttachControl.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Nov 13 09:24:24 CST 2006
Module: wine
Branch: master
Commit: 7c5f011c11c9b557670ff6822b059458d2a52196
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5f011c11c9b557670ff6822b059458d2a52196
Author: Andrey Turkin <pancha at mail.nnov.ru>
Date: Sat Nov 11 00:00:23 2006 +0300
atl: Implement AtlAxAttachControl.
---
dlls/atl/atl.spec | 2 +-
dlls/atl/atl_ax.c | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec
index 12d5a19..bfbaaec 100644
--- a/dlls/atl/atl.spec
+++ b/dlls/atl/atl.spec
@@ -32,7 +32,7 @@
38 stdcall AtlAxCreateDialogA(long str long ptr long)
39 stdcall AtlAxCreateControl(ptr ptr ptr ptr)
40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr)
-41 stub AtlAxAttachControl
+41 stdcall AtlAxAttachControl(ptr ptr ptr)
42 stdcall AtlAxWinInit()
43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr)
44 stdcall AtlModuleExtractCreateWndData(ptr)
diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c
index c2b5812..712cae0 100644
--- a/dlls/atl/atl_ax.c
+++ b/dlls/atl/atl_ax.c
@@ -470,8 +470,20 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCO
*/
HRESULT WINAPI AtlAxAttachControl(IUnknown* pControl, HWND hWnd, IUnknown** ppUnkContainer)
{
- FIXME( "(%p %p %p) - stub\n", pControl, hWnd, ppUnkContainer );
- return E_NOTIMPL;
+ IOCS *pUnkContainer;
+ HRESULT hr;
+
+ TRACE( "%p %p %p\n", pControl, hWnd, ppUnkContainer );
+
+ *ppUnkContainer = NULL;
+
+ hr = IOCS_Create( hWnd, pControl, &pUnkContainer );
+ if ( SUCCEEDED( hr ) )
+ {
+ *ppUnkContainer = (IUnknown*) pUnkContainer;
+ }
+
+ return hr;
}
/**********************************************************************
More information about the wine-cvs
mailing list