Skip to content

W
wine-winehq
Commit 912f1a43 authored by Gabriel Ivăncescu's avatar Gabriel Ivăncescu Committed by Alexandre Julliard
Browse files
Options

mshtml: Get rid of useless element destructors.

Just use the HTMLElement_destructor directly. Signed-off-by: 's avatarGabriel Ivăncescu <gabrielopcode@gmail.com>
parent 13842950
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 64 deletions
dlls/mshtml/htmlcomment.c
View file @ 912f1a43
...@@ -146,13 +146,6 @@ static inline HTMLCommentElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -146,13 +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_destructor(HTMLDOMNode *iface)
{
HTMLCommentElement *This = impl_from_HTMLDOMNode(iface);
HTMLElement_destructor(&This->element.node);
}
static HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) static HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret)
{ {
HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); HTMLCommentElement *This = impl_from_HTMLDOMNode(iface);
...@@ -180,7 +173,7 @@ static void *HTMLCommentElement_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -180,7 +173,7 @@ static void *HTMLCommentElement_QI(HTMLDOMNode *iface, REFIID riid)
static const NodeImplVtbl HTMLCommentElementImplVtbl = { static const NodeImplVtbl HTMLCommentElementImplVtbl = {
.clsid = &CLSID_HTMLCommentElement, .clsid = &CLSID_HTMLCommentElement,
.qi = HTMLCommentElement_QI, .qi = HTMLCommentElement_QI,
.destructor = HTMLCommentElement_destructor, .destructor = HTMLElement_destructor,
.cpc_entries = HTMLElement_cpc, .cpc_entries = HTMLElement_cpc,
.clone = HTMLCommentElement_clone, .clone = HTMLCommentElement_clone,
.handle_event = HTMLElement_handle_event, .handle_event = HTMLElement_handle_event,
......
dlls/mshtml/htmlgeneric.c
View file @ 912f1a43
...@@ -138,17 +138,10 @@ static void *HTMLGenericElement_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -138,17 +138,10 @@ static void *HTMLGenericElement_QI(HTMLDOMNode *iface, REFIID riid)
return HTMLElement_QI(&This->element.node, riid); return HTMLElement_QI(&This->element.node, riid);
} }
static void HTMLGenericElement_destructor(HTMLDOMNode *iface)
{
HTMLGenericElement *This = impl_from_HTMLDOMNode(iface);
HTMLElement_destructor(&This->element.node);
}
static const NodeImplVtbl HTMLGenericElementImplVtbl = { static const NodeImplVtbl HTMLGenericElementImplVtbl = {
.clsid = &CLSID_HTMLGenericElement, .clsid = &CLSID_HTMLGenericElement,
.qi = HTMLGenericElement_QI, .qi = HTMLGenericElement_QI,
.destructor = HTMLGenericElement_destructor, .destructor = HTMLElement_destructor,
.cpc_entries = HTMLElement_cpc, .cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone, .clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event, .handle_event = HTMLElement_handle_event,
......
dlls/mshtml/htmlhead.c
View file @ 912f1a43
...@@ -156,17 +156,10 @@ static void *HTMLTitleElement_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -156,17 +156,10 @@ static void *HTMLTitleElement_QI(HTMLDOMNode *iface, REFIID riid)
return HTMLElement_QI(&This->element.node, riid); return HTMLElement_QI(&This->element.node, riid);
} }
static void HTMLTitleElement_destructor(HTMLDOMNode *iface)
{
HTMLTitleElement *This = HTMLTitleElement_from_HTMLDOMNode(iface);
HTMLElement_destructor(&This->element.node);
}
static const NodeImplVtbl HTMLTitleElementImplVtbl = { static const NodeImplVtbl HTMLTitleElementImplVtbl = {
.clsid = &CLSID_HTMLTitleElement, .clsid = &CLSID_HTMLTitleElement,
.qi = HTMLTitleElement_QI, .qi = HTMLTitleElement_QI,
.destructor = HTMLTitleElement_destructor, .destructor = HTMLElement_destructor,
.cpc_entries = HTMLElement_cpc, .cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone, .clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event, .handle_event = HTMLElement_handle_event,
...@@ -303,13 +296,6 @@ static inline HTMLHtmlElement *HTMLHtmlElement_from_HTMLDOMNode(HTMLDOMNode *ifa ...@@ -303,13 +296,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_destructor(HTMLDOMNode *iface)
{
HTMLHtmlElement *This = HTMLHtmlElement_from_HTMLDOMNode(iface);
HTMLElement_destructor(&This->element.node);
}
static BOOL HTMLHtmlElement_is_settable(HTMLDOMNode *iface, DISPID dispid) static BOOL HTMLHtmlElement_is_settable(HTMLDOMNode *iface, DISPID dispid)
{ {
switch(dispid) { switch(dispid) {
...@@ -333,7 +319,7 @@ static void *HTMLHtmlElement_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -333,7 +319,7 @@ static void *HTMLHtmlElement_QI(HTMLDOMNode *iface, REFIID riid)
static const NodeImplVtbl HTMLHtmlElementImplVtbl = { static const NodeImplVtbl HTMLHtmlElementImplVtbl = {
.clsid = &CLSID_HTMLHtmlElement, .clsid = &CLSID_HTMLHtmlElement,
.qi = HTMLHtmlElement_QI, .qi = HTMLHtmlElement_QI,
.destructor = HTMLHtmlElement_destructor, .destructor = HTMLElement_destructor,
.cpc_entries = HTMLElement_cpc, .cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone, .clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event, .handle_event = HTMLElement_handle_event,
...@@ -553,17 +539,10 @@ static void *HTMLMetaElement_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -553,17 +539,10 @@ static void *HTMLMetaElement_QI(HTMLDOMNode *iface, REFIID riid)
return HTMLElement_QI(&This->element.node, riid); return HTMLElement_QI(&This->element.node, riid);
} }
static void HTMLMetaElement_destructor(HTMLDOMNode *iface)
{
HTMLMetaElement *This = HTMLMetaElement_from_HTMLDOMNode(iface);
HTMLElement_destructor(&This->element.node);
}
static const NodeImplVtbl HTMLMetaElementImplVtbl = { static const NodeImplVtbl HTMLMetaElementImplVtbl = {
.clsid = &CLSID_HTMLMetaElement, .clsid = &CLSID_HTMLMetaElement,
.qi = HTMLMetaElement_QI, .qi = HTMLMetaElement_QI,
.destructor = HTMLMetaElement_destructor, .destructor = HTMLElement_destructor,
.cpc_entries = HTMLElement_cpc, .cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone, .clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event, .handle_event = HTMLElement_handle_event,
...@@ -713,17 +692,10 @@ static void *HTMLHeadElement_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -713,17 +692,10 @@ static void *HTMLHeadElement_QI(HTMLDOMNode *iface, REFIID riid)
return HTMLElement_QI(&This->element.node, riid); return HTMLElement_QI(&This->element.node, riid);
} }
static void HTMLHeadElement_destructor(HTMLDOMNode *iface)
{
HTMLHeadElement *This = impl_from_HTMLDOMNode(iface);
HTMLElement_destructor(&This->element.node);
}
static const NodeImplVtbl HTMLHeadElementImplVtbl = { static const NodeImplVtbl HTMLHeadElementImplVtbl = {
.clsid = &CLSID_HTMLHeadElement, .clsid = &CLSID_HTMLHeadElement,
.qi = HTMLHeadElement_QI, .qi = HTMLHeadElement_QI,
.destructor = HTMLHeadElement_destructor, .destructor = HTMLElement_destructor,
.cpc_entries = HTMLElement_cpc, .cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone, .clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event, .handle_event = HTMLElement_handle_event,
......
dlls/mshtml/htmlobject.c
View file @ 912f1a43
...@@ -1006,17 +1006,10 @@ static void *HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid) ...@@ -1006,17 +1006,10 @@ static void *HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid)
return HTMLElement_QI(&This->element.node, riid); return HTMLElement_QI(&This->element.node, riid);
} }
static void HTMLEmbedElement_destructor(HTMLDOMNode *iface)
{
HTMLEmbed *This = embed_from_HTMLDOMNode(iface);
HTMLElement_destructor(&This->element.node);
}
static const NodeImplVtbl HTMLEmbedElementImplVtbl = { static const NodeImplVtbl HTMLEmbedElementImplVtbl = {
.clsid = &CLSID_HTMLEmbed, .clsid = &CLSID_HTMLEmbed,
.qi = HTMLEmbedElement_QI, .qi = HTMLEmbedElement_QI,
.destructor = HTMLEmbedElement_destructor, .destructor = HTMLElement_destructor,
.cpc_entries = HTMLElement_cpc, .cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone, .clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event, .handle_event = HTMLElement_handle_event,
......
dlls/mshtml/htmltable.c
View file @ 912f1a43
...@@ -446,13 +446,6 @@ static inline HTMLTableCell *HTMLTableCell_from_HTMLDOMNode(HTMLDOMNode *iface) ...@@ -446,13 +446,6 @@ 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) static inline HTMLTableCell *HTMLTableCell_from_DispatchEx(DispatchEx *iface)
{ {
return CONTAINING_RECORD(iface, HTMLTableCell, element.node.event_target.dispex); return CONTAINING_RECORD(iface, HTMLTableCell, element.node.event_target.dispex);
...@@ -491,7 +484,7 @@ static void HTMLTableCell_unlink(DispatchEx *dispex) ...@@ -491,7 +484,7 @@ static void HTMLTableCell_unlink(DispatchEx *dispex)
static const NodeImplVtbl HTMLTableCellImplVtbl = { static const NodeImplVtbl HTMLTableCellImplVtbl = {
.clsid = &CLSID_HTMLTableCell, .clsid = &CLSID_HTMLTableCell,
.qi = HTMLTableCell_QI, .qi = HTMLTableCell_QI,
.destructor = HTMLTableCell_destructor, .destructor = HTMLElement_destructor,
.cpc_entries = HTMLElement_cpc, .cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone, .clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event, .handle_event = HTMLElement_handle_event,
......
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