- Wine-Devel - list.winehq.org

Re: [PATCH v2 0/1] MR304: mshtml: Enable CSS grid layout. - approved
by Alexandre Julliard (＠julliard) June 24, 2022

June 24, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/304

1 0

Re: [PATCH v3 0/4] MR271: win32u: Move rawinput APIs. - approved
by Alexandre Julliard (＠julliard) June 24, 2022

June 24, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/271

1 0

Re: [PATCH v5 0/5] MR255: d3d11: Fix reporting of some format caps. - approved
by Alexandre Julliard (＠julliard) June 24, 2022

June 24, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/255

1 0

[PATCH 0/5] MR307: dnsapi: Fix wow64 translation.
by Zebediah Figura (＠zfigura) June 24, 2022

June 24, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/307

5 9

[PATCH v3 0/1] MR303: win32u: Don't report cloned monitors in EnumDisplayMonitors().
by Arek Hiler (＠ivyl) June 24, 2022

June 24, 2022

Based on: ca39b1c22dfa ("user32: Don't report mirrored slave monitors in EnumDisplayMonitors.") 2affb854e524 ("user32: Change slave to a more neutral word.") Which seems to got lost during: 318673405c62 ("win32u: Move NtUserEnumDisplayMonitors implementation from user32.") Fixes regression with Elite Dangerous launcher freezing when cloned displays are present. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> CC: @zhiyi @jacek -- v3: win32u: Don't report cloned monitors in EnumDisplayMonitors(). https://gitlab.winehq.org/wine/wine/-/merge_requests/303

4 3

[tools] testbot/web: The task failures list is read-only.
by Francois Gouget June 24, 2022

June 24, 2022

Manually adding and removing task failures is not supported. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/FailureDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index f39af5ac91..ae4ccb4041 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -167,7 +167,7 @@ sub GenerateBody($) { print "<h2><a name='TaskFailures'></a>Task Failures</h2>\n"; my $TaskFailuresBlock = new TaskFailuresBlock($self->{Item}->TaskFailures, $self); - $TaskFailuresBlock->SetReadWrite(0) if (!$self->{RW}); + $TaskFailuresBlock->SetReadWrite(0); $TaskFailuresBlock->GenerateList(); } } -- 2.30.2

1 0

[tools] testbot/UpdateFailures: Truncate the bug status and description if needed.
by Francois Gouget June 24, 2022

June 24, 2022

They have to fit otherwise Failure::Validate() will prevent saving to the database. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateFailures.pl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/testbot/bin/UpdateFailures.pl b/testbot/bin/UpdateFailures.pl index 7c89b7b99b..f324cca280 100755 --- a/testbot/bin/UpdateFailures.pl +++ b/testbot/bin/UpdateFailures.pl @@ -157,6 +157,7 @@ foreach my $FailureId (@FailureIds) # Update the failures bug information my $Bugs = CollectBugInfo([keys %$BugIds]); +my ($MaxStatusLen, $MaxDescriptionLen); foreach my $FailureId (@FailureIds) { my $Failure = $Failures->GetItem($FailureId); @@ -167,9 +168,19 @@ foreach my $FailureId (@FailureIds) { my $Resolution = $Bug->{Resolution} || " ---"; $Resolution = $Resolution eq " ---" ? "" : " $Resolution"; - $Failure->BugStatus("$Bug->{Status}$Resolution"); + if (!defined $MaxStatusLen) + { + my $PropertyDescriptor = $Failure->GetPropertyDescriptorByName("BugStatus"); + $MaxStatusLen = $PropertyDescriptor->GetMaxLength(); + } + $Failure->BugStatus(substr("$Bug->{Status}$Resolution", 0, $MaxStatusLen)); + } + if (!defined $MaxDescriptionLen) + { + my $PropertyDescriptor = $Failure->GetPropertyDescriptorByName("BugDescription"); + $MaxDescriptionLen = $PropertyDescriptor->GetMaxLength(); } - $Failure->BugDescription($Bug->{Description}); + $Failure->BugDescription(substr($Bug->{Description}, 0, $MaxDescriptionLen)); } else { -- 2.30.2

1 0

[tools] testbot: Sort failures on their notes as a last resort.
by Francois Gouget June 24, 2022

June 24, 2022

Sometimes a bug is spread across multiple failures and the Notes field normally describes what each one corresponds to. Sorting on the Notes field as a last resort typically ensures that all the parts are in an order that makes sense. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Failures.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 21b1610ca9..4a65374988 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -50,11 +50,11 @@ sub Compare($$) # Sort deleted entries last my %StatusOrders = ("deleted" => 1); - my $Cmp = ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) || + return ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) || $self->GetColValue("ErrorGroup") cmp $B->GetColValue("ErrorGroup") || $self->GetColValue("TestUnit") cmp $B->GetColValue("TestUnit") || - $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription"); - return $Cmp + $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription") || + $self->GetColValue("Notes") cmp $B->GetColValue("Notes"); } sub BugId($;$) -- 2.30.2

1 0

[tools] testbot: Treat regular expression warnings as errors.
by Francois Gouget June 24, 2022

June 24, 2022

In particular do so when validating failures so errors are caught when the failure is created / modified. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Failures.pm | 1 + testbot/lib/WineTestBot/LogUtils.pm | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 4a65374988..dee8b68558 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -104,6 +104,7 @@ sub Validate($) my ($Field, $Name) = @$Pair; my $RegExp = $self->$Field; my $ErrMessage = eval { + use warnings FATAL => qw(regexp); if ($RegExp and "" =~ /$RegExp/) { return "The $Name regular expression should not match empty strings"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 99941b54a1..651c1d0a47 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1391,7 +1391,10 @@ sub MatchLogFailures($$) { # Ignore failures that don't apply to this configuration my $ConfigRegExp = $Failure->ConfigRegExp; - my $Match = eval { !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/ }; + my $Match = eval { + use warnings FATAL => qw(regexp); + !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/; + }; next if (!$Match); my $UnitFailures = $FailureTree{$Failure->ErrorGroup}->{$Failure->TestUnit} ||= []; @@ -1413,7 +1416,10 @@ sub MatchLogFailures($$) foreach my $UnitFailure (@$UnitFailures) { my $RegExp = $UnitFailure->FailureRegExp; - my $Match = eval { $RegExp and $Line =~ /$RegExp/ }; + my $Match = eval { + use warnings FATAL => qw(regexp); + $RegExp and $Line =~ /$RegExp/; + }; next if (!$Match); my $LineFailures = $Group->{Failures}->{$ErrIndex} ||= []; -- 2.30.2

1 0

[PATCH v2 0/1] MR306: reg: Add REG_QWORD support to 'add'.
by Nikolay Sivov (＠nsivov) June 24, 2022

June 24, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- v2: reg: Add REG_QWORD support to 'add'. https://gitlab.winehq.org/wine/wine/-/merge_requests/306

2 2