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

Re: [PATCH v2 0/5] MR204: win32u: Avoid calling PE code with user lock - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

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

1 0

Re: [PATCH v2 0/1] MR196: winegstreamer: Return void from align_video_info_planes. - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

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

1 0

Re: [PATCH v6 0/1] MR175: d3d11: Do not return uninitialized values on Map() failure. - approved
by Alexandre Julliard (＠julliard) 08 Jun '22

08 Jun '22

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

1 0

[PATCH 0/5] MR197: winegstreamer: Add support for zero-copy in wg_transform.
by Rémi Bernon 08 Jun '22

08 Jun '22

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

4 12

[PATCH v2 1/5] mshtml: Set the channel's content type when parsing the header.
by Gabriel Ivăncescu 08 Jun '22

08 Jun '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Needed by 3rd patch. dlls/mshtml/navigate.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e6f2035..5d74cc1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -708,12 +708,26 @@ HRESULT read_stream(BSCallback *This, IStream *stream, void *buf, DWORD size, DW static void parse_content_type(nsChannelBSC *This, const WCHAR *value) { - const WCHAR *ptr; - size_t len; + const WCHAR *ptr, *beg, *end; + size_t len = wcslen(value); + char *content_type; static const WCHAR charsetW[] = {'c','h','a','r','s','e','t','='}; ptr = wcschr(value, ';'); + for(end = ptr ? ptr : value + len; end > value; end--) + if(!iswspace(end[-1])) + break; + for(beg = value; beg < end; beg++) + if(!iswspace(*beg)) + break; + + if((content_type = heap_strndupWtoU(beg, end - beg))) { + heap_free(This->nschannel->content_type); + This->nschannel->content_type = content_type; + strlwr(content_type); + } + if(!ptr) return; -- 2.34.1

2 6

[PATCH] po: Update Traditional Chinese translation.
by Chilung Chan 08 Jun '22

08 Jun '22

--- po/zh_TW.po | 66 +++++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index e1e2c09a37e..6d91a2902c9 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-23 14:09+0800\n" +"PO-Revision-Date: 2022-06-09 03:05+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -3924,13 +3924,11 @@ msgstr "無法在這個物件更改屬性描述符中的 'writable' 屬性為 't #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "循環的 __proto__ 值" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "無法定義屬性 '|': 物件不能擴展" +msgstr "無法為不可擴展的物件建立屬性" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -3945,10 +3943,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "無法修改不可寫入的屬性 '|'" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' 不是 Map 物件" +msgstr "'this' 不是一個 | 物件" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" @@ -3965,45 +3961,39 @@ msgstr "Wine" #: dlls/kernelbase/kernelbase.rc:29 msgid "Western Europe and United States" -msgstr "" +msgstr "西歐和美國" #: dlls/kernelbase/kernelbase.rc:30 -#, fuzzy -#| msgid "Central European" msgid "Central Europe" msgstr "中歐語言" #: dlls/kernelbase/kernelbase.rc:34 -#, fuzzy -#| msgid "Turkish" msgid "Turkic" -msgstr "土耳其語" +msgstr "突厥語" #: dlls/kernelbase/kernelbase.rc:36 msgid "Korean" -msgstr "" +msgstr "韓語" #: dlls/kernelbase/kernelbase.rc:37 -#, fuzzy -#| msgid "Operation Ceased" msgid "Traditional Chinese" -msgstr "作業已停止" +msgstr "繁體中文" #: dlls/kernelbase/kernelbase.rc:38 msgid "Simplified Chinese" -msgstr "" +msgstr "簡體中文" #: dlls/kernelbase/kernelbase.rc:43 msgid "Indic" -msgstr "" +msgstr "印度語" #: dlls/kernelbase/kernelbase.rc:44 msgid "Georgian" -msgstr "" +msgstr "喬治亞語" #: dlls/kernelbase/kernelbase.rc:45 msgid "Armenian" -msgstr "" +msgstr "亞美尼亞語" #: dlls/kernelbase/winerror.mc:28 msgid "Success.\n" @@ -6962,54 +6952,40 @@ msgid "This network connection does not exist.\n" msgstr "這個網路連線不存在。\n" #: dlls/kernelbase/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "於插斷時間無效。\n" +msgstr "呼叫已中斷。\n" #: dlls/kernelbase/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "無效的控制代碼。\n" +msgstr "無效的檔案控制代碼。\n" #: dlls/kernelbase/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "無效的網路位址。\n" +msgstr "無效的指標位址。\n" #: dlls/kernelbase/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "無效的名稱。\n" +msgstr "無效的引數。\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "連線被同儕節點重設。\n" #: dlls/kernelbase/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "找不到點。\n" +msgstr "找不到主機。\n" #: dlls/kernelbase/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "找不到屬性。\n" +msgstr "找不到未授權的主機。\n" #: dlls/kernelbase/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "發生致命錯誤。\n" +msgstr "無法復原的錯誤。\n" #: dlls/kernelbase/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "名稱有效，無資料記錄。" #: dlls/kernelbase/winerror.mc:3817 msgid "Not implemented.\n" @@ -7695,7 +7671,7 @@ msgstr "不支援的狀態轉換。\n" #: dlls/mferror/mferror.mc:291 msgid "Unrecoverable error occurred.\n" -msgstr "發生致命錯誤。\n" +msgstr "發生無法復原的錯誤。\n" #: dlls/mferror/mferror.mc:298 msgid "Sample has too many buffers.\n" -- 2.36.1.windows.1

