Jacek Caban : atl80: Forward calls directly to atl100 when possible.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Wed Nov 21 11:12:13 2012 +0100

atl80: Forward calls directly to atl100 when possible.

---

dlls/atl80/atl80.c    |   13 ++---------
 dlls/atl80/atl80.spec |   54 ++++++++++++++++++++++++------------------------
 tools/make_specfiles  |    1 +
 3 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c
index 1c31fe9..ec9a515 100644
--- a/dlls/atl80/atl80.c
+++ b/dlls/atl80/atl80.c
@@ -19,17 +19,10 @@
 #include <stdarg.h>
 #include "windef.h"
 #include "winbase.h"
-#include "atliface.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(atl80);
-
-HRESULT WINAPI AtlCreateRegistrar(IRegistrar** ppReg)
-{
-    FIXME("(%p) stub\n", ppReg);
-    return E_NOTIMPL;
-}

+/***********************************************************************
+ *           AtlGetVersion              [atl80.@]
+ */
 DWORD WINAPI AtlGetVersion(void *pReserved)
 {
    return 0x0800;
diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec
index 7f8cfc2..519bdd0 100644
--- a/dlls/atl80/atl80.spec
+++ b/dlls/atl80/atl80.spec
@@ -1,8 +1,8 @@
-10 stdcall AtlAdvise(ptr ptr ptr ptr) atl.AtlAdvise
-11 stdcall AtlUnadvise(ptr ptr long) atl.AtlUnadvise
-12 stdcall AtlFreeMarshalStream(ptr) atl.AtlFreeMarshalStream
-13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl.AtlMarshalPtrInProc
-14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl.AtlUnmarshalPtr
+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 AtlModuleGetClassObject(ptr ptr ptr ptr) atl.AtlModuleGetClassObject
 16 stdcall AtlModuleInit(ptr long long) atl.AtlModuleInit
 17 stdcall AtlModuleRegisterClassObjects(ptr long long) atl.AtlModuleRegisterClassObjects
@@ -14,41 +14,41 @@
 23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) atl.AtlModuleUpdateRegistryFromResourceD
 24 stub AtlWaitWithMessageLoop
 25 stub AtlSetErrorInfo
-26 stdcall AtlCreateTargetDC(long ptr) atl.AtlCreateTargetDC
-27 stdcall AtlHiMetricToPixel(ptr ptr) atl.AtlHiMetricToPixel
-28 stdcall AtlPixelToHiMetric(ptr ptr) atl.AtlPixelToHiMetric
+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) atl.AtlComPtrAssign
-31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl.AtlComQIPtrAssign
-32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl.AtlInternalQueryInterface
+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 stub AtlAxDialogBoxW
 36 stub AtlAxDialogBoxA
-37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl.AtlAxCreateDialogW
-38 stdcall AtlAxCreateDialogA(long str long ptr long) atl.AtlAxCreateDialogA
-39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl.AtlAxCreateControl
-40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl.AtlAxCreateControlEx
-41 stdcall AtlAxAttachControl(ptr ptr ptr) atl.AtlAxAttachControl
-42 stdcall AtlAxWinInit() atl.AtlAxWinInit
-43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl.AtlModuleAddCreateWndData
-44 stdcall AtlModuleExtractCreateWndData(ptr) atl.AtlModuleExtractCreateWndData
-45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoW
-46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoA
-47 stdcall AtlAxGetControl(long ptr) atl.AtlAxGetControl
-48 stdcall AtlAxGetHost(long ptr) atl.AtlAxGetHost
+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
+42 stdcall AtlAxWinInit() atl100.AtlAxWinInit
+43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl.AtlModuleAddCreateWndData # don't forward to atl100.dll
+44 stdcall AtlModuleExtractCreateWndData(ptr) atl.AtlModuleExtractCreateWndData # don't forward to atl100.dll
+45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoW # don't forward to atl100.dll
+46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoA # don't forward to atl100.dll
+47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl
+48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost
 49 stub AtlRegisterClassCategoriesHelper
-50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl.AtlIPersistStreamInit_Load
-51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl.AtlIPersistStreamInit_Save
+50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load
+51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save
 52 stub AtlIPersistPropertyBag_Load
 53 stub AtlIPersistPropertyBag_Save
 54 stub AtlGetObjectSourceInterface
 55 stub AtlModuleUnRegisterTypeLib
 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) atl.AtlModuleLoadTypeLib
 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) atl.AtlModuleUnregisterServerEx
-58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl.AtlModuleAddTermFunc
+58 stdcall AtlModuleAddTermFunc(ptr) atl.AtlModuleAddTermFunc # don't forward to atl100.dll
 59 stub AtlAxCreateControlLic
 60 stub AtlAxCreateControlLicEx
-61 stdcall AtlCreateRegistrar(ptr)
+61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar
 62 stub AltWinModuleRegisterClassExW
 63 stub AltWinModuleRegisterClassExA
 64 stub AltCallTermFunc
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 301345c..fdba89d 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -112,6 +112,7 @@ my @dll_groups =
   "vcomp90",
  ],
  [
+  "atl100",
   "atl",
   "atl80",
  ],