Jacek Caban : mshtml.idl: Added helper macros for element coclasses and use it where appropriate.
Alexandre Julliard
julliard at winehq.org
Thu Apr 13 13:06:09 CDT 2017
Module: wine
Branch: master
Commit: d653086102b18b8f7282188a4bedb89a4522bfea
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d653086102b18b8f7282188a4bedb89a4522bfea
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Apr 13 16:04:53 2017 +0200
mshtml.idl: Added helper macros for element coclasses and use it where appropriate.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/mshtml.idl | 107 ++++++++++++++++++++++++++++-------------------------
1 file changed, 56 insertions(+), 51 deletions(-)
diff --git a/include/mshtml.idl b/include/mshtml.idl
index cbcb44f..97f22a7 100644
--- a/include/mshtml.idl
+++ b/include/mshtml.idl
@@ -6912,6 +6912,19 @@ interface IHTMLDatabinding : IDispatch
[propget, id(DISPID_IHTMLDATABINDING_DATAFORMATAS)] \
BSTR dataFormatAs()
+#define WINE_HTMLELEMENT_INTERFACES \
+ interface IHTMLElement; \
+ interface IHTMLElement2; \
+ interface IHTMLElement3; \
+ interface IHTMLElement4; \
+ interface IHTMLUniqueName; \
+ interface IHTMLDOMNode; \
+ interface IHTMLDOMNode2; \
+ /* interface IHTMLElement5; */ \
+ interface IHTMLElement6; \
+ interface IHTMLDOMConstructor \
+ /* interface IHTMLElement7 */
+
#define WINE_HTMLELEMENT_DISPINTERFACE_DECL \
WINE_IHTMLELEMENT_DISPINTERFACE_DECL; \
WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; \
@@ -6923,6 +6936,21 @@ interface IHTMLDatabinding : IDispatch
WINE_IHTMLELEMENT6_DISPINTERFACE_DECL; \
WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL
+#define WINE_HTMLDATAELEMENT_INTERFACES \
+ interface IHTMLElement; \
+ interface IHTMLElement2; \
+ interface IHTMLElement3; \
+ interface IHTMLElement4; \
+ interface IHTMLUniqueName; \
+ interface IHTMLDOMNode; \
+ interface IHTMLDOMNode2; \
+ interface IHTMLDatabinding; \
+ /* interface IHTMLElement5; */ \
+ interface IHTMLElement6; \
+ interface IElementSelector; \
+ interface IHTMLDOMConstructor \
+ /* interface IHTMLElement7 */
+
#define WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL \
WINE_IHTMLELEMENT_DISPINTERFACE_DECL; \
WINE_IHTMLELEMENT2_DISPINTERFACE_DECL; \
@@ -8474,15 +8502,12 @@ coclass HTMLFormElement
[default] dispinterface DispHTMLFormElement;
[source, default] dispinterface HTMLFormElementEvents;
[source] dispinterface HTMLFormElementEvents2;
- interface IHTMLElement;
- interface IHTMLElement2;
- interface IHTMLElement3;
- interface IHTMLElement4;
- interface IHTMLUniqueName;
- interface IHTMLDOMNode;
- interface IHTMLDOMNode2;
- interface IHTMLDOMConstructor;
- interface IHTMLFormElement;
+ WINE_HTMLELEMENT_INTERFACES;
+ interface IHTMLFormElement;
+ /* interface IHTMLFormElement2; */
+ /* interface IHTMLFormElement3; */
+ /* interface IHTMLSubmitData; */
+ /* interface IHTMLFormElement4; */
}
/*****************************************************************************
@@ -9394,17 +9419,14 @@ coclass HTMLBody
[default] dispinterface DispHTMLBody;
[source, default] dispinterface HTMLTextContainerEvents;
[source] dispinterface HTMLTextContainerEvents2;
- interface IHTMLElement;
- interface IHTMLElement2;
- interface IHTMLElement3;
- interface IHTMLElement4;
- interface IHTMLUniqueName;
- interface IHTMLDOMNode;
- interface IHTMLDOMNode2;
- interface IHTMLControlElement;
- interface IHTMLTextContainer;
- interface IHTMLBodyElement;
- interface IHTMLBodyElement2;
+ WINE_HTMLELEMENT_INTERFACES;
+ interface IHTMLControlElement;
+ interface IHTMLTextContainer;
+ interface IHTMLBodyElement;
+ interface IHTMLBodyElement2;
+ /* interface IHTMLBodyElement3; */
+ /* interface IHTMLBodyElement4; */
+ /* interface IHTMLBodyElement5; */
}
/*****************************************************************************
@@ -10489,16 +10511,10 @@ coclass HTMLOptionElement
[default] dispinterface DispHTMLOptionElement;
[source, default] dispinterface HTMLElementEvents;
[source] dispinterface HTMLElementEvents2;
- interface IHTMLElement;
- interface IHTMLElement2;
- interface IHTMLElement3;
- interface IHTMLElement4;
- interface IHTMLUniqueName;
- interface IHTMLDOMNode;
- interface IHTMLDOMNode2;
- interface IHTMLDatabinding;
- interface IHTMLOptionElement;
- interface IHTMLOptionElement3;
+ WINE_HTMLDATAELEMENT_INTERFACES;
+ interface IHTMLOptionElement;
+ interface IHTMLOptionElement3;
+ /* interface IHTMLOptionElement4; */
}
/*****************************************************************************
@@ -16884,15 +16900,10 @@ coclass HTMLCommentElement
[default] dispinterface DispHTMLCommentElement;
[source, default] dispinterface HTMLElementEvents;
[source] dispinterface HTMLElementEvents2;
- interface IHTMLElement;
- interface IHTMLElement2;
- interface IHTMLElement3;
- interface IHTMLElement4;
- interface IHTMLUniqueName;
- interface IHTMLDOMNode;
- interface IHTMLDOMNode2;
- interface IHTMLCommentElement;
- interface IHTMLCommentElement2;
+ WINE_HTMLELEMENT_INTERFACES;
+ interface IHTMLCommentElement;
+ interface IHTMLCommentElement2;
+ /* interface IHTMLCommentElement3; */
}
/*****************************************************************************
@@ -17525,18 +17536,12 @@ coclass HTMLTable
[default] dispinterface DispHTMLTable;
[source, default] dispinterface HTMLTableEvents;
[source] dispinterface HTMLTableEvents2;
- interface IHTMLElement;
- interface IHTMLElement2;
- interface IHTMLElement3;
- interface IHTMLElement4;
- interface IHTMLUniqueName;
- interface IHTMLDOMNode;
- interface IHTMLDOMNode2;
- interface IHTMLDatabinding;
- interface IHTMLControlElement;
- interface IHTMLTable;
- interface IHTMLTable2;
- interface IHTMLTable3;
+ WINE_HTMLDATAELEMENT_INTERFACES;
+ interface IHTMLControlElement;
+ interface IHTMLTable;
+ interface IHTMLTable2;
+ interface IHTMLTable3;
+ /* interface IHTMLTable4; */
}
[
More information about the wine-cvs
mailing list