Jacek Caban : mshtml: Moved common element tids to macro.
Alexandre Julliard
julliard at winehq.org
Thu Jan 28 11:15:33 CST 2010
Module: wine
Branch: master
Commit: b00bd14e77ee11852686d3578f6065d54cc6c841
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b00bd14e77ee11852686d3578f6065d54cc6c841
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Jan 28 02:09:02 2010 +0100
mshtml: Moved common element tids to macro.
---
dlls/mshtml/htmlanchor.c | 7 +------
dlls/mshtml/htmlbody.c | 7 +------
dlls/mshtml/htmlcomment.c | 6 +-----
dlls/mshtml/htmlelem.c | 6 +-----
dlls/mshtml/htmlform.c | 6 +-----
dlls/mshtml/htmlframe.c | 6 +-----
dlls/mshtml/htmlgeneric.c | 6 +-----
dlls/mshtml/htmliframe.c | 6 +-----
dlls/mshtml/htmlimg.c | 6 +-----
dlls/mshtml/htmlinput.c | 6 +-----
dlls/mshtml/htmloption.c | 6 +-----
dlls/mshtml/htmlselect.c | 6 +-----
dlls/mshtml/htmltable.c | 6 +-----
dlls/mshtml/htmltablerow.c | 6 +-----
dlls/mshtml/mshtml_private.h | 8 ++++++++
15 files changed, 22 insertions(+), 72 deletions(-)
diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c
index 6bbaf26..ae269ee 100644
--- a/dlls/mshtml/htmlanchor.c
+++ b/dlls/mshtml/htmlanchor.c
@@ -520,12 +520,7 @@ static const NodeImplVtbl HTMLAnchorElementImplVtbl = {
static const tid_t HTMLAnchorElement_iface_tids[] = {
IHTMLAnchorElement_tid,
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
- IHTMLElement4_tid,
+ HTMLELEMENT_TIDS,
IHTMLTextContainer_tid,
IHTMLUniqueName_tid,
0
diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c
index 7f22a4e..5c0f7ca 100644
--- a/dlls/mshtml/htmlbody.c
+++ b/dlls/mshtml/htmlbody.c
@@ -799,12 +799,7 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = {
static const tid_t HTMLBodyElement_iface_tids[] = {
IHTMLBodyElement_tid,
IHTMLBodyElement2_tid,
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
- IHTMLElement4_tid,
+ HTMLELEMENT_TIDS,
IHTMLTextContainer_tid,
IHTMLUniqueName_tid,
0
diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c
index e38432c..85fd4e1 100644
--- a/dlls/mshtml/htmlcomment.c
+++ b/dlls/mshtml/htmlcomment.c
@@ -171,11 +171,7 @@ static const NodeImplVtbl HTMLCommentElementImplVtbl = {
};
static const tid_t HTMLCommentElement_iface_tids[] = {
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
+ HTMLELEMENT_TIDS,
IHTMLCommentElement_tid,
0
};
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index a65ed20..e98243d 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -1572,11 +1572,7 @@ static const NodeImplVtbl HTMLElementImplVtbl = {
};
static const tid_t HTMLElement_iface_tids[] = {
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
+ HTMLELEMENT_TIDS,
0
};
diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c
index 1db965a..75dcf90 100644
--- a/dlls/mshtml/htmlform.c
+++ b/dlls/mshtml/htmlform.c
@@ -483,11 +483,7 @@ static const NodeImplVtbl HTMLFormElementImplVtbl = {
};
static const tid_t HTMLFormElement_iface_tids[] = {
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
+ HTMLELEMENT_TIDS,
IHTMLFormElement_tid,
0
};
diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c
index 99b3f0b..8d458f7 100644
--- a/dlls/mshtml/htmlframe.c
+++ b/dlls/mshtml/htmlframe.c
@@ -270,11 +270,7 @@ static const NodeImplVtbl HTMLFrameElementImplVtbl = {
};
static const tid_t HTMLFrameElement_iface_tids[] = {
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
+ HTMLELEMENT_TIDS,
IHTMLFrameBase_tid,
IHTMLFrameBase2_tid,
IHTMLFrameElement3_tid,
diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c
index 8b75316..82075b8 100644
--- a/dlls/mshtml/htmlgeneric.c
+++ b/dlls/mshtml/htmlgeneric.c
@@ -153,11 +153,7 @@ static const NodeImplVtbl HTMLGenericElementImplVtbl = {
};
static const tid_t HTMLGenericElement_iface_tids[] = {
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
+ HTMLELEMENT_TIDS,
IHTMLGenericElement_tid,
0
};
diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c
index b776077..12cd427 100644
--- a/dlls/mshtml/htmliframe.c
+++ b/dlls/mshtml/htmliframe.c
@@ -255,11 +255,7 @@ static const NodeImplVtbl HTMLIFrameImplVtbl = {
};
static const tid_t HTMLIFrame_iface_tids[] = {
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
+ HTMLELEMENT_TIDS,
IHTMLFrameBase_tid,
IHTMLFrameBase2_tid,
IHTMLIFrameElement_tid,
diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c
index 87fe498..4ba6d36 100644
--- a/dlls/mshtml/htmlimg.c
+++ b/dlls/mshtml/htmlimg.c
@@ -609,11 +609,7 @@ static const NodeImplVtbl HTMLImgElementImplVtbl = {
};
static const tid_t HTMLImgElement_iface_tids[] = {
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
+ HTMLELEMENT_TIDS,
IHTMLImgElement_tid,
0
};
diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c
index ae7994a..a72a9f2 100644
--- a/dlls/mshtml/htmlinput.c
+++ b/dlls/mshtml/htmlinput.c
@@ -1173,11 +1173,7 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = {
};
static const tid_t HTMLInputElement_iface_tids[] = {
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
+ HTMLELEMENT_TIDS,
IHTMLInputElement_tid,
0
};
diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c
index 4701c57..ea205ea 100644
--- a/dlls/mshtml/htmloption.c
+++ b/dlls/mshtml/htmloption.c
@@ -324,11 +324,7 @@ static const NodeImplVtbl HTMLOptionElementImplVtbl = {
};
static const tid_t HTMLOptionElement_iface_tids[] = {
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
+ HTMLELEMENT_TIDS,
IHTMLOptionElement_tid,
0
};
diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c
index fccc912..bb45a5e 100644
--- a/dlls/mshtml/htmlselect.c
+++ b/dlls/mshtml/htmlselect.c
@@ -505,11 +505,7 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = {
};
static const tid_t HTMLSelectElement_tids[] = {
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
+ HTMLELEMENT_TIDS,
IHTMLSelectElement_tid,
0
};
diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c
index 6357f77..1286952 100644
--- a/dlls/mshtml/htmltable.c
+++ b/dlls/mshtml/htmltable.c
@@ -558,11 +558,7 @@ static const NodeImplVtbl HTMLTableImplVtbl = {
};
static const tid_t HTMLTable_iface_tids[] = {
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
+ HTMLELEMENT_TIDS,
IHTMLTable_tid,
0
};
diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c
index 862ed75..950535a 100644
--- a/dlls/mshtml/htmltablerow.c
+++ b/dlls/mshtml/htmltablerow.c
@@ -301,11 +301,7 @@ static const NodeImplVtbl HTMLTableRowImplVtbl = {
};
static const tid_t HTMLTableRow_iface_tids[] = {
- IHTMLDOMNode_tid,
- IHTMLDOMNode2_tid,
- IHTMLElement_tid,
- IHTMLElement2_tid,
- IHTMLElement3_tid,
+ HTMLELEMENT_TIDS,
IHTMLTableRow_tid,
0
};
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 0f7930e..30b47e8 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -490,6 +490,14 @@ typedef struct {
nsIDOMHTMLElement *nselem;
} HTMLElement;
+#define HTMLELEMENT_TIDS \
+ IHTMLDOMNode_tid, \
+ IHTMLDOMNode2_tid, \
+ IHTMLElement_tid, \
+ IHTMLElement2_tid, \
+ IHTMLElement3_tid, \
+ IHTMLElement4_tid
+
typedef struct {
HTMLElement element;
More information about the wine-cvs
mailing list