mshtml: Convert the classes registration to the IRegistrar mechanism.

dlls/mshtml/Makefile.in

@@ -103,4 +103,8 @@ RC_SRCS = \
 
 IDL_H_SRCS = nsiface.idl
 
+IDL_R_SRCS = \
+	mshtml_classes.idl \
+	mshtml_tlb.idl
+
 @MAKE_DLL_RULES@

dlls/mshtml/main.c

@@ -33,6 +33,7 @@
 #include "advpub.h"
 #include "shlwapi.h"
 #include "optary.h"
+#include "rpcproxy.h"
 #include "shlguid.h"
 
 #include "wine/unicode.h"
@@ -368,7 +369,6 @@ DEFINE_GUID(CLSID_IImageDecodeFilter, 0x607FD4E8, 0x0A03, 0x11D1, 0xAB,0x1D, 0x0
 DEFINE_GUID(CLSID_IImgCtx, 0x3050F3D6, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);
 DEFINE_GUID(CLSID_IntDitherer, 0x05F6FE1A, 0xECEF, 0x11D0, 0xAA,0xE7, 0x00,0xC0,0x4F,0xC9,0xB3,0x04);
 DEFINE_GUID(CLSID_MHTMLDocument, 0x3050F3D9, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);
-DEFINE_GUID(CLSID_Scriptlet, 0xAE24FDAE, 0x03C6, 0x11D1, 0x8B,0x76, 0x00,0x80,0xC7,0x44,0xF3,0x89);
 DEFINE_GUID(CLSID_TridentAPI, 0x429AF92C, 0xA51F, 0x11D2, 0x86,0x1E, 0x00,0xC0,0x4F,0xA3,0x5C,0x89);
 
 #define INF_SET_ID(id)            \
@@ -484,7 +484,9 @@ HRESULT WINAPI DllRegisterServer(void)
 {
     HRESULT hres;
 
-    hres = register_server(TRUE);
+    hres = __wine_register_resources( hInst, NULL );
+    if(SUCCEEDED(hres))
+        hres = register_server(TRUE);
     if(SUCCEEDED(hres))
         load_gecko(FALSE);
 
@@ -496,7 +498,9 @@ HRESULT WINAPI DllRegisterServer(void)
  */
 HRESULT WINAPI DllUnregisterServer(void)
 {
-    return register_server(FALSE);
+    HRESULT hres = __wine_unregister_resources( hInst, NULL );
+    if(SUCCEEDED(hres)) hres = register_server(FALSE);
+    return hres;
 }
 
 const char *debugstr_variant(const VARIANT *v)

dlls/mshtml/mshtml_classes.idl

+/*
+ * COM Classes for mshtml
+ *
+ * Copyright 2010 Alexandre Julliard
+ *
+ * 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
+ */
+
+[
+    helpstring("Microsoft HTML About Pluggable Protocol"),
+    threading(apartment),
+    uuid(3050f406-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass AboutProtocol { }
+
+[
+    helpstring("Microsoft Anchor Element Browse Property Page"),
+    threading(apartment),
+    uuid(3050f3bb-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass CAnchorBrowsePropertyPage { }
+
+[
+    helpstring("Microsoft HTML Background Page"),
+    threading(apartment),
+    uuid(3050f232-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass CBackgroundPropertyPage { }
+
+[
+    helpstring("Microsoft HTML Anchor Page"),
+    threading(apartment),
+    uuid(3050f1fc-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass CCDAnchorPropertyPage { }
+
+[
+    helpstring("Microsoft HTML Generic Page"),
+    threading(apartment),
+    uuid(3050f17f-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass CCDGenericPropertyPage { }
+
+[
+    helpstring("Microsoft Document Browse Property Page"),
+    threading(apartment),
+    uuid(3050f3b4-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass CDocBrowsePropertyPage { }
+
+[
+    helpstring("Microsoft HTML DwnBindInfo"),
+    threading(apartment),
+    uuid(3050f3c2-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass CDwnBindInfo { }
+
+[
+    helpstring("Microsoft HTML External Document"),
+    threading(apartment),
+    uuid(3050f163-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass ExternalFrameworkSite { }
+
+[
+    helpstring("Microsoft Scriptlet HiFiTimer Uses"),
+    progid("Scriptlet.HiFiTimer"),
+    threading(apartment),
+    uuid(5aaf51b3-b1f0-11d1-b6ab-00a0c90833e9)
+]
+coclass CHiFiUses { }
+
+[
+    helpstring("Microsoft Html Component"),
+    threading(apartment),
+    uuid(3050f4f8-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass CHtmlComponentConstructor { }
+
+[
+    helpstring("Microsoft Image Element Browse Property Page"),
+    threading(apartment),
+    uuid(3050f3b3-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass CImageBrowsePropertyPage { }
+
+[
+    helpstring("Microsoft HTML Inline Style Page"),
+    threading(apartment),
+    uuid(3050f296-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass CInlineStylePropertyPage { }
+
+[
+    helpstring("Microsoft Scriptlet Element Behavior Handler"),
+    progid("Scriptlet.Behavior"),
+    threading(apartment),
+    uuid(5aaf51b2-b1f0-11d1-b6ab-00a0c90833e9)
+]
+coclass CPeerHandler { }
+
+[
+    helpstring("Microsoft HTML Recalc"),
+    threading(apartment),
+    uuid(3050f499-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass CRecalcEngine { }
+
+[
+    helpstring("Microsoft CrSource 4.0"),
+    threading(apartment),
+    progid("CrSource"),
+    version(4.0),
+    uuid(65014010-9f62-11d1-a651-00600811d5ce)
+]
+coclass CrSource { }
+
+[
+    helpstring("Microsoft Scriptlet svr om Uses"),
+    progid("Scriptlet.SvrOm"),
+    threading(apartment),
+    uuid(3050f4f0-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass CSvrOMUses { }
+
+[
+    helpstring("Microsoft HTA Document 6.0"),
+    threading(apartment),
+    version(6.0),
+    uuid(3050f5c8-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass HTADocument { }
+
+[
+    helpstring("HTML Document"),
+    progid("htmlfile"),
+    threading(apartment),
+    version(6.0),
+    uuid(25336920-03f9-11cf-8fd0-00aa00686f13)
+]
+coclass HTMLDocument { }
+
+[
+    helpstring("Microsoft HTML Document 6.0"),
+    progid("htmlfile_FullWindowEmbed"),
+    threading(apartment),
+    uuid(25336921-03f9-11cf-8fd0-00aa00686f13)
+]
+coclass HTMLPluginDocument { }
+
+[
+    helpstring("Microsoft Html Popup Window"),
+    threading(apartment),
+    uuid(3050f667-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass HTMLPopup { }
+
+[
+    helpstring("Microsoft Html Document for Popup Window"),
+    threading(apartment),
+    uuid(3050f67d-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass HTMLPopupDoc { }
+
+[
+    helpstring("Microsoft HTML Server Document 6.0"),
+    threading(apartment),
+    uuid(3050f4e7-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass HTMLServerDoc { }
+
+[
+    helpstring("Microsoft HTML Window Security Proxy"),
+    threading(apartment),
+    uuid(3050f391-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass HTMLWindowProxy { }
+
+[
+    helpstring("CoBMPFilter Class"),
+    progid("BMPFilter.CoBMPFilter.1"),
+    vi_progid("BMPFilter.CoBMPFilter"),
+    threading(apartment),
+    uuid(607fd4e8-0a03-11d1-ab1d-00c04fc9b304)
+]
+coclass CoBMPFilter { }
+
+[
+    helpstring("CoGIFFilter Class"),
+    progid("GIFFilter.CoGIFFilter.1"),
+    vi_progid("GIFFilter.CoGIFFilter"),
+    threading(apartment),
+    uuid(607fd4e8-0a03-11d1-ab1d-00c04fc9b304)
+]
+coclass CoGIFFilter { }
+
+[
+    helpstring("CoJPEGFilter Class"),
+    progid("JPEGFilter.CoJPEGFilter.1"),
+    vi_progid("JPEGFilter.CoJPEGFilter"),
+    threading(apartment),
+    uuid(607fd4e8-0a03-11d1-ab1d-00c04fc9b304)
+]
+coclass CoJPEGFilter { }
+
+[
+    helpstring("CoWMFFilter Class"),
+    progid("WMFFilter.CoWMFFilter.1"),
+    vi_progid("WMFFilter.CoWMFFilter"),
+    threading(apartment),
+    uuid(607fd4e8-0a03-11d1-ab1d-00c04fc9b304)
+]
+coclass CoWMFFilter { }
+
+[
+    helpstring("CoICOFilter Class"),
+    progid("ICOFilter.CoICOFilter.1"),
+    vi_progid("ICOFilter.CoICOFilter"),
+    threading(apartment),
+    uuid(607fd4e8-0a03-11d1-ab1d-00c04fc9b304)
+]
+coclass CoICOFilter { }
+
+[
+    progid("IImgCtx"),
+    threading(apartment),
+    uuid(3050f3d6-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass IImgCtx { }
+
+[
+    helpstring("Microsoft HTML Load Options"),
+    threading(apartment),
+    uuid(18845040-0fa5-11d1-ba19-00c04fd912d0)
+]
+coclass HTMLLoadOptions { }
+
+[
+    helpstring("IntDitherer Class"),
+    threading(apartment),
+    uuid(05f6fe1a-ecef-11d0-aae7-00c04fc9b304)
+]
+coclass IntDitherer { }
+
+[
+    helpstring("Microsoft HTML Javascript Pluggable Protocol"),
+    threading(apartment),
+    uuid(3050f3b2-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass JSProtocol { }
+
+[
+    helpstring("Microsoft HTML Mailto Pluggable Protocol"),
+    threading(apartment),
+    uuid(3050f3da-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass MailtoProtocol { }
+
+[
+    helpstring("MHTML Document"),
+    progid("mhtmlfile"),
+    threading(apartment),
+    version(6.0),
+    uuid(3050f3d9-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass MHTMLDocument { }
+
+[
+    helpstring("Microsoft HTML Resource Pluggable Protocol"),
+    threading(apartment),
+    uuid(3050f3bc-98b5-11cf-bb82-00aa00bdce0b)
+]
+coclass ResProtocol { }
+
+[
+    helpstring("Microsoft HTML Resource Pluggable Protocol"),
+    threading(apartment),
+    uuid(76e67a63-06e9-11d2-a840-006008059382)
+]
+coclass SysimageProtocol { }
+
+[
+    helpstring("Trident API"),
+    threading(apartment),
+    uuid(429af92c-a51f-11d2-861e-00c04fa35c89)
+]
+coclass TridentAPI { }

dlls/mshtml/mshtml_tlb.idl

+/*
+ * 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"