commit e76db63c02ee62ce894f315afc87ac68eb4c5de8
author Alexandre Julliard <julliard@winehq.org> Tue Aug 02 15:46:48 2011 +0200
committer Alexandre Julliard <julliard@winehq.org> Tue Aug 02 20:47:49 2011 +0200
tree 6bed4bd463cd4559bb4306f4ce8ab67b65b986f9
parent 1380a77074541514c3e9bd83ab2f98019e931e39

winecrt0: No longer register typelibs, they use IRegistrar scripts now.

dlls/winecrt0/register.c

diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c
index 28ce3c5..275ed32 100644
--- a/dlls/winecrt0/register.c
+++ b/dlls/winecrt0/register.c
@@ -31,11 +31,9 @@
 #include "atliface.h"
 
 static const WCHAR ole32W[] = {'o','l','e','3','2','.','d','l','l',0};
-static const WCHAR oleaut32W[] = {'o','l','e','a','u','t','3','2','.','d','l','l',0};
 static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0};
 static const WCHAR moduleW[] = {'M','O','D','U','L','E',0};
 static const WCHAR clsidW[] = {'C','L','S','I','D','_','P','S','F','a','c','t','o','r','y','B','u','f','f','e','r',0};
-static const WCHAR typelibW[] = {'T','Y','P','E','L','I','B',0};
 
 struct reg_info
 {
@@ -47,13 +45,10 @@
 };
 
 static HMODULE ole32;
-static HMODULE oleaut32;
 static HRESULT (WINAPI *pCoInitialize)(LPVOID);
 static void (WINAPI *pCoUninitialize)(void);
 static HRESULT (WINAPI *pCoCreateInstance)(REFCLSID,LPUNKNOWN,DWORD,REFIID,LPVOID*);
 static INT (WINAPI *pStringFromGUID2)(REFGUID,LPOLESTR,INT);
-static HRESULT (WINAPI *pLoadTypeLibEx)(LPCOLESTR,REGKIND,ITypeLib**);
-static HRESULT (WINAPI *pUnRegisterTypeLib)(REFGUID,WORD,WORD,LCID,SYSKIND);
 
 static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info )
 {
@@ -116,40 +111,6 @@
     return SUCCEEDED(info->result);
 }
 
-static HRESULT register_typelib( HMODULE module, BOOL do_register )
-{
-    WCHAR name[MAX_PATH];
-    ITypeLib *typelib;
-    HRESULT ret;
-
-    if (!pUnRegisterTypeLib)
-    {
-        if (!(oleaut32 = LoadLibraryW( oleaut32W )) ||
-            !(pLoadTypeLibEx = (void *)GetProcAddress( oleaut32, "LoadTypeLibEx" )) ||
-            !(pUnRegisterTypeLib = (void *)GetProcAddress( oleaut32, "UnRegisterTypeLib" )))
-            return E_FAIL;
-    }
-    GetModuleFileNameW( module, name, MAX_PATH );
-    if (do_register)
-    {
-        ret = pLoadTypeLibEx( name, REGKIND_REGISTER, &typelib );
-    }
-    else
-    {
-        ret = pLoadTypeLibEx( name, REGKIND_NONE, &typelib );
-        if (SUCCEEDED( ret ))
-        {
-            TLIBATTR *attr;
-            ITypeLib_GetLibAttr( typelib, &attr );
-            ret = pUnRegisterTypeLib( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum,
-                                      attr->lcid, attr->syskind );
-            ITypeLib_ReleaseTLibAttr( typelib, attr );
-        }
-    }
-    if (SUCCEEDED( ret )) ITypeLib_Release( typelib );
-    return ret;
-}
-
 HRESULT __wine_register_resources( HMODULE module, const CLSID *clsid )
 {
     struct reg_info info;
@@ -161,8 +122,6 @@
     info.result = S_OK;
     EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info );
     if (info.registrar) IRegistrar_Release( info.registrar );
-    if (SUCCEEDED(info.result) && FindResourceW( module, MAKEINTRESOURCEW(1), typelibW ))
-        info.result = register_typelib( module, TRUE );
     if (info.uninit) pCoUninitialize();
     return info.result;
 }
@@ -178,8 +137,6 @@
     info.result = S_OK;
     EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info );
     if (info.registrar) IRegistrar_Release( info.registrar );
-    if (SUCCEEDED(info.result) && FindResourceW( module, MAKEINTRESOURCEW(1), typelibW ))
-        info.result = register_typelib( module, FALSE );
     if (info.uninit) pCoUninitialize();
     return info.result;
 }