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

[PATCH v2 0/1] MR252: shell32/tests: Add tests for Program Manager name sanitization.
by Alex Henrie (＠alexhenrie) 17 Jun '22

17 Jun '22

Split from https://gitlab.winehq.org/wine/wine/-/merge_requests/23 -- v2: shell32/tests: Add tests for Program Manager name sanitization. https://gitlab.winehq.org/wine/wine/-/merge_requests/252

4 4

[PATCH 0/1] MR264: winex11.drv: Always call XSync() in destroy_whole_window() if there is client window.
by Paul Gofman (＠gofman) 17 Jun '22

17 Jun '22

XSync() is already called when there is a whole window only. When GL child window is deleted shortly after resize X error (request code 12, which is X_ConfigureWindow) may happen. XConfigureWindow is called for child window from sync_client_position. Then, destroy_whole_window() doesn't hit XSync() path because there is no whole_window. client_window is destroyed from opengl.c:release_gl_drawable() independently (that may happen right from X11DRV_DestroyWindow() or later if the drawable is still referenced elsewhere) and that may happen before XConfigureWindow request is processed. We can't flush in release_gl_drawable() as window data is unavailable at that moment and it is unknown which display to flush. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/264

2 1

[tools 1/2] patches: must have an end tag.
by Francois Gouget 17 Jun '22

17 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- is not allowed, at least according to the Mozilla documentation: | Tag omission: None, both the starting and ending tag are mandatory. --- patches/update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/update b/patches/update index 494d2e1575..f3eac9eeac 100755 --- a/patches/update +++ b/patches/update @@ -344,8 +344,8 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k foreach my $child (@{$patch->{"children"}}) { printf INDEX "<tr class=\"%s\ $file.reply\" id=\"%s\" style=\"display: none;\" onclick=\"toggle_display('$file.reply')\">" . - "<td colspan=\"2\" /><td colspan=\"2\" class=\"reply author\">%s</td> " . - "<td class=\"reply author\"><a href=\"data/%s\">%s</a></td> " . + "<td colspan=\"2\" /><td colspan=\"2\" class=\"reply author\">%s</td> " . + "<td class=\"reply author\"><a href=\"data/%s\">%s</a></td> " . "<td colspan=\"4\" /></tr>\n", $row & 1 ? "odd" : "even", $child->{"id"}, escapeHTML($child->{"author"}), $child->{"id"}, escapeHTML($child->{"subject"}); } -- 2.30.2

1 1

[tools] testbot/WineSendLog: Remove an unused variable.
by Francois Gouget 17 Jun '22

17 Jun '22

The failure count has been split between $NewCount and $OldCount. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index a2f2369b63..0848bf596c 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -179,7 +179,7 @@ sub SendLog($) # my ($JobInfo, @New, %BugDescriptions); - my ($NewCount, $FailCount, $OldCount, $BotCount, $NotRun) = (0, 0, 0, 0, 0); + my ($NewCount, $OldCount, $BotCount, $NotRun) = (0, 0, 0, 0); my $FileType = "test executable"; my $Failures = CreateFailures($Job); -- 2.30.2

1 0

[tools] testbot: Fix the default Failures sort order.
by Francois Gouget 17 Jun '22

17 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Initially the last criterion was the failure id but then I decided sorting by the bug description made more sense. Unfortunately I forgot to switch the comparison from integers to strings. --- testbot/lib/WineTestBot/Failures.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index f0f78b6ff7..906205119c 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -53,7 +53,7 @@ sub Compare($$) my $Cmp = ($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") <=> $B->GetColValue("BugDescription"); + $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription"); return $Cmp } -- 2.30.2

1 0

[tools] testbot/web: Preserve the bug status when changing a deleted failure bug id.
by Francois Gouget 17 Jun '22

17 Jun '22

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 c510d8d480..f39af5ac91 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -202,7 +202,7 @@ sub OnAction($$) } if (($self->{Item}->BugId || "") ne $self->GetParam("BugId")) { - $self->{Item}->BugStatus(""); + $self->{Item}->BugStatus("") if ($self->{Item}->BugStatus ne "deleted"); $self->{Item}->BugDescription(""); } return undef if (!$self->Save()); -- 2.30.2

1 0

[tools] testbot/LibvirtTool: Add a trailing linefeed to a log message.
by Francois Gouget 17 Jun '22

17 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index a9622de7d8..d087b3583e 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -461,7 +461,7 @@ sub Monitor() # does not exist. But only revert can tell. For this reason, let revert # announce when the VM works again. return 1 if (ChangeStatus("offline", "off", "done")); - LogMsg("Switching $VMKey from offline to off after ". PrettyElapsed($Start) ."."); + LogMsg("Switching $VMKey from offline to off after ". PrettyElapsed($Start) .".\n"); return 0; } -- 2.30.2

1 0

[tools] testbot: Empty configuration regexps match any configuration.
by Francois Gouget 17 Jun '22

17 Jun '22

Unlike the failure regexps which must not be empty. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e25ea3ae27..4c643b9e09 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1387,7 +1387,7 @@ sub MatchLogFailures($$) { # Ignore failures that don't apply to this configuration my $ConfigRegExp = $Failure->ConfigRegExp; - my $Match = eval { $ConfigRegExp and $ConfigName =~ /$ConfigRegExp/ }; + my $Match = eval { !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/ }; next if (!$Match); my $UnitFailures = $FailureTree{$Failure->ErrorGroup}->{$Failure->TestUnit} ||= []; -- 2.30.2

1 0

[tools] testbot/LogUtils: Make the compilation error detection stricter.
by Francois Gouget 17 Jun '22

17 Jun '22

This avoids some false positives in the d3d WINE_ERR() messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Specifically this type of messages in the Wine log which are simple WINE_ERR() messages and should thus be ignored by the TestBot: 059c:err:d3d:wined3d_debug_callback 0016A650: "0:43(1): error: error index must be >= 0". 059c:fixme:d3d_shader:print_glsl_info_log 0:43(1): error: error index must be >= 0 --- testbot/lib/WineTestBot/LogUtils.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4c643b9e09..9e73b5f63d 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -102,7 +102,10 @@ sub GetLogLineCategory($) $Line =~ /^error: patch failed:/ or $Line =~ /^error: corrupt patch / or # Build errors - $Line =~ /: error: / or + # Note that just ': error:' leads to false positives. So assume the + # error location (source filename + line number) contains no space. + $Line =~ /^[^ ]+: fatal error: / or # nonexistent include file + $Line =~ /^[^ ]+: error: / or $Line =~ /: undefined reference to `/ or $Line =~ /^make: [*]{3} No rule to make target / or $Line =~ /^Makefile:\d+: recipe for target .* failed$/ or -- 2.30.2

1 0

[PATCH v2 0/5] MR261: win32u: nonclient conversion
by Jacek Caban (＠jacek) 17 Jun '22

17 Jun '22

-- v2: win32u: Move NtUserGetTitleBarInfo implementation from user32. win32u: Move more WM_SYSCOMMAND implementation from user32. win32u: Move WM_NCLBUTTONDBLCLK and WM_LBUTTONDBLCLK implementation from user32. win32u: Move WM_SETCURSOR implementation from user32. win32u: Move NtUserDrawCaptionTemp implementation from user32. https://gitlab.winehq.org/wine/wine/-/merge_requests/261

4 8