Jacek Caban : mshtml: Use nsIDOMEvent directly to prevent default event handling in dispatch_event_object.

Alexandre Julliard julliard at winehq.org
Mon May 14 06:54:25 CDT 2018


Module: wine
Branch: stable
Commit: e93abfb47d39c1f94b4c3dcaaf15a161ac1f86a6
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e93abfb47d39c1f94b4c3dcaaf15a161ac1f86a6

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Mar  8 08:56:28 2018 -0600

mshtml: Use nsIDOMEvent directly to prevent default event handling in dispatch_event_object.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 39766bcded650cec23c0c288dde12fe1e46e43cc)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/mshtml/htmlevent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index abc0a1c..78a89f7 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -1684,8 +1684,8 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event,
     }
 
     if(event->event_id != EVENTID_LAST && (event_info[event->event_id].flags & EVENT_HASDEFAULTHANDLERS)) {
-        for(i = 0; !event->prevent_default && i < chain_cnt; i++) {
-            BOOL prevent_default = FALSE;
+        BOOL prevent_default = event->prevent_default;
+        for(i = 0; !prevent_default && i < chain_cnt; i++) {
             vtbl = dispex_get_vtbl(&target_chain[i]->dispex);
             if(!vtbl || !vtbl->handle_event_default)
                 continue;
@@ -1694,7 +1694,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event,
             if(FAILED(hres) || event->stop_propagation)
                 break;
             if(prevent_default)
-                IDOMEvent_preventDefault(&event->IDOMEvent_iface);
+                nsIDOMEvent_PreventDefault(event->nsevent);
         }
     }
 




More information about the wine-cvs mailing list