October 2017 - Wine-Commits

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

Oct. 20, 2017

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 document load event.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 9a11dcf3f2a982226db6a427e8af08946084618a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a11dcf3f2a982226db6a427e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:10:17 2017 +0200 mshtml: Don't use fire_event to dispatch document load event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsevents.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 3ba506f..4617205 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -272,7 +272,11 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event flush_pending_tasks(doc->basedoc.task_magic); - fire_event(doc, EVENTID_LOAD, TRUE, &doc->node.event_target, event); + hres = create_document_event(doc, EVENTID_LOAD, &load_event); + if(SUCCEEDED(hres)) { + fire_event_obj(&doc->node.event_target, load_event); + IDOMEvent_Release(&load_event->IDOMEvent_iface); + } hres = create_event_from_nsevent(event, &load_event); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Don' t use fire_event to dispatch document and frame element readystatechange event.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

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

1 0

Jacek Caban : mshtml: Use create_event_from_nsevent in handle_htmlevent.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

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 contextmenu event.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

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

Dmitry Timoshkov : ole32/tests: Add a test for saving an IOleCache storage.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 970c5b1dd2a971c5bac69e1f4e6f8e494c37fd8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=970c5b1dd2a971c5bac69e1f4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 20 17:41:56 2017 +0800 ole32/tests: Add a test for saving an IOleCache storage. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 205 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 195 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=970c5b1dd2a971c5bac69…

1 0

Alexandre Julliard : configure: Silence error when krb5-config is missing.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 56cb45456b8146d4c2aaa67298afdbaa4084bfbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=56cb45456b8146d4c2aaa6729… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 18:59:00 2017 +0200 configure: Silence error when krb5-config is missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 8b6fc45..0c090eb 100755 --- a/configure +++ b/configure @@ -13753,13 +13753,13 @@ then KRB5_CFLAGS=`$PKG_CONFIG --cflags krb5 2>/dev/null` fi fi -test "$cross_compiling" = yes || KRB5_CFLAGS=${KRB5_CFLAGS:-`krb5-config --cflags`} +test "$cross_compiling" = yes || KRB5_CFLAGS=${KRB5_CFLAGS:-`${KRB5_CONFIG:-krb5-config} --cflags 2>/dev/null`} if ${KRB5_LIBS:+false} :; then : if ${PKG_CONFIG+:} false; then : KRB5_LIBS=`$PKG_CONFIG --libs krb5 2>/dev/null` fi fi -test "$cross_compiling" = yes || KRB5_LIBS=${KRB5_LIBS:-`krb5-config --libs`} +test "$cross_compiling" = yes || KRB5_LIBS=${KRB5_LIBS:-`${KRB5_CONFIG:-krb5-config} --libs 2>/dev/null`} $as_echo "$as_me:${as_lineno-$LINENO}: krb5 cflags: $KRB5_CFLAGS" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: krb5 libs: $KRB5_LIBS" >&5 diff --git a/configure.ac b/configure.ac index 0ad9028..c02253b 100644 --- a/configure.ac +++ b/configure.ac @@ -1629,7 +1629,9 @@ WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"], dnl **** Check for krb5 **** if test "x$with_krb5" != "xno" then - WINE_PACKAGE_FLAGS(KRB5,[krb5],,[`krb5-config --cflags`],[`krb5-config --libs`], + WINE_PACKAGE_FLAGS(KRB5,[krb5],, + [`${KRB5_CONFIG:-krb5-config} --cflags 2>/dev/null`], + [`${KRB5_CONFIG:-krb5-config} --libs 2>/dev/null`], [AC_CHECK_HEADERS([krb5/krb5.h]) if test "$ac_cv_header_krb5_krb5_h" = "yes" then

1 0

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

Oct. 20, 2017

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: Store current IHTMLEventObj in DOMEvent and create it in fire_event_obj if needed.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

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

Piotr Caban : msvcp: Fix logic_error and runtime_error class layout if _MSVCP_VER>90.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 818d20adb50fb74d468326a86f538b1aa45b4abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=818d20adb50fb74d468326a86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 20 13:02:30 2017 +0200 msvcp: Fix logic_error and runtime_error class layout if _MSVCP_VER>90. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index e62dfae..4e2dda6 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -297,7 +297,7 @@ DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor) /* logic_error class data */ typedef struct { exception e; -#ifndef _MSVCIRT +#if _MSVCP_VER <= 90 && !defined _MSVCIRT basic_string_char str; #endif } logic_error; @@ -308,12 +308,15 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_ctor, 8) logic_error* __thiscall MSVCP_logic_error_ctor( logic_error *this, exception_name name ) { TRACE("%p %s\n", this, EXCEPTION_STR(name)); -#ifdef _MSVCIRT - MSVCP_exception_ctor(&this->e, name); +#if _MSVCP_VER <= 90 && !defined _MSVCIRT +#if _MSVCP_VER == 60 + MSVCP_exception_ctor(&this->e, ""); #else - this->e.name = NULL; - this->e.do_free = FALSE; + MSVCP_exception_ctor(&this->e, NULL); +#endif MSVCP_basic_string_char_ctor_cstr(&this->str, EXCEPTION_STR(name)); +#else + MSVCP_exception_ctor(&this->e, name); #endif this->e.vtable = &MSVCP_logic_error_vtable; return this; @@ -327,7 +330,7 @@ logic_error* __thiscall MSVCP_logic_error_copy_ctor( { TRACE("%p %p\n", this, rhs); MSVCP_exception_copy_ctor(&this->e, &rhs->e); -#ifndef _MSVCIRT +#if _MSVCP_VER <= 90 && !defined _MSVCIRT MSVCP_basic_string_char_copy_ctor(&this->str, &rhs->str); #endif this->e.vtable = &MSVCP_logic_error_vtable; @@ -357,7 +360,7 @@ void __thiscall MSVCP_logic_error_dtor(logic_error *this) { TRACE("%p\n", this); MSVCP_exception_dtor(&this->e); -#ifndef _MSVCIRT +#if _MSVCP_VER <= 90 && !defined _MSVCIRT MSVCP_basic_string_char_dtor(&this->str); #endif } @@ -408,7 +411,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_what, 4) const char* __thiscall MSVCP_logic_error_what(logic_error *this) { TRACE("%p\n", this); -#ifdef _MSVCIRT +#if _MSVCP_VER > 90 || defined _MSVCIRT return MSVCP_exception_what( &this->e ); #else return MSVCP_basic_string_char_c_str(&this->str); @@ -543,18 +546,23 @@ DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_t /* runtime_error class data */ typedef struct { exception e; +#if _MSVCP_VER <= 90 && !defined _MSVCIRT basic_string_char str; +#endif } runtime_error; static runtime_error* MSVCP_runtime_error_ctor( runtime_error *this, exception_name name ) { TRACE("%p %s\n", this, EXCEPTION_STR(name)); -#ifdef _MSVCIRT - MSVCP_exception_ctor(&this->e, name); +#if _MSVCP_VER <= 90 && !defined _MSVCIRT +#if _MSVCP_VER == 60 + MSVCP_exception_ctor(&this->e, ""); #else - this->e.name = NULL; - this->e.do_free = FALSE; + MSVCP_exception_ctor(&this->e, NULL); +#endif MSVCP_basic_string_char_ctor_cstr(&this->str, EXCEPTION_STR(name)); +#else + MSVCP_exception_ctor(&this->e, name); #endif this->e.vtable = &MSVCP_runtime_error_vtable; return this; @@ -568,7 +576,7 @@ runtime_error* __thiscall MSVCP_runtime_error_copy_ctor( { TRACE("%p %p\n", this, rhs); MSVCP_exception_copy_ctor(&this->e, &rhs->e); -#ifndef _MSVCIRT +#if _MSVCP_VER <= 90 && !defined _MSVCIRT MSVCP_basic_string_char_copy_ctor(&this->str, &rhs->str); #endif this->e.vtable = &MSVCP_runtime_error_vtable; @@ -596,7 +604,7 @@ void __thiscall MSVCP_runtime_error_dtor(runtime_error *this) { TRACE("%p\n", this); MSVCP_exception_dtor(&this->e); -#ifndef _MSVCIRT +#if _MSVCP_VER <= 90 && !defined _MSVCIRT MSVCP_basic_string_char_dtor(&this->str); #endif } @@ -637,7 +645,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_what, 4) const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) { TRACE("%p\n", this); -#ifdef _MSVCIRT +#if _MSVCP_VER > 90 || defined _MSVCIRT return MSVCP_exception_what( &this->e ); #else return MSVCP_basic_string_char_c_str(&this->str); @@ -911,7 +919,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(MSVCP_exception_what)); EXCEPTION_VTABLE(range_error, VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) - VTABLE_ADD_FUNC(MSVCP_exception_what)); + VTABLE_ADD_FUNC(MSVCP_runtime_error_what)); #ifndef __GNUC__ } #endif

1 0