Alexandre Julliard : oleaut32: Remove typelib registrations.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Tue Aug  2 15:37:14 2011 +0200

oleaut32: Remove typelib registrations.

---

dlls/oleaut32/oleaut.c |   38 +-------------------------------------
 tools/wine.inf.in      |    1 -
 2 files changed, 1 insertions(+), 38 deletions(-)

diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index 1fe6dcf..95c4b6a 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -843,48 +843,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved)
     return OLEAUTPS_DllMain( hInstDll, fdwReason, lpvReserved );
 }

-
-static HRESULT register_typelib( const WCHAR *name )
-{
-    static const WCHAR backslash[] = {'\',0};
-    HRESULT hr;
-    ITypeLib *typelib;
-    WCHAR *path;
-    DWORD len;
-
-    len = GetSystemDirectoryW( NULL, 0 ) + strlenW( name ) + 1;
-    if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return E_OUTOFMEMORY;
-    GetSystemDirectoryW( path, len );
-    strcatW( path, backslash );
-    strcatW( path, name );
-    hr = LoadTypeLib( path, &typelib );
-    if (SUCCEEDED(hr))
-    {
-        hr = RegisterTypeLib( typelib, path, NULL );
-        ITypeLib_Release( typelib );
-    }
-    HeapFree( GetProcessHeap(), 0, path );
-    return hr;
-}
-
 /***********************************************************************
  *		DllRegisterServer (OLEAUT32.@)
  */
 HRESULT WINAPI DllRegisterServer(void)
 {
-    HRESULT hr;
-
-    TRACE("\n");
-
-    hr = OLEAUTPS_DllRegisterServer();
-    if (SUCCEEDED(hr))
-    {
-        const WCHAR stdole32W[] = {'s','t','d','o','l','e','3','2','.','t','l','b',0};
-        const WCHAR stdole2W[] = {'s','t','d','o','l','e','2','.','t','l','b',0};
-        hr = register_typelib( stdole2W );
-        if (SUCCEEDED(hr)) hr = register_typelib( stdole32W );
-    }
-    return hr;
+    return OLEAUTPS_DllRegisterServer();
 }

/***********************************************************************
diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index af68d8f..c27524d 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -2486,7 +2486,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"

[RegisterDllsSection]
 ;;some dlls have to be registered first
-11,,oleaut32.dll,1
 11,,shell32.dll,1

11,,comctl32.dll,2