Re: [patch ping] w32api: MSHTML interfaces, HID dll stub

Hosaka Yuji <[email protected]> Sun, 05 Sep 2004 19:45:11 +0900
Newsgroups	gmane.comp.gnu.mingw.patches
Message-ID	<[email protected]>
--=-=-=

Danny Smith <[email protected]> writes:

> The archive of the above seems to have truncated the mshtml-uuid.c part
> of the patch. Could you please repost.

attached file is patch for mshtml.

thanks
-- 
hosaka

--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=w32api-mshtml.patch

Index: include/mshtml.h
===================================================================
RCS file: /cvs/src/src/winsup/w32api/include/mshtml.h,v
retrieving revision 1.3
diff -u -3 -p -r1.3 mshtml.h
--- include/mshtml.h	3 Jan 2004 23:18:31 -0000	1.3
+++ include/mshtml.h	18 May 2004 14:50:22 -0000
@@ -20,6 +20,12 @@ typedef interface IHTMLStyle *LPHTMLSTYL
 typedef interface IHTMLFiltersCollection *LPHTMLFILTERSCOLLECTION;
 typedef interface IHTMLLinkElement *LPHTMLLINKELEMENT;
 typedef interface IHTMLImgElement *LPHTMLIMGELEMENT;
+typedef interface IHTMLImageElementFactory *LPHTMLIMAGEELEMENTFACTORY;
+typedef interface IHTMLEventObj *LPHTMLEVENTOBJ;
+typedef interface IHTMLScreen *LPHTMLSCREEN;
+typedef interface IHTMLOptionElementFactory *LPHTMLOPTIONELEMENTFACTORY;
+typedef interface IOmHistory *LPOMHISTORY;
+typedef interface IOmNavigator *LPOMNAVIGATOR;
 
 EXTERN_C const IID IID_IHTMLLinkElement;
 #undef INTERFACE
@@ -185,7 +191,7 @@ DECLARE_INTERFACE_(IHTMLDocument2,IHTMLD
 	STDMETHOD(get_scripts)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
 	STDMETHOD(put_designMode)(THIS_ BSTR) PURE;
 	STDMETHOD(get_designMode)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_selection)(LPHTMLSELECTIONOBJECT*) PURE;
+	STDMETHOD(get_selection)(THIS_ LPHTMLSELECTIONOBJECT*) PURE;
 	STDMETHOD(get_readyState)(THIS_ BSTR*) PURE;
 	STDMETHOD(get_frames)(THIS_ LPHTMLFRAMESCOLLECTION*) PURE;
 	STDMETHOD(get_embeds)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
@@ -298,7 +304,7 @@ DECLARE_INTERFACE_(IHTMLSelectionObject,
 	STDMETHOD(createRange)(THIS_ IDispatch**) PURE;
 	STDMETHOD(empty)(THIS) PURE;
 	STDMETHOD(clear)(THIS) PURE;
-	STDMETHOD(type)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_type)(THIS_ BSTR*) PURE;
 };
 
 EXTERN_C const IID IID_IHTMLTxtRange;
