MSHTML: Added library declaration
Jacek Caban
jack at itma.pwr.wroc.pl
Wed Jul 13 15:44:52 CDT 2005
Changelog:
Added MSHTML library declaration
-------------- next part --------------
Index: include/mshtml.idl
===================================================================
RCS file: /home/wine/wine/include/mshtml.idl,v
retrieving revision 1.1
diff -u -p -r1.1 mshtml.idl
--- include/mshtml.idl 10 Jan 2005 13:31:29 -0000 1.1
+++ include/mshtml.idl 13 Jul 2005 20:39:43 -0000
@@ -30,6 +30,35 @@ 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
*/
[
@@ -1096,30 +1125,6 @@ interface IHTMLRuleStyle : IDispatch
}
/*****************************************************************************
- * 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 */
Index: dlls/mshtml/main.c
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/main.c,v
retrieving revision 1.15
diff -u -p -r1.15 main.c
--- dlls/mshtml/main.c 6 Jul 2005 10:33:10 -0000 1.15
+++ dlls/mshtml/main.c 13 Jul 2005 20:39:44 -0000
@@ -109,7 +109,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL,
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, 0x3050F
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_r
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_r
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);
Index: dlls/mshtml/mshtml.inf
===================================================================
RCS file: /home/wine/wine/dlls/mshtml/mshtml.inf,v
retrieving revision 1.2
diff -u -p -r1.2 mshtml.inf
--- dlls/mshtml/mshtml.inf 11 Jul 2005 17:59:53 -0000 1.2
+++ dlls/mshtml/mshtml.inf 13 Jul 2005 20:39:46 -0000
@@ -237,7 +237,7 @@ HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus
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%"
More information about the wine-patches
mailing list