wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Jacek Caban : mshtml: Don' t use fire_event to dispatch focusin and focusout events.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 8aaa18fd558a848215571fa5f7d327dda15ef82c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aaa18fd558a848215571fa5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:10:11 2017 +0200 mshtml: Don't use fire_event to dispatch focusin and focusout events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsevents.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 4e79f63..3ba506f 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -331,17 +331,14 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * } /* If we fine need for more special cases here, we may consider handling it in a more generic way. */ - switch(event->event_id) { - case EVENTID_FOCUS: - if(doc->event_vector[EVENTID_FOCUSIN]) - fire_event(doc, EVENTID_FOCUSIN, TRUE, &node->event_target, NULL); - break; - case EVENTID_BLUR: - if(doc->event_vector[EVENTID_FOCUSOUT]) - fire_event(doc, EVENTID_FOCUSOUT, TRUE, &node->event_target, NULL); - break; - default: - break; + if(event->event_id == EVENTID_FOCUS || event->event_id == EVENTID_BLUR) { + DOMEvent *focus_event; + + 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); + IDOMEvent_Release(&focus_event->IDOMEvent_iface); + } } fire_event_obj(&node->event_target, event);

1 0

Jacek Caban : mshtml: Don't use fire_event to dispatch help event.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 2a771127cda45a3ea50c98072a8f5c831168d9b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a771127cda45a3ea50c98072… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:10:04 2017 +0200 mshtml: Don't use fire_event to dispatch help event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8aab4c4..9f231f5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5188,10 +5188,17 @@ HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *eve nsIDOMKeyEvent_GetKeyCode(key_event, &code); - switch(code) { - case VK_F1: /* DOM_VK_F1 */ + if(code == VK_F1 /* DOM_VK_F1 */) { + DOMEvent *help_event; + HRESULT hres; + TRACE("F1 pressed\n"); - fire_event(This->node.doc, EVENTID_HELP, TRUE, &This->node.event_target, NULL); + + hres = create_document_event(This->node.doc, EVENTID_HELP, &help_event); + if(SUCCEEDED(hres)) { + fire_event_obj(&This->node.event_target, help_event); + IDOMEvent_Release(&help_event->IDOMEvent_iface); + } *prevent_default = TRUE; }

1 0

Jacek Caban : mshtml: Don't use fire_event in postMessage.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 9130720e85a874a1b3881b25a02f3410ef13ca7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9130720e85a874a1b3881b25a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:52 2017 +0200 mshtml: Don't use fire_event in postMessage. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 9 ++++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 8167694..6533bb9 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1132,7 +1132,7 @@ HRESULT create_document_event_str(HTMLDocumentNode *doc, const WCHAR *type, IDOM return S_OK; } -static HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEvent **ret_event) +HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEvent **ret_event) { nsIDOMEvent *nsevent; DOMEvent *event; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 1d99604..d8717d5 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -88,6 +88,7 @@ HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,eventid_t) DECLSPEC_HIDDEN; void fire_event_obj(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; HRESULT create_event_from_nsevent(nsIDOMEvent*,DOMEvent**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index df181d6..5dc50cc 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2161,6 +2161,8 @@ static HRESULT WINAPI HTMLWindow6_get_maxConnectionsPerServer(IHTMLWindow6 *ifac static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VARIANT targetOrigin) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); + DOMEvent *event; + HRESULT hres; FIXME("(%p)->(%s %s) semi-stub\n", This, debugstr_w(msg), debugstr_variant(&targetOrigin)); @@ -2169,7 +2171,12 @@ static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VAR return E_FAIL; } - fire_event(This->inner_window->doc, EVENTID_MESSAGE, TRUE, &This->inner_window->event_target, NULL); + hres = create_document_event(This->inner_window->doc, EVENTID_MESSAGE, &event); + if(FAILED(hres)) + return hres; + + fire_event_obj(&This->inner_window->event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); return S_OK; }

1 0

