October 2017 - Wine-Commits

Francois Gouget : testbot: Base LibvirtDomain::IsPoweredOn() on get_state( ).
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: tools Branch: master Commit: bfb23ab81b1bd15ba180fcc05a9d4ef0624134f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bfb23ab81b1bd15ba180fcc0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 19 14:54:16 2017 +0200 testbot: Base LibvirtDomain::IsPoweredOn() on get_state(). is_active() returns true even if the VM is in the process of being reverted (i.e. it uses resources) which is not what we are after. So use get_state() which provides more detailed information. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 20d619a..1b74315 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -273,9 +273,10 @@ sub IsPoweredOn($) return undef; } - my $IsActive; - eval { $IsActive = $Domain->is_active() }; - return $@ ? $self->_Reset(undef) : $IsActive; + my ($State, $_Reason); + eval { ($State, $_Reason) = $Domain->get_state() }; + return $self->_Reset(undef) if ($@); + return ($State == Sys::Virt::Domain::STATE_RUNNING); } sub PowerOff($$)

1 0

Jacek Caban : mshtml: Store event target in DOMEvent.
by Alexandre Julliard Oct. 19, 2017

Oct. 19, 2017

Module: wine Branch: master Commit: 8def42e7552517c2de7dc0999bff1cfdc872aa52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8def42e7552517c2de7dc0999… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 17:02:54 2017 +0200 mshtml: Store event target in DOMEvent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 15 ++++++--------- dlls/mshtml/htmlevent.h | 1 + 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 981c611..294c65c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -229,7 +229,6 @@ struct HTMLEventObj { LONG ref; - EventTarget *target; const event_info_t *type; DOMEvent *event; VARIANT return_value; @@ -282,8 +281,6 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if(This->target) - IDispatchEx_Release(&This->target->dispex.IDispatchEx_iface); if(This->event) IDOMEvent_Release(&This->event->IDOMEvent_iface); release_dispex(&This->dispex); @@ -331,8 +328,8 @@ static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLEle TRACE("(%p)->(%p)\n", This, p); *p = NULL; - if(This->target) - IDispatchEx_QueryInterface(&This->target->dispex.IDispatchEx_iface, &IID_IHTMLElement, (void**)p); + if(This->event && This->event->target) + IDispatchEx_QueryInterface(&This->event->target->dispex.IDispatchEx_iface, &IID_IHTMLElement, (void**)p); return S_OK; } @@ -871,6 +868,8 @@ static ULONG WINAPI DOMEvent_Release(IDOMEvent *iface) TRACE("(%p) ref=%u\n", This, ref); if(!ref) { + if(This->target) + IDispatchEx_Release(&This->target->dispex.IDispatchEx_iface); nsIDOMEvent_Release(This->nsevent); release_dispex(&This->dispex); heap_free(This); @@ -1415,10 +1414,8 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent 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); - if(event_obj) { - event_obj->target = event_target; - IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); - } + 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->event_id); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 9dfd5e7..0bec4ff 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -63,6 +63,7 @@ typedef struct { nsIDOMEvent *nsevent; eventid_t event_id; + EventTarget *target; } DOMEvent; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Store event id in DOMEvent.
by Alexandre Julliard Oct. 19, 2017

Oct. 19, 2017

