Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLStyleSheet.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9019e969ad069121ac6eefb48e275fd502a6bbfc
URL:    https://gitlab.winehq.org/wine/wine/-/commit/9019e969ad069121ac6eefb48e275fd...

Author: Gabriel Ivăncescu 
Date:   Tue Aug  1 19:45:25 2023 +0300

mshtml: Use unlink and destructor in the vtbl for HTMLStyleSheet.

Signed-off-by: Gabriel Ivăncescu

---

dlls/mshtml/htmlstylesheet.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c
index 02c46195314..010f3ef3f8c 100644
--- a/dlls/mshtml/htmlstylesheet.c
+++ b/dlls/mshtml/htmlstylesheet.c
@@ -1017,12 +1017,8 @@ static ULONG WINAPI HTMLStyleSheet_Release(IHTMLStyleSheet *iface)

TRACE("(%p) ref=%ld\n", This, ref);

-    if(!ref) {
+    if(!ref)
         release_dispex(&This->dispex);
-        if(This->nsstylesheet)
-            nsIDOMCSSStyleSheet_Release(This->nsstylesheet);
-        free(This);
-    }

return ref;
 }
@@ -1500,19 +1496,41 @@ static const IHTMLStyleSheet4Vtbl HTMLStyleSheet4Vtbl = {
     HTMLStyleSheet4_deleteRule,
 };

+static inline HTMLStyleSheet *HTMLStyleSheet_from_DispatchEx(DispatchEx *iface)
+{
+    return CONTAINING_RECORD(iface, HTMLStyleSheet, dispex);
+}
+
+static void HTMLStyleSheet_unlink(DispatchEx *dispex)
+{
+    HTMLStyleSheet *This = HTMLStyleSheet_from_DispatchEx(dispex);
+    unlink_ref(&This->nsstylesheet);
+}
+
+static void HTMLStyleSheet_destructor(DispatchEx *dispex)
+{
+    HTMLStyleSheet *This = HTMLStyleSheet_from_DispatchEx(dispex);
+    free(This);
+}
+
 static void HTMLStyleSheet_init_dispex_info(dispex_data_t *info, compat_mode_t mode)
 {
     if(mode >= COMPAT_MODE_IE9)
         dispex_info_add_interface(info, IHTMLStyleSheet4_tid, NULL);
 }

+static const dispex_static_data_vtbl_t HTMLStyleSheet_dispex_vtbl = {
+    HTMLStyleSheet_destructor,
+    HTMLStyleSheet_unlink
+};
+
 static const tid_t HTMLStyleSheet_iface_tids[] = {
     IHTMLStyleSheet_tid,
     0
 };
 static dispex_static_data_t HTMLStyleSheet_dispex = {
     L"CSSStyleSheet",
-    NULL,
+    &HTMLStyleSheet_dispex_vtbl,
     DispHTMLStyleSheet_tid,
     HTMLStyleSheet_iface_tids,
     HTMLStyleSheet_init_dispex_info