wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Francois Gouget : testbot: Monitor offline VMs and automatically put them back online.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: tools Branch: master Commit: 51b379e666f7962a00d143208f1384282dfd1306 URL: http://source.winehq.org/git/tools.git/?a=commit;h=51b379e666f7962a00d14320… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 19 14:53:27 2017 +0200 testbot: Monitor offline VMs and automatically put them back online. When a VM goes offline, start a LibvirtTool process to monitor it and put it back online as soon as we can access it again. This makes the TestBot resilient to temporary network outages and VM host reboots. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 4 ++- testbot/bin/LibvirtTool.pl | 60 ++++++++++++++++++++++++++++++++++++++--- testbot/lib/WineTestBot/Jobs.pm | 18 ++++++++----- testbot/lib/WineTestBot/VMs.pm | 31 ++++++++++++++++++--- 4 files changed, 100 insertions(+), 13 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 02c361c..e6755bc 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -181,7 +181,9 @@ sub Cleanup(;$$) if ($KillVMs) { $VM->KillChild(); - $VM->RunPowerOff(); + # $KillVMs is normally used on shutdown so don't start a process that + # will get stuck 'forever' waiting for an offline VM. + $VM->RunPowerOff() if ($VM->Status ne "offline"); } elsif (!$VM->CanHaveChild()) { diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index fcc0e81..ab97261 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# Performs poweroff and revert operations on the specified VM. +# Performs poweroff, revert and other operations on the specified VM. # These operations can take quite a bit of time, particularly in case of # network trouble, and thus are best performed in a separate process. # @@ -104,7 +104,7 @@ while (@ARGV) { $LogOnly = 1; } - elsif ($Arg =~ /^(?:checkidle|poweroff|revert)$/) + elsif ($Arg =~ /^(?:checkidle|monitor|poweroff|revert)$/) { $Action = $Arg; } @@ -163,7 +163,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|poweroff|revert) VMName\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|monitor|poweroff|revert) VMName\n"; exit $Usage; } @@ -251,6 +251,56 @@ sub ChangeStatus($$;$) return 0; } +sub Monitor() +{ + $CurrentStatus = "offline"; + while (1) + { + # Get a fresh status + $VM = CreateVMs()->GetItem($VMKey); + if (!defined $VM or $VM->Role eq "retired" or $VM->Role eq "deleted" or + $VM->Status eq "maintenance") + { + my $Reason = $VM ? "Role=". $VM->Role ."\nStatus=". $VM->Status : + "$VMKey does not exist anymore"; + NotifyAdministrator("The $VMKey VM is not relevant anymore", + "The $VMKey VM was offline but ceased to be relevant after ". + Elapsed($Start). " seconds:\n\n$Reason\n"); + return 1; + } + if ($VM->Status ne "offline") + { + NotifyAdministrator("The $VMKey VM is working again (". $VM->Status .")", + "The status of the $VMKey VM unexpectedly switched from offline\n". + "to ". $VM->Status ." after ". Elapsed($Start) + ." seconds."); + return 0; + } + + my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); + if ($IsPoweredOn) + { + my $ErrMessage = $VM->GetDomain()->PowerOff(1); + if (defined $ErrMessage) + { + Error "$ErrMessage\n"; + $IsPoweredOn = undef; + } + } + if (defined $IsPoweredOn) + { + return 1 if (ChangeStatus("offline", "off", "done")); + NotifyAdministrator("The $VMKey VM is working again", + "The $VMKey VM started working again after ". + Elapsed($Start) ." seconds."); + return 0; + } + + Debug(Elapsed($Start), " $VMKey is still unreachable\n"); + sleep(60); + } +} + sub PowerOff() { # Power off VMs no matter what their initial status is @@ -336,6 +386,10 @@ if ($Action eq "checkidle") { $Rc = CheckIdle(); } +elsif ($Action eq "monitor") +{ + $Rc = Monitor(); +} elsif ($Action eq "poweroff") { $Rc = PowerOff(); diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 6e7937f..de639c7 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -215,24 +215,23 @@ sub Cancel($) $Tasks->AddFilter("Status", ["queued", "running"]); foreach my $Task (@{$Tasks->GetItems()}) { + my $VM = $Task->VM; if ($Task->Status eq "queued") { $Task->Status("skipped"); my ($EProperty, $EMessage) = $Task->Save(); $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); } - elsif (defined $Task->ChildPid) + elsif (defined $VM->ChildPid) { require WineTestBot::Log; WineTestBot::Log::LogMsg("Canceling the " . join("/", $self->Id, $Step->No, $Task->No) . " task\n"); - kill("TERM", $Task->ChildPid); $Task->Status("canceled"); - $Task->ChildPid(undef); my ($EProperty, $EMessage) = $Task->Save(); $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); - my $VM = $Task->VM; $VM->Status('dirty'); + $VM->KillChild(); ($EProperty, $EMessage) = $VM->Save(); $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); } @@ -285,7 +284,6 @@ sub Restart($) system("rm", "-rf", "$JobDir/" . $Step->No . "/" . $Task->No); } $Task->Status("queued"); - $Task->ChildPid(undef); $Task->Started(undef); $Task->Ended(undef); $Task->TestFailures(undef); @@ -493,6 +491,14 @@ sub ScheduleOnHost($$$) { $RunningCount++; } + elsif ($VMStatus eq "offline") + { + if (!$VM->HasRunningChild()) + { + my $ErrMessage = $VM->RunMonitor(); + return $ErrMessage if (defined $ErrMessage); + } + } else { my $Priority = $VM->Type eq "build" ? 10 : @@ -617,7 +623,7 @@ sub ScheduleOnHost($$$) next if (exists $VMsToRevert{$VMKey}); my $VM = $HostVMs->GetItem($VMKey); - next if ($VM->Status ne "dirty" or defined $VM->ChildPid); + next if ($VM->Status ne "dirty" or $VM->HasRunningChild()); my $ErrMessage = $VM->RunPowerOff(); return $ErrMessage if (defined $ErrMessage); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 377eb0a..e71ad21 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -241,7 +241,7 @@ Returns true if the VM status is compatible with ChildPid being set. sub CanHaveChild($) { my ($self) = @_; - return ($self->Status =~ /^(?:dirty|reverting|sleeping)$/); + return ($self->Status =~ /^(?:dirty|reverting|sleeping|offline)$/); } =pod @@ -416,6 +416,31 @@ sub RunCheckIdle($) return $self->_RunVMTool("dirty", ["--log-only", "checkidle", $self->GetKey()]); } +=pod +=over 12 + +=item C<RunMonitor()> + +Monitors an offline VM to detect when it becomes accessible again. +When the VM can again be accessed through the hypervisor it is powered off and +its status is set to 'off'. + +This operation can obviously take a long time so it is performed in a separate +process. + +=back +=cut + +sub RunMonitor($) +{ + my ($self) = @_; + # In fact the status is already set + return $self->_RunVMTool("offline", ["--log-only", "monitor", $self->GetKey()]); +} + +=pod +=over 12 + =item C<RunPowerOff()> Powers off the VM so that it stops using resources. @@ -547,8 +572,8 @@ sub FilterEnabledRole($) sub FilterEnabledStatus($) { my ($self) = @_; - # Filter out the disabled VMs, that is the offline and maintenance ones - $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running", "off"]); + # Filter out the maintenance VMs + $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running", "off", "offline"]); } sub FilterHypervisors($$)