Jacek Caban : mshtml: Use create_event_from_nsevent in handle_htmlevent.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: b271b48d5bfb5498007e9986c01f9ea60fb51911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b271b48d5bfb5498007e9986c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:55 2017 +0200 mshtml: Use create_event_from_nsevent in handle_htmlevent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/nsevents.c | 25 ++++++++++++------------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 352121b..8167694 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -195,7 +195,7 @@ static const event_info_t event_info[] = { static BOOL use_event_quirks(EventTarget*); -eventid_t str_to_eid(LPCWSTR str) +static eventid_t str_to_eid(const WCHAR *str) { int i; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 8c26c38..1d99604 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -71,7 +71,6 @@ typedef struct { BOOL no_event_obj; } DOMEvent; -eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; 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; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index b5dc0bf..4e79f63 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -288,16 +288,14 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event return nsres; } -static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event) +static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *nsevent) { nsEventListener *This = impl_from_nsIDOMEventListener(iface); HTMLDocumentNode *doc = This->This->doc; - const PRUnichar *type; nsIDOMEventTarget *event_target; nsIDOMNode *nsnode; - nsAString type_str; HTMLDOMNode *node; - eventid_t eid; + DOMEvent *event; nsresult nsres; HRESULT hres; @@ -308,13 +306,7 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * return NS_OK; } - nsAString_Init(&type_str, NULL); - nsIDOMEvent_GetType(event, &type_str); - nsAString_GetData(&type_str, &type); - eid = str_to_eid(type); - nsAString_Finish(&type_str); - - nsres = nsIDOMEvent_GetTarget(event, &event_target); + nsres = nsIDOMEvent_GetTarget(nsevent, &event_target); if(NS_FAILED(nsres) || !event_target) { ERR("GetEventTarget failed: %08x\n", nsres); return NS_OK; @@ -332,8 +324,14 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * if(FAILED(hres)) return NS_OK; + hres = create_event_from_nsevent(nsevent, &event); + if(FAILED(hres)) { + node_release(node); + return NS_OK; + } + /* If we fine need for more special cases here, we may consider handling it in a more generic way. */ - switch(eid) { + switch(event->event_id) { case EVENTID_FOCUS: if(doc->event_vector[EVENTID_FOCUSIN]) fire_event(doc, EVENTID_FOCUSIN, TRUE, &node->event_target, NULL); @@ -346,8 +344,9 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * break; } - fire_event(doc, eid, TRUE, &node->event_target, event); + fire_event_obj(&node->event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); node_release(node); return NS_OK; }

1 0

Jacek Caban : mshtml: Don't use fire_event to dispatch window load event.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: a52828c8b216eda2c89e4a129347bf7709774263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52828c8b216eda2c89e4a129… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:36 2017 +0200 mshtml: Don't use fire_event to dispatch window load event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsevents.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 733d7e7..b5dc0bf 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -267,10 +267,18 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event &doc->basedoc.window->base.IHTMLWindow2_iface, 0); if(doc->nsdoc) { + DOMEvent *load_event; + HRESULT hres; + flush_pending_tasks(doc->basedoc.task_magic); fire_event(doc, EVENTID_LOAD, TRUE, &doc->node.event_target, event); - fire_event(doc, EVENTID_LOAD, TRUE, &doc->window->event_target, event); + + hres = create_event_from_nsevent(event, &load_event); + if(SUCCEEDED(hres)) { + fire_event_obj(&doc->window->event_target, load_event); + IDOMEvent_Release(&load_event->IDOMEvent_iface); + } }else { ERR("NULL nsdoc\n"); nsres = NS_ERROR_FAILURE;

1 0

Jacek Caban : mshtml: Don't use fire_event to dispatch contextmenu event.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 6bf1250b826b3ee16e12d6ff29edda8f354e9e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf1250b826b3ee16e12d6ff2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:29 2017 +0200 mshtml: Don't use fire_event to dispatch contextmenu event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index bb4f122..c811a0f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1486,8 +1486,9 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList UINT32 aContextFlags, nsIDOMEvent *aEvent, nsIDOMNode *aNode) { NSContainer *This = impl_from_nsIContextMenuListener(iface); - nsIDOMMouseEvent *event; + nsIDOMMouseEvent *mouse_event; HTMLDOMNode *node; + DOMEvent *event; POINT pt; DWORD dwID = CONTEXT_MENU_DEFAULT; nsresult nsres; @@ -1499,14 +1500,18 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList if(FAILED(hres)) return NS_ERROR_FAILURE; - fire_event(This->doc->basedoc.doc_node /* FIXME */, EVENTID_CONTEXTMENU, TRUE, &node->event_target, aEvent); + hres = create_event_from_nsevent(aEvent, &event); + if(SUCCEEDED(hres)) { + fire_event_obj(&node->event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); + } - nsres = nsIDOMEvent_QueryInterface(aEvent, &IID_nsIDOMMouseEvent, (void**)&event); + nsres = nsIDOMEvent_QueryInterface(aEvent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); assert(NS_SUCCEEDED(nsres)); - nsIDOMMouseEvent_GetScreenX(event, &pt.x); - nsIDOMMouseEvent_GetScreenY(event, &pt.y); - nsIDOMMouseEvent_Release(event); + nsIDOMMouseEvent_GetScreenX(mouse_event, &pt.x); + nsIDOMMouseEvent_GetScreenY(mouse_event, &pt.y); + nsIDOMMouseEvent_Release(mouse_event); switch(aContextFlags) { case CONTEXT_NONE:

1 0

Jacek Caban : mshtml: Use fire_event_obj to dispatch XHR readystatechange event.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 62e76f1847f648a4973fec72c7c8345782366a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e76f1847f648a4973fec72c… Author: Jacek Caban <jacek(a)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(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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;

1 0

Jacek Caban : mshtml: Store current IHTMLEventObj in DOMEvent and create it in fire_event_obj if needed.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: aaa576463c0caf015bdd3f8bff9f92f27ce44351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa576463c0caf015bdd3f8bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:15 2017 +0200 mshtml: Store current IHTMLEventObj in DOMEvent and create it in fire_event_obj if needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 59 +++++++++++++++++++++++++------------------- dlls/mshtml/htmlevent.h | 6 +++-- dlls/mshtml/xmlhttprequest.c | 3 ++- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 02e4363..6314b14 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -223,7 +223,7 @@ static eventid_t attr_to_eid(const WCHAR *str) return EVENTID_LAST; } -struct HTMLEventObj { +typedef struct { DispatchEx dispex; IHTMLEventObj IHTMLEventObj_iface; @@ -232,7 +232,7 @@ struct HTMLEventObj { const event_info_t *type; DOMEvent *event; VARIANT return_value; -}; +} HTMLEventObj; static inline HTMLEventObj *impl_from_IHTMLEventObj(IHTMLEventObj *iface) { @@ -1204,7 +1204,7 @@ static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) return hres; } -static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, HTMLEventObj *event_obj, VARIANT *retv) +static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event_obj, VARIANT *retv) { DISPPARAMS dp = {NULL,NULL,0,0}; VARIANT event_arg; @@ -1213,7 +1213,7 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, HTMLEventObj *event_ if(event_obj) { V_VT(&event_arg) = VT_DISPATCH; - V_DISPATCH(&event_arg) = (IDispatch*)&event_obj->IHTMLEventObj_iface; + V_DISPATCH(&event_arg) = (IDispatch*)event_obj; dp.rgvarg = &event_arg; dp.cArgs = 1; } @@ -1252,7 +1252,7 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) return FALSE; } -void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOMEvent *event) +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); @@ -1299,7 +1299,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM int i; V_VT(&arg) = VT_DISPATCH; - V_DISPATCH(&arg) = (IDispatch*)&event_obj->dispex.IDispatchEx_iface; + V_DISPATCH(&arg) = (IDispatch*)event->event_obj; i = handler_vector->handler_cnt; while(i--) { @@ -1347,7 +1347,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM TRACE("cp %s [%u] >>>\n", debugstr_w(event_info[eid].name), i); hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, - cp->data->pass_event_arg ? event_obj : NULL, &v); + cp->data->pass_event_arg ? event->event_obj : NULL, &v); if(hres == S_OK) { TRACE("cp %s [%u] <<<\n", debugstr_w(event_info[eid].name), i); @@ -1370,11 +1370,12 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM } } -static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEventObj *event_obj) +static 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; const event_target_vtbl_t *vtbl, *target_vtbl; + HTMLEventObj *event_obj_ref = NULL; IHTMLEventObj *prev_event = NULL; EventTarget *iter; DWORD event_flags; @@ -1418,15 +1419,23 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent iter = vtbl->get_parent_event_target(&iter->dispex); } while(iter); + if(!event->event_obj && !event->no_event_obj) { + event_obj_ref = alloc_event_obj(event); + if(event_obj_ref) { + event_obj_ref->type = event_info + event->event_id; + event->event_obj = &event_obj_ref->IHTMLEventObj_iface; + } + } + target_vtbl = dispex_get_vtbl(&event_target->dispex); if(target_vtbl && target_vtbl->set_current_event) - prev_event = target_vtbl->set_current_event(&event_target->dispex, event_obj ? &event_obj->IHTMLEventObj_iface : NULL); + prev_event = target_vtbl->set_current_event(&event_target->dispex, event->event_obj); event->target = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); for(i = 0; i < chain_cnt; i++) { - call_event_handlers(event_obj, target_chain[i], event); + call_event_handlers(target_chain[i], event); if(!(event_flags & EVENT_BUBBLES) || event->stop_propagation) break; } @@ -1452,6 +1461,11 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent } } + if(event_obj_ref) { + event->event_obj = NULL; + IHTMLEventObj_Release(&event_obj_ref->IHTMLEventObj_iface); + } + for(i = 0; i < chain_cnt; i++) IDispatchEx_Release(&target_chain[i]->dispex.IDispatchEx_iface); if(target_chain != target_chain_buf) @@ -1460,7 +1474,6 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarget *target, nsIDOMEvent *nsevent) { - HTMLEventObj *event_obj = NULL; DOMEvent *event; HRESULT hres; @@ -1471,19 +1484,11 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarge if(FAILED(hres)) return; - if(set_event) { - event_obj = alloc_event_obj(event); - if(!event_obj) { - IDOMEvent_Release(&event->IDOMEvent_iface); - return; - } - event_obj->type = event_info + eid; - } + if(!set_event) + event->no_event_obj = TRUE; - fire_event_obj(target, event, event_obj); + fire_event_obj(target, event); - if(event_obj) - IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); IDOMEvent_Release(&event->IDOMEvent_iface); } @@ -1533,11 +1538,13 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even if(!event_obj->event) hres = create_document_event(node->doc, eid, &event_obj->event); - if(SUCCEEDED(hres)) - fire_event_obj(&node->event_target, event_obj->event, event_obj); + if(SUCCEEDED(hres)) { + event_obj->event->event_obj = &event_obj->IHTMLEventObj_iface; + fire_event_obj(&node->event_target, event_obj->event); + event_obj->event->event_obj = NULL; + } - if(event_obj) - IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); + IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 76b971f..f348076 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -66,6 +66,9 @@ typedef struct { EventTarget *target; BOOL prevent_default; BOOL stop_propagation; + + IHTMLEventObj *event_obj; + BOOL no_event_obj; } DOMEvent; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; @@ -84,8 +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; -typedef struct HTMLEventObj HTMLEventObj; -void call_event_handlers(HTMLEventObj*,EventTarget*,DOMEvent*); +void call_event_handlers(EventTarget*,DOMEvent*); 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 1563870..cc7a5e0 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -194,7 +194,8 @@ static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *i hres = create_event_from_nsevent(nsevent, &event); if(SUCCEEDED(hres) ){ - call_event_handlers(NULL, &This->xhr->event_target, event); + event->no_event_obj = TRUE; + call_event_handlers(&This->xhr->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } return NS_OK;

1 0

Jacek Caban : mshtml: Implement IDOMEvent:: stopPropagation and use it where appropriate.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: aa6882cba86d63ac89d06081e0af69cafd0f2e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa6882cba86d63ac89d06081e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:05 2017 +0200 mshtml: Implement IDOMEvent::stopPropagation and use it where appropriate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 19 ++++++++++++------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 3 +++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0e1946b..02e4363 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -232,7 +232,6 @@ struct HTMLEventObj { const event_info_t *type; DOMEvent *event; VARIANT return_value; - BOOL cancel_bubble; }; static inline HTMLEventObj *impl_from_IHTMLEventObj(IHTMLEventObj *iface) @@ -455,7 +454,8 @@ static HRESULT WINAPI HTMLEventObj_put_cancelBubble(IHTMLEventObj *iface, VARIAN TRACE("(%p)->(%x)\n", This, v); - This->cancel_bubble = !!v; + if(This->event) + IDOMEvent_stopPropagation(&This->event->IDOMEvent_iface); return S_OK; } @@ -465,7 +465,7 @@ static HRESULT WINAPI HTMLEventObj_get_cancelBubble(IHTMLEventObj *iface, VARIAN TRACE("(%p)->(%p)\n", This, p); - *p = This->cancel_bubble ? VARIANT_TRUE : VARIANT_FALSE; + *p = This->event && This->event->stop_propagation ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; } @@ -984,8 +984,13 @@ static HRESULT WINAPI DOMEvent_preventDefault(IDOMEvent *iface) static HRESULT WINAPI DOMEvent_stopPropagation(IDOMEvent *iface) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->stop_propagation = TRUE; + nsIDOMEvent_StopPropagation(This->nsevent); + IDOMEvent_preventDefault(&This->IDOMEvent_iface); + return S_OK; } static HRESULT WINAPI DOMEvent_stopImmediatePropagation(IDOMEvent *iface) @@ -1422,7 +1427,7 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent for(i = 0; i < chain_cnt; i++) { call_event_handlers(event_obj, target_chain[i], event); - if(!(event_flags & EVENT_BUBBLES) || (event_obj && event_obj->cancel_bubble)) + if(!(event_flags & EVENT_BUBBLES) || event->stop_propagation) break; } @@ -1440,7 +1445,7 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent continue; hres = vtbl->handle_event_default(&event_target->dispex, event->event_id, event->nsevent, &prevent_default); - if(FAILED(hres) || (event_obj && event_obj->cancel_bubble)) + if(FAILED(hres) || event->stop_propagation) break; if(prevent_default) IDOMEvent_preventDefault(&event->IDOMEvent_iface); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 1528f91..76b971f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -65,6 +65,7 @@ typedef struct { eventid_t event_id; EventTarget *target; BOOL prevent_default; + BOOL stop_propagation; } DOMEvent; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index cc1da62..84a35f3 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2550,6 +2550,9 @@ static void test_create_event(IHTMLDocument2 *doc) hres = IDOMEvent_preventDefault(event); ok(hres == S_OK, "preventDefault failed: %08x\n", hres); + hres = IDOMEvent_stopPropagation(event); + ok(hres == S_OK, "stopPropagation failed: %08x\n", hres); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

