Jacek Caban : mshtml: Rename fire_event_obj and dispatch_event.
Alexandre Julliard
julliard at winehq.org
Fri Oct 20 15:09:37 CDT 2017
Module: wine
Branch: master
Commit: c29d776de82d75a77f044167af637f5519f68f60
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29d776de82d75a77f044167af637f5519f68f60
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Oct 20 15:10:46 2017 +0200
mshtml: Rename fire_event_obj and dispatch_event.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmldoc.c | 2 +-
dlls/mshtml/htmlelem.c | 4 ++--
dlls/mshtml/htmlevent.c | 6 +++---
dlls/mshtml/htmlevent.h | 4 ++--
dlls/mshtml/htmlwindow.c | 2 +-
dlls/mshtml/nsembed.c | 2 +-
dlls/mshtml/nsevents.c | 8 ++++----
dlls/mshtml/persist.c | 4 ++--
dlls/mshtml/script.c | 2 +-
dlls/mshtml/xmlhttprequest.c | 2 +-
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 734f649..5f33e84 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -2679,7 +2679,7 @@ static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEv
TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(bstrEventName), pvarEventObject, pfCanceled);
- return dispatch_event(&This->doc_node->node, bstrEventName, pvarEventObject, pfCanceled);
+ return fire_event(&This->doc_node->node, bstrEventName, pvarEventObject, pfCanceled);
}
static HRESULT WINAPI HTMLDocument4_createRenderStyle(IHTMLDocument4 *iface, BSTR v,
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index 9f231f5..ed1aa86 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -3526,7 +3526,7 @@ static HRESULT WINAPI HTMLElement3_fireEvent(IHTMLElement3 *iface, BSTR bstrEven
TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(bstrEventName), debugstr_variant(pvarEventObject),
pfCancelled);
- return dispatch_event(&This->node, bstrEventName, pvarEventObject, pfCancelled);
+ return fire_event(&This->node, bstrEventName, pvarEventObject, pfCancelled);
}
static HRESULT WINAPI HTMLElement3_put_onresizestart(IHTMLElement3 *iface, VARIANT v)
@@ -5196,7 +5196,7 @@ HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *eve
hres = create_document_event(This->node.doc, EVENTID_HELP, &help_event);
if(SUCCEEDED(hres)) {
- fire_event_obj(&This->node.event_target, help_event);
+ dispatch_event(&This->node.event_target, help_event);
IDOMEvent_Release(&help_event->IDOMEvent_iface);
}
*prevent_default = TRUE;
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index e1b52b5..a428879 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -1370,7 +1370,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event)
}
}
-void fire_event_obj(EventTarget *event_target, DOMEvent *event)
+void dispatch_event(EventTarget *event_target, DOMEvent *event)
{
EventTarget *target_chain_buf[8], **target_chain = target_chain_buf;
unsigned chain_cnt, chain_buf_size, i;
@@ -1472,7 +1472,7 @@ void fire_event_obj(EventTarget *event_target, DOMEvent *event)
heap_free(target_chain);
}
-HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled)
+HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled)
{
HTMLEventObj *event_obj = NULL;
eventid_t eid;
@@ -1520,7 +1520,7 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even
if(SUCCEEDED(hres)) {
event_obj->event->event_obj = &event_obj->IHTMLEventObj_iface;
- fire_event_obj(&node->event_target, event_obj->event);
+ dispatch_event(&node->event_target, event_obj->event);
event_obj->event->event_obj = NULL;
}
diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h
index 3e84ec1..0a967f2 100644
--- a/dlls/mshtml/htmlevent.h
+++ b/dlls/mshtml/htmlevent.h
@@ -77,7 +77,7 @@ HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN;
HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN;
HRESULT attach_event(EventTarget*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN;
HRESULT detach_event(EventTarget*,BSTR,IDispatch*) DECLSPEC_HIDDEN;
-HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN;
+HRESULT fire_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) 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;
@@ -85,7 +85,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 fire_event_obj(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN;
+void dispatch_event(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN;
HRESULT create_document_event(HTMLDocumentNode*,eventid_t,DOMEvent**) DECLSPEC_HIDDEN;
HRESULT create_document_event_str(HTMLDocumentNode*,const WCHAR*,IDOMEvent**) DECLSPEC_HIDDEN;
diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index 5dc50cc..b174de2 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -2175,7 +2175,7 @@ static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VAR
if(FAILED(hres))
return hres;
- fire_event_obj(&This->inner_window->event_target, event);
+ dispatch_event(&This->inner_window->event_target, event);
IDOMEvent_Release(&event->IDOMEvent_iface);
return S_OK;
}
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index c811a0f..a72a587 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -1502,7 +1502,7 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList
hres = create_event_from_nsevent(aEvent, &event);
if(SUCCEEDED(hres)) {
- fire_event_obj(&node->event_target, event);
+ dispatch_event(&node->event_target, event);
IDOMEvent_Release(&event->IDOMEvent_iface);
}
diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c
index 4617205..84971d8 100644
--- a/dlls/mshtml/nsevents.c
+++ b/dlls/mshtml/nsevents.c
@@ -274,13 +274,13 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event
hres = create_document_event(doc, EVENTID_LOAD, &load_event);
if(SUCCEEDED(hres)) {
- fire_event_obj(&doc->node.event_target, load_event);
+ dispatch_event(&doc->node.event_target, load_event);
IDOMEvent_Release(&load_event->IDOMEvent_iface);
}
hres = create_event_from_nsevent(event, &load_event);
if(SUCCEEDED(hres)) {
- fire_event_obj(&doc->window->event_target, load_event);
+ dispatch_event(&doc->window->event_target, load_event);
IDOMEvent_Release(&load_event->IDOMEvent_iface);
}
}else {
@@ -340,12 +340,12 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *
hres = create_document_event(doc, event->event_id == EVENTID_FOCUS ? EVENTID_FOCUSIN : EVENTID_FOCUSOUT, &focus_event);
if(SUCCEEDED(hres)) {
- fire_event_obj(&node->event_target, focus_event);
+ dispatch_event(&node->event_target, focus_event);
IDOMEvent_Release(&focus_event->IDOMEvent_iface);
}
}
- fire_event_obj(&node->event_target, event);
+ dispatch_event(&node->event_target, event);
IDOMEvent_Release(&event->IDOMEvent_iface);
node_release(node);
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index 0146527..fa1bb6e 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -454,14 +454,14 @@ static void notif_readystate(HTMLOuterWindow *window)
hres = create_document_event(window->base.inner_window->doc, EVENTID_READYSTATECHANGE, &event);
if(SUCCEEDED(hres)) {
event->no_event_obj = TRUE;
- fire_event_obj(&window->base.inner_window->doc->node.event_target, event);
+ dispatch_event(&window->base.inner_window->doc->node.event_target, event);
IDOMEvent_Release(&event->IDOMEvent_iface);
}
if(window->frame_element) {
hres = create_document_event(window->frame_element->element.node.doc, EVENTID_READYSTATECHANGE, &event);
if(SUCCEEDED(hres)) {
- fire_event_obj(&window->frame_element->element.node.event_target, event);
+ dispatch_event(&window->frame_element->element.node.event_target, event);
IDOMEvent_Release(&event->IDOMEvent_iface);
}
}
diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c
index 3b4fcc5..025db3b 100644
--- a/dlls/mshtml/script.c
+++ b/dlls/mshtml/script.c
@@ -733,7 +733,7 @@ static void dispatch_script_readystatechange_event(HTMLScriptElement *script)
if(FAILED(hres))
return;
- fire_event_obj(&script->element.node.event_target, event);
+ dispatch_event(&script->element.node.event_target, event);
IDOMEvent_Release(&event->IDOMEvent_iface);
}
diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c
index 455bbfb..a107fa2 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;
- fire_event_obj(&This->xhr->event_target, event);
+ dispatch_event(&This->xhr->event_target, event);
IDOMEvent_Release(&event->IDOMEvent_iface);
}
return NS_OK;
More information about the wine-cvs
mailing list