Gabriel Ivăncescu : mshtml: Traverse variants using a helper function.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c32616c502ff16703f6ced6abd7ec91f86cb8854
URL:    https://gitlab.winehq.org/wine/wine/-/commit/c32616c502ff16703f6ced6abd7ec91...

Author: Gabriel Ivăncescu 
Date:   Mon Aug 21 16:41:49 2023 +0300

mshtml: Traverse variants using a helper function.

Signed-off-by: Gabriel Ivăncescu

---

dlls/mshtml/dispex.c         | 9 +++------
 dlls/mshtml/mshtml_private.h | 6 ++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c
index 237c61e89bf..463456651dd 100644
--- a/dlls/mshtml/dispex.c
+++ b/dlls/mshtml/dispex.c
@@ -2031,10 +2031,8 @@ static nsresult NSAPI dispex_traverse(void *ccp, void *p, nsCycleCollectionTrave
     if(!This->dynamic_data)
         return NS_OK;

-    for(prop = This->dynamic_data->props; prop < This->dynamic_data->props + This->dynamic_data->prop_cnt; prop++) {
-        if(V_VT(&prop->var) == VT_DISPATCH)
-            note_cc_edge((nsISupports*)V_DISPATCH(&prop->var), "dispex_data", cb);
-    }
+    for(prop = This->dynamic_data->props; prop < This->dynamic_data->props + This->dynamic_data->prop_cnt; prop++)
+        traverse_variant(&prop->var, "dispex_data", cb);

if(This->dynamic_data->func_disps) {
         func_obj_entry_t *iter = This->dynamic_data->func_disps, *end = iter + This->info->func_disp_cnt;
@@ -2043,8 +2041,7 @@ static nsresult NSAPI dispex_traverse(void *ccp, void *p, nsCycleCollectionTrave
             if(!iter->func_obj)
                 continue;
             note_cc_edge((nsISupports*)&iter->func_obj->dispex.IDispatchEx_iface, "func_obj", cb);
-            if(V_VT(&iter->val) == VT_DISPATCH)
-                note_cc_edge((nsISupports*)V_DISPATCH(&iter->val), "func_val", cb);
+            traverse_variant(&iter->val, "func_val", cb);
         }
     }

diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 63d07c872e3..0b9921f1ecf 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -1517,6 +1517,12 @@ static inline void unlink_variant(VARIANT *v)
         unlink_ref(&V_UNKNOWN(v));
 }

+static inline void traverse_variant(VARIANT *v, const char *name, nsCycleCollectionTraversalCallback *cb)
+{
+    if(V_VT(v) == VT_DISPATCH || V_VT(v) == VT_UNKNOWN)
+        note_cc_edge((nsISupports*)V_UNKNOWN(v), "dispex_data", cb);
+}
+
 #ifdef __i386__
 extern void *call_thiscall_func;
 #endif