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

Francois Gouget : testbot: Empty configuration regexps match any configuration.
by Alexandre Julliard 17 Jun '22

17 Jun '22

Module: tools Branch: master Commit: 23f7f716a869553d0a0e7ab54a066a4f36614936 URL: https://source.winehq.org/git/tools.git/?a=commit;h=23f7f716a869553d0a0e7ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 17 16:50:03 2022 +0200 testbot: Empty configuration regexps match any configuration. Unlike the failure regexps which must not be empty. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 720482f3..9e73b5f6 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1390,7 +1390,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} ||= [];

1 0

Francois Gouget : testbot/LibvirtTool: Add a trailing linefeed to a log message.
by Alexandre Julliard 17 Jun '22

17 Jun '22

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/web: Preserve the bug status when changing a deleted failure bug id.
by Alexandre Julliard 17 Jun '22

17 Jun '22

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 : testbot: Fix the default Failures sort order.
by Alexandre Julliard 17 Jun '22

17 Jun '22

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/WineSendLog: Remove an unused variable.
by Alexandre Julliard 17 Jun '22

17 Jun '22

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 : patches: must have an end tag.
by Alexandre Julliard 17 Jun '22

17 Jun '22

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 : patches: Add an end tag for some <td colspan='xxx'>.
by Alexandre Julliard 17 Jun '22

17 Jun '22

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/Engine: Prevent recursion into ScheduleJobs().
by Alexandre Julliard 17 Jun '22

17 Jun '22

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

Alex Henrie : ntdll: Don't hard-code the battery and AC adapter names on Linux.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: wine Branch: master Commit: 89ec37871f6093d8336f636dc967d79579607dd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ec37871f6093d8336f636d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 15 20:33:54 2022 -0600 ntdll: Don't hard-code the battery and AC adapter names on Linux. Look through all of the devices in /sys/class/power_supply and take the statistics from the first battery and the first AC adapter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52831 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/unix/system.c | 79 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 87cc8b9c3a4..0df20aff3d5 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -35,6 +35,7 @@ #include <errno.h> #include <sys/time.h> #include <time.h> +#include <dirent.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -3379,12 +3380,14 @@ static ULONG mhz_from_cpuinfo(void) return cmz; } -static const char * get_sys_str(const char *path, char *s) +static const char * get_sys_str(const char *dirname, const char *basename, char *s) { - FILE *f = fopen(path, "r"); + char path[64]; + FILE *f; const char *ret = NULL; - if (f) + if (snprintf(path, sizeof(path), "%s/%s", dirname, basename) >= sizeof(path)) return NULL; + if ((f = fopen(path, "r"))) { if (fgets(s, 16, f)) ret = s; fclose(f); @@ -3392,42 +3395,68 @@ static const char * get_sys_str(const char *path, char *s) return ret; } -static int get_sys_int(const char *path, int def) +static int get_sys_int(const char *dirname, const char *basename) { char s[16]; - return get_sys_str(path, s) ? atoi(s) : def; + return get_sys_str(dirname, basename, s) ? atoi(s) : 0; } static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) { + DIR *d = opendir("/sys/class/power_supply"); + struct dirent *de; char s[16], path[64]; - unsigned int i = 0; + BOOL found_ac = FALSE; LONG64 voltage; /* microvolts */ - bs->AcOnLine = get_sys_int("/sys/class/power_supply/AC/online", 1); + bs->AcOnLine = TRUE; + if (!d) return STATUS_SUCCESS; - for (;;) + while ((de = readdir(d))) { - sprintf(path, "/sys/class/power_supply/BAT%u/status", i); - if (!get_sys_str(path, s)) break; - bs->Charging |= (strcmp(s, "Charging\n") == 0); - bs->Discharging |= (strcmp(s, "Discharging\n") == 0); - bs->BatteryPresent = TRUE; - i++; - } + if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) continue; + if (snprintf(path, sizeof(path), "/sys/class/power_supply/%s", de->d_name) >= sizeof(path)) continue; + if (get_sys_str(path, "scope", s) && strcmp(s, "Device\n") == 0) continue; + if (!get_sys_str(path, "type", s)) continue; - if (bs->BatteryPresent) - { - voltage = get_sys_int("/sys/class/power_supply/BAT0/voltage_now", 0); - bs->MaxCapacity = get_sys_int("/sys/class/power_supply/BAT0/charge_full", 0) * voltage / 1e9; - bs->RemainingCapacity = get_sys_int("/sys/class/power_supply/BAT0/charge_now", 0) * voltage / 1e9; - bs->Rate = -get_sys_int("/sys/class/power_supply/BAT0/current_now", 0) * voltage / 1e9; - if (!bs->Charging && (LONG)bs->Rate < 0) - bs->EstimatedTime = 3600 * bs->RemainingCapacity / -(LONG)bs->Rate; - else - bs->EstimatedTime = ~0u; + if (strcmp(s, "Mains\n") == 0) + { + if (!get_sys_str(path, "online", s)) continue; + if (found_ac) + { + FIXME("Multiple mains found, only reporting on the first\n"); + } + else + { + bs->AcOnLine = atoi(s); + found_ac = TRUE; + } + } + else if (strcmp(s, "Battery\n") == 0) + { + if (!get_sys_str(path, "status", s)) continue; + if (bs->BatteryPresent) + { + FIXME("Multiple batteries found, only reporting on the first\n"); + } + else + { + bs->Charging = (strcmp(s, "Charging\n") == 0); + bs->Discharging = (strcmp(s, "Discharging\n") == 0); + bs->BatteryPresent = TRUE; + voltage = get_sys_int(path, "voltage_now"); + bs->MaxCapacity = get_sys_int(path, "charge_full") * voltage / 1e9; + bs->RemainingCapacity = get_sys_int(path, "charge_now") * voltage / 1e9; + bs->Rate = -get_sys_int(path, "current_now") * voltage / 1e9; + if (!bs->Charging && (LONG)bs->Rate < 0) + bs->EstimatedTime = 3600 * bs->RemainingCapacity / -(LONG)bs->Rate; + else + bs->EstimatedTime = ~0u; + } + } } + closedir(d); return STATUS_SUCCESS; }