Module: wine Branch: master Commit: af3376a6ae86ebdb383db97c4e795d0dd887396f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3376a6ae86ebdb383db97c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 17:02:30 2017 +0200 mshtml: Store event id in DOMEvent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 47 +++++++++++++++++++++++++++++++++++++++-------- dlls/mshtml/htmlevent.h | 1 + 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9e6bed5..ffb07ef 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1058,19 +1058,44 @@ static dispex_static_data_t DOMEvent_dispex = { DOMEvent_iface_tids }; -static HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, DOMEvent **ret_event) +static DOMEvent *alloc_event(nsIDOMEvent *nsevent) { DOMEvent *event; event = heap_alloc_zero(sizeof(*event)); if(!event) - return E_OUTOFMEMORY; + return NULL; init_dispex(&event->dispex, (IUnknown*)&event->IDOMEvent_iface, &DOMEvent_dispex); event->IDOMEvent_iface.lpVtbl = &DOMEventVtbl; event->ref = 1; - nsIDOMEvent_AddRef(event->nsevent = nsevent); + event->event_id = EVENTID_LAST; + return event; +} + +static HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, DOMEvent **ret_event) +{ + DOMEvent *event; + nsAString nsstr; + nsresult nsres; + + event = alloc_event(nsevent); + if(!event) + return E_OUTOFMEMORY; + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMEvent_GetType(event->nsevent, &nsstr); + if(NS_SUCCEEDED(nsres)) { + const WCHAR *type; + nsAString_GetData(&nsstr, &type); + event->event_id = str_to_eid(type); + if(event->event_id == EVENTID_LAST) + FIXME("unknown event type %s\n", debugstr_w(type)); + }else { + ERR("GetType failed: %08x\n", nsres); + } + nsAString_Finish(&nsstr); *ret_event = event; return S_OK; @@ -1082,7 +1107,6 @@ HRESULT create_document_event_str(HTMLDocumentNode *doc, const WCHAR *type, IDOM DOMEvent *event; nsAString nsstr; nsresult nsres; - HRESULT hres; nsAString_InitDepend(&nsstr, type); nsres = nsIDOMHTMLDocument_CreateEvent(doc->nsdoc, &nsstr, &nsevent); @@ -1092,10 +1116,10 @@ HRESULT create_document_event_str(HTMLDocumentNode *doc, const WCHAR *type, IDOM return E_FAIL; } - hres = create_event_from_nsevent(nsevent, &event); + event = alloc_event(nsevent); nsIDOMEvent_Release(nsevent); - if(FAILED(hres)) - return hres; + if(!event) + return E_OUTOFMEMORY; *ret_event = &event->IDOMEvent_iface; return S_OK; @@ -1104,6 +1128,7 @@ HRESULT create_document_event_str(HTMLDocumentNode *doc, const WCHAR *type, IDOM static HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEvent **ret_event) { nsIDOMEvent *nsevent; + DOMEvent *event; nsAString nsstr; nsresult nsres; @@ -1115,7 +1140,13 @@ static HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, return E_FAIL; } - return create_event_from_nsevent(nsevent, ret_event); + event = alloc_event(nsevent); + if(!event) + return E_OUTOFMEMORY; + + event->event_id = event_id; + *ret_event = event; + return S_OK; } static handler_vector_t *get_handler_vector(EventTarget *event_target, eventid_t eid, BOOL alloc) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index daf4368..9dfd5e7 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -62,6 +62,7 @@ typedef struct { LONG ref; nsIDOMEvent *nsevent; + eventid_t event_id; } DOMEvent; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Store DOMEvent instead of nsIDOMEvent in HTMLEventObj.
by Alexandre Julliard Oct. 19, 2017

Oct. 19, 2017

Module: wine Branch: master Commit: 3077358aa17f85916cf1e32c9ce822b2f440377c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3077358aa17f85916cf1e32c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 17:02:21 2017 +0200 mshtml: Store DOMEvent instead of nsIDOMEvent in HTMLEventObj. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 201 +++++++++++++++++++++++++----------------------- dlls/mshtml/htmlevent.h | 9 +++ 2 files changed, 112 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3077358aa17f85916cf1e…

1 0

Stefan Dösinger : d3d9/tests: Windows 10 15.07 doesn' t detect external mode changes.
by Alexandre Julliard Oct. 19, 2017

Oct. 19, 2017

Module: wine Branch: master Commit: eb7c1fd62eaac3847c86c855806f9d78c1c9a3a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7c1fd62eaac3847c86c8558… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 19 10:09:22 2017 +0200 d3d9/tests: Windows 10 15.07 doesn't detect external mode changes. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 59a1daf..9dd3553 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2843,11 +2843,13 @@ static void test_wndproc(void) change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x, i=%u.\n", change_ret, i); - /* Native needs a present call to pick up the mode change. */ + /* Native needs a present call to pick up the mode change. Windows 10 15.07 never picks up the mode change + * in these calls and returns S_OK. This is a regression from Windows 8 and has been fixed in later Win10 + * builds. */ hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x, i=%u.\n", hr, i); + todo_wine ok(hr == S_PRESENT_MODE_CHANGED || broken(hr == S_OK), "Got unexpected hr %#x, i=%u.\n", hr, i); hr = IDirect3DDevice9Ex_CheckDeviceState(device, device_window); - todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x, i=%u.\n", hr, i); + todo_wine ok(hr == S_PRESENT_MODE_CHANGED || broken(hr == S_OK), "Got unexpected hr %#x, i=%u.\n", hr, i); expect_messages = tests[i].focus_loss_messages; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or

1 0

Stefan Dösinger : d3d8/tests: Make test_reset more resilient against DPI scaling.
by Alexandre Julliard Oct. 19, 2017

Oct. 19, 2017

Module: wine Branch: master Commit: 1acef2b93d980710966afb331e1eb9e0bac12472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acef2b93d980710966afb331… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 19 10:09:21 2017 +0200 d3d8/tests: Make test_reset more resilient against DPI scaling. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b35de66..9cebd17 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1312,7 +1312,7 @@ static void test_reset(void) UINT mode_count = 0; DEVMODEW devmode; IDirect3D8 *d3d8; - RECT winrect; + RECT winrect, client_rect; D3DVIEWPORT8 vp; D3DCAPS8 caps; DWORD shader; @@ -1579,6 +1579,9 @@ static void test_reset(void) SWP_NOMOVE|SWP_NOZORDER), "SetWindowPos failed\n"); + /* Windows 10 gives us a different size than we requested with some DPI scaling settings (e.g. 172%). */ + GetClientRect(window, &client_rect); + memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = TRUE; @@ -1614,8 +1617,10 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); - ok(vp.Width == 200, "D3DVIEWPORT->Width = %u, expected 200.\n", vp.Width); - ok(vp.Height == 150, "D3DVIEWPORT->Height = %u, expected 150.\n", vp.Height); + ok(vp.Width == client_rect.right, "D3DVIEWPORT->Width = %d, expected %d\n", + vp.Width, client_rect.right); + ok(vp.Height == client_rect.bottom, "D3DVIEWPORT->Height = %d, expected %d\n", + vp.Height, client_rect.bottom); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); } @@ -1627,8 +1632,10 @@ static void test_reset(void) ok(surface_desc.Format == d3ddm.Format, "Got unexpected Format %#x, expected %#x.\n", surface_desc.Format, d3ddm.Format); ok(!surface_desc.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); - ok(surface_desc.Width == 200, "Back buffer width is %u, expected 200.\n", surface_desc.Width); - ok(surface_desc.Height == 150, "Back buffer height is %u, expected 150.\n", surface_desc.Height); + ok(surface_desc.Width == client_rect.right, + "Back buffer width is %u, expected %d.\n", surface_desc.Width, client_rect.right); + ok(surface_desc.Height == client_rect.bottom, + "Back buffer height is %u, expected %d.\n", surface_desc.Height, client_rect.bottom); IDirect3DSurface8_Release(surface); memset(&d3dpp, 0, sizeof(d3dpp));