@@ -446,6 +452,250 @@ DECLARE_INTERFACE_(IHTMLElement,IDispatc
 	STDMETHOD(get_onfilterchange)(THIS_ VARIANT*) PURE;
 	STDMETHOD(get_children)(THIS_ IDispatch**) PURE;
 	STDMETHOD(get_all)(THIS_ IDispatch**) PURE;
+};
+
+EXTERN_C const IID IID_IHTMLFramesCollection2;
+#undef INTERFACE
+#define INTERFACE IHTMLFramesCollection2
+DECLARE_INTERFACE_(IHTMLFramesCollection2,IDispatch)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+    STDMETHOD(item)(THIS_ VARIANT*,VARIANT*) PURE;
+    STDMETHOD(get_length)(THIS_ long*) PURE;
+};
+
+EXTERN_C const IID IID_IHTMLWindow2;
+#undef INTERFACE
+#define INTERFACE IHTMLWindow2
+DECLARE_INTERFACE_(IHTMLWindow2,IHTMLFramesCollection2)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+    STDMETHOD(item)(THIS_ VARIANT*,VARIANT*) PURE;
+    STDMETHOD(get_length)(THIS_ long*) PURE;
+
+    STDMETHOD(get_frames)(THIS_ IHTMLFramesCollection2**) PURE;
+    STDMETHOD(put_defaultStatus)(THIS_ BSTR) PURE;
+    STDMETHOD(get_defaultStatus)(THIS_ BSTR*) PURE;
+    STDMETHOD(put_status)(THIS_ BSTR) PURE;
+    STDMETHOD(get_status)(THIS_ BSTR*) PURE;
+    STDMETHOD(setTimeout)(THIS_ BSTR,long,VARIANT*,long*) PURE;
+    STDMETHOD(clearTimeout)(THIS_ long) PURE;
+    STDMETHOD(alert)(THIS_ BSTR) PURE;
+    STDMETHOD(confirm)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+    STDMETHOD(prompt)(THIS_ BSTR,BSTR,VARIANT*) PURE;
+    STDMETHOD(get_Image)(THIS_ LPHTMLIMAGEELEMENTFACTORY*) PURE;
+    STDMETHOD(get_location)(THIS_ LPHTMLLOCATION*) PURE;
+    STDMETHOD(get_history)(THIS_ LPOMHISTORY*) PURE;
+    STDMETHOD(close)(THIS) PURE;
+    STDMETHOD(put_opener)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_opener)(THIS_ VARIANT*) PURE;
+    STDMETHOD(get_navigator)(THIS_ LPOMNAVIGATOR*) PURE;
+    STDMETHOD(put_name)(THIS_ BSTR) PURE;
+    STDMETHOD(get_name)(THIS_ BSTR*) PURE;
+    STDMETHOD(get_parent)(THIS_ LPHTMLWINDOW2*) PURE;
+    STDMETHOD(open)(THIS_ BSTR,BSTR,BSTR,VARIANT_BOOL,LPHTMLWINDOW2*) PURE;
+    STDMETHOD(get_self)(THIS_ LPHTMLWINDOW2*) PURE;
+    STDMETHOD(get_top)(THIS_ LPHTMLWINDOW2*) PURE;
+    STDMETHOD(get_window)(THIS_ LPHTMLWINDOW2*) PURE;
+    STDMETHOD(navigate)(THIS_ BSTR) PURE;
+    STDMETHOD(put_onfocus)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onfocus)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onblur)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onblur)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onload)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onload)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onbeforeunload)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onbeforeunload)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onunload)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onunload)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onhelp)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onhelp)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onerror)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onerror)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onresize)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onresize)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onscroll)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onscroll)(THIS_ VARIANT*) PURE;
+    STDMETHOD(get_document)(THIS_ IHTMLDocument2**) PURE;
+    STDMETHOD(get_event)(THIS_ LPHTMLEVENTOBJ*) PURE;
+    STDMETHOD(get__newEnum)(THIS_ IUnknown**) PURE;
+    STDMETHOD(showModalDialog)(THIS_ BSTR,VARIANT*,VARIANT*,VARIANT*) PURE;
+    STDMETHOD(showHelp)(THIS_ BSTR,VARIANT,BSTR) PURE;
+    STDMETHOD(get_screen)(THIS_ LPHTMLSCREEN*) PURE;
+    STDMETHOD(get_Option)(THIS_ LPHTMLOPTIONELEMENTFACTORY*) PURE;
+    STDMETHOD(focus)(THIS) PURE;
+    STDMETHOD(get_closed)(THIS_ VARIANT_BOOL*) PURE;
+    STDMETHOD(blur)(THIS) PURE;
+    STDMETHOD(scroll)(THIS_ long,long) PURE;
+    STDMETHOD(get_clientInformation)(THIS_ LPOMNAVIGATOR*) PURE;
+    STDMETHOD(setInterval)(THIS_ BSTR,long,VARIANT*,long*) PURE;
+    STDMETHOD(clearInterval)(THIS_ long) PURE;
+    STDMETHOD(put_offscreenBuffering)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_offscreenBuffering)(THIS_ VARIANT*) PURE;
+    STDMETHOD(execScript)(THIS_ BSTR,BSTR,VARIANT*) PURE;
+    STDMETHOD(toString)(THIS_ BSTR*) PURE;
+    STDMETHOD(scrollBy)(THIS_ long,long) PURE;
+    STDMETHOD(scrollTo)(THIS_ long,long) PURE;
+    STDMETHOD(moveTo)(THIS_ long,long) PURE;
+    STDMETHOD(moveBy)(THIS_ long,long) PURE;
+    STDMETHOD(resizeTo)(THIS_ long,long) PURE;
+    STDMETHOD(resizeBy)(THIS_ long,long) PURE;
+    STDMETHOD(get_external)(THIS_ IDispatch**) PURE;
+};
+
+EXTERN_C const IID IID_IHTMLFrameBase;
+#undef INTERFACE
+#define INTERFACE IHTMLFrameBase
+DECLARE_INTERFACE_(IHTMLFrameBase,IDispatch)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+    STDMETHOD(put_src)(THIS_ BSTR) PURE;
+    STDMETHOD(get_src)(THIS_ BSTR*) PURE;
+    STDMETHOD(put_name)(THIS_ BSTR) PURE;
+    STDMETHOD(get_name)(THIS_ BSTR*) PURE;
+    STDMETHOD(put_border)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_border)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_frameBorder)(THIS_ BSTR) PURE;
+    STDMETHOD(get_frameBorder)(THIS_ BSTR*) PURE;
+    STDMETHOD(put_frameSpacing)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_frameSpacing)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_marginWidth)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_marginWidth)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_marginHeight)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_marginHeight)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_noResize)(THIS_ VARIANT_BOOL) PURE;
+    STDMETHOD(get_noResize)(THIS_ VARIANT_BOOL*) PURE;
+    STDMETHOD(put_scrolling)(THIS_ BSTR) PURE;
+    STDMETHOD(get_scrolling)(THIS_ BSTR*) PURE;
+};
+
+EXTERN_C const IID IID_IHTMLFrameBase2;
+#undef INTERFACE
+#define INTERFACE IHTMLFrameBase2
+DECLARE_INTERFACE_(IHTMLFrameBase2,IDispatch)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+    STDMETHOD(get_contentWindow)(THIS_ IHTMLWindow2 **) PURE;
+    STDMETHOD(put_onload)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onload)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onreadystatechange)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onreadystatechange)(THIS_ VARIANT*) PURE;
+    STDMETHOD(get_readyState)(THIS_ BSTR*) PURE;
+    STDMETHOD(put_allowTransparency)(THIS_ VARIANT_BOOL) PURE;
+    STDMETHOD(get_allowTransparency)(THIS_ VARIANT_BOOL*) PURE;
+};
+
+EXTERN_C const IID IID_IHTMLFrameBase3;
+#undef INTERFACE
+#define INTERFACE IHTMLFrameBase3
+DECLARE_INTERFACE_(IHTMLFrameBase3,IDispatch)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+    STDMETHOD(put_longDesc)(THIS_ BSTR) PURE;
+    STDMETHOD(get_longDesc)(THIS_ BSTR*) PURE;
+};
+
+EXTERN_C const IID IID_IHTMLBodyElement;
+#undef INTERFACE
+#define INTERFACE IHTMLBodyElement
+DECLARE_INTERFACE_(IHTMLBodyElement,IDispatch)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+    STDMETHOD(put_background)(THIS_ BSTR) PURE;
+    STDMETHOD(get_background)(THIS_ BSTR*) PURE;
+    STDMETHOD(put_bgProperties)(THIS_ BSTR) PURE;
+    STDMETHOD(get_bgProperties)(THIS_ BSTR*) PURE;
+    STDMETHOD(put_leftMargin)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_leftMargin)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_topMargin)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_topMargin)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_rightMargin)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_rightMargin)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_bottomMargin)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_bottomMargin)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_noWrap)(THIS_ VARIANT_BOOL) PURE;
+    STDMETHOD(get_noWrap)(THIS_ VARIANT_BOOL*) PURE;
+    STDMETHOD(put_bgColor)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_bgColor)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_text)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_text)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_link)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_link)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_vLink)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_vLink)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_aLink)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_aLink)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onload)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onload)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onunload)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onunload)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_scroll)(THIS_ BSTR) PURE;
+    STDMETHOD(get_scroll)(THIS_ BSTR*) PURE;
+    STDMETHOD(put_onselect)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onselect)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onbeforeunload)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onbeforeunload)(THIS_ VARIANT*) PURE;
+    STDMETHOD(createTextRange)(THIS_ IHTMLTxtRange**) PURE;
+};
+
+EXTERN_C const IID IID_IHTMLBodyElement2;
+#undef INTERFACE
+#define INTERFACE IHTMLBodyElement2
+DECLARE_INTERFACE_(IHTMLBodyElement2,IDispatch)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+    STDMETHOD(put_onbeforeprint)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onbeforeprint)(THIS_ VARIANT*) PURE;
+    STDMETHOD(put_onafterprint)(THIS_ VARIANT) PURE;
+    STDMETHOD(get_onafterprint)(THIS_ VARIANT*) PURE;
 };
 
 #ifdef __cplusplus
