From a52828c8b216eda2c89e4a129347bf7709774263 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Fri, 20 Oct 2017 15:09:36 +0200 Subject: [PATCH] mshtml: Don't use fire_event to dispatch window load event. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/mshtml/nsevents.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 733d7e774c5..b5dc0bf1237 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -267,10 +267,18 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event &doc->basedoc.window->base.IHTMLWindow2_iface, 0); if(doc->nsdoc) { + DOMEvent *load_event; + HRESULT hres; + flush_pending_tasks(doc->basedoc.task_magic); fire_event(doc, EVENTID_LOAD, TRUE, &doc->node.event_target, event); - fire_event(doc, EVENTID_LOAD, TRUE, &doc->window->event_target, event); + + hres = create_event_from_nsevent(event, &load_event); + if(SUCCEEDED(hres)) { + fire_event_obj(&doc->window->event_target, load_event); + IDOMEvent_Release(&load_event->IDOMEvent_iface); + } }else { ERR("NULL nsdoc\n"); nsres = NS_ERROR_FAILURE; -- 2.11.4.GIT