Alexandre Julliard : mshtml: Remove typelib registrations.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Aug  2 15:38:12 2011 +0200

mshtml: Remove typelib registrations.

---

 dlls/mshtml/Makefile.in        |    4 +---
 dlls/mshtml/main.c             |   19 +------------------
 dlls/mshtml/mshtml_classes.idl |    9 +++++++++
 dlls/mshtml/mshtml_tlb.idl     |   19 -------------------
 include/mshtml.idl             |    1 -
 5 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index 1732951..3933645 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -104,8 +104,6 @@ PO_SRCS = mshtml.rc
 
 IDL_H_SRCS = nsiface.idl
 
-IDL_R_SRCS = \
-	mshtml_classes.idl \
-	mshtml_tlb.idl
+IDL_R_SRCS = mshtml_classes.idl
 
 @MAKE_DLL_RULES@
diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
index 1661c26..f7a2d71 100644
--- a/dlls/mshtml/main.c
+++ b/dlls/mshtml/main.c
@@ -451,25 +451,8 @@ static HRESULT register_server(BOOL do_register)
     for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++)
         heap_free(pse[i].pszValue);
 
-    if(FAILED(hres)) {
-        ERR("RegInstall failed: %08x\n", hres);
-        return hres;
-    }
-
-    if(do_register) {
-        ITypeLib *typelib;
-
-        static const WCHAR wszMSHTML[] = {'m','s','h','t','m','l','.','t','l','b',0};
-
-        hres = LoadTypeLibEx(wszMSHTML, REGKIND_REGISTER, &typelib);
-        if(SUCCEEDED(hres))
-            ITypeLib_Release(typelib);
-    }else {
-        hres = UnRegisterTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, SYS_WIN32);
-    }
-
     if(FAILED(hres))
-        ERR("typelib registration failed: %08x\n", hres);
+        ERR("RegInstall failed: %08x\n", hres);
 
     return hres;
 }
diff --git a/dlls/mshtml/mshtml_classes.idl b/dlls/mshtml/mshtml_classes.idl
index a5aef84..9766031 100644
--- a/dlls/mshtml/mshtml_classes.idl
+++ b/dlls/mshtml/mshtml_classes.idl
@@ -285,6 +285,15 @@ coclass MHTMLDocument { }
 coclass ResProtocol { }
 
 [
+    helpstring("Microsoft Scriptlet Component"),
+    progid("ScriptBridge.ScriptBridge.1"),
+    vi_progid("ScriptBridge.ScriptBridge"),
+    threading(apartment),
+    uuid(ae24fdae-03c6-11d1-8b76-0080c744f389)
+]
+coclass Scriptlet { }
+
+[
     helpstring("Microsoft HTML Resource Pluggable Protocol"),
     threading(apartment),
     uuid(76e67a63-06e9-11d2-a840-006008059382)
diff --git a/dlls/mshtml/mshtml_tlb.idl b/dlls/mshtml/mshtml_tlb.idl
deleted file mode 100644
index 371cdaf..0000000
--- a/dlls/mshtml/mshtml_tlb.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2007 Jacek Caban for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "mshtml.idl"
diff --git a/include/mshtml.idl b/include/mshtml.idl
index ff2c6ba..13c0fa3 100644
--- a/include/mshtml.idl
+++ b/include/mshtml.idl
@@ -13700,7 +13700,6 @@ interface IWebBridge : IDispatch
     helpstring("Microsoft Scriptlet Component"),
     progid("ScriptBridge.ScriptBridge.1"),
     vi_progid("ScriptBridge.ScriptBridge"),
-    threading(apartment),
     uuid(ae24fdae-03c6-11d1-8b76-0080c744f389)
 ]
 coclass Scriptlet