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

Francois Gouget : patches: must have an end tag.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: tools Branch: master Commit: b8b21cc9e971e0760be2e460ae56e89d7c849505 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b8b21cc9e971e0760be2e46… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 16:58:50 2022 +0200 patches: must have an end tag. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/update b/patches/update index 494d2e15..f3eac9ee 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"}); }

1 0

Francois Gouget : testbot/LogUtils: Make the compilation error detection stricter.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: tools Branch: master Commit: 3a8057a8e3356fefb5b7909c0fb0d8206558d6f3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3a8057a8e3356fefb5b7909… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 16:49:44 2022 +0200 testbot/LogUtils: Make the compilation error detection stricter. This avoids some false positives in the d3d WINE_ERR() messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 e25ea3ae..720482f3 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

1 0

Francois Gouget : testbot/WineSendLog: Remove an unused variable.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: tools Branch: master Commit: 10177bb70783918e38f0ac10336625dd7e96891c URL: https://source.winehq.org/git/tools.git/?a=commit;h=10177bb70783918e38f0ac1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 16:54:31 2022 +0200 testbot/WineSendLog: Remove an unused variable. The failure count has been split between $NewCount and $OldCount. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 a2f2369b..0848bf59 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);

1 0

Francois Gouget : testbot: Fix the default Failures sort order.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: tools Branch: master Commit: 114d42a03cc9ede960aa98a97b07c7d264e98891 URL: https://source.winehq.org/git/tools.git/?a=commit;h=114d42a03cc9ede960aa98a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 16:52:45 2022 +0200 testbot: Fix the default Failures sort order. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 f0f78b6f..90620511 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 }

1 0

Francois Gouget : testbot/web: Preserve the bug status when changing a deleted failure bug id.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: tools Branch: master Commit: 47148b9a622d3282d8b61af28edc001475cb4a0f URL: https://source.winehq.org/git/tools.git/?a=commit;h=47148b9a622d3282d8b61af… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 16:50:46 2022 +0200 testbot/web: Preserve the bug status when changing a deleted failure bug id. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 c510d8d4..f39af5ac 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());

1 0

Francois Gouget : patches: Add an end tag for some <td colspan='xxx'>.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: tools Branch: master Commit: 1dfa91e21aea36df8ed194f63bb32af68be93df8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1dfa91e21aea36df8ed194f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 16:58:53 2022 +0200 patches: Add an end tag for some <td colspan='xxx'>. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/update b/patches/update index f3eac9ee..8f79da9c 100755 --- a/patches/update +++ b/patches/update @@ -338,15 +338,15 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k if (@signoff) { printf INDEX "<tr class=\"%s $file.signoff\" id=\"$file.signoff\" style=\"display: none;\" onclick=\"toggle_display('$file.signoff')\">" . - "<td colspan=\"5\" /><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", + "<td colspan=\"5\"></td><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", $row & 1 ? "odd" : "even", join("", map { "Signed-off-by: " . escapeHTML($_) . " "; } @signoff ); } 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 colspan=\"2\"></td><td colspan=\"2\" class=\"reply author\">%s</td> " . "<td class=\"reply author\"><a href=\"data/%s\">%s</a></td> " . - "<td colspan=\"4\" /></tr>\n", + "<td colspan=\"4\"></td></tr>\n", $row & 1 ? "odd" : "even", $child->{"id"}, escapeHTML($child->{"author"}), $child->{"id"}, escapeHTML($child->{"subject"}); } $row++;

1 0

Francois Gouget : testbot/LibvirtTool: Add a trailing linefeed to a log message.
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: tools Branch: master Commit: 95c6679d9127dbd07c16ca6d3a804d69b5a9071d URL: https://source.winehq.org/git/tools.git/?a=commit;h=95c6679d9127dbd07c16ca6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 16:50:12 2022 +0200 testbot/LibvirtTool: Add a trailing linefeed to a log message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 a9622de7..d087b358 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; }

1 0

Francois Gouget : testbot/Engine: Prevent recursion into ScheduleJobs().
by Alexandre Julliard June 17, 2022

June 17, 2022

Module: tools Branch: master Commit: 399c4bedd782326bba65b0944caeaf91df65a7ef URL: https://source.winehq.org/git/tools.git/?a=commit;h=399c4bedd782326bba65b09… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 10:09:27 2022 +0200 testbot/Engine: Prevent recursion into ScheduleJobs(). Recursion may happen through the ScheduleJobs() -> VM::Run() -> VMStatusChange() -> ScheduleJobs() chain. It can cause multiple revert processes to run on the same VM, or even a revert process to run at the same time as a task. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index cc2ea1f1..1b21ab97 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -945,6 +945,7 @@ sub _PowerOffDirtyVMs($) } } +my $_InScheduleJobs; my $_LastTaskCounts = ""; =pod @@ -1003,6 +1004,11 @@ kept on standby so they are ready when their turn comes. sub ScheduleJobs() { + # Don't let Engine notifications (specifically VMStatusChange) cause + # recursion into ScheduleJobs(). + return if ($_InScheduleJobs); + $_InScheduleJobs = 1; + my $Sched = _CheckAndClassifyVMs(); my $NeededVMs = _ScheduleTasks($Sched); _RevertVMs($Sched, $NeededVMs); @@ -1052,6 +1058,8 @@ sub ScheduleJobs() $Timeout = 600; } AddEvent("ScheduleJobs", $Timeout, 0, \&ScheduleJobs); + + $_InScheduleJobs = undef; }

1 0

Julian Klemann : http.sys: Add support for adding multiple urls to request queues.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: 0f139a04b110c222dfca05831d8263c912919c1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f139a04b110c222dfca0583… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Thu Jun 16 12:55:10 2022 -0500 http.sys: Add support for adding multiple urls to request queues. The request queue has a growable array rather than single URL and socket properties. Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 137 ++++++++++++++++++++++++++++++------------- dlls/http.sys/request.h | 2 +- dlls/httpapi/tests/httpapi.c | 41 ++++++++++++- 3 files changed, 136 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f139a04b110c222dfca…

1 0

Giovanni Mascellani : mfplat/tests: Test interaction between Lock2D() and LockRect().
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: 433845277ba7a019737dad2050d51c7d38df9316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=433845277ba7a019737dad20… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 14 17:15:47 2022 +0200 mfplat/tests: Test interaction between Lock2D() and LockRect(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 2cd27ed1269..67cf8954c36 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6526,9 +6526,23 @@ static void test_MFCreateDXSurfaceBuffer(void) hr = IMF2DBuffer_GetScanline0AndPitch(_2dbuffer, &data, &pitch); ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#lx.\n", hr); + hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); + ok(hr == S_OK, "Failed to lock back buffer, hr %#lx.\n", hr); + + /* Cannot lock the buffer while the surface is locked. */ + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#lx.\n", hr); + + hr = IDirect3DSurface9_UnlockRect(backbuffer); + ok(hr == S_OK, "Failed to unlock back buffer, hr %#lx.\n", hr); + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + /* Cannot lock the surface once the buffer is locked. */ + hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer_GetScanline0AndPitch(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0