1 0

Alex Henrie : user32: Implement IDI_SHIELD.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: c14a16b08911d1695e42b75c60436ace9f42ea01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14a16b08911d1695e42b75c6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 19 10:23:46 2017 -0600 user32: Implement IDI_SHIELD. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 1 + dlls/user32/resources/oic_shield.ico | Bin 0 -> 34494 bytes dlls/user32/resources/oic_shield.svg | 271 +++++++++++++++++++++++++++++++++++ dlls/user32/user32.rc | 2 + 4 files changed, 274 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c14a16b08911d1695e42b…

1 0

Jacek Caban : mshtml: Pass DOMEvent to call_event_handlers.
by Alexandre Julliard 19 Oct '17

19 Oct '17

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: Store event target in DOMEvent.
by Alexandre Julliard 19 Oct '17

19 Oct '17

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: Pass DOMEvent instead of event id to fire_event_obj.
by Alexandre Julliard 19 Oct '17

19 Oct '17

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: Store event id in DOMEvent.
by Alexandre Julliard 19 Oct '17

19 Oct '17

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 19 Oct '17

19 Oct '17

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

Jacek Caban : mshtml: Added IDocumentEvent::createEvent implementation.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 8c74926bf925919caa6402e45d262a95979fcc0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c74926bf925919caa6402e45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 17:02:08 2017 +0200 mshtml: Added IDocumentEvent::createEvent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 +- dlls/mshtml/htmlevent.c | 279 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlevent.h | 2 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/events.c | 9 ++ 5 files changed, 295 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c74926bf925919caa640…

