Jacek Caban : atl110: Share atl_ax.c with atl100.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Jan 29 14:49:37 2014 +0100

atl110: Share atl_ax.c with atl100.

---

 dlls/atl100/atl_ax.c    |    2 ++
 dlls/atl110/Makefile.in |    7 +++++--
 dlls/atl110/atl110.c    |   53 -----------------------------------------------
 dlls/atl110/atl110.spec |   18 ++++++++--------
 4 files changed, 16 insertions(+), 64 deletions(-)

diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c
index be0b836..be52917 100644
--- a/dlls/atl100/atl_ax.c
+++ b/dlls/atl100/atl_ax.c
@@ -93,6 +93,8 @@ BOOL WINAPI AtlAxWinInit(void)
 #define ATL_NAME_SUFFIX '9','0',0
 #elif _ATL_VER == _ATL_VER_100
 #define ATL_NAME_SUFFIX '1','0','0',0
+#elif _ATL_VER == _ATL_VER_110
+#define ATL_NAME_SUFFIX '1','1','0',0
 #else
 #error Unsupported version
 #endif
diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in
index 8160d64..e8d340f 100644
--- a/dlls/atl110/Makefile.in
+++ b/dlls/atl110/Makefile.in
@@ -1,5 +1,8 @@
 MODULE    = atl110.dll
-IMPORTS   = atl100 ole32 user32
+IMPORTS   = atl100 oleaut32 ole32 user32 uuid
 EXTRADEFS = -D_ATL_VER=_ATL_VER_110
+PARENTSRC = ../atl100
 
-C_SRCS = atl110.c
+C_SRCS = \
+	atl110.c \
+	atl_ax.c
diff --git a/dlls/atl110/atl110.c b/dlls/atl110/atl110.c
index 707b43b..9386812 100644
--- a/dlls/atl110/atl110.c
+++ b/dlls/atl110/atl110.c
@@ -40,56 +40,3 @@ DWORD WINAPI AtlGetVersion(void *pReserved)
     TRACE("version %04x (%p)\n", _ATL_VER, pReserved);
    return _ATL_VER;
 }
-
-/**********************************************************************
- * AtlAxWin class window procedure
- */
-static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam )
-{
-    if ( wMsg == WM_CREATE )
-    {
-            DWORD len = GetWindowTextLengthW( hWnd ) + 1;
-            WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
-            if (!ptr)
-                return 1;
-            GetWindowTextW( hWnd, ptr, len );
-            AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL );
-            HeapFree( GetProcessHeap(), 0, ptr );
-            return 0;
-    }
-    return DefWindowProcW( hWnd, wMsg, wParam, lParam );
-}
-
-BOOL WINAPI AtlAxWinInit(void)
-{
-    WNDCLASSEXW wcex;
-    const WCHAR AtlAxWin110[] = {'A','t','l','A','x','W','i','n','1','1','0',0};
-    const WCHAR AtlAxWinLic110[] = {'A','t','l','A','x','W','i','n','L','i','c','1','1','0',0};
-
-    FIXME("version %04x semi-stub\n", _ATL_VER);
-
-    if ( FAILED( OleInitialize(NULL) ) )
-        return FALSE;
-
-    wcex.cbSize        = sizeof(wcex);
-    wcex.style         = CS_GLOBALCLASS | CS_DBLCLKS;
-    wcex.cbClsExtra    = 0;
-    wcex.cbWndExtra    = 0;
-    wcex.hInstance     = GetModuleHandleW( NULL );
-    wcex.hIcon         = NULL;
-    wcex.hCursor       = NULL;
-    wcex.hbrBackground = NULL;
-    wcex.lpszMenuName  = NULL;
-    wcex.hIconSm       = 0;
-
-    wcex.lpfnWndProc   = AtlAxWin_wndproc;
-    wcex.lpszClassName = AtlAxWin110;
-    if ( !RegisterClassExW( &wcex ) )
-        return FALSE;
-
-    wcex.lpszClassName = AtlAxWinLic110;
-    if ( !RegisterClassExW( &wcex ) )
-        return FALSE;
-
-    return TRUE;
-}
diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec
index 045969e..35facf8 100644
--- a/dlls/atl110/atl110.spec
+++ b/dlls/atl110/atl110.spec
@@ -18,20 +18,20 @@
 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign
 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface
 34 stdcall AtlGetVersion(ptr)
-35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW
-36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA
-37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW
-38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA
-39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl
-40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx
-41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl
+35 stdcall AtlAxDialogBoxW(long wstr long ptr long)
+36 stdcall AtlAxDialogBoxA(long str long ptr long)
+37 stdcall AtlAxCreateDialogW(long wstr long ptr long)
+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 stdcall AtlAxAttachControl(ptr ptr ptr)
 42 stdcall AtlAxWinInit()
 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData
 44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData
 45 stub AtlWinModuleRegisterWndClassInfoW
 46 stub AtlWinModuleRegisterWndClassInfoA
-47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl
-48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost
+47 stdcall AtlAxGetControl(long ptr)
+48 stdcall AtlAxGetHost(long ptr)
 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper
 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load
 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save