Jacek Caban : mshtml: Don' t use fire_event to dispatch document and frame element readystatechange event.
Alexandre Julliard
julliard at winehq.org
Fri Oct 20 15:09:37 CDT 2017
Module: wine
Branch: master
Commit: a252059a88497750820efc20472cf37e163c18b1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a252059a88497750820efc20472cf37e163c18b1
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Oct 20 15:10:38 2017 +0200
mshtml: Don't use fire_event to dispatch document and frame element readystatechange event.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlevent.c | 20 --------------------
dlls/mshtml/htmlevent.h | 1 -
dlls/mshtml/persist.c | 21 ++++++++++++++++-----
3 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 6533bb9..e1b52b5 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -1472,26 +1472,6 @@ void fire_event_obj(EventTarget *event_target, DOMEvent *event)
heap_free(target_chain);
}
-void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarget *target, nsIDOMEvent *nsevent)
-{
- DOMEvent *event;
- HRESULT hres;
-
- if(nsevent)
- hres = create_event_from_nsevent(nsevent, &event);
- else
- hres = create_document_event(doc, eid, &event);
- if(FAILED(hres))
- return;
-
- if(!set_event)
- event->no_event_obj = TRUE;
-
- fire_event_obj(target, event);
-
- IDOMEvent_Release(&event->IDOMEvent_iface);
-}
-
HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled)
{
HTMLEventObj *event_obj = NULL;
diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h
index d8717d5..3e84ec1 100644
--- a/dlls/mshtml/htmlevent.h
+++ b/dlls/mshtml/htmlevent.h
@@ -73,7 +73,6 @@ typedef struct {
void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN;
void release_event_target(EventTarget*) DECLSPEC_HIDDEN;
-void fire_event(HTMLDocumentNode*,eventid_t,BOOL,EventTarget*,nsIDOMEvent*) DECLSPEC_HIDDEN;
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;
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index 866b06f..0146527 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -443,17 +443,28 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind
static void notif_readystate(HTMLOuterWindow *window)
{
+ DOMEvent *event;
+ HRESULT hres;
+
window->readystate_pending = FALSE;
if(window->doc_obj && window->doc_obj->basedoc.window == window)
call_property_onchanged(&window->doc_obj->basedoc.cp_container, DISPID_READYSTATE);
- fire_event(window->base.inner_window->doc, EVENTID_READYSTATECHANGE, FALSE,
- &window->base.inner_window->doc->node.event_target, NULL);
+ 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);
+ IDOMEvent_Release(&event->IDOMEvent_iface);
+ }
- if(window->frame_element)
- fire_event(window->frame_element->element.node.doc, EVENTID_READYSTATECHANGE,
- TRUE, &window->frame_element->element.node.event_target, NULL);
+ 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);
+ IDOMEvent_Release(&event->IDOMEvent_iface);
+ }
+ }
}
typedef struct {
More information about the wine-cvs
mailing list