April 2022 - Wine-devel - list.winehq.org

[PATCH v2 0/3] MR1: server: Implement thread input keystate locking.
by Rémi Bernon 26 Apr '22

26 Apr '22

Based on a patch from Sebastian Lackner <sebastian(a)fds-team.de>, the series has been in Proton for a while. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 -- v2: server: Create message queue and thread input in get_key_state. server: Lock thread input keystate whenever it is modified. server: Create message queue and thread input in set_key_state. https://gitlab.winehq.org/wine/wine/-/merge_requests/1

3 7

[PATCH v2 0/1] MR3: msvcrt: Faster memcmp().
by Jan Sikorski (＠jsikorski) 26 Apr '22

26 Apr '22

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- v3: Piotr's reviewed variant. I don't know how well compilers will handle unaligned access on archs that don't natively support it. One thing to perhaps look out for it to not have the compiler resort to faulting with software fixup.. -- v2: msvcrt: Faster memcmp(). https://gitlab.winehq.org/wine/wine/-/merge_requests/3

3 2

[PATCH] ieframe: Make sure that history initial state is fully initialized.
by Dmitry Timoshkov 26 Apr '22

26 Apr '22

In addition to 41cfc86d8dd65c71a7c81b826d02ac0a99050d6a. This fixes another crash when browsing help file that I have here. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/dochost.c | 4 ++-- dlls/ieframe/ieframe.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7717f786d52..4e1e1d82fa1 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -436,7 +436,7 @@ static void update_travellog(DocHost *This) } if(!This->travellog.log) { - This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); + This->travellog.log = heap_alloc_zero(4 * sizeof(*This->travellog.log)); if(!This->travellog.log) return; @@ -444,7 +444,7 @@ static void update_travellog(DocHost *This) }else if(This->travellog.size < This->travellog.position+1) { travellog_entry_t *new_travellog; - new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); + new_travellog = heap_realloc_zero(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); if(!new_travellog) return; diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 633906a70ca..1bae1f6781d 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -340,6 +340,11 @@ static inline void unlock_module(void) { InterlockedDecrement(&module_ref); } +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, SIZE_T len) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +} + static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.35.3

2 4

[tools 1/2] testbot: Provide (quick) read access to Itemref columns.
by Francois Gouget 26 Apr '22

26 Apr '22

Specifically this provides read-only access to the Itemref column(s). For instance if a task refers to a VM using a VMName field, then one can now write $Task->VMName instead of $Task->VM->Name. Incidentally read accesses are also much faster, except for the first Itemref / Detailref access which has to go through the slow path to initialize the relevant hashtable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The speedup is about 40% for regular columns. In the Task + VM example this replaces two slow accesses with a single faster access, resulting in a ~70% speedup or even more if it avoids loading the VM object from the database. --- testbot/lib/ObjectModel/Item.pm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index c086aec40..d47238182 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -230,10 +230,29 @@ sub AUTOLOAD # strip fully-qualified portion my $PropertyName = substr($ObjectModel::Item::AUTOLOAD, rindex($ObjectModel::Item::AUTOLOAD, ':') + 1); + + if (!@_) + { + # Provide quick read access to all the columns and cached object refs + if (defined $self->{ColValues}{$PropertyName}) + { + return $self->{ColValues}{$PropertyName}; + } + elsif (defined $self->{Itemrefs}{$PropertyName}) + { + return $self->{Itemrefs}{$PropertyName}; + } + elsif (defined $self->{Details}{$PropertyName}) + { + return $self->{Details}{$PropertyName}; + } + } if ($PropertyName eq "DESTROY") { return; } + + # Populate the Itemrefs and Details hashtable if necessary foreach my $PropertyDescriptor (@{$self->{PropertyDescriptors}}) { if ($PropertyName eq $PropertyDescriptor->GetName()) -- 2.30.2

1 1

[tools] testbot/web: Only show the patches day and time to limit line wrapping.
by Francois Gouget 26 Apr '22

26 Apr '22

