Module: wine Branch: master Commit: 62e76f1847f648a4973fec72c7c8345782366a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e76f1847f648a4973fec72c7...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Oct 20 15:09:20 2017 +0200
mshtml: Use fire_event_obj to dispatch XHR readystatechange event.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/xmlhttprequest.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6314b14..352121b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1252,7 +1252,7 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) return FALSE; }
-void call_event_handlers(EventTarget *event_target, DOMEvent *event) +static void call_event_handlers(EventTarget *event_target, DOMEvent *event) { const eventid_t eid = event->event_id; handler_vector_t *handler_vector = get_handler_vector(event_target, eid, FALSE); @@ -1370,7 +1370,7 @@ void call_event_handlers(EventTarget *event_target, DOMEvent *event) } }
-static void fire_event_obj(EventTarget *event_target, DOMEvent *event) +void fire_event_obj(EventTarget *event_target, DOMEvent *event) { EventTarget *target_chain_buf[8], **target_chain = target_chain_buf; unsigned chain_cnt, chain_buf_size, i; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f348076..8c26c38 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -87,7 +87,7 @@ HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,eventid_t) DECLSPEC_HIDDEN;
-void call_event_handlers(EventTarget*,DOMEvent*); +void fire_event_obj(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN;
HRESULT create_document_event_str(HTMLDocumentNode*,const WCHAR*,IDOMEvent**) DECLSPEC_HIDDEN; HRESULT create_event_from_nsevent(nsIDOMEvent*,DOMEvent**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index cc7a5e0..455bbfb 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -195,7 +195,7 @@ static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *i hres = create_event_from_nsevent(nsevent, &event); if(SUCCEEDED(hres) ){ event->no_event_obj = TRUE; - call_event_handlers(&This->xhr->event_target, event); + fire_event_obj(&This->xhr->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } return NS_OK;