From: Gabriel Ivăncescu gabrielopcode@gmail.com
So they're in a consistent ordering for dispex conversion.
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com --- dlls/mshtml/htmlbody.c | 32 ++++++++++---------- dlls/mshtml/htmlcomment.c | 20 ++++++------- dlls/mshtml/htmlhead.c | 20 ++++++------- dlls/mshtml/htmlimg.c | 20 ++++++------- dlls/mshtml/htmlinput.c | 60 ++++++++++++++++++------------------- dlls/mshtml/htmllink.c | 20 ++++++------- dlls/mshtml/htmlnode.c | 32 ++++++++++---------- dlls/mshtml/htmlscript.c | 28 ++++++++--------- dlls/mshtml/htmlselect.c | 10 +++---- dlls/mshtml/htmlstyleelem.c | 26 ++++++++-------- dlls/mshtml/htmltable.c | 44 +++++++++++++-------------- dlls/mshtml/htmltextarea.c | 28 ++++++++--------- dlls/mshtml/htmltextnode.c | 14 ++++----- 13 files changed, 177 insertions(+), 177 deletions(-)
diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 46f3ddef0dd..51c88b409f8 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -890,22 +890,6 @@ static inline HTMLBodyElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLBodyElement, element.node); }
-static void *HTMLBodyElement_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IUnknown, riid)) - return &This->IHTMLBodyElement_iface; - if(IsEqualGUID(&IID_IDispatch, riid)) - return &This->IHTMLBodyElement_iface; - if(IsEqualGUID(&IID_IHTMLBodyElement, riid)) - return &This->IHTMLBodyElement_iface; - if(IsEqualGUID(&IID_IHTMLTextContainer, riid)) - return &This->IHTMLTextContainer_iface; - - return HTMLElement_QI(&This->element.node, riid); -} - static EventTarget *HTMLBodyElement_get_event_prop_target(HTMLDOMNode *iface, int event_id) { HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); @@ -944,6 +928,22 @@ static inline HTMLBodyElement *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLBodyElement, element.node.event_target.dispex); }
+static void *HTMLBodyElement_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) + return &This->IHTMLBodyElement_iface; + if(IsEqualGUID(&IID_IDispatch, riid)) + return &This->IHTMLBodyElement_iface; + if(IsEqualGUID(&IID_IHTMLBodyElement, riid)) + return &This->IHTMLBodyElement_iface; + if(IsEqualGUID(&IID_IHTMLTextContainer, riid)) + return &This->IHTMLTextContainer_iface; + + return HTMLElement_QI(&This->element.node, riid); +} + static void HTMLBodyElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLBodyElement *This = impl_from_DispatchEx(dispex); diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 1ac331e8c31..1f08e2ffa5e 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -146,16 +146,6 @@ static inline HTMLCommentElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLCommentElement, element.node); }
-static void *HTMLCommentElement_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IHTMLCommentElement, riid)) - return &This->IHTMLCommentElement_iface; - - return HTMLElement_QI(&This->element.node, riid); -} - static void HTMLCommentElement_destructor(HTMLDOMNode *iface) { HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); @@ -177,6 +167,16 @@ static HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, return S_OK; }
+static void *HTMLCommentElement_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IHTMLCommentElement, riid)) + return &This->IHTMLCommentElement_iface; + + return HTMLElement_QI(&This->element.node, riid); +} + static const NodeImplVtbl HTMLCommentElementImplVtbl = { .clsid = &CLSID_HTMLCommentElement, .qi = HTMLCommentElement_QI, diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 4703553e818..3449b27e050 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -303,16 +303,6 @@ static inline HTMLHtmlElement *HTMLHtmlElement_from_HTMLDOMNode(HTMLDOMNode *ifa return CONTAINING_RECORD(iface, HTMLHtmlElement, element.node); }
-static void *HTMLHtmlElement_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLHtmlElement *This = HTMLHtmlElement_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IHTMLHtmlElement, riid)) - return &This->IHTMLHtmlElement_iface; - - return HTMLElement_QI(&This->element.node, riid); -} - static void HTMLHtmlElement_destructor(HTMLDOMNode *iface) { HTMLHtmlElement *This = HTMLHtmlElement_from_HTMLDOMNode(iface); @@ -330,6 +320,16 @@ static BOOL HTMLHtmlElement_is_settable(HTMLDOMNode *iface, DISPID dispid) } }
+static void *HTMLHtmlElement_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLHtmlElement *This = HTMLHtmlElement_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IHTMLHtmlElement, riid)) + return &This->IHTMLHtmlElement_iface; + + return HTMLElement_QI(&This->element.node, riid); +} + static const NodeImplVtbl HTMLHtmlElementImplVtbl = { .clsid = &CLSID_HTMLHtmlElement, .qi = HTMLHtmlElement_QI, diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 766d01b9eb7..7ede42e3ec5 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -658,16 +658,6 @@ static inline HTMLImg *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLImg, element.node); }
-static void *HTMLImgElement_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLImg *This = impl_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IHTMLImgElement, riid)) - return &This->IHTMLImgElement_iface; - - return HTMLElement_QI(&This->element.node, riid); -} - static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLImg *This = impl_from_HTMLDOMNode(iface); @@ -680,6 +670,16 @@ static inline HTMLImg *HTMLImg_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLImg, element.node.event_target.dispex); }
+static void *HTMLImgElement_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLImg *This = impl_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IHTMLImgElement, riid)) + return &This->IHTMLImgElement_iface; + + return HTMLElement_QI(&This->element.node, riid); +} + static void HTMLImgElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLImg *This = HTMLImg_from_DispatchEx(dispex); diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 79af8c617a0..c6527309b8c 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1344,24 +1344,6 @@ static inline HTMLInputElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLInputElement, element.node); }
-static void *HTMLInputElement_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLInputElement *This = impl_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IUnknown, riid)) - return &This->IHTMLInputElement_iface; - if(IsEqualGUID(&IID_IDispatch, riid)) - return &This->IHTMLInputElement_iface; - if(IsEqualGUID(&IID_IHTMLInputElement, riid)) - return &This->IHTMLInputElement_iface; - if(IsEqualGUID(&IID_IHTMLInputTextElement, riid)) - return &This->IHTMLInputTextElement_iface; - if(IsEqualGUID(&IID_IHTMLInputTextElement2, riid)) - return &This->IHTMLInputTextElement2_iface; - - return HTMLElement_QI(&This->element.node, riid); -} - static HRESULT HTMLInputElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) { HTMLInputElement *This = impl_from_HTMLDOMNode(iface); @@ -1398,6 +1380,24 @@ static inline HTMLInputElement *input_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLInputElement, element.node.event_target.dispex); }
+static void *HTMLInputElement_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLInputElement *This = impl_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) + return &This->IHTMLInputElement_iface; + if(IsEqualGUID(&IID_IDispatch, riid)) + return &This->IHTMLInputElement_iface; + if(IsEqualGUID(&IID_IHTMLInputElement, riid)) + return &This->IHTMLInputElement_iface; + if(IsEqualGUID(&IID_IHTMLInputTextElement, riid)) + return &This->IHTMLInputTextElement_iface; + if(IsEqualGUID(&IID_IHTMLInputTextElement2, riid)) + return &This->IHTMLInputTextElement2_iface; + + return HTMLElement_QI(&This->element.node, riid); +} + static void HTMLInputElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLInputElement *This = input_from_DispatchEx(dispex); @@ -1894,18 +1894,6 @@ static inline HTMLButtonElement *button_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLButtonElement, element.node); }
-static void *HTMLButtonElement_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLButtonElement *This = button_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IUnknown, riid)) - return &This->IHTMLButtonElement_iface; - if(IsEqualGUID(&IID_IHTMLButtonElement, riid)) - return &This->IHTMLButtonElement_iface; - - return HTMLElement_QI(&This->element.node, riid); -} - static HRESULT HTMLButtonElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) { HTMLButtonElement *This = button_from_HTMLDOMNode(iface); @@ -1928,6 +1916,18 @@ static inline HTMLButtonElement *button_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLButtonElement, element.node.event_target.dispex); }
+static void *HTMLButtonElement_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLButtonElement *This = button_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) + return &This->IHTMLButtonElement_iface; + if(IsEqualGUID(&IID_IHTMLButtonElement, riid)) + return &This->IHTMLButtonElement_iface; + + return HTMLElement_QI(&This->element.node, riid); +} + static void HTMLButtonElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLButtonElement *This = button_from_DispatchEx(dispex); diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index ef756494b76..f27941728cb 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -374,16 +374,6 @@ static inline HTMLLinkElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLLinkElement, element.node); }
-static void *HTMLLinkElement_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IHTMLLinkElement, riid)) - return &This->IHTMLLinkElement_iface; - - return HTMLElement_QI(&This->element.node, riid); -} - static HRESULT HTMLLinkElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) { HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); @@ -401,6 +391,16 @@ static inline HTMLLinkElement *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLLinkElement, element.node.event_target.dispex); }
+static void *HTMLLinkElement_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IHTMLLinkElement, riid)) + return &This->IHTMLLinkElement_iface; + + return HTMLElement_QI(&This->element.node, riid); +} + static void HTMLLinkElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLLinkElement *This = impl_from_DispatchEx(dispex); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index a2bec6126ba..6092d1367ef 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1410,6 +1410,22 @@ void *HTMLDOMNode_query_interface(DispatchEx *dispex, REFIID riid) return This->vtbl->qi(This, riid); }
+void *HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid) +{ + if(IsEqualGUID(&IID_IUnknown, riid)) + return &This->IHTMLDOMNode_iface; + if(IsEqualGUID(&IID_IDispatch, riid)) + return &This->IHTMLDOMNode_iface; + if(IsEqualGUID(&IID_IHTMLDOMNode, riid)) + return &This->IHTMLDOMNode_iface; + if(IsEqualGUID(&IID_IHTMLDOMNode2, riid)) + return &This->IHTMLDOMNode2_iface; + if(IsEqualGUID(&IID_IHTMLDOMNode3, riid)) + return &This->IHTMLDOMNode3_iface; + + return EventTarget_query_interface(&This->event_target, riid); +} + void HTMLDOMNode_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLDOMNode *This = HTMLDOMNode_from_DispatchEx(dispex); @@ -1443,22 +1459,6 @@ void HTMLDOMNode_destructor(DispatchEx *dispex) free(This); }
-void *HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid) -{ - if(IsEqualGUID(&IID_IUnknown, riid)) - return &This->IHTMLDOMNode_iface; - if(IsEqualGUID(&IID_IDispatch, riid)) - return &This->IHTMLDOMNode_iface; - if(IsEqualGUID(&IID_IHTMLDOMNode, riid)) - return &This->IHTMLDOMNode_iface; - if(IsEqualGUID(&IID_IHTMLDOMNode2, riid)) - return &This->IHTMLDOMNode2_iface; - if(IsEqualGUID(&IID_IHTMLDOMNode3, riid)) - return &This->IHTMLDOMNode3_iface; - - return EventTarget_query_interface(&This->event_target, riid); -} - static HRESULT HTMLDOMNode_clone(HTMLDOMNode *This, nsIDOMNode *nsnode, HTMLDOMNode **ret) { return create_node(This->doc, nsnode, ret); diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 7bedf3682c7..dadd31d24a8 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -354,20 +354,6 @@ static inline HTMLScriptElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLScriptElement, element.node); }
-static void *HTMLScriptElement_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IUnknown, riid)) - return &This->IHTMLScriptElement_iface; - if(IsEqualGUID(&IID_IDispatch, riid)) - return &This->IHTMLScriptElement_iface; - if(IsEqualGUID(&IID_IHTMLScriptElement, riid)) - return &This->IHTMLScriptElement_iface; - - return HTMLElement_QI(&This->element.node, riid); -} - static void HTMLScriptElement_destructor(HTMLDOMNode *iface) { HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); @@ -406,6 +392,20 @@ static inline HTMLScriptElement *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLScriptElement, element.node.event_target.dispex); }
+static void *HTMLScriptElement_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) + return &This->IHTMLScriptElement_iface; + if(IsEqualGUID(&IID_IDispatch, riid)) + return &This->IHTMLScriptElement_iface; + if(IsEqualGUID(&IID_IHTMLScriptElement, riid)) + return &This->IHTMLScriptElement_iface; + + return HTMLElement_QI(&This->element.node, riid); +} + static void HTMLScriptElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLScriptElement *This = impl_from_DispatchEx(dispex); diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 13b8f14b807..787b04933c5 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -346,6 +346,11 @@ static inline HTMLOptionElement *HTMLOptionElement_from_HTMLDOMNode(HTMLDOMNode return CONTAINING_RECORD(iface, HTMLOptionElement, element.node); }
+static inline HTMLOptionElement *HTMLOptionElement_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLOptionElement, element.node.event_target.dispex); +} + static void *HTMLOptionElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLOptionElement *This = HTMLOptionElement_from_HTMLDOMNode(iface); @@ -360,11 +365,6 @@ static void *HTMLOptionElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); }
-static inline HTMLOptionElement *HTMLOptionElement_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLOptionElement, element.node.event_target.dispex); -} - static void HTMLOptionElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLOptionElement *This = HTMLOptionElement_from_DispatchEx(dispex); diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 6c7005f097e..8ad167a5fe3 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -365,6 +365,19 @@ static inline HTMLStyleElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLStyleElement, element.node); }
+static void HTMLStyleElement_destructor(HTMLDOMNode *iface) +{ + HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); + + unlink_ref(&This->style_sheet); + HTMLElement_destructor(iface); +} + +static inline HTMLStyleElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLStyleElement, element.node.event_target.dispex); +} + static void *HTMLStyleElement_QI(HTMLDOMNode *iface, REFIID riid) { HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); @@ -381,19 +394,6 @@ static void *HTMLStyleElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); }
-static void HTMLStyleElement_destructor(HTMLDOMNode *iface) -{ - HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); - - unlink_ref(&This->style_sheet); - HTMLElement_destructor(iface); -} - -static inline HTMLStyleElement *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLStyleElement, element.node.event_target.dispex); -} - static void HTMLStyleElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLStyleElement *This = impl_from_DispatchEx(dispex); diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index c1df64198d6..4d5438d165b 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -446,6 +446,18 @@ static inline HTMLTableCell *HTMLTableCell_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLTableCell, element.node); }
+static void HTMLTableCell_destructor(HTMLDOMNode *iface) +{ + HTMLTableCell *This = HTMLTableCell_from_HTMLDOMNode(iface); + + HTMLElement_destructor(&This->element.node); +} + +static inline HTMLTableCell *HTMLTableCell_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLTableCell, element.node.event_target.dispex); +} + static void *HTMLTableCell_QI(HTMLDOMNode *iface, REFIID riid) { HTMLTableCell *This = HTMLTableCell_from_HTMLDOMNode(iface); @@ -460,18 +472,6 @@ static void *HTMLTableCell_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); }
-static void HTMLTableCell_destructor(HTMLDOMNode *iface) -{ - HTMLTableCell *This = HTMLTableCell_from_HTMLDOMNode(iface); - - HTMLElement_destructor(&This->element.node); -} - -static inline HTMLTableCell *HTMLTableCell_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLTableCell, element.node.event_target.dispex); -} - static void HTMLTableCell_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLTableCell *This = HTMLTableCell_from_DispatchEx(dispex); @@ -887,6 +887,11 @@ static inline HTMLTableRow *HTMLTableRow_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLTableRow, element.node); }
+static inline HTMLTableRow *HTMLTableRow_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLTableRow, element.node.event_target.dispex); +} + static void *HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid) { HTMLTableRow *This = HTMLTableRow_from_HTMLDOMNode(iface); @@ -901,11 +906,6 @@ static void *HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); }
-static inline HTMLTableRow *HTMLTableRow_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLTableRow, element.node.event_target.dispex); -} - static void HTMLTableRow_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLTableRow *This = HTMLTableRow_from_DispatchEx(dispex); @@ -1895,6 +1895,11 @@ static inline HTMLTable *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLTable, element.node); }
+static inline HTMLTable *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLTable, element.node.event_target.dispex); +} + static void *HTMLTable_QI(HTMLDOMNode *iface, REFIID riid) { HTMLTable *This = impl_from_HTMLDOMNode(iface); @@ -1913,11 +1918,6 @@ static void *HTMLTable_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); }
-static inline HTMLTable *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLTable, element.node.event_target.dispex); -} - static void HTMLTable_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLTable *This = impl_from_DispatchEx(dispex); diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 7aa3f9dbb67..2760f37b665 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -390,20 +390,6 @@ static inline HTMLTextAreaElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLTextAreaElement, element.node); }
-static void *HTMLTextAreaElement_QI(HTMLDOMNode *iface, REFIID riid) -{ - HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IUnknown, riid)) - return &This->IHTMLTextAreaElement_iface; - if(IsEqualGUID(&IID_IDispatch, riid)) - return &This->IHTMLTextAreaElement_iface; - if(IsEqualGUID(&IID_IHTMLTextAreaElement, riid)) - return &This->IHTMLTextAreaElement_iface; - - return HTMLElement_QI(&This->element.node, riid); -} - static HRESULT HTMLTextAreaElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) { HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); @@ -426,6 +412,20 @@ static inline HTMLTextAreaElement *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLTextAreaElement, element.node.event_target.dispex); }
+static void *HTMLTextAreaElement_QI(HTMLDOMNode *iface, REFIID riid) +{ + HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) + return &This->IHTMLTextAreaElement_iface; + if(IsEqualGUID(&IID_IDispatch, riid)) + return &This->IHTMLTextAreaElement_iface; + if(IsEqualGUID(&IID_IHTMLTextAreaElement, riid)) + return &This->IHTMLTextAreaElement_iface; + + return HTMLElement_QI(&This->element.node, riid); +} + static void HTMLTextAreaElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLTextAreaElement *This = impl_from_DispatchEx(dispex); diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index f3302fcaf6f..2bebe9dee1b 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -324,6 +324,13 @@ static inline HTMLDOMTextNode *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLDOMTextNode, node); }
+static HRESULT HTMLDOMTextNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +{ + HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); + + return HTMLDOMTextNode_Create(This->node.doc, nsnode, ret); +} + static void *HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid) { HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); @@ -336,13 +343,6 @@ static void *HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid) return HTMLDOMNode_QI(&This->node, riid); }
-static HRESULT HTMLDOMTextNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) -{ - HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); - - return HTMLDOMTextNode_Create(This->node.doc, nsnode, ret); -} - static const cpc_entry_t HTMLDOMTextNode_cpc[] = {{NULL}};
static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = {