wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Zebediah Figura : version: Use the string value length when converting strings.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: bec279d8c1d571e0fe9f03e3215f489b60a71af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bec279d8c1d571e0fe9f03e32… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 29 21:15:01 2017 +0100 version: Use the string value length when converting strings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index ed060c8..13436ca 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1010,6 +1010,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, BOOL ret, isText; INT len; LPWSTR lpSubBlockW; + UINT value_len; len = MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, NULL, 0); lpSubBlockW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); @@ -1019,7 +1020,8 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, lpSubBlockW, len); - ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, puLen, &isText); + ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, &value_len, &isText); + if (puLen) *puLen = value_len; HeapFree(GetProcessHeap(), 0, lpSubBlockW); @@ -1030,8 +1032,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, */ LPSTR lpBufferA = (LPSTR)pBlock + info->wLength + 4; DWORD pos = (LPCSTR)*lplpBuffer - (LPCSTR)pBlock; - - len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, -1, + len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, value_len, lpBufferA + pos, info->wLength - pos, NULL, NULL); *lplpBuffer = lpBufferA + pos; if (puLen) *puLen = len;

1 0

Alistair Leslie-Hughes : midimap: Check each Midi Output for a Midi Through synthesizer.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: efe0a09fb57567b79a8e0f2b170499241c9aab65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe0a09fb57567b79a8e0f2b1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 26 01:26:18 2017 +0000 midimap: Check each Midi Output for a Midi Through synthesizer. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index f36b252..16707bb 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -574,7 +574,7 @@ static LRESULT MIDIMAP_drvOpen(void) midiOutPorts[dev].lpbPatch = NULL; for (i = 0; i < 16; i++) midiOutPorts[dev].aChn[i] = i; - if (strncmpW(midiOutPorts[0].name, throughportW, strlenW(throughportW)) != 0) + if (strncmpW(midiOutPorts[dev].name, throughportW, strlenW(throughportW)) != 0) found_valid_port = TRUE; } else

1 0

Jacek Caban : mshtml: Release listeners in call_event_handlers.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: d2552c06a0c2c6f259960d92414ca1847d5f75c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2552c06a0c2c6f259960d924… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 23:20:39 2017 +0200 mshtml: Release listeners in call_event_handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a3359e0..f9d2460 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1439,6 +1439,8 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } } + for(listener = listeners; listener < listeners + listeners_cnt; listener++) + IDispatch_Release(listener->function); if(listeners != listeners_buf) heap_free(listeners); if(event->phase == DEP_CAPTURING_PHASE)

1 0

Michael Stefaniuc : wmvcore: Print the debug string and not the pointer to it.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 81c38c87852ff8d2302fb747eabbdfb3320796ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c38c87852ff8d2302fb747e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 25 23:06:40 2017 +0200 wmvcore: Print the debug string and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/wmvcore_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index be07909..ae8b486 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -1490,7 +1490,7 @@ static HRESULT WINAPI headerinfo_AddScript(IWMHeaderInfo3 *iface, LPCWSTR_WMSDK_ LPCWSTR_WMSDK_TYPE_SAFE command, QWORD script_time) { WMReader *This = impl_from_IWMHeaderInfo3(iface); - FIXME("%p, %s, %p, %s\n", This, debugstr_w(type), debugstr_w(command), wine_dbgstr_longlong(script_time)); + FIXME("%p, %s, %s, %s\n", This, debugstr_w(type), debugstr_w(command), wine_dbgstr_longlong(script_time)); return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Don't set no_event_obj for XHR events.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: 17d43ef54e4eaaa549fba0b8aed4a816b42c7154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d43ef54e4eaaa549fba0b8a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 18:14:12 2017 +0200 mshtml: Don't set no_event_obj for XHR events. It's no longer needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index a107fa2..bbe2833 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -194,7 +194,6 @@ static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *i hres = create_event_from_nsevent(nsevent, &event); if(SUCCEEDED(hres) ){ - event->no_event_obj = TRUE; dispatch_event(&This->xhr->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); }

1 0

Jacek Caban : mshtml/tests: Added addEventListener tests.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: b81eea83da2c18af742d3f68a70f5ac506eec5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81eea83da2c18af742d3f68a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 18:14:05 2017 +0200 mshtml/tests: Added addEventListener tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 98 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 91ec4b6..4f57745 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -62,6 +62,8 @@ DEFINE_EXPECT(body_onclick); DEFINE_EXPECT(doc_onclick_attached); DEFINE_EXPECT(div_onclick); DEFINE_EXPECT(div_onclick_attached); +DEFINE_EXPECT(div_onclick_capture); +DEFINE_EXPECT(div_onclick_bubble); DEFINE_EXPECT(timeout); DEFINE_EXPECT(doccp_onclick); DEFINE_EXPECT(doccp_onclick_cancel); @@ -756,6 +758,42 @@ static void _elem_attach_event(unsigned line, IUnknown *unk, const char *namea, ok_(__FILE__,line)(res == VARIANT_TRUE, "attachEvent returned %x\n", res); } +#define add_event_listener(a,b,c,d) _add_event_listener(__LINE__,a,b,c,d) +static void _add_event_listener(unsigned line, IUnknown *unk, const char *type, IDispatch *listener, VARIANT_BOOL use_capture) +{ + IEventTarget *event_target; + BSTR str; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IEventTarget, (void**)&event_target); + ok_(__FILE__,line)(hres == S_OK, "Could not get IEventTarget iface: %08x\n", hres); + + str = a2bstr(type); + hres = IEventTarget_addEventListener(event_target, str, listener, use_capture); + SysFreeString(str); + ok_(__FILE__,line)(hres == S_OK, "addEventListener failed: %08x\n", hres); + + IEventTarget_Release(event_target); +} + +#define remove_event_listener(a,b,c,d) _remove_event_listener(__LINE__,a,b,c,d) +static void _remove_event_listener(unsigned line, IUnknown *unk, const char *type, IDispatch *listener, VARIANT_BOOL use_capture) +{ + IEventTarget *event_target; + BSTR str; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IEventTarget, (void**)&event_target); + ok_(__FILE__,line)(hres == S_OK, "Could not get IEventTarget iface: %08x\n", hres); + + str = a2bstr(type); + hres = IEventTarget_removeEventListener(event_target, str, listener, use_capture); + SysFreeString(str); + ok_(__FILE__,line)(hres == S_OK, "removeEventListener failed: %08x\n", hres); + + IEventTarget_Release(event_target); +} + #define elem_detach_event(a,b,c) _elem_detach_event(__LINE__,a,b,c) static void _elem_detach_event(unsigned line, IUnknown *unk, const char *namea, IDispatch *disp) { @@ -998,6 +1036,30 @@ static HRESULT WINAPI body_onclick(IDispatchEx *iface, DISPID id, LCID lcid, WOR EVENT_HANDLER_FUNC_OBJ(body_onclick); +static HRESULT WINAPI div_onclick_capture(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(div_onclick_capture); + + test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("DIV"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(div_onclick_capture); + +static HRESULT WINAPI div_onclick_bubble(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(div_onclick_bubble); + + test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("DIV"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(div_onclick_bubble); + static HRESULT WINAPI img_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1810,6 +1872,11 @@ static void test_onclick(IHTMLDocument2 *doc) ok(V_DISPATCH(&v) == (IDispatch*)&document_onclick_obj, "V_DISPATCH(onclick) != onclickFunc\n"); VariantClear(&v); + if(document_mode >= 9) { + add_event_listener((IUnknown*)div, "click", (IDispatch*)&div_onclick_capture_obj, VARIANT_TRUE); + add_event_listener((IUnknown*)div, "click", (IDispatch*)&div_onclick_bubble_obj, VARIANT_FALSE); + } + body = doc_get_body(doc); V_VT(&v) = VT_DISPATCH; @@ -1817,7 +1884,7 @@ static void test_onclick(IHTMLDocument2 *doc) hres = IHTMLElement_put_onclick(body, v); ok(hres == S_OK, "put_onclick failed: %08x\n", hres); - if(winetest_interactive) { + if(winetest_interactive && document_mode < 9) { SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); @@ -1833,6 +1900,10 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_attached); + if(document_mode >= 9) { + SET_EXPECT(div_onclick_capture); + SET_EXPECT(div_onclick_bubble); + } SET_EXPECT(body_onclick); SET_EXPECT(document_onclick); SET_EXPECT(invoke_onclick); @@ -1842,6 +1913,10 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(div_onclick); CHECK_CALLED(div_onclick_attached); + if(document_mode >= 9) { + CHECK_CALLED(div_onclick_capture); + CHECK_CALLED(div_onclick_bubble); + } CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); CHECK_CALLED(invoke_onclick); @@ -1868,6 +1943,10 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_disp); SET_EXPECT(div_onclick_attached); + if(document_mode >= 9) { + SET_EXPECT(div_onclick_capture); + SET_EXPECT(div_onclick_bubble); + } SET_EXPECT(body_onclick); SET_EXPECT(document_onclick); SET_EXPECT(doc_onclick_attached); @@ -1880,6 +1959,10 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(div_onclick); CHECK_CALLED(div_onclick_disp); CHECK_CALLED(div_onclick_attached); + if(document_mode >= 9) { + CHECK_CALLED(div_onclick_capture); + CHECK_CALLED(div_onclick_bubble); + } CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); CHECK_CALLED(doc_onclick_attached); @@ -1891,6 +1974,10 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_disp); SET_EXPECT(div_onclick_attached); + if(document_mode >= 9) { + SET_EXPECT(div_onclick_capture); + SET_EXPECT(div_onclick_bubble); + } SET_EXPECT(elem2_cp_onclick); SET_EXPECT(body_onclick); SET_EXPECT(document_onclick); @@ -1906,6 +1993,10 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(div_onclick); CHECK_CALLED(div_onclick_disp); CHECK_CALLED(div_onclick_attached); + if(document_mode >= 9) { + CHECK_CALLED(div_onclick_capture); + CHECK_CALLED(div_onclick_bubble); + } CHECK_CALLED(elem2_cp_onclick); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); @@ -1929,6 +2020,11 @@ static void test_onclick(IHTMLDocument2 *doc) elem_detach_event((IUnknown*)div, "test", (IDispatch*)&div_onclick_disp); doc_detach_event(doc, "onclick", (IDispatch*)&doc_onclick_attached_obj); + if(document_mode >= 9) { + remove_event_listener((IUnknown*)div, "click", (IDispatch*)&div_onclick_capture_obj, VARIANT_TRUE); + remove_event_listener((IUnknown*)div, "click", (IDispatch*)&div_onclick_bubble_obj, VARIANT_FALSE); + } + SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); SET_EXPECT(document_onclick);

1 0

Jacek Caban : mshtml: Added support for capturing event phase.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: 2bffe9af8d5e6360dc1e977535d41acf2e64c649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bffe9af8d5e6360dc1e97753… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 18:13:54 2017 +0200 mshtml: Added support for capturing event phase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 778b692..a3359e0 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1551,8 +1551,15 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) event->target = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); - event->phase = DEP_AT_TARGET; - call_event_handlers(target_chain[0], event); + event->phase = DEP_CAPTURING_PHASE; + i = chain_cnt-1; + while(!event->stop_propagation && i) + call_event_handlers(target_chain[i--], event); + + if(!event->stop_propagation) { + event->phase = DEP_AT_TARGET; + call_event_handlers(target_chain[0], event); + } if(event_flags & EVENT_BUBBLES) { event->phase = DEP_BUBBLING_PHASE;

1 0

Jacek Caban : mshtml: Added IDOMEvent::removeEventListener implementation.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: 8e32ee6aad43a9dfc7c7f7f05b14795c0fdb0560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e32ee6aad43a9dfc7c7f7f05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 18:13:42 2017 +0200 mshtml: Added IDOMEvent::removeEventListener implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3334324..778b692 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2125,8 +2125,18 @@ static HRESULT WINAPI EventTarget_removeEventListener(IEventTarget *iface, BSTR IDispatch *listener, VARIANT_BOOL capture) { EventTarget *This = impl_from_IEventTarget(iface); - FIXME("(%p)->(%s %p %x)\n", This, debugstr_w(type), listener, capture); - return E_NOTIMPL; + eventid_t eid; + + TRACE("(%p)->(%s %p %x)\n", This, debugstr_w(type), listener, capture); + + eid = str_to_eid(type); + if(eid == EVENTID_LAST) { + FIXME("Unsupported on event %s\n", debugstr_w(type)); + return E_NOTIMPL; + } + + remove_event_listener(This, eid, capture ? LISTENER_TYPE_CAPTURE : LISTENER_TYPE_BUBBLE, listener); + return S_OK; } static HRESULT WINAPI EventTarget_dispatchEvent(IEventTarget *iface, IDOMEvent *event, VARIANT_BOOL *result)

1 0

Jacek Caban : mshtml: Added IDOMEvent::addEventListener implementation.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: da8c7dde864d3c1a6f7a2d87fc0d7d6d29539c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8c7dde864d3c1a6f7a2d87f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 18:13:35 2017 +0200 mshtml: Added IDOMEvent::addEventListener implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 88282c0..3334324 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef enum { + LISTENER_TYPE_CAPTURE, + LISTENER_TYPE_BUBBLE, LISTENER_TYPE_ONEVENT, LISTENER_TYPE_ATTACHED } listener_type_t; @@ -1344,6 +1346,14 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) if(use_quirks || event->phase == DEP_CAPTURING_PHASE) continue; break; + case LISTENER_TYPE_CAPTURE: + if(event->phase == DEP_BUBBLING_PHASE || event->in_fire_event) + continue; + break; + case LISTENER_TYPE_BUBBLE: + if(event->in_fire_event) + continue; + /* fallthrough */ case LISTENER_TYPE_ATTACHED: if(event->phase == DEP_CAPTURING_PHASE) continue; @@ -2074,11 +2084,41 @@ static HRESULT WINAPI EventTarget_Invoke(IEventTarget *iface, DISPID dispIdMembe } static HRESULT WINAPI EventTarget_addEventListener(IEventTarget *iface, BSTR type, - IDispatch *listener, VARIANT_BOOL capture) + IDispatch *function, VARIANT_BOOL capture) { EventTarget *This = impl_from_IEventTarget(iface); - FIXME("(%p)->(%s %p %x)\n", This, debugstr_w(type), listener, capture); - return E_NOTIMPL; + listener_type_t listener_type = capture ? LISTENER_TYPE_CAPTURE : LISTENER_TYPE_BUBBLE; + listener_container_t *container; + event_listener_t *listener; + eventid_t eid; + + TRACE("(%p)->(%s %p %x)\n", This, debugstr_w(type), function, capture); + + eid = str_to_eid(type); + if(eid == EVENTID_LAST) { + FIXME("Unsupported on event %s\n", debugstr_w(type)); + return E_NOTIMPL; + } + + + container = get_listener_container(This, eid, TRUE); + if(!container) + return E_OUTOFMEMORY; + + /* check for duplicates */ + LIST_FOR_EACH_ENTRY(listener, &container->listeners, event_listener_t, entry) { + if(listener->type == listener_type && listener->function == function) + return S_OK; + } + + listener = heap_alloc(sizeof(*listener)); + if(!listener) + return E_OUTOFMEMORY; + + listener->type = listener_type; + IDispatch_AddRef(listener->function = function); + list_add_tail(&container->listeners, &listener->entry); + return S_OK; } static HRESULT WINAPI EventTarget_removeEventListener(IEventTarget *iface, BSTR type,

1 0

Jacek Caban : mshtml: Properly invoke event listeners in IE9+ mode.
by Alexandre Julliard 25 Oct '17

25 Oct '17

Module: wine Branch: master Commit: d1f1e93c4659032cd6e24d44a746bf35046d1bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f1e93c4659032cd6e24d44a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 25 18:13:26 2017 +0200 mshtml: Properly invoke event listeners in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 55 ++++++++++++++++++++++++++++++++++++++++++---- dlls/mshtml/htmlevent.h | 3 ++- dlls/mshtml/tests/events.c | 42 +++++++++++++++++++++++++++++++++-- 3 files changed, 93 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 8ca94eb..88282c0 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1292,6 +1292,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) const eventid_t eid = event->event_id; const listener_container_t *container = get_listener_container(event_target, eid, FALSE); const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; + const BOOL use_quirks = use_event_quirks(event_target); event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; unsigned listeners_cnt, listeners_size; ConnectionPointContainer *cp_container = NULL; @@ -1299,9 +1300,10 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) VARIANT v; HRESULT hres; - if(container && !list_empty(&container->listeners)) { + if(use_quirks && container && !list_empty(&container->listeners) + && event->phase != DEP_CAPTURING_PHASE) { listener = LIST_ENTRY(list_tail(&container->listeners), event_listener_t, entry); - if(listener->function && listener->type == LISTENER_TYPE_ONEVENT) { + if(listener && listener->function && listener->type == LISTENER_TYPE_ONEVENT) { DISPID named_arg = DISPID_THIS; VARIANTARG arg; DISPPARAMS dp = {&arg, &named_arg, 1, 1}; @@ -1337,6 +1339,16 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) LIST_FOR_EACH_ENTRY(listener, &container->listeners, event_listener_t, entry) { if(!listener->function) continue; + switch(listener->type) { + case LISTENER_TYPE_ONEVENT: + if(use_quirks || event->phase == DEP_CAPTURING_PHASE) + continue; + break; + case LISTENER_TYPE_ATTACHED: + if(event->phase == DEP_CAPTURING_PHASE) + continue; + break; + } if(listeners_cnt == listeners_size) { event_listener_t *new_listeners; @@ -1359,7 +1371,37 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } for(listener = listeners; listener < listeners + listeners_cnt; listener++) { - if(listener->type == LISTENER_TYPE_ATTACHED) { + if(listener->type != LISTENER_TYPE_ATTACHED) { + DISPID named_arg = DISPID_THIS; + VARIANTARG args[2]; + DISPPARAMS dp = {args, &named_arg, 2, 1}; + + V_VT(args) = VT_DISPATCH; + V_DISPATCH(args) = (IDispatch*)&event_target->dispex.IDispatchEx_iface; + V_VT(args+1) = VT_DISPATCH; + V_DISPATCH(args+1) = event->in_fire_event + ? (IDispatch*)event->event_obj : (IDispatch*)&event->IDOMEvent_iface; + V_VT(&v) = VT_EMPTY; + + TRACE("%s >>>\n", debugstr_w(event_info[event->event_id].name)); + hres = call_disp_func(listener->function, &dp, &v); + if(hres == S_OK) { + TRACE("%s <<< %s\n", debugstr_w(event_info[event->event_id].name), + debugstr_variant(&v)); + + if(cancelable) { + if(V_VT(&v) == VT_BOOL) { + if(!V_BOOL(&v)) + IDOMEvent_preventDefault(&event->IDOMEvent_iface); + }else if(V_VT(&v) != VT_EMPTY) { + FIXME("unhandled result %s\n", debugstr_variant(&v)); + } + } + VariantClear(&v); + }else { + WARN("%s <<< %08x\n", debugstr_w(event_info[event->event_id].name), hres); + } + }else { VARIANTARG arg; DISPPARAMS dp = {&arg, NULL, 1, 0}; @@ -1588,7 +1630,9 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va if(SUCCEEDED(hres)) { event_obj->event->event_obj = &event_obj->IHTMLEventObj_iface; + event_obj->event->in_fire_event++; dispatch_event(&node->event_target, event_obj->event); + event_obj->event->in_fire_event--; event_obj->event->event_obj = NULL; } @@ -1826,7 +1870,10 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI listener->type = LISTENER_TYPE_ATTACHED; IDispatch_AddRef(listener->function = disp); - list_add_head(&container->listeners, &listener->entry); + if(use_event_quirks(event_target)) + list_add_head(&container->listeners, &listener->entry); + else + list_add_tail(&container->listeners, &listener->entry); *res = VARIANT_TRUE; return S_OK; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 97d34af..eaf42eb 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -66,10 +66,11 @@ typedef struct { EventTarget *target; BOOL prevent_default; BOOL stop_propagation; - USHORT phase; + DOM_EVENT_PHASE phase; IHTMLEventObj *event_obj; BOOL no_event_obj; + unsigned in_fire_event; } DOMEvent; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index ac7ae43..91ec4b6 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -93,6 +93,7 @@ static IHTMLWindow2 *window; static IOleDocumentView *view; static BOOL is_ie9plus; static int document_mode; +static unsigned in_fire_event; typedef struct { LONG x; @@ -358,7 +359,9 @@ static void _elem_fire_event(unsigned line, IUnknown *unk, const char *event, VA b = 100; str = a2bstr(event); + in_fire_event++; hres = IHTMLElement3_fireEvent(elem3, str, evobj, &b); + in_fire_event--; SysFreeString(str); ok_(__FILE__,line)(hres == S_OK, "fireEvent failed: %08x\n", hres); ok_(__FILE__,line)(b == VARIANT_TRUE, "fireEvent returned %x\n", b); @@ -371,20 +374,51 @@ static void _test_event_args(unsigned line, const IID *dispiid, DISPID id, WORD ok_(__FILE__,line) (id == DISPID_VALUE, "id = %d\n", id); ok_(__FILE__,line) (wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); ok_(__FILE__,line) (pdp != NULL, "pdp == NULL\n"); - todo_wine_if(document_mode >= 9) ok_(__FILE__,line) (pdp->cArgs == (document_mode < 9 ? 1 : 2), "pdp->cArgs = %d\n", pdp->cArgs); ok_(__FILE__,line) (pdp->cNamedArgs == 1, "pdp->cNamedArgs = %d\n", pdp->cNamedArgs); ok_(__FILE__,line) (pdp->rgdispidNamedArgs[0] == DISPID_THIS, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); ok_(__FILE__,line) (V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); if(pdp->cArgs > 1) - ok_(__FILE__,line) (V_VT(pdp->rgvarg+1) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); + ok_(__FILE__,line) (V_VT(pdp->rgvarg+1) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg+1)); ok_(__FILE__,line) (pvarRes != NULL, "pvarRes == NULL\n"); ok_(__FILE__,line) (pei != NULL, "pei == NULL"); ok_(__FILE__,line) (!pspCaller, "pspCaller != NULL\n"); if(dispiid) _test_disp(line, (IUnknown*)V_DISPATCH(pdp->rgvarg), dispiid); + + if(pdp->cArgs > 1) { + IHTMLEventObj *window_event, *event_obj; + IDOMEvent *event; + HRESULT hres; + + hres = IDispatch_QueryInterface(V_DISPATCH(pdp->rgvarg+1), &IID_IDOMEvent, (void**)&event); + if(in_fire_event) + ok(hres == E_NOINTERFACE, "QI(IID_IDOMEvent) returned %08x\n", hres); + else + ok(hres == S_OK, "Could not get IDOMEvent iface: %08x\n", hres); + + hres = IDispatch_QueryInterface(V_DISPATCH(pdp->rgvarg+1), &IID_IHTMLEventObj, (void**)&event_obj); + if(in_fire_event) + ok(hres == S_OK, "Could not get IDOMEventObj iface: %08x\n", hres); + else + ok(hres == E_NOINTERFACE, "QI(IID_IHTMLEventObj) returned %08x\n", hres); + + if(event) + IDOMEvent_Release(event); + if(event_obj) + IHTMLEventObj_Release(event_obj); + + hres = IHTMLWindow2_get_event(window, &window_event); + ok(hres == S_OK, "get_event failed: %08x\n", hres); + if(window_event) { + todo_wine_if(in_fire_event) + ok(!iface_cmp((IUnknown*)V_DISPATCH(pdp->rgvarg+1), (IUnknown*)window_event), + "window_event != event arg\n"); + IHTMLEventObj_Release(window_event); + } + } } #define test_attached_event_args(a,b,c,d,e) _test_attached_event_args(__LINE__,a,b,c,d,e) @@ -666,6 +700,7 @@ static void _test_event_srcfilter(unsigned line, IHTMLEventObj *event) static void _test_event_obj(unsigned line, const char *type, const xy_test_t *xy) { IHTMLEventObj *event = _get_event_obj(line); + IDOMEvent *dom_event; VARIANT v; HRESULT hres; @@ -699,6 +734,9 @@ static void _test_event_obj(unsigned line, const char *type, const xy_test_t *xy if(V_VT(&v) == VT_BOOL) ok_(__FILE__,line)(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(returnValue) = %x\n", V_BOOL(&v)); + hres = IHTMLEventObj_QueryInterface(event, &IID_IDOMEvent, (void**)&dom_event); + ok(hres == E_NOINTERFACE, "Could not get IDOMEvent iface: %08x\n", hres); + IHTMLEventObj_Release(event); }

1 0

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