Module: wine Branch: master Commit: 912f1a43ded779645e15e4172f972158e8c1e124 URL: https://gitlab.winehq.org/wine/wine/-/commit/912f1a43ded779645e15e4172f97215...
Author: Gabriel Ivăncescu gabrielopcode@gmail.com Date: Mon Sep 18 18:00:53 2023 +0300
mshtml: Get rid of useless element destructors.
Just use the HTMLElement_destructor directly.
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com
---
dlls/mshtml/htmlcomment.c | 9 +-------- dlls/mshtml/htmlgeneric.c | 9 +-------- dlls/mshtml/htmlhead.c | 36 ++++-------------------------------- dlls/mshtml/htmlobject.c | 9 +-------- dlls/mshtml/htmltable.c | 9 +-------- 5 files changed, 8 insertions(+), 64 deletions(-)
diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 1f08e2ffa5e..9c720d9468e 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -146,13 +146,6 @@ static inline HTMLCommentElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) 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) { HTMLCommentElement *This = impl_from_HTMLDOMNode(iface); @@ -180,7 +173,7 @@ static void *HTMLCommentElement_QI(HTMLDOMNode *iface, REFIID riid) static const NodeImplVtbl HTMLCommentElementImplVtbl = { .clsid = &CLSID_HTMLCommentElement, .qi = HTMLCommentElement_QI, - .destructor = HTMLCommentElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLCommentElement_clone, .handle_event = HTMLElement_handle_event, diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 7cae4026c47..5f069e05f67 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -138,17 +138,10 @@ static void *HTMLGenericElement_QI(HTMLDOMNode *iface, REFIID 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 = { .clsid = &CLSID_HTMLGenericElement, .qi = HTMLGenericElement_QI, - .destructor = HTMLGenericElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 3449b27e050..af17a35dbb7 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -156,17 +156,10 @@ static void *HTMLTitleElement_QI(HTMLDOMNode *iface, REFIID 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 = { .clsid = &CLSID_HTMLTitleElement, .qi = HTMLTitleElement_QI, - .destructor = HTMLTitleElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, @@ -303,13 +296,6 @@ static inline HTMLHtmlElement *HTMLHtmlElement_from_HTMLDOMNode(HTMLDOMNode *ifa 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) { switch(dispid) { @@ -333,7 +319,7 @@ static void *HTMLHtmlElement_QI(HTMLDOMNode *iface, REFIID riid) static const NodeImplVtbl HTMLHtmlElementImplVtbl = { .clsid = &CLSID_HTMLHtmlElement, .qi = HTMLHtmlElement_QI, - .destructor = HTMLHtmlElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, @@ -553,17 +539,10 @@ static void *HTMLMetaElement_QI(HTMLDOMNode *iface, REFIID 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 = { .clsid = &CLSID_HTMLMetaElement, .qi = HTMLMetaElement_QI, - .destructor = HTMLMetaElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, @@ -713,17 +692,10 @@ static void *HTMLHeadElement_QI(HTMLDOMNode *iface, REFIID 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 = { .clsid = &CLSID_HTMLHeadElement, .qi = HTMLHeadElement_QI, - .destructor = HTMLHeadElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 6c0fc014dad..6e903a0e97e 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -1006,17 +1006,10 @@ static void *HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID 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 = { .clsid = &CLSID_HTMLEmbed, .qi = HTMLEmbedElement_QI, - .destructor = HTMLEmbedElement_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 4d5438d165b..aa4e16037e3 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -446,13 +446,6 @@ 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); @@ -491,7 +484,7 @@ static void HTMLTableCell_unlink(DispatchEx *dispex) static const NodeImplVtbl HTMLTableCellImplVtbl = { .clsid = &CLSID_HTMLTableCell, .qi = HTMLTableCell_QI, - .destructor = HTMLTableCell_destructor, + .destructor = HTMLElement_destructor, .cpc_entries = HTMLElement_cpc, .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event,
-
Alexandre Julliard