2 1

[PATCH 0/5] MR201: ntdll: Implement RtlSetUserValueHeap.
by Rémi Bernon 08 Jun '22

08 Jun '22

And prepare HLOCAL allocation to use it. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/201

3 11

[PATCH 0/6] MR208: dinput/tests: Cleanup old tests and merge more dinput8 / dinput tests together.
by Rémi Bernon 08 Jun '22

08 Jun '22

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

2 13

[tools 1/2] testbot/orm: Turn Itemrefs into virtual properties.
by Francois Gouget 08 Jun '22

08 Jun '22

Itemref properties are used to map foreign key columns to the object corresponding to the target table row. However so far adding an Itemref property meant hiding the underlying table column(s) with annoying side-effects: * The type of the underlying property is unknown which is not an issue for strings and integers but rules out using booleans and timestamps in foreign keys since they need conversion from / to the database format. * Filtering on an Itemref property is possible by passing the target object, but not by using the underlying property(s). This makes inequality filters (e.g. >= JobId) awkward or impossible. * This also makes it impossible to filter on a partial foreign key. For instance if one had a TaskFailures table matching known failures to the tasks (JobId, TaskNo) they appear in, one would be unable to get a collection with all the entries for a given job since it's impossible to filter on just the JobId column. So this modifies Itemref properties to come in addition to the underlying column instead of replacing them. This means declaring all the underlying columns, with their proper property descriptors, which makes it possible to access them the normal way and to use them in filters, while still being able to access the corresponding object using the extra Itemref 'virtual' property. It also means filtering out the new properties if they should not be shown in the GUI. Another consequence is that Itemref properties cannot be keys: only the underlying columns can. Finally the underlying columns should not be modified directly as that would cause them to be inconsistent with the corresponding Itemref property but this is not enforced. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 26 ++++++++++++------- testbot/lib/ObjectModel/Item.pm | 25 +++++------------- .../ObjectModel/ItemrefPropertyDescriptor.pm | 17 +++++++----- testbot/lib/WineTestBot/CGI/Sessions.pm | 1 + testbot/lib/WineTestBot/Jobs.pm | 3 +++ testbot/lib/WineTestBot/PendingPatches.pm | 1 + testbot/lib/WineTestBot/StepsTasks.pm | 1 + testbot/lib/WineTestBot/Tasks.pm | 1 + testbot/lib/WineTestBot/UserRoles.pm | 3 ++- testbot/web/JobDetails.pl | 6 ++--- testbot/web/index.pl | 11 +++----- 11 files changed, 50 insertions(+), 45 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index f4d16836b..e837d47f5 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -219,15 +219,23 @@ sub ColNameToDb($) { my ($PropertyDescriptor) = @_; - my $ColNames = $PropertyDescriptor->GetColNames(); - if (@$ColNames != 1) - { - # This would require building a more complex where clause, something like - # ((col1 = item1.val1 AND col2 = item1.val2...) OR - # (col1 = item2.val1 AND col2 = item2.val2...) OR ...) - # So it is not supported. Instead one should build the where clause by - # hand from the underlying columns. - die "cannot filter on the ". $PropertyDescriptor->GetName() ." Itemref because it has a multi-column key: @$ColNames"; + my $ColNames; + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + $ColNames = $PropertyDescriptor->GetRefColNames(); + if (@$ColNames != 1) + { + # This would require building a more complex where clause, something like + # ((col1 = item1.val1 AND col2 = item1.val2...) OR + # (col1 = item2.val1 AND col2 = item2.val2...) OR ...) + # So it is not supported. Instead one should build the where clause by + # hand from the underlying columns. + die "cannot filter on the ". $PropertyDescriptor->GetName() ." Itemref because it has a multi-column key: @$ColNames"; + } + } + else + { + $ColNames = $PropertyDescriptor->GetColNames(); } return $ColNames->[0]; } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 593b039ff..b07b76066 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -292,7 +292,7 @@ sub AUTOLOAD { $self->{IsModified} = 1; $self->{Itemrefs}{$PropertyName} = undef; - foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) + foreach my $ColName (@{$PropertyDescriptor->GetRefColNames()}) { $self->{ColValues}{$ColName} = undef; } @@ -305,7 +305,7 @@ sub AUTOLOAD # Note that the foreign key names ($RefColNames) typically don't # match the Item's primary key column names. But their order and # count must match the primary key values. - my $RefColNames = $PropertyDescriptor->GetColNames(); + my $RefColNames = $PropertyDescriptor->GetRefColNames(); my ($_ColNames, $ColValues) = $Item->GetMasterKey(); foreach my $ColIndex (0..$#{$RefColNames}) { @@ -315,8 +315,8 @@ sub AUTOLOAD } elsif (! defined($self->{Itemrefs}{$PropertyName})) { - my $ColNames = $PropertyDescriptor->GetColNames(); - my @KeyComponents = map { $self->{ColValues}{$_} || "" } @$ColNames; + my $RefColNames = $PropertyDescriptor->GetRefColNames(); + my @KeyComponents = map { $self->{ColValues}{$_} || "" } @$RefColNames; my $Collection = &{$PropertyDescriptor->GetCreator()}($self); my $Key = $Collection->CombineKey(@KeyComponents); $self->{Itemrefs}{$PropertyName} = $Collection->GetItem($Key); @@ -455,32 +455,21 @@ sub Compare($$) { next if (!$PropertyDescriptor->GetIsKey()); - my $ColNames = $PropertyDescriptor->GetColNames(); + my $ColName = $PropertyDescriptor->GetColNames()->[0]; if ($PropertyDescriptor->GetClass() eq "Basic") { - my $ColName = $ColNames->[0]; my $ColType = $PropertyDescriptor->GetType(); my $Cmp = ($ColType eq "N" or $ColType eq "S" or $ColType eq "DT") ? $self->{ColValues}{$ColName} <=> $B->{ColValues}{$ColName} : $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; return $Cmp if ($Cmp); } - elsif ($PropertyDescriptor->GetClass() eq "Enum") + else { - my $ColName = $ColNames->[0]; + # Detailrefs and Itemrefs cannot be keys so this is an Enum. my $Cmp = $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; return $Cmp if ($Cmp); } - else - { - # A Detailref cannot be a key so this is an Itemref. Note that its - # underlying column types are unknown so treat them as strings. - foreach my $ColName (@$ColNames) - { - my $Cmp = $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; - return $Cmp if ($Cmp); - } - } } return 0; } diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index cba4f9af1..d79e1d25a 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -32,11 +32,11 @@ our @EXPORT = qw(CreateItemrefPropertyDescriptor); sub _initialize($$$) { - my ($self, $Creator, $ColNames) = @_; + my ($self, $Creator, $RefColNames) = @_; $self->{Class} = "Itemref"; $self->{Creator} = $Creator; - $self->{ColNames} = $ColNames; + $self->{RefColNames} = $RefColNames; $self->SUPER::_initialize(); } @@ -50,9 +50,14 @@ sub GetCreator($) sub GetColNames($) { - my ($self) = @_; + #my ($self) = @_; + return []; +} - return $self->{ColNames}; +sub GetRefColNames($) +{ + my ($self) = @_; + return $self->{RefColNames}; } sub ValidateValue($$$) @@ -69,8 +74,8 @@ sub ValidateValue($$$) sub CreateItemrefPropertyDescriptor($$$$$$) { - my ($Name, $DisplayName, $IsKey, $IsRequired, $Creator, $ColNames) = @_; - return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Creator, $ColNames); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Creator, $RefColNames) = @_; + return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Creator, $RefColNames); } 1; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 39634e3ef..d61c6e0ff 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -71,6 +71,7 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Session id", 1, 1, "A", 32), + CreateBasicPropertyDescriptor("UserName", "User", !1, 1, "A", 40), CreateItemrefPropertyDescriptor("User", "User", !1, 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Permanent", "Permanent session", !1, 1, "B", 1), ); diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 1eb7bb7eb..091420d45 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -508,13 +508,16 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Job", 1, 1, "S", 10), + CreateBasicPropertyDescriptor("BranchName", "Branch", !1, 1, "A", 20), CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]), + CreateBasicPropertyDescriptor("UserName", "Author", !1, 1, "A", 40), CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['new', 'staging', 'queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled']), CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), + CreateBasicPropertyDescriptor("PatchId", "Patch id", !1, !1, "N", 10), # Somehow mod_perl sometimes fails to find CreatePatches() if not given the # fully qualified name, but never has any trouble with the other Create*() # functions. diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index 118c74900..c65aabdce 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -65,6 +65,7 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("No", "Part no", 1, 1, "N", 2), + CreateBasicPropertyDescriptor("PatchId", "Patch id", !1, 1, "N", 10), CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", !1, 1, \&CreatePatches, ["PatchId"]), ); my @FlatPropertyDescriptors = ( diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 5970c872e..794c73eb7 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -181,6 +181,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("TaskNo", "Task", !1, 1, "N", 2), CreateBasicPropertyDescriptor("Type", "Step type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), + CreateBasicPropertyDescriptor("VMName", "VM", !1, 1, "A", 20), CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("FileName", "File", !1, !1, "A", 100), diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index a7d9e820e..8e9386299 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -354,6 +354,7 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("No", "Task", 1, 1, "N", 2), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), + CreateBasicPropertyDescriptor("VMName", "VM", !1, 1, "A", 20), CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("Missions", "Missions", !1, 1, "A", 256), diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index e01cd9d28..fcdbc8e04 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -58,7 +58,8 @@ sub CreateItem($) } my @PropertyDescriptors = ( - CreateItemrefPropertyDescriptor("Role", "Role", 1, 1, \&CreateRoles, ["RoleName"]), + CreateBasicPropertyDescriptor("RoleName", "Role", 1, 1, "A", 20), + CreateItemrefPropertyDescriptor("Role", "Role", !1, 1, \&CreateRoles, ["RoleName"]), ); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("UserName", "Username", 1, 1, "A", 40), diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 329ab150c..36bba0d04 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -50,7 +50,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName =~ /^(?:Id|PreviousNo|Type|FileType|Missions)$/ ? "" : + return $PropertyName =~ /^(?:Id|PreviousNo|Type|VM|FileType|Missions)$/ ? "" : $PropertyName eq "Started" ? ("ro", "timetipdate") : $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -89,10 +89,10 @@ sub GenerateDataView($$$) my $StepTask = $Row->{Item}; my $PropertyName = $Col->{Descriptor}->GetName(); - if ($PropertyName eq "VM") + if ($PropertyName eq "VMName") { print "<a href='#k", $StepTask->GetKey(), "'>", - $self->escapeHTML($StepTask->VM->Name), "</a>"; + $self->escapeHTML($StepTask->VMName), "</a>"; return; } if ($PropertyName eq "FileName") diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 1083d3b57..8b4af53c0 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -39,14 +39,9 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Patch" || - ($PropertyName eq "Branch" && - ! CreateBranches()->MultipleBranchesPresent)) - { - return !1; - } - - return $PropertyName eq "Submitted" ? ("ro", "timetipdate") : + return $PropertyName =~ /^(?:Branch|PatchId|Patch)$/ ? "" : + $PropertyName eq "Submitted" ? ("ro", "timetipdate") : + ($PropertyName eq "Branch" and !CreateBranches()->MultipleBranchesPresent) ? "" : $self->SUPER::DisplayProperty($PropertyDescriptor); } -- 2.30.2

1 1

[tools] testbot/cgi: Rename ItemPage::RedirectToList() to RedirectToParent().
by Francois Gouget 08 Jun '22

08 Jun '22

The parent of a Details page may not be a *List.pl page. For instance a naive web interface for a Job -> Step hierarchy would result in a JobsList -> JobDetails -> StepsList -> StepDetails page tree. But such a page hierarchy would be very cumbersome to use so one would instead have JobsList -> JobDetails (with embedded StepsBlock) -> StepDetails. So the StepDetails page would link back to the JobDetails page and not to a *List page. So a better name for the redirect method is the more generic RedirectToParent(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Also some pages may have more than one parent. This is the case of the RoleDetails page which should either go back to the main RolesList page, or to the UserDetails page. But that's for the Details page to figure out on its own. (Which in the RoleDetails page case it currently does not. But since it only bothers TestBot administrators and only on rare occasions it's a minor concern.) --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 6 +++--- testbot/web/admin/UserDetails.pl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 690458e3a..cd40ba2e4 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -125,7 +125,7 @@ sub GetActions($) return $self->{HasRW} ? ["Save", "Cancel"] : []; } -sub RedirectToList($) +sub RedirectToParent($) { my ($self) = @_; @@ -139,11 +139,11 @@ sub OnAction($$) if ($Action eq "Save") { return !1 if (!$self->Save()); - exit($self->RedirectToList()); + exit($self->RedirectToParent()); } if ($Action eq "Cancel") { - exit($self->RedirectToList()); + exit($self->RedirectToParent()); } return $self->SUPER::OnAction($Action); diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 798063dd7..833a36d14 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -196,7 +196,7 @@ sub OnApprove($) return !1 if (!$self->Save()); $self->{ErrMessage} = $self->{Item}->Approve(); return !1 if (defined $self->{ErrMessage}); - exit($self->RedirectToList()); + exit($self->RedirectToParent()); } sub OnReject($) @@ -208,7 +208,7 @@ sub OnReject($) return !1 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); - exit($self->RedirectToList()); + exit($self->RedirectToParent()); } sub OnSave($) @@ -221,7 +221,7 @@ sub OnSave($) # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); } - exit($self->RedirectToList()); + exit($self->RedirectToParent()); } sub OnAction($$) -- 2.30.2

1 0