1 0

Stefan Dösinger : d3d9/tests: Make test_reset more resilient against DPI scaling.
by Alexandre Julliard Oct. 19, 2017

Oct. 19, 2017

Module: wine Branch: master Commit: 975a686aa0ef178447216c8ab2e2c945e145832e URL: http://source.winehq.org/git/wine.git/?a=commit;h=975a686aa0ef178447216c8ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 19 10:09:20 2017 +0200 d3d9/tests: Make test_reset more resilient against DPI scaling. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 53 ++++++++++++++++++++++++++++++++---------------- dlls/d3d9/tests/device.c | 23 ++++++++++++++------- 2 files changed, 51 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=975a686aa0ef178447216…

1 0

Jacek Caban : mshtml: Pass DOMEvent to call_event_handlers.
by Alexandre Julliard Oct. 19, 2017

Oct. 19, 2017

Module: wine Branch: master Commit: 22cfd58540eaae10d9334c50e34f251a0e427fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22cfd58540eaae10d9334c50e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 17:03:26 2017 +0200 mshtml: Pass DOMEvent to 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 | 7 ++++--- dlls/mshtml/htmlevent.h | 3 ++- dlls/mshtml/xmlhttprequest.c | 10 ++++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 294c65c..00b9524 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1073,7 +1073,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent) return event; } -static HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, DOMEvent **ret_event) +HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, DOMEvent **ret_event) { DOMEvent *event; nsAString nsstr; @@ -1244,8 +1244,9 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) return FALSE; } -void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, eventid_t eid) +void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOMEvent *event) { + const eventid_t eid = event->event_id; handler_vector_t *handler_vector = get_handler_vector(event_target, eid, FALSE); const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; ConnectionPointContainer *cp_container = NULL; @@ -1418,7 +1419,7 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); for(i = 0; i < chain_cnt; i++) { - call_event_handlers(event_obj, target_chain[i], event->event_id); + call_event_handlers(event_obj, target_chain[i], event); if(!(event_flags & EVENT_BUBBLES) || (event_obj && event_obj->cancel_bubble)) break; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 0bec4ff..2230608 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -83,9 +83,10 @@ void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*) D HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,eventid_t) DECLSPEC_HIDDEN; typedef struct HTMLEventObj HTMLEventObj; -void call_event_handlers(HTMLEventObj*,EventTarget*,eventid_t); +void call_event_handlers(HTMLEventObj*,EventTarget*,DOMEvent*); HRESULT create_document_event_str(HTMLDocumentNode*,const WCHAR*,IDOMEvent**) DECLSPEC_HIDDEN; +HRESULT create_event_from_nsevent(nsIDOMEvent*,DOMEvent**) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 1e77c2b..1563870 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -181,16 +181,22 @@ static nsrefcnt NSAPI XMLHttpReqEventListener_Release(nsIDOMEventListener *iface return ref; } -static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *iface, nsIDOMEvent *event) +static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *iface, nsIDOMEvent *nsevent) { XMLHttpReqEventListener *This = impl_from_nsIDOMEventListener(iface); + DOMEvent *event; + HRESULT hres; TRACE("(%p)\n", This); if(!This->xhr) return NS_OK; - call_event_handlers(NULL, &This->xhr->event_target, EVENTID_READYSTATECHANGE); + hres = create_event_from_nsevent(nsevent, &event); + if(SUCCEEDED(hres) ){ + call_event_handlers(NULL, &This->xhr->event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); + } return NS_OK; }

