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

Rémi Bernon : winegstreamer: Register stub ColorConvertDMO transform.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: 5b178b2fa94b2fe3d0140d0c841695903cb39bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b178b2fa94b2fe3d0140d0c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 5 23:54:58 2022 +0200 winegstreamer: Register stub ColorConvertDMO transform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 42 +- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/color_convert.c | 606 +++++++++++++++++++++++++++ dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 50 +++ dlls/winegstreamer/mfplat.c | 60 +++ dlls/winegstreamer/winegstreamer_classes.idl | 6 + 7 files changed, 765 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b178b2fa94b2fe3d014…

1 0

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

June 16, 2022

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

Rémi Bernon : winegstreamer: Implement ColorConvertDMO transform.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: 41184e9de97599dacad00d80021c35f2010f9d0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=41184e9de97599dacad00d80… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 13 16:16:18 2022 +0200 winegstreamer: Implement ColorConvertDMO transform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 41 +--- dlls/winegstreamer/color_convert.c | 422 ++++++++++++++++++++++++++++++++++--- dlls/winegstreamer/wg_transform.c | 2 +- 3 files changed, 398 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41184e9de97599dacad0…

1 0

Rémi Bernon : winegstreamer: Implement ResamplerMediaObject transform.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: d33cb57e7d891ee9f01dcde3b6366095b4bcf8a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d33cb57e7d891ee9f01dcde3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 13 16:07:42 2022 +0200 winegstreamer: Implement ResamplerMediaObject transform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 39 ---- dlls/winegstreamer/resampler.c | 402 +++++++++++++++++++++++++++++++++++--- dlls/winegstreamer/wg_transform.c | 1 + 3 files changed, 376 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d33cb57e7d891ee9f01d…

1 0

Alistair Leslie-Hughes : d3drm: Pass all D3DRM_LOAD* flags directly through to CreateEnumObject() in IDirect3DRMMeshBuilder3::Load().
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: wine Branch: master Commit: 88c29c3ff07cb9383178e0f80546108b804d3741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88c29c3ff07cb9383178e0f8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 1 18:46:13 2022 +1000 d3drm: Pass all D3DRM_LOAD* flags directly through to CreateEnumObject() in IDirect3DRMMeshBuilder3::Load(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3drm/meshbuilder.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 1f783baf1fe..2867ea14ebe 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1462,8 +1462,10 @@ end: static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, void *filename, void *name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURE3CALLBACK cb, void *arg) { + static const DWORD supported_flags = D3DRMLOAD_FROMFILE | D3DRMLOAD_FROMRESOURCE + | D3DRMLOAD_FROMMEMORY | D3DRMLOAD_FROMSTREAM | D3DRMLOAD_FROMURL; struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - DXFILELOADOPTIONS load_options; + DXFILELOADOPTIONS load_options = loadflags & supported_flags; IDirectXFile *dxfile = NULL; IDirectXFileEnumObject *enum_object = NULL; IDirectXFileData *data = NULL; @@ -1476,22 +1478,10 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v TRACE("iface %p, filename %p, name %p, loadflags %#lx, cb %p, arg %p.\n", iface, filename, name, loadflags, cb, arg); - clean_mesh_builder_data(mesh_builder); + if (loadflags & ~supported_flags) + FIXME("Ignoring flags %#lx.\n", loadflags & ~supported_flags); - if (loadflags == D3DRMLOAD_FROMMEMORY) - { - load_options = DXFILELOAD_FROMMEMORY; - } - else if (loadflags == D3DRMLOAD_FROMFILE) - { - load_options = DXFILELOAD_FROMFILE; - TRACE("Loading from file %s\n", debugstr_a(filename)); - } - else - { - FIXME("Load options %ld not supported yet\n", loadflags); - return E_NOTIMPL; - } + clean_mesh_builder_data(mesh_builder); hr = DirectXFileCreate(&dxfile); if (hr != DXFILE_OK) @@ -1503,7 +1493,10 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v hr = IDirectXFile_CreateEnumObject(dxfile, filename, load_options, &enum_object); if (hr != DXFILE_OK) + { + WARN("Failed to create object, load flags %#lx.\n", loadflags); goto end; + } hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &data); if (hr != DXFILE_OK)

