[PATCH v2 09/11] mshtml: Pass an optional script global window to init_dispatch.

[Jacek Caban]

From: Jacek Caban

Based on patch by Gabriel Ivăncescu.
---
 dlls/mshtml/dispex.c         |  4 ++--
 dlls/mshtml/htmlattr.c       |  2 +-
 dlls/mshtml/htmlelem.c       | 12 +++++++-----
 dlls/mshtml/htmlelemcol.c    |  2 +-
 dlls/mshtml/htmlevent.c      |  6 +++---
 dlls/mshtml/htmlimg.c        |  3 ++-
 dlls/mshtml/htmllocation.c   |  2 +-
 dlls/mshtml/htmlnode.c       |  2 +-
 dlls/mshtml/htmlselect.c     |  3 ++-
 dlls/mshtml/htmlstorage.c    |  3 ++-
 dlls/mshtml/htmlstyle.c      |  2 +-
 dlls/mshtml/htmlstylesheet.c |  8 ++++----
 dlls/mshtml/mshtml_private.h | 22 ++++++++++------------
 dlls/mshtml/mutation.c       |  4 ++--
 dlls/mshtml/omnavigator.c    | 30 ++++++++++++++++++------------
 dlls/mshtml/range.c          |  5 +++--
 dlls/mshtml/selection.c      |  3 ++-
 dlls/mshtml/xmlhttprequest.c |  3 ++-
 18 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c
index a5526f2901c..ef83b508bde 100644
--- a/dlls/mshtml/dispex.c
+++ b/dlls/mshtml/dispex.c
@@ -1069,7 +1069,7 @@ static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info)
     if(!ret)
         return NULL;

-    init_dispatch(&ret->dispex, &function_dispex, dispex_compat_mode(obj));
+    init_dispatch(&ret->dispex, &function_dispex, NULL, dispex_compat_mode(obj));
     ret->obj = obj;
     ret->info = info;

@@ -2499,7 +2499,7 @@ const void *dispex_get_vtbl(DispatchEx *dispex)
     return dispex->info->desc->vtbl;
 }

