Jacek Caban : mshtml: Pass EventTarget to update_cp_events.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Thu May 14 13:25:56 2015 +0200

mshtml: Pass EventTarget to update_cp_events.

---

dlls/mshtml/htmldoc.c   |  2 +-
 dlls/mshtml/htmlevent.c | 10 +++++-----
 dlls/mshtml/htmlevent.h |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index b293367..1b72a32 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -3962,7 +3962,7 @@ static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp)
     HTMLDocument *This = impl_from_IHTMLDocument2((IHTMLDocument2*)iface);

if(This->window)
-        update_cp_events(This->window->base.inner_window, &This->doc_node->node.event_target.ptr, cp);
+        update_cp_events(This->window->base.inner_window, &This->doc_node->node.event_target, cp);
 }

static inline HTMLDocument *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 18bca41..3713389 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -1563,18 +1563,18 @@ void bind_target_event(HTMLDocumentNode *doc, EventTarget *event_target, const W
     set_event_handler_disp(event_target, doc, eid, disp);
 }

-void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr, cp_static_data_t *cp)
+void update_cp_events(HTMLInnerWindow *window, EventTarget *event_target, cp_static_data_t *cp)
 {
-    event_target_t *event_target;
+    event_target_t *data;
     int i;

-    event_target = get_event_target(event_target_ptr);
-    if(!event_target)
+    data = get_event_target_data(event_target, FALSE);
+    if(!data)
         return; /* FIXME */

for(i=0; i < EVENTID_LAST; i++) {
         if((event_info[i].flags & EVENT_DEFAULTLISTENER) && is_cp_event(cp, event_info[i].dispid))
-            ensure_nsevent_handler(window->doc, event_target, i);
+            ensure_nsevent_handler(window->doc, data, i);
     }
 }

diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h
index 8c3163e..85f056c 100644
--- a/dlls/mshtml/htmlevent.h
+++ b/dlls/mshtml/htmlevent.h
@@ -60,7 +60,7 @@ HRESULT attach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) D
 HRESULT detach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN;
 HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN;
 HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN;
-void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*) DECLSPEC_HIDDEN;
+void update_cp_events(HTMLInnerWindow*,EventTarget*,cp_static_data_t*) DECLSPEC_HIDDEN;
 HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN;
 void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN;
 HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN;