Module: wine Branch: master Commit: bd82d6446727a8beaa5d57d035596c495d1ef0bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd82d6446727a8beaa5d57d035...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Jan 28 12:48:47 2014 +0100
atl90: Share registrar.c with atl100.
---
dlls/atl90/Makefile.in | 5 +++-- dlls/atl90/atl90.spec | 4 ++-- tools/make_specfiles | 1 - 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index 88f441b..3e5114b 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,10 +1,11 @@ MODULE = atl90.dll -IMPORTS = atl100 oleaut32 user32 ole32 gdi32 advapi32 uuid +IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_90 PARENTSRC = ../atl100
C_SRCS = \ atl.c \ - atl_ax.c + atl_ax.c \ + registrar.c
RC_SRCS = atl90.rc diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index a8fcf46..0d41c1e 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -7,7 +7,7 @@ 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 +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) 24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) @@ -42,7 +42,7 @@ 58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA 64 stdcall AtlCallTermFunc(ptr) diff --git a/tools/make_specfiles b/tools/make_specfiles index 31449b8..f587f39 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -123,7 +123,6 @@ my @dll_groups = "atl110", "atl", "atl80", - "atl90", ], [ "advapi32",