1 0

Francois Gouget : testbot/web: Automatically refresh the failure bug information.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: tools Branch: master Commit: b1645e5b54a1c069665a4e090f9b2af906002480 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b1645e5b54a1c069665a4e0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 16 18:28:00 2022 +0200 testbot/web: Automatically refresh the failure bug information. Automatically refresh the failure bug information when the bug id is modified. Also trigger a refresh when a failure is undeleted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 39 ++++++++++++++++++++++++++++++++ testbot/lib/WineTestBot/Engine/Notify.pm | 20 +++++++++++++++- testbot/lib/WineTestBot/Failures.pm | 31 +++++++++++++++++++++++++ testbot/web/FailureDetails.pl | 1 - testbot/web/FailuresList.pl | 5 ++-- 5 files changed, 91 insertions(+), 5 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 88852730..29dce183 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -49,6 +49,7 @@ use WineTestBot::Config; use WineTestBot::Engine::Events; use WineTestBot::Engine::Notify; use WineTestBot::Engine::Scheduler; +use WineTestBot::Failures; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Patches; @@ -548,6 +549,43 @@ sub HandleGetScreenshot($) return "1" . $ImageBytes; } +sub HandleUpdateFailure($) +{ + my ($FailureId) = @_; + + # Validate FailureId + if ($FailureId !~ /^(\d+)$/) + { + LogMsg "Invalid failure id\n"; + return "0Invalid Failure Id"; + } + $FailureId = $1; + + if (!CreateFailures()->GetItem($FailureId)) + { + LogMsg "Unknown Failure $FailureId\n"; + return "0Unknown Failure $FailureId"; + } + + my $Pid = fork; + if (!defined $Pid) + { + LogMsg "Unable to fork for UpdateFailures.pl: $!\n"; + } + elsif (!$Pid) + { + # Clean up the child environment + CloseAllDBBackEnds(); + WineTestBot::Log::SetupRedirects(); + + exec("$BinDir/UpdateFailures.pl --log-only $FailureId") or + LogMsg "Unable to exec ${ProjectName}UpdateFailures.pl: $!\n"; + exit(1); + } + + return "1"; +} + my %Handlers=( "getscreenshot" => \&HandleGetScreenshot, "jobcontrol" => \&HandleJobControl, @@ -558,6 +596,7 @@ my %Handlers=( "vmstatuschange" => \&HandleVMStatusChange, "winepatchmlsubmission" => \&HandleWinePatchMLSubmission, "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, + "updatefailure" => \&HandleUpdateFailure, ); sub HandleClientCmd(@) diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 82221c9e..9c180298 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -31,7 +31,8 @@ use Exporter 'import'; our $RunningInEngine; our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobControl RescheduleJobs VMStatusChange - WinePatchMLSubmission WinePatchWebSubmission GetScreenshot); + WinePatchMLSubmission WinePatchWebSubmission + UpdateFailure GetScreenshot); our @EXPORT_OK = qw($RunningInEngine); use Socket; @@ -194,6 +195,23 @@ sub WinePatchWebSubmission() return substr($Reply, 1); } +sub UpdateFailure($) +{ + my ($FailureId) = @_; + + my $Reply = SendCmdReceiveReply("updatefailure $FailureId\n"); + if (length($Reply) < 1) + { + return "The Engine did not acknowledge the UpdateFailure command"; + } + if (substr($Reply, 0, 1) eq "1") + { + return (undef, substr($Reply, 1)); + } + + return (substr($Reply, 1), undef); +} + sub GetScreenshot($) { my ($VMName) = @_; diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 344af756..f0f78b6f 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -40,6 +40,8 @@ TaskFailure objects. use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); +use WineTestBot::Engine::Notify; + sub Compare($$) { @@ -55,6 +57,35 @@ sub Compare($$) return $Cmp } +sub BugId($;$) +{ + my ($self, $NewBugId) = @_; + + my $CurrentBugId = $self->SUPER::BugId; + return $CurrentBugId if (!defined $NewBugId); + + if (!defined $CurrentBugId or $NewBugId ne $CurrentBugId) + { + $self->{OldBugId} = $CurrentBugId if (!defined $self->{OldBugId}); + $self->SUPER::BugId($NewBugId); + } + + return $NewBugId; +} + +sub OnSaved($) +{ + my ($self) = @_; + + $self->SUPER::OnSaved(); + if ((defined $self->{OldBugId} and $self->{OldBugId} ne $self->BugId) or + !$self->BugStatus or !$self->BugDescription) + { + UpdateFailure($self->Id); + } + delete $self->{OldBugId}; +} + sub Validate($) { my ($self) = @_; diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index ab7d1311..c510d8d4 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -206,7 +206,6 @@ sub OnAction($$) $self->{Item}->BugDescription(""); } return undef if (!$self->Save()); - # FIXME Notify the TestBot Engine so it updates the bug information exit($self->RedirectToParent()); } return $self->SUPER::OnAction($Action); diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index f763413f..e271ee1d 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -129,9 +129,9 @@ sub OnItemAction($$$) return 1 if ($Action eq "Restore" and $Failure->BugStatus ne "deleted"); my $NewStatus = $Action eq "Delete" ? "deleted" : - $Action eq "Restore" ? "unknown" : + $Action eq "Restore" ? "" : undef; - if ($NewStatus) + if (defined $NewStatus) { $Failure->BugStatus($NewStatus); my ($_ErrProperty, $ErrMessage) = $Failure->Save(); @@ -141,7 +141,6 @@ sub OnItemAction($$$) $self->{EnclosingPage}->SetError(undef, $ErrMessage); return 0; } - # FIXME Notify the TestBot Engine so it updates the bug information return 1; } }

1 0

Francois Gouget : patches: Take the .testbot file Status into account.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: tools Branch: master Commit: 7d320f65aa489279440c6ee92ae6ce04df2928ef URL: https://source.winehq.org/git/tools.git/?a=commit;h=7d320f65aa489279440c6ee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 16 17:20:39 2022 +0200 patches: Take the .testbot file Status into account. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/patches/update b/patches/update index 5d20f2a1..494d2e15 100755 --- a/patches/update +++ b/patches/update @@ -210,7 +210,8 @@ foreach my $file (readdir DIR) { utf8::decode($_); last if /^$/; - if (/^Job-ID: (.*)$/) { $patch{"testjob"} = $1; } + if (/^Status: (.*)$/) { $patch{"testbot"} = $1; } + elsif (/^Job-ID: (.*)$/) { $patch{"testjob"} = $1; } elsif (/^URL: (.*)$/) { $patch{"testurl"} = $1; } } close LOG; @@ -254,7 +255,6 @@ sub assign_parent($) if ($patch->{"from_marvin"}) { $parent->{"testbot"} = "<a href=\"data/$patch->{id}\">Failed</a>"; - $parent->{"testclass"} = "testbot botfail"; } return $parent; } @@ -320,6 +320,10 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { printf INDEX "<td class=\"failmark\">X</td>"; } + if ($patch->{"testbot"} and $patch->{"testbot"} ne "OK") + { + $patch->{"testclass"} .= " botfail"; + } printf INDEX "<td class=\"%s\">%s</td>", $patch->{"testclass"}, $patch->{"testbot"}; if ($patch->{"testjob"} && $patch->{"testurl"}) {

1 0

Francois Gouget : testbot/web: Add a task failures block to the failure details page.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: tools Branch: master Commit: e255846b2fe7fed68da23539fd7d4100cef5e20b URL: https://source.winehq.org/git/tools.git/?a=commit;h=e255846b2fe7fed68da2353… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 16 17:22:15 2022 +0200 testbot/web: Add a task failures block to the failure details page. This allows reviewing all instances of a given failure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/FailureDetails.pl | 101 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index 7cab1d2a..ab7d1311 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -19,6 +19,93 @@ use strict; + +package TaskFailuresBlock; + +use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); + +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::CGI::ValueFormatter; + +use WineTestBot::Jobs; +use WineTestBot::Utils; + + +sub GetPropertyDescriptors($) +{ + my ($self) = @_; + + # Add some extra columns + my @PropertyDescriptors; + foreach my $PropertyDescriptor (@{$self->{Collection}->GetPropertyDescriptors()}) + { + my $PropertyName = $PropertyDescriptor->GetName(); + next if ($PropertyName =~ /^(?:JobId|StepNo|TaskNo)$/); + push @PropertyDescriptors, $PropertyDescriptor; + if ($PropertyName eq "TaskLog") + { + push @PropertyDescriptors, CreateBasicPropertyDescriptor("Date", "Date", !1, !1, "DT", 19); + } + } + push @PropertyDescriptors, CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128); + + return \@PropertyDescriptors; +} + +sub GenerateHeaderView($$$) +{ + my ($self, $Row, $Col) = @_; + + my $PropertyName = $Col->{Descriptor}->GetName(); + if ($PropertyName eq "NewCount" or $PropertyName eq "OldCount") + { + $PropertyName =~ s/Count$//; + print "<a class='title' title='", $self->escapeHTML($Col->{Descriptor}->GetDisplayName()), "'>$PropertyName</a>\n"; + } + else + { + $self->SUPER::GenerateHeaderView($Row, $Col); + } +} + +sub GenerateDataView($$$) +{ + my ($self, $Row, $Col) = @_; + + my $PropertyName = $Col->{Descriptor}->GetName(); + if ($PropertyName eq "Task") + { + my $JobId = $Row->{Item}->JobId; + my $StepNo = $Row->{Item}->StepNo; + my $TaskNo = $Row->{Item}->TaskNo; + my $URL = GetTaskURL($JobId, $StepNo, $TaskNo); + print "<a href='", $self->escapeHTML($URL), "'>$JobId/$StepNo/$TaskNo</a>"; + } + elsif ($PropertyName eq "TaskLog") + { + my $URL = GetTaskURL($Row->{Item}->JobId, $Row->{Item}->StepNo, + $Row->{Item}->TaskNo, 0, $Row->{Item}->TaskLog); + print "<a href='", $self->escapeHTML($URL), "'>", + $self->escapeHTML($Row->{Item}->TaskLog), "</a>"; + } + elsif ($PropertyName eq "Date") + { + # The enclosing page already pulled in the datetime JavaScript code + GenerateDateTime($Row->{Item}->Task->Started); + } + elsif ($PropertyName eq "Remarks") + { + my $Job = CreateJobs()->GetItem($Row->{Item}->JobId); + print $self->escapeHTML($Job->Remarks); + } + else + { + $self->SUPER::GenerateDataView($Row, $Col); + } +} + + package FailureDetailsPage; use ObjectModel::CGI::ItemPage; @@ -71,6 +158,20 @@ sub GenerateValueView($$$$) } } +sub GenerateBody($) +{ + my ($self) = @_; + + $self->SUPER::GenerateBody(); + if (!$self->{Item}->GetIsNew()) + { + 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->GenerateList(); + } +} + sub GenerateFooter($) { my ($self) = @_;

1 0

Francois Gouget : testbot: Update the failures 'last seen' fields.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: tools Branch: master Commit: 1421ab5cdd51ccd4c5a4fdc13c5c51b6be769047 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1421ab5cdd51ccd4c5a4fdc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 16 18:24:07 2022 +0200 testbot: Update the failures 'last seen' fields. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index b8aaaa43..e25ea3ae 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1435,11 +1435,14 @@ sub MatchLogFailures($$) =item C<SaveLogFailures()> -Updates the TaskFailures objects for the task and log specified by the -$LogFailures structure. +Updates the Failures and TaskFailures objects for the task and log specified +by the $LogFailures structure. -Note that this implies deleting any preexisting TaskFailure to avoid leaving -obsolete data. +Notes: +* This implies deleting any preexisting TaskFailure to avoid leaving obsolete + data. +* This also updates the failures LastNew and LastOld fields which can however + not be undone. =back =cut @@ -1457,15 +1460,26 @@ sub SaveLogFailures($) return $ErrMessage if (defined $ErrMessage); return undef if (!$LogFailures->{Failures}); + my $Started = $LogFailures->{Task}->Started; foreach my $LogFailure (values %{$LogFailures->{Failures}}) { - my $TaskFailure = $LogFailure->{Failure}->TaskFailures->Add(); + my $Failure = $LogFailure->{Failure}; + my $TaskFailure = $Failure->TaskFailures->Add(); my $OldKey = $TaskFailure->GetKey(); $TaskFailure->Task($LogFailures->{Task}); $TaskFailure->TaskLog($LogFailures->{LogName}); $TaskFailure->KeyChanged($OldKey, $TaskFailure->GetKey()); $TaskFailure->NewCount($LogFailure->{NewCount}); $TaskFailure->OldCount($LogFailure->{OldCount}); + + if ($LogFailure->{NewCount} and ($Failure->LastNew || 0) < $Started) + { + $Failure->LastNew($Started); + } + if ($LogFailure->{OldCount} and ($Failure->LastOld || 0) < $Started) + { + $Failure->LastOld($Started); + } } (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $LogFailures->{Collection}->Save();

1 0

Francois Gouget : testbot/web: Tweak the failures page columns.
by Alexandre Julliard June 16, 2022

June 16, 2022

Module: tools Branch: master Commit: e49b4c5231fca6973fe70b86c4c2435987cc9a7d URL: https://source.winehq.org/git/tools.git/?a=commit;h=e49b4c5231fca6973fe70b8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 16 17:18:23 2022 +0200 testbot/web: Tweak the failures page columns. Show the bug id in the failure list: this makes it easier to find all the failures related to a given bug. Shorten some column labels so they don't make the column too wide. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Failures.pm | 6 +++--- testbot/web/FailuresList.pl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index b37b9e04..344af756 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -156,9 +156,9 @@ my @PropertyDescriptors = ( # Every entry must be associated with a Wine bug. # Note: The 'deleted' bug status means this failure entry should be # deleted as soon as it is not referenced anymore. - CreateBasicPropertyDescriptor("BugId", "WineHQ bug id", !1, 1, "N", 10), - CreateBasicPropertyDescriptor("BugStatus", "WineHQ bug status", !1, !1, "A", 32), - CreateBasicPropertyDescriptor("BugDescription", "WineHQ bug description", !1, !1, "A", 128), + CreateBasicPropertyDescriptor("BugId", "Bug id", !1, 1, "N", 10), + CreateBasicPropertyDescriptor("BugStatus", "Bug status", !1, !1, "A", 32), + CreateBasicPropertyDescriptor("BugDescription", "WineHQ Bug description", !1, !1, "A", 128), CreateDetailrefPropertyDescriptor("TaskFailures", "Tasks", \&CreateTaskFailures), ); diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index f2608dc4..f763413f 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -55,7 +55,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Notes|ConfigRegExp|FailureRegExp|BugId)$/ ? "" : + return $PropertyName =~ /^(?:Notes|ConfigRegExp|FailureRegExp)$/ ? "" : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -79,7 +79,7 @@ sub GenerateDataView($$$) my ($self, $Row, $Col) = @_; my $PropertyName = $Col->{Descriptor}->GetName(); - if ($PropertyName =~ /^Test(?:Module|Unit)$/) + if ($PropertyName eq "TestUnit") { print "<a href='", $self->escapeHTML($self->GetDetailsLink($Row)), "'>", $self->escapeHTML($Row->{Item}->$PropertyName), "</a>";

1 0