1 0

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

19 Oct '17

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

Jacek Caban : mshtml: Use event target vtbl to set current window event in fire_event_obj.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 6dc67c4234a93f49a64ea05a7acca4dc31323947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc67c4234a93f49a64ea05a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 17:01:43 2017 +0200 mshtml: Use event target vtbl to set current window event in fire_event_obj. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 9 ++++++++- dlls/mshtml/htmlelem.c | 9 ++++++++- dlls/mshtml/htmlevent.c | 37 ++++++++++++++++--------------------- dlls/mshtml/htmlevent.h | 3 +++ dlls/mshtml/htmlwindow.c | 26 +++++++++++++++++++++++++- 5 files changed, 60 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6624257..622ceea 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5048,6 +5048,12 @@ static ConnectionPointContainer *HTMLDocumentNode_get_cp_container(DispatchEx *d return container; } +static IHTMLEventObj *HTMLDocumentNode_set_current_event(DispatchEx *dispex, IHTMLEventObj *event) +{ + HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + return default_set_current_event(This->window, event); +} + static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { { NULL, @@ -5059,7 +5065,8 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { HTMLDocumentNode_bind_event, HTMLDocumentNode_get_parent_event_target, NULL, - HTMLDocumentNode_get_cp_container + HTMLDocumentNode_get_cp_container, + HTMLDocumentNode_set_current_event }; static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f7cdcf4..8aab4c4 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5384,6 +5384,12 @@ static ConnectionPointContainer *HTMLElement_get_cp_container(DispatchEx *dispex return &This->cp_container; } +static IHTMLEventObj *HTMLElement_set_current_event(DispatchEx *dispex, IHTMLEventObj *event) +{ + HTMLElement *This = impl_from_DispatchEx(dispex); + return default_set_current_event(This->node.doc->window, event); +} + void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { static const DISPID elem2_ie11_blacklist[] = {DISPID_IHTMLELEMENT2_DOSCROLL, DISPID_UNKNOWN}; @@ -5417,7 +5423,8 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_bind_event, HTMLElement_get_parent_event_target, HTMLElement_handle_event_default, - HTMLElement_get_cp_container + HTMLElement_get_cp_container, + HTMLElement_set_current_event }; static dispex_static_data_t HTMLElement_dispex = { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 7769932..6f81a89 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1063,29 +1063,17 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, eve } } -static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *event_obj, EventTarget *event_target) +static void fire_event_obj(EventTarget *event_target, eventid_t eid, HTMLEventObj *event_obj) { EventTarget *target_chain_buf[8], **target_chain = target_chain_buf; unsigned chain_cnt, chain_buf_size, i; - IHTMLEventObj *prev_event; - const event_target_vtbl_t *vtbl; + const event_target_vtbl_t *vtbl, *target_vtbl; + IHTMLEventObj *prev_event = NULL; BOOL prevent_default = FALSE; - HTMLInnerWindow *window; EventTarget *iter; HRESULT hres; - TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); - - window = doc->window; - if(!window) { - WARN("NULL window\n"); - return; - } - - htmldoc_addref(&doc->basedoc); - - prev_event = window->event; - window->event = event_obj ? &event_obj->IHTMLEventObj_iface : NULL; + TRACE("(%p) %s\n", event_target, debugstr_w(event_info[eid].name)); iter = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); @@ -1117,15 +1105,24 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e iter = vtbl->get_parent_event_target(&iter->dispex); } while(iter); + 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); + 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)) break; } + if(target_vtbl && target_vtbl->set_current_event) { + prev_event = target_vtbl->set_current_event(&event_target->dispex, prev_event); + if(prev_event) + IHTMLEventObj_Release(prev_event); + } + if(event_obj && event_obj->prevent_default) prevent_default = TRUE; - window->event = prev_event; if(event_info[eid].flags & EVENT_HASDEFAULTHANDLERS) { for(i = 0; !prevent_default && i < chain_cnt; i++) { @@ -1147,8 +1144,6 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e TRACE("calling PreventDefault\n"); nsIDOMEvent_PreventDefault(event_obj->nsevent); } - - htmldoc_release(&doc->basedoc); } void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarget *target, nsIDOMEvent *nsevent) @@ -1168,7 +1163,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarge } } - fire_event_obj(doc, eid, event_obj, target); + fire_event_obj(target, eid, event_obj); if(event_obj) IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); @@ -1213,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); if(SUCCEEDED(hres)) - fire_event_obj(node->doc, eid, event_obj, &node->event_target); + fire_event_obj(&node->event_target, eid, event_obj); IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); if(FAILED(hres)) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index efe707f..d3ddded 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -86,8 +86,11 @@ typedef struct { EventTarget *(*get_parent_event_target)(DispatchEx*); HRESULT (*handle_event_default)(DispatchEx*,eventid_t,nsIDOMEvent*,BOOL*); ConnectionPointContainer *(*get_cp_container)(DispatchEx*); + IHTMLEventObj *(*set_current_event)(DispatchEx*,IHTMLEventObj*); } event_target_vtbl_t; +IHTMLEventObj *default_set_current_event(HTMLInnerWindow*,IHTMLEventObj*) DECLSPEC_HIDDEN; + static inline EventTarget *get_node_event_prop_target(HTMLDOMNode *node, eventid_t eid) { return node->vtbl->get_event_prop_target ? node->vtbl->get_event_prop_target(node, eid) : &node->event_target; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f9fd047..df181d6 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1241,6 +1241,20 @@ static HRESULT WINAPI HTMLWindow2_get_document(IHTMLWindow2 *iface, IHTMLDocumen return S_OK; } +IHTMLEventObj *default_set_current_event(HTMLInnerWindow *window, IHTMLEventObj *event_obj) +{ + IHTMLEventObj *prev_event = NULL; + + if(window) { + if(event_obj) + IHTMLEventObj_AddRef(event_obj); + prev_event = window->event; + window->event = event_obj; + } + + return prev_event; +} + static HRESULT WINAPI HTMLWindow2_get_event(IHTMLWindow2 *iface, IHTMLEventObj **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); @@ -3006,6 +3020,12 @@ static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compa dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); } +static IHTMLEventObj *HTMLWindow_set_current_event(DispatchEx *dispex, IHTMLEventObj *event) +{ + HTMLInnerWindow *This = impl_from_DispatchEx(dispex); + return default_set_current_event(This, event); +} + static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { { NULL, @@ -3014,7 +3034,11 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { NULL, NULL }, - HTMLWindow_bind_event + HTMLWindow_bind_event, + NULL, + NULL, + NULL, + HTMLWindow_set_current_event }; static const tid_t HTMLWindow_iface_tids[] = {

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
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