From c53279342644488764d8d10dfcff02c93b2d8165 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jack@itma.pwr.wroc.pl>
Date: Thu, 14 Jul 2005 12:18:30 +0000
Subject: [PATCH] Added MSHTML library declaration.

---
 dlls/mshtml/main.c     | 15 +++++++-----
 dlls/mshtml/mshtml.inf |  2 +-
 include/mshtml.idl     | 55 ++++++++++++++++++++++++------------------
 3 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
index 9ccf7dba7e..20fb460d9d 100644
--- a/dlls/mshtml/main.c
+++ b/dlls/mshtml/main.c
@@ -109,7 +109,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
                 if(!hMozCtl)
                     ERR("Can't load the Mozilla ActiveX control\n");
             }else {
-                TRACE("Not found Mozilla ActiveX Control. HTML rendering will be disabled.");
+                TRACE("Not found Mozilla ActiveX Control. HTML rendering will be disabled.\n");
             }
             hInst = hInstDLL;
 	    break;
@@ -312,9 +312,11 @@ DEFINE_GUID(CLSID_MHTMLDocument, 0x3050F3D9, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xA
 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_CLSID(clsid) \
-    pse[i].pszName = "CLSID_" #clsid; \
-    clsids[i++] = &CLSID_ ## clsid;
+#define INF_SET_ID(id) \
+    pse[i].pszName = #id; \
+    clsids[i++] = &id;
+
+#define INF_SET_CLSID(clsid) INF_SET_ID(CLSID_ ## clsid)
 
 static HRESULT register_server(BOOL do_register)
 {
@@ -322,8 +324,8 @@ static HRESULT register_server(BOOL do_register)
     HMODULE hAdvpack;
     typeof(RegInstall) *pRegInstall;
     STRTABLE strtable;
-    STRENTRY pse[34];
-    static CLSID const *clsids[34];
+    STRENTRY pse[35];
+    static CLSID const *clsids[35];
     int i = 0;
     
     static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
@@ -364,6 +366,7 @@ static HRESULT register_server(BOOL do_register)
     INF_SET_CLSID(Scriptlet);
     INF_SET_CLSID(SysimageProtocol);
     INF_SET_CLSID(TridentAPI);
+    INF_SET_ID(LIBID_MSHTML);
 
     for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) {
         pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39);
diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf
index 09c8ef7a5a..01f7c2c16e 100644
--- a/dlls/mshtml/mshtml.inf
+++ b/dlls/mshtml/mshtml.inf
@@ -237,7 +237,7 @@ HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus\1",,,"131473"
 HKCR,"CLSID\%CLSID_Scriptlet%\ProgID",,,"ScriptBridge.ScriptBridge.1"
 HKCR,"CLSID\%CLSID_Scriptlet%\Programmable"
 ;; HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%IEXPLORE%,1"
-HKCR,"CLSID\%CLSID_Scriptlet%\TypeLib",,,"{3050f1c5-98b5-11cf-bb82-00aa00bdce0b}"
+HKCR,"CLSID\%CLSID_Scriptlet%\TypeLib",,,"%LIBID_MSHTML%"
 HKCR,"CLSID\%CLSID_Scriptlet%\Version",,,"4.0"
 HKCR,"CLSID\%CLSID_Scriptlet%\VersionIndependentProgID",,,"ScriptBridge.ScriptBridge"
 HKCR,"MIME\Database\Content Type\text/x-scriptlet","CLSID",,"%CLSID_Scriptlet%"
diff --git a/include/mshtml.idl b/include/mshtml.idl
index 270fa60a27..55562b3fdc 100644
--- a/include/mshtml.idl
+++ b/include/mshtml.idl
@@ -29,6 +29,35 @@ interface IHTMLElement;
 interface IHTMLDocument2;
 interface IHTMLStyleSheetsCollection;
 
+/*****************************************************************************
+ *    IHTMLFiltersCollection interface
+ */
+[
+    odl,
+    oleautomation,
+    dual,
+    uuid(3050F3EE-98B5-11Cf-BB82-00AA00BDCE0B)
+]
+interface IHTMLFiltersCollection : IDispatch
+{
+    [propget, id(DISPID_IHTMLFILTERSCOLLECTION_LENGTH)]
+    HRESULT length([retval, out] long *p);
+
+    [propget, id(DISPID_IHTMLFILTERSCOLLECTION__NEWENUM)]
+    HRESULT _newEnum([retval, out] IUnknown **p);
+
+    [id(DISPID_IHTMLFILTERSCOLLECTION_ITEM)]
+    HRESULT item(
+            [in] VARIANT *pvarIndex,
+            [retval, out] VARIANT *pvarResult);
+}
+
+[
+    uuid(3050F1C5-98B5-11CF-BB82-00AA00BDCE0B)
+]
+library MSHTML
+{
+
 /*****************************************************************************
  *    IHTMLStyle interface
  */
@@ -1095,30 +1124,6 @@ interface IHTMLRuleStyle : IDispatch
         [retval, out] VARIANT_BOOL *pfSuccess);
 }
 
-/*****************************************************************************
- *    IHTMLFiltersCollection interface
- */
-[
-	odl,
-	oleautomation,
-	dual,
-	uuid(3050F3EE-98B5-11Cf-BB82-00AA00BDCE0B)
-]
-interface IHTMLFiltersCollection : IDispatch
-{
-    [propget, id(DISPID_IHTMLFILTERSCOLLECTION_LENGTH)]
-    HRESULT length([retval, out] long *p);
-
-    [propget, id(DISPID_IHTMLFILTERSCOLLECTION__NEWENUM)]
-    HRESULT _newEnum([retval, out] IUnknown **p);
-
-    [id(DISPID_IHTMLFILTERSCOLLECTION_ITEM)]
-    HRESULT item(
-        [in] VARIANT *pvarIndex,
-        [retval, out] VARIANT *pvarResult);
-}
-
-
 /*****************************************************************************
  *    IHTMLElement interface
  */
@@ -2989,3 +2994,5 @@ coclass HTMLDocument
     [default]         interface IHTMLDocument2;
     [source, default] dispinterface HTMLDocumentEvents;
 };
+
+} /* library MSHTML */