1 0

Sebastián Aedo : winex11.drv: Change order register_extension for WGL_ARB_pixel_format_float.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: wine Branch: master Commit: b39fa96d0c95b047e54e74aca6a27e556a0f5893 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b39fa96d0c95b047e54e74ac… Author: Sebastián Aedo <sebastian.aedo29(a)gmail.com> Date: Wed Jun 15 17:48:09 2022 -0400 winex11.drv: Change order register_extension for WGL_ARB_pixel_format_float. Some processes use very naive string matching when detecting extensions, for example, Cossacks III checks if the extension is "contained" in the current extension is checking, causing that `WGL_ARB_pixel_format` is contained in `WGL_ARB_pixel_format_float`, but it ends up with the flag deactivated because they aren't the same. This makes it consistent with the behavior on winemac.drv/opengl.c too. Signed-off-by: Sebastián Aedo <sebastian.aedo29(a)gmail.com> --- dlls/winex11.drv/opengl.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 91aef7f67be..017a8813caa 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3180,11 +3180,6 @@ static void X11DRV_WineGL_LoadExtensions(void) register_extension("WGL_ARB_create_context_profile"); } - if (has_extension( glxExtensions, "GLX_ARB_fbconfig_float")) - { - register_extension("WGL_ARB_pixel_format_float"); - register_extension("WGL_ATI_pixel_format_float"); - } register_extension( "WGL_ARB_extensions_string" ); opengl_funcs.ext.p_wglGetExtensionsStringARB = X11DRV_wglGetExtensionsStringARB; @@ -3214,6 +3209,12 @@ static void X11DRV_WineGL_LoadExtensions(void) opengl_funcs.ext.p_wglGetPixelFormatAttribfvARB = X11DRV_wglGetPixelFormatAttribfvARB; opengl_funcs.ext.p_wglGetPixelFormatAttribivARB = X11DRV_wglGetPixelFormatAttribivARB; + if (has_extension( glxExtensions, "GLX_ARB_fbconfig_float")) + { + register_extension("WGL_ARB_pixel_format_float"); + register_extension("WGL_ATI_pixel_format_float"); + } + /* Support WGL_ARB_render_texture when there's support or pbuffer based emulation */ if (has_extension( glxExtensions, "GLX_ARB_render_texture") || (glxRequireVersion(3) && use_render_texture_emulation))

1 0