diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 1732951199f..393364553a2 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 1661c2685f0..f7a2d7174e6 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 a5aef841791..9766031979b 100644 --- a/dlls/mshtml/mshtml_classes.idl +++ b/dlls/mshtml/mshtml_classes.idl @@ -284,6 +284,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), diff --git a/dlls/mshtml/mshtml_tlb.idl b/dlls/mshtml/mshtml_tlb.idl deleted file mode 100644 index 371cdaf9b0f..00000000000 --- 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 ff2c6ba72df..13c0fa30672 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