From 52c9b51ca88ade36ead5bdb54a78a8d3ff2c71bd Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 28 Jan 2014 12:48:34 +0100 Subject: [PATCH] atl90: Share atl.c with atl100. --- dlls/atl90/Makefile.in | 4 +- dlls/atl90/atl90.c | 42 -------------------- dlls/atl90/atl90.spec | 104 ++++++++++++++++++++++++------------------------- 3 files changed, 54 insertions(+), 96 deletions(-) delete mode 100644 dlls/atl90/atl90.c rewrite dlls/atl90/atl90.spec (69%) diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index 677aaae439d..88f441b3f16 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,10 +1,10 @@ MODULE = atl90.dll -IMPORTS = atl100 oleaut32 user32 ole32 uuid +IMPORTS = atl100 oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_90 PARENTSRC = ../atl100 C_SRCS = \ - atl90.c \ + atl.c \ atl_ax.c RC_SRCS = atl90.rc diff --git a/dlls/atl90/atl90.c b/dlls/atl90/atl90.c deleted file mode 100644 index 9dd0b70cec9..00000000000 --- a/dlls/atl90/atl90.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2013 Zhenbo Li - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include -#include - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "atlbase.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(atl); - -/*********************************************************************** - * AtlGetVersion [atl90.@] - */ -DWORD WINAPI AtlGetVersion(void *reserved) -{ - TRACE("version %04x (%p)\n", _ATL_VER, reserved); - return _ATL_VER; -} diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec dissimilarity index 69% index 35facf89cfa..a8fcf468e0f 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -1,52 +1,52 @@ -10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise -11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise -12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream -13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc -14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr -15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject -17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects -20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects -22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer -23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD -24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop -25 stub AtlSetErrorInfo -26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC -27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel -28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric -29 stub AtlDevModeW2A -30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign -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) -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) -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 -52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load -53 stub AtlIPersistPropertyBag_Save -54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface -56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib -58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx -61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar -62 stub AtlWinModuleRegisterClassExW -63 stub AtlWinModuleRegisterClassExA -64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc -65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit -66 stub AtlWinModuleTerm -67 stdcall AtlSetPerUserRegistration(long) atl100.AtlSetPerUserRegistration -68 stdcall AtlGetPerUserRegistration(ptr) atl100.AtlGetPerUserRegistration +10 stdcall AtlAdvise(ptr ptr ptr ptr) +11 stdcall AtlUnadvise(ptr ptr long) +12 stdcall AtlFreeMarshalStream(ptr) +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) +20 stdcall AtlComModuleRevokeClassObjects(ptr) +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD +24 stdcall AtlWaitWithMessageLoop(long) +25 stub AtlSetErrorInfo +26 stdcall AtlCreateTargetDC(long ptr) +27 stdcall AtlHiMetricToPixel(ptr ptr) +28 stdcall AtlPixelToHiMetric(ptr ptr) +29 stub AtlDevModeW2A +30 stdcall AtlComPtrAssign(ptr ptr) +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) +34 stdcall AtlGetVersion(ptr) +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) +44 stdcall AtlWinModuleExtractCreateWndData(ptr) +45 stub AtlWinModuleRegisterWndClassInfoW +46 stub AtlWinModuleRegisterWndClassInfoA +47 stdcall AtlAxGetControl(long ptr) +48 stdcall AtlAxGetHost(long ptr) +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) +53 stub AtlIPersistPropertyBag_Save +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) +58 stdcall AtlModuleAddTermFunc(ptr ptr long) +59 stub AtlAxCreateControlLic +60 stub AtlAxCreateControlLicEx +61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +62 stub AtlWinModuleRegisterClassExW +63 stub AtlWinModuleRegisterClassExA +64 stdcall AtlCallTermFunc(ptr) +65 stdcall AtlWinModuleInit(ptr) +66 stub AtlWinModuleTerm +67 stdcall AtlSetPerUserRegistration(long) +68 stdcall AtlGetPerUserRegistration(ptr) -- 2.11.4.GIT