From ce02f4d98a93d2c94cf9ebefed9cb053aa231e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= Date: Fri, 4 Aug 2023 17:30:14 +0300 Subject: [PATCH] mshtml: Use unlink and destructor in the vtbl for MutationObserver. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gabriel Ivăncescu --- dlls/mshtml/mutation.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 3f544e0a90f..13d0b757158 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -1127,11 +1127,8 @@ static ULONG WINAPI MutationObserver_Release(IWineMSHTMLMutationObserver *iface) TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { + if(!ref) release_dispex(&This->dispex); - IDispatch_Release(This->callback); - free(This); - } return ref; } @@ -1213,13 +1210,35 @@ static const IWineMSHTMLMutationObserverVtbl WineMSHTMLMutationObserverVtbl = { MutationObserver_takeRecords }; +static inline struct mutation_observer *mutation_observer_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, struct mutation_observer, dispex); +} + +static void mutation_observer_unlink(DispatchEx *dispex) +{ + struct mutation_observer *This = mutation_observer_from_DispatchEx(dispex); + unlink_ref(&This->callback); +} + +static void mutation_observer_destructor(DispatchEx *dispex) +{ + struct mutation_observer *This = mutation_observer_from_DispatchEx(dispex); + free(This); +} + +static const dispex_static_data_vtbl_t mutation_observer_dispex_vtbl = { + mutation_observer_destructor, + mutation_observer_unlink +}; + static const tid_t mutation_observer_iface_tids[] = { IWineMSHTMLMutationObserver_tid, 0 }; static dispex_static_data_t mutation_observer_dispex = { L"MutationObserver", - NULL, + &mutation_observer_dispex_vtbl, IWineMSHTMLMutationObserver_tid, mutation_observer_iface_tids };