atl: Reimplemented AtlModuleRegisterTypeLib on top of AtlRegisterTypeLib.

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

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])

dlls/atl/Makefile.in

 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

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);
 }
 
 /***********************************************************************

dlls/atl80/Makefile.in

 MODULE    = atl80.dll
+IMPORTLIB = atl80
 IMPORTS   = atl100 oleaut32
 EXTRADEFS = -D_ATL_VER=_ATL_VER_80