Skip to content

W
wine-winehq
Commit c4d59250 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

mshtml: Use macro for tid declaration.

parent 2da5890e
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 177 deletions
dlls/mshtml/dispex.c
View file @ c4d59250
...@@ -83,94 +83,11 @@ static ITypeInfo *typeinfos[LAST_tid]; ...@@ -83,94 +83,11 @@ static ITypeInfo *typeinfos[LAST_tid];
static struct list dispex_data_list = LIST_INIT(dispex_data_list); static struct list dispex_data_list = LIST_INIT(dispex_data_list);
static REFIID tid_ids[] = { static REFIID tid_ids[] = {
&IID_NULL, #define XIID(iface) &IID_ ## iface,
&DIID_DispCEventObj, #define XDIID(iface) &DIID_ ## iface,
&DIID_DispCPlugins, TID_LIST
&DIID_DispDOMChildrenCollection, #undef XIID
&DIID_DispHTMLAnchorElement, #undef XDIID
&DIID_DispHTMLBody,
&DIID_DispHTMLCommentElement,
&DIID_DispHTMLCurrentStyle,
&DIID_DispHTMLDocument,
&DIID_DispHTMLDOMTextNode,
&DIID_DispHTMLElementCollection,
&DIID_DispHTMLEmbed,
&DIID_DispHTMLFormElement,
&DIID_DispHTMLGenericElement,
&DIID_DispHTMLFrameElement,
&DIID_DispHTMLIFrame,
&DIID_DispHTMLImg,
&DIID_DispHTMLInputElement,
&DIID_DispHTMLLocation,
&DIID_DispHTMLNavigator,
&DIID_DispHTMLObjectElement,
&DIID_DispHTMLOptionElement,
&DIID_DispHTMLScreen,
&DIID_DispHTMLScriptElement,
&DIID_DispHTMLSelectElement,
&DIID_DispHTMLStyle,
&DIID_DispHTMLStyleSheetsCollection,
&DIID_DispHTMLTable,
&DIID_DispHTMLTableRow,
&DIID_DispHTMLTextAreaElement,
&DIID_DispHTMLUnknownElement,
&DIID_DispHTMLWindow2,
&DIID_HTMLDocumentEvents,
&IID_IHTMLAnchorElement,
&IID_IHTMLBodyElement,
&IID_IHTMLBodyElement2,
&IID_IHTMLCommentElement,
&IID_IHTMLCurrentStyle,
&IID_IHTMLCurrentStyle2,
&IID_IHTMLCurrentStyle3,
&IID_IHTMLCurrentStyle4,
&IID_IHTMLDocument2,
&IID_IHTMLDocument3,
&IID_IHTMLDocument4,
&IID_IHTMLDocument5,
&IID_IHTMLDOMChildrenCollection,
&IID_IHTMLDOMNode,
&IID_IHTMLDOMNode2,
&IID_IHTMLDOMTextNode,
&IID_IHTMLElement,
&IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IHTMLElement4,
&IID_IHTMLElementCollection,
&IID_IHTMLEmbedElement,
&IID_IHTMLEventObj,
&IID_IHTMLFiltersCollection,
&IID_IHTMLFormElement,
&IID_IHTMLFrameBase,
&IID_IHTMLFrameBase2,
&IID_IHTMLGenericElement,
&IID_IHTMLFrameElement3,
&IID_IHTMLIFrameElement,
&IID_IHTMLImageElementFactory,
&IID_IHTMLImgElement,
&IID_IHTMLInputElement,
&IID_IHTMLLocation,
&IID_IHTMLObjectElement,
&IID_IHTMLOptionElement,
&IID_IHTMLPluginsCollection,
&IID_IHTMLRect,
&IID_IHTMLScreen,
&IID_IHTMLScriptElement,
&IID_IHTMLSelectElement,
&IID_IHTMLStyle,
&IID_IHTMLStyle2,
&IID_IHTMLStyle3,
&IID_IHTMLStyle4,
&IID_IHTMLStyleSheetsCollection,
&IID_IHTMLTable,
&IID_IHTMLTableRow,
&IID_IHTMLTextAreaElement,
&IID_IHTMLTextContainer,
&IID_IHTMLUniqueName,
&IID_IHTMLWindow2,
&IID_IHTMLWindow3,
&IID_IHTMLWindow4,
&IID_IOmNavigator
}; };
static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo)
......
dlls/mshtml/mshtml_private.h
View file @ c4d59250
...@@ -63,96 +63,102 @@ typedef struct ConnectionPoint ConnectionPoint; ...@@ -63,96 +63,102 @@ typedef struct ConnectionPoint ConnectionPoint;
typedef struct BSCallback BSCallback; typedef struct BSCallback BSCallback;
typedef struct event_target_t event_target_t; typedef struct event_target_t event_target_t;
/* NOTE: make sure to keep in sync with dispex.c */ #define TID_LIST \
XIID(NULL) \
XDIID(DispCEventObj) \
XDIID(DispCPlugins) \
XDIID(DispDOMChildrenCollection) \
XDIID(DispHTMLAnchorElement) \
XDIID(DispHTMLBody) \
XDIID(DispHTMLCommentElement) \
XDIID(DispHTMLCurrentStyle) \
XDIID(DispHTMLDocument) \
XDIID(DispHTMLDOMTextNode) \
XDIID(DispHTMLElementCollection) \
XDIID(DispHTMLEmbed) \
XDIID(DispHTMLFormElement) \
XDIID(DispHTMLGenericElement) \
XDIID(DispHTMLFrameElement) \
XDIID(DispHTMLIFrame) \
XDIID(DispHTMLImg) \
XDIID(DispHTMLInputElement) \
XDIID(DispHTMLLocation) \
XDIID(DispHTMLNavigator) \
XDIID(DispHTMLObjectElement) \
XDIID(DispHTMLOptionElement) \
XDIID(DispHTMLScreen) \
XDIID(DispHTMLScriptElement) \
XDIID(DispHTMLSelectElement) \
XDIID(DispHTMLStyle) \
XDIID(DispHTMLStyleSheetsCollection) \
XDIID(DispHTMLTable) \
XDIID(DispHTMLTableRow) \
XDIID(DispHTMLTextAreaElement) \
XDIID(DispHTMLUnknownElement) \
XDIID(DispHTMLWindow2) \
XDIID(HTMLDocumentEvents) \
XIID(IHTMLAnchorElement) \
XIID(IHTMLBodyElement) \
XIID(IHTMLBodyElement2) \
XIID(IHTMLCommentElement) \
XIID(IHTMLCurrentStyle) \
XIID(IHTMLCurrentStyle2) \
XIID(IHTMLCurrentStyle3) \
XIID(IHTMLCurrentStyle4) \
XIID(IHTMLDocument2) \
XIID(IHTMLDocument3) \
XIID(IHTMLDocument4) \
XIID(IHTMLDocument5) \
XIID(IHTMLDOMChildrenCollection) \
XIID(IHTMLDOMNode) \
XIID(IHTMLDOMNode2) \
XIID(IHTMLDOMTextNode) \
XIID(IHTMLElement) \
XIID(IHTMLElement2) \
XIID(IHTMLElement3) \
XIID(IHTMLElement4) \
XIID(IHTMLElementCollection) \
XIID(IHTMLEmbedElement) \
XIID(IHTMLEventObj) \
XIID(IHTMLFiltersCollection) \
XIID(IHTMLFormElement) \
XIID(IHTMLFrameBase) \
XIID(IHTMLFrameBase2) \
XIID(IHTMLFrameElement3) \
XIID(IHTMLGenericElement) \
XIID(IHTMLIFrameElement) \
XIID(IHTMLImageElementFactory) \
XIID(IHTMLImgElement) \
XIID(IHTMLInputElement) \
XIID(IHTMLLocation) \
XIID(IHTMLObjectElement) \
XIID(IHTMLOptionElement) \
XIID(IHTMLPluginsCollection) \
XIID(IHTMLRect) \
XIID(IHTMLScreen) \
XIID(IHTMLScriptElement) \
XIID(IHTMLSelectElement) \
XIID(IHTMLStyle) \
XIID(IHTMLStyle2) \
XIID(IHTMLStyle3) \
XIID(IHTMLStyle4) \
XIID(IHTMLStyleSheetsCollection) \
XIID(IHTMLTable) \
XIID(IHTMLTableRow) \
XIID(IHTMLTextAreaElement) \
XIID(IHTMLTextContainer) \
XIID(IHTMLUniqueName) \
XIID(IHTMLWindow2) \
XIID(IHTMLWindow3) \
XIID(IHTMLWindow4) \
XIID(IOmNavigator)
typedef enum { typedef enum {
NULL_tid, #define XIID(iface) iface ## _tid,
DispCEventObj_tid, #define XDIID(iface) iface ## _tid,
DispCPlugins_tid, TID_LIST
DispDOMChildrenCollection_tid, #undef XIID
DispHTMLAnchorElement_tid, #undef XDIID
DispHTMLBody_tid,
DispHTMLCommentElement_tid,
DispHTMLCurrentStyle_tid,
DispHTMLDocument_tid,
DispHTMLDOMTextNode_tid,
DispHTMLElementCollection_tid,
DispHTMLEmbed_tid,
DispHTMLFormElement_tid,
DispHTMLGenericElement_tid,
DispHTMLFrameElement_tid,
DispHTMLIFrame_tid,
DispHTMLImg_tid,
DispHTMLInputElement_tid,
DispHTMLLocation_tid,
DispHTMLNavigator_tid,
DispHTMLObjectElement_tid,
DispHTMLOptionElement_tid,
DispHTMLScreen_tid,
DispHTMLScriptElement_tid,
DispHTMLSelectElement_tid,
DispHTMLStyle_tid,
DispHTMLStyleSheetsCollection_tid,
DispHTMLTable_tid,
DispHTMLTableRow_tid,
DispHTMLTextAreaElement_tid,
DispHTMLUnknownElement_tid,
DispHTMLWindow2_tid,
HTMLDocumentEvents_tid,
IHTMLAnchorElement_tid,
IHTMLBodyElement_tid,
IHTMLBodyElement2_tid,
IHTMLCommentElement_tid,
IHTMLCurrentStyle_tid,
IHTMLCurrentStyle2_tid,
IHTMLCurrentStyle3_tid,
IHTMLCurrentStyle4_tid,
IHTMLDocument2_tid,
IHTMLDocument3_tid,
IHTMLDocument4_tid,
IHTMLDocument5_tid,
IHTMLDOMChildrenCollection_tid,
IHTMLDOMNode_tid,
IHTMLDOMNode2_tid,
IHTMLDOMTextNode_tid,
IHTMLElement_tid,
IHTMLElement2_tid,
IHTMLElement3_tid,
IHTMLElement4_tid,
IHTMLElementCollection_tid,
IHTMLEmbedElement_tid,
IHTMLEventObj_tid,
IHTMLFiltersCollection_tid,
IHTMLFormElement_tid,
IHTMLFrameBase_tid,
IHTMLFrameBase2_tid,
IHTMLFrameElement3_tid,
IHTMLGenericElement_tid,
IHTMLIFrameElement_tid,
IHTMLImageElementFactory_tid,
IHTMLImgElement_tid,
IHTMLInputElement_tid,
IHTMLLocation_tid,
IHTMLObjectElement_tid,
IHTMLOptionElement_tid,
IHTMLPluginsCollection_tid,
IHTMLRect_tid,
IHTMLScreen_tid,
IHTMLScriptElement_tid,
IHTMLSelectElement_tid,
IHTMLStyle_tid,
IHTMLStyle2_tid,
IHTMLStyle3_tid,
IHTMLStyle4_tid,
IHTMLStyleSheetsCollection_tid,
IHTMLTable_tid,
IHTMLTableRow_tid,
IHTMLTextAreaElement_tid,
IHTMLTextContainer_tid,
IHTMLUniqueName_tid,
IHTMLWindow2_tid,
IHTMLWindow3_tid,
IHTMLWindow4_tid,
IOmNavigator_tid,
LAST_tid LAST_tid
} tid_t; } tid_t;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment