Jacek Caban : atl: Reimplemented AtlModuleRegisterTypeLib on top of AtlRegisterTypeLib.

Alexandre Julliard julliard at winehq.org
Fri Dec 28 15:05:16 CST 2012


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Dec 28 14:23:56 2012 +0100

atl: Reimplemented AtlModuleRegisterTypeLib on top of AtlRegisterTypeLib.

---

 configure              |    2 +-
 configure.ac           |    2 +-
 dlls/atl/Makefile.in   |    2 +-
 dlls/atl/atl_main.c    |   17 ++---------------
 dlls/atl80/Makefile.in |    1 +
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/configure b/configure
index 13cd76d..f13d0ed 100755
--- a/configure
+++ b/configure
@@ -15380,7 +15380,7 @@ wine_fn_config_dll atl enable_atl implib
 wine_fn_config_test dlls/atl/tests atl_test
 wine_fn_config_dll atl100 enable_atl100 implib
 wine_fn_config_test dlls/atl100/tests atl100_test
-wine_fn_config_dll atl80 enable_atl80
+wine_fn_config_dll atl80 enable_atl80 implib
 wine_fn_config_dll authz enable_authz
 wine_fn_config_dll avicap32 enable_avicap32 implib
 wine_fn_config_dll avifil32 enable_avifil32 implib,po
diff --git a/configure.ac b/configure.ac
index f27c201..2cfa4d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2555,7 +2555,7 @@ WINE_CONFIG_DLL(atl,,[implib])
 WINE_CONFIG_TEST(dlls/atl/tests)
 WINE_CONFIG_DLL(atl100,,[implib])
 WINE_CONFIG_TEST(dlls/atl100/tests)
-WINE_CONFIG_DLL(atl80)
+WINE_CONFIG_DLL(atl80,,[implib])
 WINE_CONFIG_DLL(authz)
 WINE_CONFIG_DLL(avicap32,,[implib])
 WINE_CONFIG_DLL(avifil32,,[implib,po])
diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in
index cb114ff..fb986f9 100644
--- a/dlls/atl/Makefile.in
+++ b/dlls/atl/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = atl.dll
 IMPORTLIB = atl
-IMPORTS   = uuid atl100 oleaut32 ole32 user32
+IMPORTS   = uuid atl80 atl100 oleaut32 ole32 user32
 EXTRADEFS = -D_ATL_VER=_ATL_VER_30
 
 C_SRCS = atl_main.c
diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c
index 5ef083e..f75ecee 100644
--- a/dlls/atl/atl_main.c
+++ b/dlls/atl/atl_main.c
@@ -225,7 +225,7 @@ HRESULT WINAPI AtlModuleRegisterServer(_ATL_MODULEW* pM, BOOL bRegTypeLib, const
 
     if (bRegTypeLib)
     {
-        hRes = AtlModuleRegisterTypeLib(pM, NULL);
+        hRes = AtlRegisterTypeLib(pM->m_hInstTypeLib, NULL);
         if (FAILED(hRes))
             return hRes;
     }
@@ -276,25 +276,12 @@ HRESULT WINAPI AtlModuleGetClassObject(_ATL_MODULEW *pm, REFCLSID rclsid,
  */
 HRESULT WINAPI AtlModuleRegisterTypeLib(_ATL_MODULEW *pm, LPCOLESTR lpszIndex)
 {
-    HRESULT hRes;
-    BSTR path;
-    ITypeLib *typelib;
-
     TRACE("%p %s\n", pm, debugstr_w(lpszIndex));
 
     if (!pm)
         return E_INVALIDARG;
 
-    hRes = AtlModuleLoadTypeLib(pm, lpszIndex, &path, &typelib);
-
-    if (SUCCEEDED(hRes))
-    {
-        hRes = RegisterTypeLib(typelib, path, NULL); /* FIXME: pass help directory */
-        ITypeLib_Release(typelib);
-        SysFreeString(path);
-    }
-
-    return hRes;
+    return AtlRegisterTypeLib(pm->m_hInstTypeLib, lpszIndex);
 }
 
 /***********************************************************************
diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in
index 1b83f5f..71cb651 100644
--- a/dlls/atl80/Makefile.in
+++ b/dlls/atl80/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = atl80.dll
+IMPORTLIB = atl80
 IMPORTS   = atl100 oleaut32
 EXTRADEFS = -D_ATL_VER=_ATL_VER_80
 




More information about the wine-cvs mailing list