Jacek Caban : mshtml: Use get_handler_vector in remove_event_handler.

Alexandre Julliard julliard at winehq.org
Tue Feb 14 16:24:51 CST 2017


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Feb 13 21:11:25 2017 +0100

mshtml: Use get_handler_vector in remove_event_handler.

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

---

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

diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 44a5df0..0f835e2 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -1392,7 +1392,7 @@ void detach_events(HTMLDocumentNode *doc)
 
 static void remove_event_handler(EventTarget *event_target, eventid_t eid)
 {
-    event_target_t *data;
+    handler_vector_t *handler_vector;
     VARIANT *store;
     HRESULT hres;
 
@@ -1400,10 +1400,10 @@ static void remove_event_handler(EventTarget *event_target, eventid_t eid)
     if(SUCCEEDED(hres))
         VariantClear(store);
 
-    data = get_event_target_data(event_target, FALSE);
-    if(data && data->event_table[eid] && data->event_table[eid]->handler_prop) {
-        IDispatch_Release(data->event_table[eid]->handler_prop);
-        data->event_table[eid]->handler_prop = NULL;
+    handler_vector = get_handler_vector(event_target, eid, FALSE);
+    if(handler_vector && handler_vector->handler_prop) {
+        IDispatch_Release(handler_vector->handler_prop);
+        handler_vector->handler_prop = NULL;
     }
 }
 




More information about the wine-cvs mailing list