Jacek Caban : mshtml: Don't use fire_event to dispatch window load event.

Alexandre Julliard julliard at winehq.org
Fri Oct 20 15:09:36 CDT 2017


Module: wine
Branch: master
Commit: a52828c8b216eda2c89e4a129347bf7709774263
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a52828c8b216eda2c89e4a129347bf7709774263

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Oct 20 15:09:36 2017 +0200

mshtml: Don't use fire_event to dispatch window load event.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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 733d7e7..b5dc0bf 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;




More information about the wine-cvs mailing list