Skip to content

W
wine-cw
Commit 6c1c1aaa authored by Gabriel Ivăncescu's avatar Gabriel Ivăncescu Committed by Alexandre Julliard
Browse files
Options

mshtml: Move node vtbl QI methods around.

So they're in a consistent ordering for dispex conversion. Signed-off-by: 's avatarGabriel Ivăncescu <gabrielopcode@gmail.com>
parent 6e6cc7e2
Show whitespace changes
Inline Side-by-side
Showing with 177 additions and 177 deletions
dlls/mshtml/htmlbody.c
View file @ 6c1c1aaa
...@@ -890,22 +890,6 @@ static inline HTMLBodyElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -890,22 +890,6 @@ static inline HTMLBodyElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLBodyElement, element.node); 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) static EventTarget *HTMLBodyElement_get_event_prop_target(HTMLDOMNode *iface, int event_id)
{ {
HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); HTMLBodyElement *This = impl_from_HTMLDOMNode(iface);
...@@ -944,6 +928,22 @@ static inline HTMLBodyElement *impl_from_DispatchEx(DispatchEx *iface) ...@@ -944,6 +928,22 @@ static inline HTMLBodyElement *impl_from_DispatchEx(DispatchEx *iface)
return CONTAINING_RECORD(iface, HTMLBodyElement, element.node.event_target.dispex); 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) static void HTMLBodyElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLBodyElement *This = impl_from_DispatchEx(dispex); HTMLBodyElement *This = impl_from_DispatchEx(dispex);
......
dlls/mshtml/htmlcomment.c
View file @ 6c1c1aaa
...@@ -146,16 +146,6 @@ static inline HTMLCommentElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -146,16 +146,6 @@ static inline HTMLCommentElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLCommentElement, element.node); 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) static void HTMLCommentElement_destructor(HTMLDOMNode *iface)
{ {
HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); HTMLCommentElement *This = impl_from_HTMLDOMNode(iface);
...@@ -177,6 +167,16 @@ static HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, ...@@ -177,6 +167,16 @@ static HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode,
return S_OK; 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 = { static const NodeImplVtbl HTMLCommentElementImplVtbl = {
.clsid = &CLSID_HTMLCommentElement, .clsid = &CLSID_HTMLCommentElement,
.qi = HTMLCommentElement_QI, .qi = HTMLCommentElement_QI,
......
dlls/mshtml/htmlhead.c
View file @ 6c1c1aaa
...@@ -303,16 +303,6 @@ static inline HTMLHtmlElement *HTMLHtmlElement_from_HTMLDOMNode(HTMLDOMNode *ifa ...@@ -303,16 +303,6 @@ static inline HTMLHtmlElement *HTMLHtmlElement_from_HTMLDOMNode(HTMLDOMNode *ifa
return CONTAINING_RECORD(iface, HTMLHtmlElement, element.node); 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) static void HTMLHtmlElement_destructor(HTMLDOMNode *iface)
{ {
HTMLHtmlElement *This = HTMLHtmlElement_from_HTMLDOMNode(iface); HTMLHtmlElement *This = HTMLHtmlElement_from_HTMLDOMNode(iface);
...@@ -330,6 +320,16 @@ static BOOL HTMLHtmlElement_is_settable(HTMLDOMNode *iface, DISPID dispid) ...@@ -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 = { static const NodeImplVtbl HTMLHtmlElementImplVtbl = {
.clsid = &CLSID_HTMLHtmlElement, .clsid = &CLSID_HTMLHtmlElement,
.qi = HTMLHtmlElement_QI, .qi = HTMLHtmlElement_QI,
......
dlls/mshtml/htmlimg.c
View file @ 6c1c1aaa
...@@ -658,16 +658,6 @@ static inline HTMLImg *impl_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -658,16 +658,6 @@ static inline HTMLImg *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLImg, element.node); 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) static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p)
{ {
HTMLImg *This = impl_from_HTMLDOMNode(iface); HTMLImg *This = impl_from_HTMLDOMNode(iface);
...@@ -680,6 +670,16 @@ static inline HTMLImg *HTMLImg_from_DispatchEx(DispatchEx *iface) ...@@ -680,6 +670,16 @@ static inline HTMLImg *HTMLImg_from_DispatchEx(DispatchEx *iface)
return CONTAINING_RECORD(iface, HTMLImg, element.node.event_target.dispex); 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) static void HTMLImgElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLImg *This = HTMLImg_from_DispatchEx(dispex); HTMLImg *This = HTMLImg_from_DispatchEx(dispex);
......
dlls/mshtml/htmlinput.c
View file @ 6c1c1aaa
...@@ -1344,24 +1344,6 @@ static inline HTMLInputElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -1344,24 +1344,6 @@ static inline HTMLInputElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLInputElement, element.node); 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) static HRESULT HTMLInputElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v)
{ {
HTMLInputElement *This = impl_from_HTMLDOMNode(iface); HTMLInputElement *This = impl_from_HTMLDOMNode(iface);
...@@ -1398,6 +1380,24 @@ static inline HTMLInputElement *input_from_DispatchEx(DispatchEx *iface) ...@@ -1398,6 +1380,24 @@ static inline HTMLInputElement *input_from_DispatchEx(DispatchEx *iface)
return CONTAINING_RECORD(iface, HTMLInputElement, element.node.event_target.dispex); 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) static void HTMLInputElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLInputElement *This = input_from_DispatchEx(dispex); HTMLInputElement *This = input_from_DispatchEx(dispex);
...@@ -1894,18 +1894,6 @@ static inline HTMLButtonElement *button_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -1894,18 +1894,6 @@ static inline HTMLButtonElement *button_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLButtonElement, element.node); 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) static HRESULT HTMLButtonElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v)
{ {
HTMLButtonElement *This = button_from_HTMLDOMNode(iface); HTMLButtonElement *This = button_from_HTMLDOMNode(iface);
...@@ -1928,6 +1916,18 @@ static inline HTMLButtonElement *button_from_DispatchEx(DispatchEx *iface) ...@@ -1928,6 +1916,18 @@ static inline HTMLButtonElement *button_from_DispatchEx(DispatchEx *iface)
return CONTAINING_RECORD(iface, HTMLButtonElement, element.node.event_target.dispex); 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) static void HTMLButtonElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLButtonElement *This = button_from_DispatchEx(dispex); HTMLButtonElement *This = button_from_DispatchEx(dispex);
......
dlls/mshtml/htmllink.c
View file @ 6c1c1aaa
...@@ -374,16 +374,6 @@ static inline HTMLLinkElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -374,16 +374,6 @@ static inline HTMLLinkElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLLinkElement, element.node); 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) static HRESULT HTMLLinkElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v)
{ {
HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); HTMLLinkElement *This = impl_from_HTMLDOMNode(iface);
...@@ -401,6 +391,16 @@ static inline HTMLLinkElement *impl_from_DispatchEx(DispatchEx *iface) ...@@ -401,6 +391,16 @@ static inline HTMLLinkElement *impl_from_DispatchEx(DispatchEx *iface)
return CONTAINING_RECORD(iface, HTMLLinkElement, element.node.event_target.dispex); 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) static void HTMLLinkElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLLinkElement *This = impl_from_DispatchEx(dispex); HTMLLinkElement *This = impl_from_DispatchEx(dispex);
......
dlls/mshtml/htmlnode.c
View file @ 6c1c1aaa
...@@ -1410,6 +1410,22 @@ void *HTMLDOMNode_query_interface(DispatchEx *dispex, REFIID riid) ...@@ -1410,6 +1410,22 @@ void *HTMLDOMNode_query_interface(DispatchEx *dispex, REFIID riid)
return This->vtbl->qi(This, 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) void HTMLDOMNode_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLDOMNode *This = HTMLDOMNode_from_DispatchEx(dispex); HTMLDOMNode *This = HTMLDOMNode_from_DispatchEx(dispex);
...@@ -1443,22 +1459,6 @@ void HTMLDOMNode_destructor(DispatchEx *dispex) ...@@ -1443,22 +1459,6 @@ void HTMLDOMNode_destructor(DispatchEx *dispex)
free(This); 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) static HRESULT HTMLDOMNode_clone(HTMLDOMNode *This, nsIDOMNode *nsnode, HTMLDOMNode **ret)
{ {
return create_node(This->doc, nsnode, ret); return create_node(This->doc, nsnode, ret);
......
dlls/mshtml/htmlscript.c
View file @ 6c1c1aaa
...@@ -354,20 +354,6 @@ static inline HTMLScriptElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -354,20 +354,6 @@ static inline HTMLScriptElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLScriptElement, element.node); 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) static void HTMLScriptElement_destructor(HTMLDOMNode *iface)
{ {
HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); HTMLScriptElement *This = impl_from_HTMLDOMNode(iface);
...@@ -406,6 +392,20 @@ static inline HTMLScriptElement *impl_from_DispatchEx(DispatchEx *iface) ...@@ -406,6 +392,20 @@ static inline HTMLScriptElement *impl_from_DispatchEx(DispatchEx *iface)
return CONTAINING_RECORD(iface, HTMLScriptElement, element.node.event_target.dispex); 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) static void HTMLScriptElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLScriptElement *This = impl_from_DispatchEx(dispex); HTMLScriptElement *This = impl_from_DispatchEx(dispex);
......
dlls/mshtml/htmlselect.c
View file @ 6c1c1aaa
...@@ -346,6 +346,11 @@ static inline HTMLOptionElement *HTMLOptionElement_from_HTMLDOMNode(HTMLDOMNode ...@@ -346,6 +346,11 @@ static inline HTMLOptionElement *HTMLOptionElement_from_HTMLDOMNode(HTMLDOMNode
return CONTAINING_RECORD(iface, HTMLOptionElement, element.node); 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) static void *HTMLOptionElement_QI(HTMLDOMNode *iface, REFIID riid)
{ {
HTMLOptionElement *This = HTMLOptionElement_from_HTMLDOMNode(iface); HTMLOptionElement *This = HTMLOptionElement_from_HTMLDOMNode(iface);
...@@ -360,11 +365,6 @@ static void *HTMLOptionElement_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -360,11 +365,6 @@ static void *HTMLOptionElement_QI(HTMLDOMNode *iface, REFIID riid)
return HTMLElement_QI(&This->element.node, 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) static void HTMLOptionElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLOptionElement *This = HTMLOptionElement_from_DispatchEx(dispex); HTMLOptionElement *This = HTMLOptionElement_from_DispatchEx(dispex);
......
dlls/mshtml/htmlstyleelem.c
View file @ 6c1c1aaa
...@@ -365,6 +365,19 @@ static inline HTMLStyleElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -365,6 +365,19 @@ static inline HTMLStyleElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLStyleElement, element.node); 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) static void *HTMLStyleElement_QI(HTMLDOMNode *iface, REFIID riid)
{ {
HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); HTMLStyleElement *This = impl_from_HTMLDOMNode(iface);
...@@ -381,19 +394,6 @@ static void *HTMLStyleElement_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -381,19 +394,6 @@ static void *HTMLStyleElement_QI(HTMLDOMNode *iface, REFIID riid)
return HTMLElement_QI(&This->element.node, 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) static void HTMLStyleElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLStyleElement *This = impl_from_DispatchEx(dispex); HTMLStyleElement *This = impl_from_DispatchEx(dispex);
......
dlls/mshtml/htmltable.c
View file @ 6c1c1aaa
...@@ -446,6 +446,18 @@ static inline HTMLTableCell *HTMLTableCell_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -446,6 +446,18 @@ static inline HTMLTableCell *HTMLTableCell_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLTableCell, element.node); 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) static void *HTMLTableCell_QI(HTMLDOMNode *iface, REFIID riid)
{ {
HTMLTableCell *This = HTMLTableCell_from_HTMLDOMNode(iface); HTMLTableCell *This = HTMLTableCell_from_HTMLDOMNode(iface);
...@@ -460,18 +472,6 @@ static void *HTMLTableCell_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -460,18 +472,6 @@ static void *HTMLTableCell_QI(HTMLDOMNode *iface, REFIID riid)
return HTMLElement_QI(&This->element.node, 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) static void HTMLTableCell_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLTableCell *This = HTMLTableCell_from_DispatchEx(dispex); HTMLTableCell *This = HTMLTableCell_from_DispatchEx(dispex);
...@@ -887,6 +887,11 @@ static inline HTMLTableRow *HTMLTableRow_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -887,6 +887,11 @@ static inline HTMLTableRow *HTMLTableRow_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLTableRow, element.node); 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) static void *HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid)
{ {
HTMLTableRow *This = HTMLTableRow_from_HTMLDOMNode(iface); HTMLTableRow *This = HTMLTableRow_from_HTMLDOMNode(iface);
...@@ -901,11 +906,6 @@ static void *HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -901,11 +906,6 @@ static void *HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid)
return HTMLElement_QI(&This->element.node, 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) static void HTMLTableRow_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLTableRow *This = HTMLTableRow_from_DispatchEx(dispex); HTMLTableRow *This = HTMLTableRow_from_DispatchEx(dispex);
...@@ -1895,6 +1895,11 @@ static inline HTMLTable *impl_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -1895,6 +1895,11 @@ static inline HTMLTable *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLTable, element.node); 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) static void *HTMLTable_QI(HTMLDOMNode *iface, REFIID riid)
{ {
HTMLTable *This = impl_from_HTMLDOMNode(iface); HTMLTable *This = impl_from_HTMLDOMNode(iface);
...@@ -1913,11 +1918,6 @@ static void *HTMLTable_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -1913,11 +1918,6 @@ static void *HTMLTable_QI(HTMLDOMNode *iface, REFIID riid)
return HTMLElement_QI(&This->element.node, 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) static void HTMLTable_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLTable *This = impl_from_DispatchEx(dispex); HTMLTable *This = impl_from_DispatchEx(dispex);
......
dlls/mshtml/htmltextarea.c
View file @ 6c1c1aaa
...@@ -390,20 +390,6 @@ static inline HTMLTextAreaElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -390,20 +390,6 @@ static inline HTMLTextAreaElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLTextAreaElement, element.node); 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) static HRESULT HTMLTextAreaElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v)
{ {
HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface);
...@@ -426,6 +412,20 @@ static inline HTMLTextAreaElement *impl_from_DispatchEx(DispatchEx *iface) ...@@ -426,6 +412,20 @@ static inline HTMLTextAreaElement *impl_from_DispatchEx(DispatchEx *iface)
return CONTAINING_RECORD(iface, HTMLTextAreaElement, element.node.event_target.dispex); 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) static void HTMLTextAreaElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
{ {
HTMLTextAreaElement *This = impl_from_DispatchEx(dispex); HTMLTextAreaElement *This = impl_from_DispatchEx(dispex);
......
dlls/mshtml/htmltextnode.c
View file @ 6c1c1aaa
...@@ -324,6 +324,13 @@ static inline HTMLDOMTextNode *impl_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -324,6 +324,13 @@ static inline HTMLDOMTextNode *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
return CONTAINING_RECORD(iface, HTMLDOMTextNode, node); 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) static void *HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid)
{ {
HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface);
...@@ -336,13 +343,6 @@ static void *HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -336,13 +343,6 @@ static void *HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid)
return HTMLDOMNode_QI(&This->node, 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 cpc_entry_t HTMLDOMTextNode_cpc[] = {{NULL}};
static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = { static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = {
......
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