This adds ValueFormatter::GenerateDayTimeTipDate(). As usual the full date is shown as a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 55 ++++++++++++++++++- testbot/web/PatchesList.pl | 3 +- testbot/web/WineTestBot.css | 1 + testbot/web/js/datetime.js | 13 +++++ 4 files changed, 70 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index d987cee55..41d1e14aa 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -23,7 +23,7 @@ package ObjectModel::CGI::ValueFormatter; use Exporter 'import'; our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime GenerateTipDateTime - GenerateTimeTipDate GenerateValueHTML); + GenerateDayTimeTipDate GenerateTimeTipDate GenerateValueHTML); use POSIX qw(strftime); @@ -151,6 +151,51 @@ sub GenerateTipDateTime($$;$$) =pod =over 12 +=item C<GenerateDayTimeTipDate()> + +Show the timestamp's day and time with the date as a tooltip. + +The timestamp is shown in the user's timezone if JavaScript is available and +in the server's timezone otherwise. + +The default for TagAttrs is 'a' and it should always be a tag that shows the +content of the title attribute as a tooltip. + +See GenerateDateTime() for more details. + +=back +=cut + +sub GenerateDayTimeTipDate($;$$) +{ + my ($Sec1970, $Class, $TagAttrs) = @_; + + if (defined $Sec1970) + { + my $Tag; + if ($TagAttrs) + { + $Tag = $TagAttrs; + $Tag =~ s/ .*$//; + } + else + { + $TagAttrs = $Tag = "a"; + } + $Class = "$Class " if ($Class); + print "<$TagAttrs class='${Class}daytimetipdate' timestamp='$Sec1970' ", + strftime("title='%Y-%m-%d'>%d %H:%M:%S", localtime($Sec1970)), + "</$Tag>"; + } + else + { + print " "; + } +} + +=pod +=over 12 + =item C<GenerateTimeTipDate()> Show the timestamp's time with the date as a tooltip. @@ -221,6 +266,9 @@ for timestamp properties. =item "timetipdate" Same as above but put the date part in a tooltip. +=item "daytimetipdate" +Show the day and time and put the full date as a tooltip. + =back =back @@ -250,6 +298,11 @@ sub GenerateValueHTML($$$;$) GenerateTimeTipDate($Value); return; } + if ($Format eq "daytimetipdate") + { + GenerateDayTimeTipDate($Value); + return; + } } elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) { diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 30cfc7547..fc074ada1 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -40,7 +40,8 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Received|Disposition|FromName|Subject)$/ ? "ro" : + return $PropertyName eq "Received" ? ("ro", "daytimetipdate") : + $PropertyName =~ /^(?:Disposition|FromName|Subject)$/ ? "ro" : ""; } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 350ab64a4..a8756dfce 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -410,6 +410,7 @@ pre a.title { color:inherit; text-decoration: none; } a.tipdatetime { color:inherit; text-decoration: none; } a.timetipdate { color:inherit; text-decoration: none; } +a.daytimetipdate { color:inherit; text-decoration: none; } th.Record { text-align: center; } td.Record { text-align: center; } diff --git a/testbot/web/js/datetime.js b/testbot/web/js/datetime.js index 23b7b2718..d21bf5c6e 100644 --- a/testbot/web/js/datetime.js +++ b/testbot/web/js/datetime.js @@ -40,6 +40,16 @@ function ShowDateTime(dom, attr) } } +function ShowDayTimeTipDate(dom) +{ + const sec1970 = dom.getAttribute("timestamp"); + const dt = new Date(sec1970 * 1000); + dom.setAttribute('title', dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) + +'-'+ Pad2(dt.getDate())); + dom.innerHTML = Pad2(dt.getDate()) +' '+ Pad2(dt.getHours()) +':'+ + Pad2(dt.getMinutes()) +':'+ Pad2(dt.getSeconds()); +} + function ShowTimeTipDate(dom) { const sec1970 = dom.getAttribute("timestamp"); @@ -58,6 +68,9 @@ function init() document.querySelectorAll(".tipdatetime").forEach(dom => { ShowDateTime(dom, 'title'); }); + document.querySelectorAll(".daytimetipdate").forEach(dom => { + ShowDayTimeTipDate(dom); + }); document.querySelectorAll(".timetipdate").forEach(dom => { ShowTimeTipDate(dom); }); -- 2.30.2

1 0

[tools] testbot/web: Tweak the Activity page VMs iteration.
by Francois Gouget 26 Apr '22

26 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index ffdf0fef6..adf5a4525 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -158,7 +158,7 @@ sub GenerateBody($) print "<td class='Record'> </td>"; } - foreach my $Col (0..(a)SortedVMs-1) + foreach my $Col (0..$#SortedVMs) { my $VM = $SortedVMs[$Col]; my $VMStatus = $Group->{statusvms}->{$VM->Name}; -- 2.30.2

1 0

[tools] testbot: Tweak the error groups iteration.
by Francois Gouget 26 Apr '22

26 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 2 +- testbot/web/JobDetails.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 954edaebd..37949e45f 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -350,7 +350,7 @@ EOF next if (!$Group->{NewCount}); push @Messages, ($GroupName ? "\n$GroupName:\n" : "\n"); - foreach my $ErrIndex (0..@{$Group->{Errors}} - 1) + foreach my $ErrIndex (0..$#{$Group->{Errors}}) { if ($Group->{IsNew}->[$ErrIndex]) { diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 0b2edf735..17cfc3525 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1052,7 +1052,7 @@ sub _WriteLogErrorsToFh($$) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; print $Fh "g $Group->{LineNo} $GroupName\n"; - foreach my $Index (0..@{$Group->{Errors}} - 1) + foreach my $Index (0..$#{$Group->{Errors}}) { my $IsNew = $Group->{IsNew}->[$Index] ? "n" : "o"; print $Fh "$IsNew $Group->{LineNos}->[$Index] $Group->{Errors}->[$Index]\n"; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 33a952553..c04266330 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -513,7 +513,7 @@ sub GenerateFullLog($$$$) next if ($Group->{LineNo}); print "<div class='LogDllName'>$GroupName</div>\n"; - for my $ErrIndex (0..@{$Group->{Errors}} - 1) + for my $ErrIndex (0..$#{$Group->{Errors}}) { if ($IsEmpty) { -- 2.30.2

1 0

[tools] testbot/web: Show the job start / end dates as tooltips on the job details page.
by Francois Gouget 26 Apr '22

26 Apr '22

This also delegates the timestamp formatting to ValueFormatter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This also fixes the Time column tooltip because, just like for the main index page, they relied on the old ShowDateTime() JavaScript function. --- testbot/web/JobDetails.pl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 591a47ee9..33a952553 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -26,7 +26,8 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); use URI::Escape; -use POSIX qw(strftime); + +use ObjectModel::CGI::ValueFormatter; use WineTestBot::Utils; use WineTestBot::Missions; @@ -50,6 +51,7 @@ sub DisplayProperty($$) my $PropertyName = $PropertyDescriptor->GetName(); return $PropertyName =~ /^(?:Id|PreviousNo|Type|FileType|Missions)$/ ? "" : + $PropertyName eq "Started" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -67,9 +69,13 @@ sub GenerateHeaderView($$$) { print "Arguments / <span class='MissionHeader'>Missions</span>"; } + elsif ($PropertyName eq "Started") + { + print "<a class='title' title='Start Date'>Start</a>"; + } elsif ($PropertyName eq "Ended") { - print "<a class='title' title='Execution ended'>Time</a>"; + print "<a class='title' title='End Time'>Time</a>"; } else { @@ -129,13 +135,7 @@ sub GenerateDataView($$$) if (defined $StepTask->Ended) { my $Duration = $StepTask->Ended - $StepTask->Started; - my $TagId = "E". $StepTask->Id; - print "<a id='$TagId' class='title' title='", - strftime("%Y-%m-%d %H:%M:%S", localtime($StepTask->Ended)), - "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>"; + GenerateTipDateTime($StepTask->Ended, DurationToString($Duration)); } else { -- 2.30.2

1 0

[PATCH v3] ntdll: Use 32-bit time_t when calling __NR_futex syscall.
by Piotr Caban 26 Apr '22

26 Apr '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/unix/sync.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

2 1

[PATCH 09/11] winex11: Directly use ntdll in uri_to_dos.
by Jacek Caban 26 Apr '22

26 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)

2 1