Jacek Caban : mshtml: Removed unneeded argument from ensure_nsevent_handler.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon May 18 07:57:33 CDT 2015
Module: wine
Branch: master
Commit: 4686f3d761eaeeaf14cd25b394fa132043b691fa
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4686f3d761eaeeaf14cd25b394fa132043b691fa
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri May 15 17:59:35 2015 +0200
mshtml: Removed unneeded argument from ensure_nsevent_handler.
---
dlls/mshtml/htmldoc.c | 2 +-
dlls/mshtml/htmlevent.c | 17 ++++++-----------
dlls/mshtml/htmlevent.h | 2 +-
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 1b72a32..e377d55 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, cp);
+ update_doc_cp_events(This->doc_node, cp);
}
static inline HTMLDocument *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 037010e..897350f 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -1336,7 +1336,7 @@ static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid, in
return TRUE;
}
-static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *event_target, eventid_t eid)
+static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid)
{
nsIDOMNode *nsnode = NULL;
@@ -1410,7 +1410,7 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, HTMLDocumentNod
data->event_table[eid]->handler_prop = disp;
IDispatch_AddRef(disp);
- return ensure_nsevent_handler(doc, data, eid);
+ return ensure_nsevent_handler(doc, eid);
}
HRESULT set_event_handler(EventTarget *event_target, HTMLDocumentNode *doc, eventid_t eid, VARIANT *var)
@@ -1509,7 +1509,7 @@ HRESULT attach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name,
data->event_table[eid]->handlers[i] = disp;
*res = VARIANT_TRUE;
- return ensure_nsevent_handler(doc->doc_node, data, eid);
+ return ensure_nsevent_handler(doc->doc_node, eid);
}
HRESULT detach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp)
@@ -1557,18 +1557,13 @@ 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, EventTarget *event_target, cp_static_data_t *cp)
+void update_doc_cp_events(HTMLDocumentNode *doc, cp_static_data_t *cp)
{
- event_target_t *data;
int i;
- 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, data, i);
+ ensure_nsevent_handler(doc, i);
}
}
@@ -1617,7 +1612,7 @@ HRESULT doc_init_events(HTMLDocumentNode *doc)
for(i=0; i < EVENTID_LAST; i++) {
if(event_info[i].flags & EVENT_HASDEFAULTHANDLERS) {
- hres = ensure_nsevent_handler(doc, NULL, i);
+ hres = ensure_nsevent_handler(doc, i);
if(FAILED(hres))
return hres;
}
diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h
index 6133737..62e808f 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*,EventTarget*,cp_static_data_t*) DECLSPEC_HIDDEN;
+void update_doc_cp_events(HTMLDocumentNode*,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;
More information about the wine-cvs
mailing list