Index: lib/mshtml-uuid.c
===================================================================
RCS file: /cvs/src/src/winsup/w32api/lib/mshtml-uuid.c,v
retrieving revision 1.1
diff -u -3 -p -r1.1 mshtml-uuid.c
--- lib/mshtml-uuid.c	29 Mar 2003 21:31:15 -0000	1.1
+++ lib/mshtml-uuid.c	18 May 2004 14:50:22 -0000
@@ -143,3 +143,5 @@ DEFINE_GUID(IID_IHTMLElementCollection2,
 DEFINE_GUID(IID_IHTMLFramesCollection2,0x332c4426,0x26cb,0x11d0,0xb4,0x83,0x0,0xc0,0x4f,0xd9,0x01,0x19);
 DEFINE_GUID(IID_IHTMLWindow2,0x332c4427,0x26cb,0x11d0,0xb4,0x83,0x0,0xc0,0x4f,0xd9,0x01,0x19);
 DEFINE_GUID(IID_IHTMLLocation,0x163bb1e0,0x6e00,0x11cf,0x83,0x7a,0x48,0xdc,0x04,0xc1,0x0,0x0);
+DEFINE_GUID(IID_IHTMLFrameBase2,0x3050f6db,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);
+DEFINE_GUID(IID_IHTMLFrameBase3,0x3050f82e,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);

--=-=-=--



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click