-void init_dispatch(DispatchEx *dispex, dispex_static_data_t *data, compat_mode_t compat_mode)
+void init_dispatch(DispatchEx *dispex, dispex_static_data_t *data, HTMLInnerWindow *script_global, compat_mode_t compat_mode)
 {
     assert(compat_mode < COMPAT_MODE_CNT);

diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c
index eaf7e4fc9c5..b9d3f82e84c 100644
--- a/dlls/mshtml/htmlattr.c
+++ b/dlls/mshtml/htmlattr.c
@@ -437,7 +437,7 @@ HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dis
     ret->dispid = dispid;
     ret->elem = elem;

-    init_dispatch(&ret->dispex, &HTMLDOMAttribute_dispex, compat_mode);
+    init_dispatch(&ret->dispex, &HTMLDOMAttribute_dispex, NULL, compat_mode);

/* For attributes attached to an element, (elem,dispid) pair should be valid used for its operation. */
     if(elem) {
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index 1e20e75366a..581b50ee822 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -780,7 +780,7 @@ static HRESULT create_html_rect(nsIDOMClientRect *nsrect, compat_mode_t compat_m
     rect->IHTMLRect_iface.lpVtbl = &HTMLRectVtbl;
     rect->IHTMLRect2_iface.lpVtbl = &HTMLRect2Vtbl;

-    init_dispatch(&rect->dispex, &HTMLRect_dispex, compat_mode);
+    init_dispatch(&rect->dispex, &HTMLRect_dispex, NULL, compat_mode);

nsIDOMClientRect_AddRef(nsrect);
     rect->nsrect = nsrect;
@@ -3063,7 +3063,8 @@ static HRESULT WINAPI HTMLElement2_getClientRects(IHTMLElement2 *iface, IHTMLRec

rects->IHTMLRectCollection_iface.lpVtbl = &HTMLRectCollectionVtbl;
     rects->rect_list = rect_list;
-    init_dispatch(&rects->dispex, &HTMLRectCollection_dispex, dispex_compat_mode(&This->node.event_target.dispex));
+    init_dispatch(&rects->dispex, &HTMLRectCollection_dispex, NULL,
+                  dispex_compat_mode(&This->node.event_target.dispex));

*pRectCol = &rects->IHTMLRectCollection_iface;
     return S_OK;
@@ -7179,7 +7180,7 @@ static HRESULT create_token_list(compat_mode_t compat_mode, IHTMLElement *elemen
     }

obj->IWineDOMTokenList_iface.lpVtbl = &WineDOMTokenListVtbl;
-    init_dispatch(&obj->dispex, &token_list_dispex, compat_mode);
+    init_dispatch(&obj->dispex, &token_list_dispex, NULL, compat_mode);
     IHTMLElement_AddRef(element);
     obj->element = element;

@@ -7536,7 +7537,7 @@ static HRESULT create_filters_collection(compat_mode_t compat_mode, IHTMLFilters

collection->IHTMLFiltersCollection_iface.lpVtbl = &HTMLFiltersCollectionVtbl;

-    init_dispatch(&collection->dispex, &HTMLFiltersCollection_dispex, min(compat_mode, COMPAT_MODE_IE8));
+    init_dispatch(&collection->dispex, &HTMLFiltersCollection_dispex, NULL, min(compat_mode, COMPAT_MODE_IE8));

*ret = &collection->IHTMLFiltersCollection_iface;
     return S_OK;
@@ -8169,7 +8170,8 @@ HRESULT HTMLElement_get_attr_col(HTMLDOMNode *iface, HTMLAttributeCollection **a
     IHTMLDOMNode_AddRef(&This->node.IHTMLDOMNode_iface);
     This->attrs->elem = This;
     list_init(&This->attrs->attrs);
-    init_dispatch(&This->attrs->dispex, &HTMLAttributeCollection_dispex, dispex_compat_mode(&iface->event_target.dispex));
+    init_dispatch(&This->attrs->dispex, &HTMLAttributeCollection_dispex, NULL,
+                  dispex_compat_mode(&iface->event_target.dispex));

*ac = This->attrs;
     IHTMLAttributeCollection_AddRef(&This->attrs->IHTMLAttributeCollection_iface);
diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c
index 191fa8cbc1e..92ea4584aa4 100644
--- a/dlls/mshtml/htmlelemcol.c
+++ b/dlls/mshtml/htmlelemcol.c
@@ -812,7 +812,7 @@ static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems,
     ret->elems = elems;
     ret->len = len;

-    init_dispatch(&ret->dispex, &HTMLElementCollection_dispex, compat_mode);
+    init_dispatch(&ret->dispex, &HTMLElementCollection_dispex, NULL, compat_mode);

TRACE("ret=%p len=%ld\n", ret, len);

diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index dad7174681d..29bf94b9eea 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -1833,7 +1833,7 @@ static HTMLEventObj *alloc_event_obj(DOMEvent *event, compat_mode_t compat_mode)
     if(event)
         IDOMEvent_AddRef(&event->IDOMEvent_iface);

-    init_dispatch(&event_obj->dispex, &HTMLEventObj_dispex, compat_mode);
+    init_dispatch(&event_obj->dispex, &HTMLEventObj_dispex, NULL, compat_mode);
     return event_obj;
 }

@@ -3761,7 +3761,7 @@ static void *event_ctor(unsigned size, dispex_static_data_t *dispex_data, nsIDOM

event->time_stamp = get_time_stamp();

-    init_dispatch(&event->dispex, dispex_data, compat_mode);
+    init_dispatch(&event->dispex, dispex_data, NULL, compat_mode);
     return event;
 }

@@ -5118,7 +5118,7 @@ static int event_id_cmp(const void *key, const struct wine_rb_entry *entry)

void EventTarget_Init(EventTarget *event_target, dispex_static_data_t *dispex_data, compat_mode_t compat_mode)
 {
-    init_dispatch(&event_target->dispex, dispex_data, compat_mode);
+    init_dispatch(&event_target->dispex, dispex_data, NULL, compat_mode);
     event_target->IEventTarget_iface.lpVtbl = &EventTargetVtbl;
     wine_rb_init(&event_target->handler_map, event_id_cmp);
 }
diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c
index 84eef1ad5ea..fb3be13b918 100644
--- a/dlls/mshtml/htmlimg.c
+++ b/dlls/mshtml/htmlimg.c
@@ -901,7 +901,8 @@ HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow *window, HTMLImageElement
     ret->window = window;
     IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface);

-    init_dispatch(&ret->dispex, &HTMLImageElementFactory_dispex, dispex_compat_mode(&window->event_target.dispex));
+    init_dispatch(&ret->dispex, &HTMLImageElementFactory_dispex, NULL,
+                  dispex_compat_mode(&window->event_target.dispex));

*ret_val = ret;
     return S_OK;
diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c
index 1a5972b50ac..5c7e66c40df 100644
--- a/dlls/mshtml/htmllocation.c
+++ b/dlls/mshtml/htmllocation.c
@@ -606,7 +606,7 @@ HRESULT create_location(HTMLOuterWindow *window, HTMLLocation **ret)
     location->window = window;
     IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface);

-    init_dispatch(&location->dispex, &HTMLLocation_dispex, COMPAT_MODE_QUIRKS);
+    init_dispatch(&location->dispex, &HTMLLocation_dispex, NULL, COMPAT_MODE_QUIRKS);

*ret = location;
     return S_OK;
diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c
index 8f593371216..ceb50a17d02 100644
--- a/dlls/mshtml/htmlnode.c
+++ b/dlls/mshtml/htmlnode.c
@@ -418,7 +418,7 @@ HRESULT create_child_collection(nsIDOMNodeList *nslist, compat_mode_t compat_mod
     nsIDOMNodeList_AddRef(nslist);
     collection->nslist = nslist;

-    init_dispatch(&collection->dispex, &HTMLDOMChildrenCollection_dispex, compat_mode);
+    init_dispatch(&collection->dispex, &HTMLDOMChildrenCollection_dispex, NULL, compat_mode);

*ret = &collection->IHTMLDOMChildrenCollection_iface;
     return S_OK;
diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c
index 24affaea4ca..e85ed53c3d5 100644
--- a/dlls/mshtml/htmlselect.c
+++ b/dlls/mshtml/htmlselect.c
@@ -542,7 +542,8 @@ HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow *window, HTMLOptionEleme
     ret->window = window;
     IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface);

-    init_dispatch(&ret->dispex, &HTMLOptionElementFactory_dispex, dispex_compat_mode(&window->event_target.dispex));
+    init_dispatch(&ret->dispex, &HTMLOptionElementFactory_dispex, NULL,
+                  dispex_compat_mode(&window->event_target.dispex));

*ret_ptr = ret;
     return S_OK;
diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c
index b865e5adc7e..174813a3fef 100644
--- a/dlls/mshtml/htmlstorage.c
+++ b/dlls/mshtml/htmlstorage.c
@@ -1451,7 +1451,8 @@ HRESULT create_html_storage(HTMLInnerWindow *window, BOOL local, IHTMLStorage **
     storage->window = window;
     IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface);

-    init_dispatch(&storage->dispex, &HTMLStorage_dispex, dispex_compat_mode(&window->event_target.dispex));
+    init_dispatch(&storage->dispex, &HTMLStorage_dispex, NULL,
+                  dispex_compat_mode(&window->event_target.dispex));

*p = &storage->IHTMLStorage_iface;
     return S_OK;
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 5816139854f..def56f7aedb 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -9690,7 +9690,7 @@ void init_css_style(CSSStyle *style, nsIDOMCSSStyleDeclaration *nsstyle, dispex_
     style->nsstyle = nsstyle;
     nsIDOMCSSStyleDeclaration_AddRef(nsstyle);

-    init_dispatch(&style->dispex, dispex_info, compat_mode);
+    init_dispatch(&style->dispex, dispex_info, NULL, compat_mode);
 }

HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret)
diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c
index 1c8b52ddfba..711ef8b4042 100644
--- a/dlls/mshtml/htmlstylesheet.c
+++ b/dlls/mshtml/htmlstylesheet.c
@@ -183,7 +183,7 @@ static HRESULT create_style_sheet_rule(nsIDOMCSSRule *nsstylesheetrule, compat_m
     rule->IHTMLStyleSheetRule_iface.lpVtbl = &HTMLStyleSheetRuleVtbl;
     rule->nsstylesheetrule = NULL;

-    init_dispatch(&rule->dispex, &HTMLStyleSheetRule_dispex, compat_mode);
+    init_dispatch(&rule->dispex, &HTMLStyleSheetRule_dispex, NULL, compat_mode);

if (nsstylesheetrule)
     {
@@ -399,7 +399,7 @@ static HRESULT create_style_sheet_rules_collection(nsIDOMCSSRuleList *nslist, co
     collection->IHTMLStyleSheetRulesCollection_iface.lpVtbl = &HTMLStyleSheetRulesCollectionVtbl;
     collection->nslist = nslist;

-    init_dispatch(&collection->dispex, &HTMLStyleSheetRulesCollection_dispex, compat_mode);
+    init_dispatch(&collection->dispex, &HTMLStyleSheetRulesCollection_dispex, NULL, compat_mode);

if(nslist)
         nsIDOMCSSRuleList_AddRef(nslist);
@@ -779,7 +779,7 @@ HRESULT create_style_sheet_collection(nsIDOMStyleSheetList *nslist, compat_mode_
         nsIDOMStyleSheetList_AddRef(nslist);
     collection->nslist = nslist;

-    init_dispatch(&collection->dispex, &HTMLStyleSheetsCollection_dispex, compat_mode);
+    init_dispatch(&collection->dispex, &HTMLStyleSheetsCollection_dispex, NULL, compat_mode);

*ret = &collection->IHTMLStyleSheetsCollection_iface;
     return S_OK;
@@ -1260,7 +1260,7 @@ HRESULT create_style_sheet(nsIDOMStyleSheet *nsstylesheet, compat_mode_t compat_
     style_sheet->IHTMLStyleSheet4_iface.lpVtbl = &HTMLStyleSheet4Vtbl;
     style_sheet->nsstylesheet = NULL;

-    init_dispatch(&style_sheet->dispex, &HTMLStyleSheet_dispex, compat_mode);
+    init_dispatch(&style_sheet->dispex, &HTMLStyleSheet_dispex, NULL, compat_mode);

if(nsstylesheet) {
         nsres = nsIDOMStyleSheet_QueryInterface(nsstylesheet, &IID_nsIDOMCSSStyleSheet,
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 8520c2711eb..c14551ac5c1 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -78,11 +78,20 @@
 #define MSHTML_E_NODOC            0x800a025c
 #define MSHTML_E_NOT_FUNC         0x800a138a

+typedef struct HTMLWindow HTMLWindow;
+typedef struct HTMLInnerWindow HTMLInnerWindow;
+typedef struct HTMLOuterWindow HTMLOuterWindow;
+typedef struct HTMLDocumentNode HTMLDocumentNode;
+typedef struct HTMLDocumentObj HTMLDocumentObj;
+typedef struct HTMLFrameBase HTMLFrameBase;
+typedef struct GeckoBrowser GeckoBrowser;
+typedef struct HTMLAttributeCollection HTMLAttributeCollection;
 typedef struct DOMEvent DOMEvent;
 typedef struct HTMLDOMNode HTMLDOMNode;
 typedef struct ConnectionPoint ConnectionPoint;
 typedef struct BSCallback BSCallback;
 typedef struct EventTarget EventTarget;
+typedef struct ScriptHost ScriptHost;

#define TID_LIST \
     XIID(NULL) \
@@ -481,7 +490,7 @@ extern void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjC
 extern void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*);
 extern void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*);

-void init_dispatch(DispatchEx*,dispex_static_data_t*,compat_mode_t);
+void init_dispatch(DispatchEx*,dispex_static_data_t*,HTMLInnerWindow*,compat_mode_t);
 void dispex_props_unlink(DispatchEx*);
 HRESULT change_type(VARIANT*,VARIANT*,VARTYPE,IServiceProvider*);
 HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**);
@@ -505,17 +514,6 @@ typedef enum {

dispex_prop_type_t get_dispid_type(DISPID);

-typedef struct HTMLWindow HTMLWindow;
-typedef struct HTMLInnerWindow HTMLInnerWindow;
-typedef struct HTMLOuterWindow HTMLOuterWindow;
-typedef struct HTMLDocumentNode HTMLDocumentNode;
-typedef struct HTMLDocumentObj HTMLDocumentObj;
-typedef struct HTMLFrameBase HTMLFrameBase;
-typedef struct GeckoBrowser GeckoBrowser;
-typedef struct HTMLAttributeCollection HTMLAttributeCollection;
-
-typedef struct ScriptHost ScriptHost;
-
 typedef enum {
     GLOBAL_SCRIPTVAR,
     GLOBAL_ELEMENTVAR,
diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c
index 290174e4785..a502e3c9427 100644
--- a/dlls/mshtml/mutation.c
+++ b/dlls/mshtml/mutation.c
@@ -1200,7 +1200,7 @@ static HRESULT create_mutation_observer(compat_mode_t compat_mode, IDispatch *ca
     }

obj->IWineMSHTMLMutationObserver_iface.lpVtbl = &WineMSHTMLMutationObserverVtbl;
-    init_dispatch(&obj->dispex, &mutation_observer_dispex, compat_mode);
+    init_dispatch(&obj->dispex, &mutation_observer_dispex, NULL, compat_mode);

IDispatch_AddRef(callback);
     obj->callback = callback;
@@ -1299,7 +1299,7 @@ HRESULT create_mutation_observer_ctor(compat_mode_t compat_mode, IDispatch **ret
         return E_OUTOFMEMORY;
     }

-    init_dispatch(&obj->dispex, &mutation_observer_ctor_dispex, compat_mode);
+    init_dispatch(&obj->dispex, &mutation_observer_ctor_dispex, NULL, compat_mode);

*ret = (IDispatch *)&obj->dispex.IWineJSDispatchHost_iface;
     return S_OK;
diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c
index 69a47c2706d..4ee76a585a1 100644
--- a/dlls/mshtml/omnavigator.c
+++ b/dlls/mshtml/omnavigator.c
@@ -242,7 +242,7 @@ HRESULT create_dom_implementation(HTMLDocumentNode *doc_node, IHTMLDOMImplementa
     dom_implementation->IHTMLDOMImplementation2_iface.lpVtbl = &HTMLDOMImplementation2Vtbl;
     dom_implementation->browser = doc_node->browser;

-    init_dispatch(&dom_implementation->dispex, &HTMLDOMImplementation_dispex, doc_node->document_mode);
+    init_dispatch(&dom_implementation->dispex, &HTMLDOMImplementation_dispex, NULL, doc_node->document_mode);

nsres = nsIDOMDocument_GetImplementation(doc_node->dom_document, &dom_implementation->implementation);
     if(NS_FAILED(nsres)) {
@@ -435,7 +435,7 @@ HRESULT create_html_screen(compat_mode_t compat_mode, IHTMLScreen **ret)

screen->IHTMLScreen_iface.lpVtbl = &HTMLSreenVtbl;

-    init_dispatch(&screen->dispex, &HTMLScreen_dispex, compat_mode);
+    init_dispatch(&screen->dispex, &HTMLScreen_dispex, NULL, compat_mode);

*ret = &screen->IHTMLScreen_iface;
     return S_OK;
@@ -566,7 +566,8 @@ HRESULT create_history(HTMLInnerWindow *window, OmHistory **ret)
     if(!history)
         return E_OUTOFMEMORY;

-    init_dispatch(&history->dispex, &OmHistory_dispex, dispex_compat_mode(&window->event_target.dispex));
+    init_dispatch(&history->dispex, &OmHistory_dispex, NULL,
+                  dispex_compat_mode(&window->event_target.dispex));
     history->IOmHistory_iface.lpVtbl = &OmHistoryVtbl;

history->window = window;
@@ -682,7 +683,8 @@ static HRESULT create_plugins_collection(OmNavigator *navigator, HTMLPluginsColl
     col->IHTMLPluginsCollection_iface.lpVtbl = &HTMLPluginsCollectionVtbl;
     col->navigator = navigator;

-    init_dispatch(&col->dispex, &HTMLPluginsCollection_dispex, dispex_compat_mode(&navigator->dispex));
+    init_dispatch(&col->dispex, &HTMLPluginsCollection_dispex, NULL,
+                  dispex_compat_mode(&navigator->dispex));

*ret = col;
     return S_OK;
@@ -783,7 +785,8 @@ static HRESULT create_mime_types_collection(OmNavigator *navigator, HTMLMimeType
     col->IHTMLMimeTypesCollection_iface.lpVtbl = &HTMLMimeTypesCollectionVtbl;
     col->navigator = navigator;

-    init_dispatch(&col->dispex, &HTMLMimeTypesCollection_dispex, dispex_compat_mode(&navigator->dispex));
+    init_dispatch(&col->dispex, &HTMLMimeTypesCollection_dispex, NULL,
+                  dispex_compat_mode(&navigator->dispex));

*ret = col;
     return S_OK;
@@ -1164,7 +1167,7 @@ HRESULT create_navigator(compat_mode_t compat_mode, IOmNavigator **navigator)

ret->IOmNavigator_iface.lpVtbl = &OmNavigatorVtbl;

-    init_dispatch(&ret->dispex, &OmNavigator_dispex, compat_mode);
+    init_dispatch(&ret->dispex, &OmNavigator_dispex, NULL, compat_mode);

*navigator = &ret->IOmNavigator_iface;
     return S_OK;
@@ -1682,7 +1685,8 @@ static HRESULT WINAPI HTMLPerformance_get_navigation(IHTMLPerformance *iface,
         navigation->window = This->window;
         IHTMLWindow2_AddRef(&This->window->base.IHTMLWindow2_iface);

-        init_dispatch(&navigation->dispex, &HTMLPerformanceNavigation_dispex, dispex_compat_mode(&This->dispex));
+        init_dispatch(&navigation->dispex, &HTMLPerformanceNavigation_dispex, NULL,
+                      dispex_compat_mode(&This->dispex));

This->navigation = &navigation->IHTMLPerformanceNavigation_iface;
     }
@@ -1708,7 +1712,8 @@ static HRESULT WINAPI HTMLPerformance_get_timing(IHTMLPerformance *iface, IHTMLP
         timing->window = This->window;
         IHTMLWindow2_AddRef(&This->window->base.IHTMLWindow2_iface);

-        init_dispatch(&timing->dispex, &HTMLPerformanceTiming_dispex, dispex_compat_mode(&This->dispex));
+        init_dispatch(&timing->dispex, &HTMLPerformanceTiming_dispex, NULL,
+                      dispex_compat_mode(&This->dispex));

This->timing = &timing->IHTMLPerformanceTiming_iface;
     }
@@ -1822,7 +1827,7 @@ HRESULT create_performance(HTMLInnerWindow *window, IHTMLPerformance **ret)
     performance->window = window;
     IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface);

-    init_dispatch(&performance->dispex, &HTMLPerformance_dispex, compat_mode);
+    init_dispatch(&performance->dispex, &HTMLPerformance_dispex, NULL, compat_mode);

*ret = &performance->IHTMLPerformance_iface;
     return S_OK;
@@ -1922,7 +1927,7 @@ HRESULT create_namespace_collection(compat_mode_t compat_mode, IHTMLNamespaceCol
         return E_OUTOFMEMORY;

namespaces->IHTMLNamespaceCollection_iface.lpVtbl = &HTMLNamespaceCollectionVtbl;
-    init_dispatch(&namespaces->dispex, &HTMLNamespaceCollection_dispex, compat_mode);
+    init_dispatch(&namespaces->dispex, &HTMLNamespaceCollection_dispex, NULL, compat_mode);
     *ret = &namespaces->IHTMLNamespaceCollection_iface;
     return S_OK;
 }
@@ -2126,7 +2131,7 @@ void create_console(compat_mode_t compat_mode, IWineMSHTMLConsole **ret)
     }

obj->IWineMSHTMLConsole_iface.lpVtbl = &WineMSHTMLConsoleVtbl;
-    init_dispatch(&obj->dispex, &console_dispex, compat_mode);
+    init_dispatch(&obj->dispex, &console_dispex, NULL, compat_mode);

*ret = &obj->IWineMSHTMLConsole_iface;
 }
@@ -2442,7 +2447,8 @@ HRESULT create_media_query_list(HTMLWindow *window, BSTR media_query, IDispatch

media_query_list->IWineMSHTMLMediaQueryList_iface.lpVtbl = &media_query_list_vtbl;
     list_init(&media_query_list->listeners);
-    init_dispatch(&media_query_list->dispex, &media_query_list_dispex, dispex_compat_mode(&window->inner_window->event_target.dispex));
+    init_dispatch(&media_query_list->dispex, &media_query_list_dispex, NULL,
+                  dispex_compat_mode(&window->inner_window->event_target.dispex));

*ret = (IDispatch*)&media_query_list->IWineMSHTMLMediaQueryList_iface;
     return S_OK;
diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c
index e6d265bc2b0..10f9de09ca8 100644
--- a/dlls/mshtml/range.c
+++ b/dlls/mshtml/range.c
@@ -1699,7 +1699,8 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx
     if(!ret)
         return E_OUTOFMEMORY;

-    init_dispatch(&ret->dispex, &HTMLTxtRange_dispex, dispex_compat_mode(&doc->node.event_target.dispex));
+    init_dispatch(&ret->dispex, &HTMLTxtRange_dispex, NULL,
+                  dispex_compat_mode(&doc->node.event_target.dispex));

ret->IHTMLTxtRange_iface.lpVtbl = &HTMLTxtRangeVtbl;
     ret->IOleCommandTarget_iface.lpVtbl = &OleCommandTargetVtbl;
@@ -2004,7 +2005,7 @@ HRESULT create_dom_range(nsIDOMRange *nsrange, compat_mode_t compat_mode, IHTMLD
     if(!ret)
         return E_OUTOFMEMORY;

-    init_dispatch(&ret->dispex, &HTMLDOMRange_dispex, compat_mode);
+    init_dispatch(&ret->dispex, &HTMLDOMRange_dispex, NULL, compat_mode);

ret->IHTMLDOMRange_iface.lpVtbl = &HTMLDOMRangeVtbl;

diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c
index fdf2be9acd5..8c457f1813f 100644
--- a/dlls/mshtml/selection.c
+++ b/dlls/mshtml/selection.c
@@ -253,7 +253,8 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselect
     if(!selection)
         return E_OUTOFMEMORY;

-    init_dispatch(&selection->dispex, &HTMLSelectionObject_dispex, dispex_compat_mode(&doc->node.event_target.dispex));
+    init_dispatch(&selection->dispex, &HTMLSelectionObject_dispex, NULL,
+                  dispex_compat_mode(&doc->node.event_target.dispex));

selection->IHTMLSelectionObject_iface.lpVtbl = &HTMLSelectionObjectVtbl;
     selection->IHTMLSelectionObject2_iface.lpVtbl = &HTMLSelectionObject2Vtbl;
diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c
index 4d170c66e44..efb343e6f16 100644
--- a/dlls/mshtml/xmlhttprequest.c
+++ b/dlls/mshtml/xmlhttprequest.c
@@ -1665,7 +1665,8 @@ HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow* window, HTMLXMLHttpReq
     ret->window = window;
     IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface);

-    init_dispatch(&ret->dispex, &HTMLXMLHttpRequestFactory_dispex, dispex_compat_mode(&window->event_target.dispex));
+    init_dispatch(&ret->dispex, &HTMLXMLHttpRequestFactory_dispex, NULL,
+                  dispex_compat_mode(&window->event_target.dispex));

*ret_ptr = ret;
     return S_OK;