1 0

Jacek Caban : mshtml: Pass DOMEvent instead of event id to fire_event_obj.
by Alexandre Julliard Oct. 19, 2017

Oct. 19, 2017

Module: wine Branch: master Commit: bbfe9e768a0a6ae318b88c52e97603223e01777e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfe9e768a0a6ae318b88c52e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 17:02:46 2017 +0200 mshtml: Pass DOMEvent instead of event id to fire_event_obj. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ffb07ef..981c611 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1362,7 +1362,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, eve } } -static void fire_event_obj(EventTarget *event_target, eventid_t eid, HTMLEventObj *event_obj) +static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEventObj *event_obj) { EventTarget *target_chain_buf[8], **target_chain = target_chain_buf; unsigned chain_cnt, chain_buf_size, i; @@ -1370,10 +1370,17 @@ static void fire_event_obj(EventTarget *event_target, eventid_t eid, HTMLEventOb IHTMLEventObj *prev_event = NULL; BOOL prevent_default = FALSE; EventTarget *iter; + DWORD event_flags; HRESULT hres; - TRACE("(%p) %s\n", event_target, debugstr_w(event_info[eid].name)); + if(event->event_id == EVENTID_LAST) { + FIXME("Unsupported on unknown events\n"); + return; + } + + TRACE("(%p) %s\n", event_target, debugstr_w(event_info[event->event_id].name)); + event_flags = event_info[event->event_id].flags; iter = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); @@ -1414,8 +1421,8 @@ static void fire_event_obj(EventTarget *event_target, eventid_t eid, HTMLEventOb } for(i = 0; i < chain_cnt; i++) { - call_event_handlers(event_obj, target_chain[i], eid); - if(!(event_info[eid].flags & EVENT_BUBBLES) || (event_obj && event_obj->cancel_bubble)) + call_event_handlers(event_obj, target_chain[i], event->event_id); + if(!(event_flags & EVENT_BUBBLES) || (event_obj && event_obj->cancel_bubble)) break; } @@ -1428,13 +1435,13 @@ static void fire_event_obj(EventTarget *event_target, eventid_t eid, HTMLEventOb if(event_obj && event_obj->prevent_default) prevent_default = TRUE; - if(event_info[eid].flags & EVENT_HASDEFAULTHANDLERS) { + if(event_flags & EVENT_HASDEFAULTHANDLERS) { for(i = 0; !prevent_default && i < chain_cnt; i++) { vtbl = dispex_get_vtbl(&target_chain[i]->dispex); if(!vtbl || !vtbl->handle_event_default) continue; - hres = vtbl->handle_event_default(&event_target->dispex, eid, - event_obj && event_obj->event ? event_obj->event->nsevent : NULL, &prevent_default); + hres = vtbl->handle_event_default(&event_target->dispex, event->event_id, + event->nsevent, &prevent_default); if(FAILED(hres) || (event_obj && event_obj->cancel_bubble)) break; } @@ -1445,9 +1452,9 @@ static void fire_event_obj(EventTarget *event_target, eventid_t eid, HTMLEventOb if(target_chain != target_chain_buf) heap_free(target_chain); - if(prevent_default && event_obj && event_obj->event && event_obj->event->nsevent) { + if(prevent_default) { TRACE("calling PreventDefault\n"); - nsIDOMEvent_PreventDefault(event_obj->event->nsevent); + nsIDOMEvent_PreventDefault(event->nsevent); } } @@ -1473,7 +1480,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarge event_obj->type = event_info + eid; } - fire_event_obj(target, eid, event_obj); + fire_event_obj(target, event, event_obj); if(event_obj) IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); @@ -1527,7 +1534,7 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even hres = create_document_event(node->doc, eid, &event_obj->event); if(SUCCEEDED(hres)) - fire_event_obj(&node->event_target, eid, event_obj); + fire_event_obj(&node->event_target, event_obj->event, event_obj); if(event_obj) IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface);

1 0

Jacek Caban : mshtml: Set current event target in fire_event_obj.
by Alexandre Julliard Oct. 19, 2017

Oct. 19, 2017

Module: wine Branch: master Commit: 0a288a2e9122e1b1cd7cb2aa7f4b15ef8c2526df URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a288a2e9122e1b1cd7cb2aa7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 17:01:55 2017 +0200 mshtml: Set current event target in fire_event_obj. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 14 ++++++++------ dlls/mshtml/tests/events.html | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6f81a89..cffd6c8 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -812,7 +812,7 @@ static HTMLEventObj *create_event(void) return ret; } -static HRESULT set_event_info(HTMLEventObj *event, EventTarget *target, eventid_t eid, HTMLDocumentNode *doc, nsIDOMEvent *nsevent) +static HRESULT set_event_info(HTMLEventObj *event, eventid_t eid, HTMLDocumentNode *doc, nsIDOMEvent *nsevent) { event->type = event_info+eid; event->nsevent = nsevent; @@ -832,9 +832,6 @@ static HRESULT set_event_info(HTMLEventObj *event, EventTarget *target, eventid_ } } - event->target = target; - if(target) - IDispatchEx_AddRef(&target->dispex.IDispatchEx_iface); return S_OK; } @@ -1109,6 +1106,11 @@ static void fire_event_obj(EventTarget *event_target, eventid_t eid, HTMLEventOb 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); + if(event_obj) { + event_obj->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], eid); if(!(event_info[eid].flags & EVENT_BUBBLES) || (event_obj && event_obj->cancel_bubble)) @@ -1156,7 +1158,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarge if(!event_obj) return; - hres = set_event_info(event_obj, target, eid, doc, nsevent); + hres = set_event_info(event_obj, eid, doc, nsevent); if(FAILED(hres)) { IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); return; @@ -1206,7 +1208,7 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even } if(event_obj) { - hres = set_event_info(event_obj, &node->event_target, eid, node->doc, NULL); + hres = set_event_info(event_obj, eid, node->doc, NULL); if(SUCCEEDED(hres)) fire_event_obj(&node->event_target, eid, event_obj); diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index ffbd115..9e27491 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -176,6 +176,21 @@ function test_body_events() { ok(onclick_called, "onclick handler not invoked"); } +function test_event_target() { + var div = document.createElement("div"); + document.body.appendChild(div); + + var last_event_arg; + div.attachEvent("onclick", function(event_arg) { + ok(event_arg.srcElement === div, "srcElement != div"); + last_event_arg = event_arg; + }); + + div.click(); + with(todo_wine) + ok(last_event_arg.srcElement === null, "srcElement != null"); +} + window.onload = function() { try { ok(inlscr_complete_called, "onreadystatechange not fired"); @@ -198,6 +213,7 @@ window.onload = function() { test_insert_script(); test_string_event_handler(); test_body_events(); + test_event_target(); }catch(e) { ok(false, "Got an exception: " + e.message); }

1 0