Jacek Caban : mshtml: Implement IDOMEvent:: preventDefault and use it where appropriate.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: d5b0c1d77c7d3e329e2da7ba013bd0f505a752ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b0c1d77c7d3e329e2da7ba0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:08:59 2017 +0200 mshtml: Implement IDOMEvent::preventDefault and use it where appropriate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 33 +++++++++++++++------------------ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 3 +++ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 00b9524..0e1946b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -232,7 +232,6 @@ struct HTMLEventObj { const event_info_t *type; DOMEvent *event; VARIANT return_value; - BOOL prevent_default; BOOL cancel_bubble; }; @@ -435,8 +434,8 @@ static HRESULT WINAPI HTMLEventObj_put_returnValue(IHTMLEventObj *iface, VARIANT } This->return_value = v; - if(!V_BOOL(&v)) - This->prevent_default = TRUE; + if(!V_BOOL(&v) && This->event) + IDOMEvent_preventDefault(&This->event->IDOMEvent_iface); return S_OK; } @@ -974,8 +973,12 @@ static HRESULT WINAPI DOMEvent_initEvent(IDOMEvent *iface, BSTR type, VARIANT_BO static HRESULT WINAPI DOMEvent_preventDefault(IDOMEvent *iface) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->prevent_default = TRUE; + nsIDOMEvent_PreventDefault(This->nsevent); + return S_OK; } static HRESULT WINAPI DOMEvent_stopPropagation(IDOMEvent *iface) @@ -1274,7 +1277,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM if(cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) - event_obj->prevent_default = TRUE; + IDOMEvent_preventDefault(&event->IDOMEvent_iface); }else if(V_VT(&v) != VT_EMPTY) { FIXME("unhandled result %s\n", debugstr_variant(&v)); } @@ -1306,7 +1309,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM if(cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) - event_obj->prevent_default = TRUE; + IDOMEvent_preventDefault(&event->IDOMEvent_iface); }else if(V_VT(&v) != VT_EMPTY) { FIXME("unhandled result %s\n", debugstr_variant(&v)); } @@ -1346,7 +1349,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM if(cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) - event_obj->prevent_default = TRUE; + IDOMEvent_preventDefault(&event->IDOMEvent_iface); }else if(V_VT(&v) != VT_EMPTY) { FIXME("unhandled result %s\n", debugstr_variant(&v)); } @@ -1368,7 +1371,6 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent unsigned chain_cnt, chain_buf_size, i; const event_target_vtbl_t *vtbl, *target_vtbl; IHTMLEventObj *prev_event = NULL; - BOOL prevent_default = FALSE; EventTarget *iter; DWORD event_flags; HRESULT hres; @@ -1430,11 +1432,9 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent IHTMLEventObj_Release(prev_event); } - if(event_obj && event_obj->prevent_default) - prevent_default = TRUE; - if(event_flags & EVENT_HASDEFAULTHANDLERS) { - for(i = 0; !prevent_default && i < chain_cnt; i++) { + for(i = 0; !event->prevent_default && i < chain_cnt; i++) { + BOOL prevent_default = FALSE; vtbl = dispex_get_vtbl(&target_chain[i]->dispex); if(!vtbl || !vtbl->handle_event_default) continue; @@ -1442,6 +1442,8 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent event->nsevent, &prevent_default); if(FAILED(hres) || (event_obj && event_obj->cancel_bubble)) break; + if(prevent_default) + IDOMEvent_preventDefault(&event->IDOMEvent_iface); } } @@ -1449,11 +1451,6 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent IDispatchEx_Release(&target_chain[i]->dispex.IDispatchEx_iface); if(target_chain != target_chain_buf) heap_free(target_chain); - - if(prevent_default) { - TRACE("calling PreventDefault\n"); - nsIDOMEvent_PreventDefault(event->nsevent); - } } void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarget *target, nsIDOMEvent *nsevent) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 2230608..1528f91 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -64,6 +64,7 @@ typedef struct { nsIDOMEvent *nsevent; eventid_t event_id; EventTarget *target; + BOOL prevent_default; } DOMEvent; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 228aa04..cc1da62 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2547,6 +2547,9 @@ static void test_create_event(IHTMLDocument2 *doc) SysFreeString(str); ok(hres == S_OK, "createEvent failed: %08x\n", hres); + hres = IDOMEvent_preventDefault(event); + ok(hres == S_OK, "preventDefault failed: %08x\n", hres); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017