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

[PATCH 1/6] user32: Introduce reply_message_result helper.
by Jacek Caban 24 Mar '22

24 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-)

3 2

[tools 1/2] testbot/cgi: Group related CGI framework methods together.
by Francois Gouget 24 Mar '22

24 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should not make any difference to the way the website works but it really makes it easier to understand how the classes work. It also simplifies documenting them. --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 668 +++++++++--------- .../ObjectModel/CGI/CollectionBlockForPage.pm | 87 ++- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 152 ++-- testbot/lib/ObjectModel/CGI/FormPage.pm | 331 +++++---- testbot/lib/ObjectModel/CGI/ItemPage.pm | 136 ++-- testbot/lib/ObjectModel/CGI/Page.pm | 156 ++-- testbot/lib/WineTestBot/CGI/PageBase.pm | 355 +++++----- 7 files changed, 1024 insertions(+), 861 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 9027b8775..13bbc4c3f 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -51,6 +51,20 @@ sub _initialize($$$) #my ($self, $Collection, $EnclosingPage) = @_; } +sub CallGetDetailsPage($) +{ + my ($self) = @_; + + return $self->GetDetailsPage(); +} + +sub GetDetailsPage($) +{ + my ($self) = @_; + + return $self->{Collection}->GetItemName() . "Details.pl"; +} + sub escapeHTML($$) { my ($self, $String) = @_; @@ -58,126 +72,213 @@ sub escapeHTML($$) return $self->{EnclosingPage}->escapeHTML($String); } -sub GenerateList($) + +# +# Error handling framework +# + +sub CallGenerateErrorDiv($) { my ($self) = @_; - my $Collection = $self->{Collection}; - my $PropertyDescriptors = $Collection->GetPropertyDescriptors(); - my $HasDT = !1; - foreach my $PropertyDescriptor (@{$PropertyDescriptors}) + $self->{EnclosingPage}->GenerateErrorDiv(); +} + +sub CallGenerateErrorPopup($) +{ + my ($self) = @_; + + $self->{EnclosingPage}->GenerateErrorPopup(); +} + + +# +# Individual item property support +# + +sub CallDisplayProperty($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $self->DisplayProperty($PropertyDescriptor); +} + +sub DisplayProperty($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $PropertyDescriptor->GetClass ne "Detailref"; +} + +sub CallSortKeys($$) +{ + my ($self, $Keys) = @_; + + return $self->SortKeys($Keys); +} + +sub SortKeys($$) +{ + my ($self, $Keys) = @_; + + return $Keys; +} + +sub CallGetDisplayValue($$$) +{ + my ($self, $Item, $PropertyDescriptor) = @_; + + return $self->GetDisplayValue($Item, $PropertyDescriptor); +} + +sub GetDisplayValue($$$) +{ + my ($self, $Item, $PropertyDescriptor) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + my $Value = $Item->$PropertyName; + + if ($PropertyDescriptor->GetClass() eq "Itemref") { - if ($PropertyDescriptor->GetClass() eq "Basic" && - $PropertyDescriptor->GetType() eq "DT") + if (defined($Value)) { - $HasDT = 1; + foreach $PropertyDescriptor (@{$Value->GetPropertyDescriptors()}) + { + if ($PropertyDescriptor->GetIsKey()) + { + $PropertyName = $PropertyDescriptor->GetName(); + $Value = $Value->$PropertyName; + last; + } + } } } - if ($HasDT) + + if ($PropertyDescriptor->GetClass() eq "Basic") { - print <<"EOF"; -<script type='text/javascript'></script>\n"; + } + } + } + + return $Value; +} + +sub CallGetEscapedDisplayValue($$$) { - return n < 10 ? '0' + n : n; + my ($self, $Item, $PropertyDescriptor) = @_; + + return $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); } -function ShowDateTime(Sec1970, Id, Attr) +sub GetEscapedDisplayValue($$$) { - var Dt = new Date(Sec1970 * 1000); - var Pretty = Dt.getFullYear() + '-' + Pad2(Dt.getMonth() + 1) + '-' + - Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + - Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds()) - if (Id != null) + my ($self, $Item, $PropertyDescriptor) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + my $Value = $Item->$PropertyName; + + if ($PropertyDescriptor->GetClass() eq "Basic" && + $PropertyDescriptor->GetType() eq "DT") { - document.getElementById(Id).setAttribute(Attr || "title", Pretty); + if (defined($Value)) + { + $Value = "<script type='text/javascript'></script><noscript><div>" . + strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . + "</div></noscript>\n"; + } } else { - document.write(Pretty); + $Value = $self->escapeHTML($self->CallGetDisplayValue($Item, + $PropertyDescriptor)); } + + return $Value; } -//--></script> -EOF - } - print "<div class='CollectionBlock'>\n"; - $self->CallGenerateFormStart(); - $self->CallGenerateErrorDiv(); - print "<table border='0' cellpadding='5' cellspacing='0' summary='" . - "Overview of " . $Collection->GetCollectionName() . "'>\n"; - print "<thead>\n"; - my $ItemActions = $self->CallGetItemActions(); - $self->CallGenerateHeaderRow($PropertyDescriptors, $ItemActions); - print "</thead>\n"; +# +# Item cell generation +# - print "<tbody>\n"; - my $DetailsPage = $self->CallGetDetailsPage(); - my $Row = 0; - my $Keys = $self->CallSortKeys($self->{Collection}->GetKeys()); - foreach my $Key (@$Keys) - { - my $Class = ($Row % 2) == 0 ? "even" : "odd"; - my $Item = $self->{Collection}->GetItem($Key); - $self->CallGenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, - $Class, $ItemActions); - $Row++; - } - if (@$Keys == 0) - { - print "<tr class='even'><td colspan='0'>No entries</td></tr>\n"; - } +sub CallGenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; - print "</tbody>\n"; - print "</table>\n"; + return $self->GenerateHeaderCell($PropertyDescriptor); +} - if (@$ItemActions != 0 && @$Keys != 0) - { - print <<EOF; -<div class='CollectionBlockActions'> -<script type='text/javascript'> - -</script> -EOF - print "For selected ", $self->{Collection}->GetCollectionName() . ":"; - foreach my $Action (@$ItemActions) - { - print " <input type='submit' name='Action' value='" . - $self->escapeHTML($Action) . "' />"; - } - print "\n"; - print "</div>\n"; - } +sub CallGenerateDataCell($$$$) +{ + my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; - my $Actions = $self->CallGetActions(); - if (@$Actions != 0) + return $self->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); +} + +sub GenerateDataCell($$$$) +{ + my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; + + print "<td>"; + my $NeedLink; + if ($PropertyDescriptor->GetIsKey() && $DetailsPage) { - print "<div class='CollectionBlockActions'>\n"; - foreach my $Action (@$Actions) + $NeedLink = 1; + } + else + { + $NeedLink = !1; + } + if ($NeedLink) + { + my $Query = "$DetailsPage?Key=" . uri_escape($Item->GetKey()); + my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); + if (defined($MasterColNames)) { - print "<input type='submit' name='Action' value='$Action' />\n"; + foreach my $ColIndex (0 .. @$MasterColNames - 1) + { + $Query .= "&" . $MasterColNames->[$ColIndex] . "=" . + uri_escape($MasterColValues->[$ColIndex]); + } } - print "</div>\n"; + print "<a href='", $self->escapeHTML($Query), "'>"; } - - $self->CallGenerateErrorPopup(undef); - $self->CallGenerateFormEnd(); - print "</div>\n"; + print $self->CallGetEscapedDisplayValue($Item, $PropertyDescriptor); + if ($NeedLink) + { + print "</a>"; + } + print "</td>\n"; } + +# +# Collection table generation +# + sub CallGenerateFormStart($) { my ($self) = @_; @@ -202,33 +303,6 @@ sub GenerateFormStart($) } } -sub CallGenerateErrorDiv($) -{ - my ($self) = @_; - - $self->{EnclosingPage}->GenerateErrorDiv(); -} - -sub CallGenerateErrorPopup($) -{ - my ($self) = @_; - - $self->{EnclosingPage}->GenerateErrorPopup(); -} - -sub CallGenerateFormEnd($) -{ - my ($self) = @_; - - $self->GenerateFormEnd(); -} - -sub GenerateFormEnd($) -{ - #my ($self) = @_; - print "</form>\n"; -} - sub CallGenerateHeaderRow($$$) { my ($self, $PropertyDescriptors, $ItemActions) = @_; @@ -256,18 +330,12 @@ sub GenerateHeaderRow($$$) print "</tr>\n"; } -sub CallGenerateHeaderCell($$) +sub SelName($$) { - my ($self, $PropertyDescriptor) = @_; - - return $self->GenerateHeaderCell($PropertyDescriptor); -} + my ($self, $Key) = @_; -sub GenerateHeaderCell($$) -{ - my ($self, $PropertyDescriptor) = @_; - print "<th>", $self->escapeHTML($PropertyDescriptor->GetDisplayName()), - "</th>\n"; + $Key =~ s/[^0-9a-zA-Z]+/_/g; + return "sel_" . $Key; } sub CallGenerateDataRow($$$$$$) @@ -277,14 +345,6 @@ sub CallGenerateDataRow($$$$$$) $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } -sub SelName($$) -{ - my ($self, $Key) = @_; - - $Key =~ s/[^0-9a-zA-Z]+/_/g; - return "sel_" . $Key; -} - sub GenerateDataRow($$$$$$) { my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; @@ -295,72 +355,153 @@ sub GenerateDataRow($$$$$$) print "<td><input name='", $self->SelName($Item->GetKey()), "' type='checkbox' /></td>\n"; } - foreach my $PropertyDescriptor (@$PropertyDescriptors) + foreach my $PropertyDescriptor (@$PropertyDescriptors) + { + if ($self->CallDisplayProperty($PropertyDescriptor)) + { + $self->CallGenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); + } + } + print "</tr>\n"; +} + +sub CallGenerateFormEnd($) +{ + my ($self) = @_; + + $self->GenerateFormEnd(); +} + +sub GenerateFormEnd($) +{ + #my ($self) = @_; + print "</form>\n"; +} + +sub GenerateList($) +{ + my ($self) = @_; + + my $Collection = $self->{Collection}; + my $PropertyDescriptors = $Collection->GetPropertyDescriptors(); + my $HasDT = !1; + foreach my $PropertyDescriptor (@{$PropertyDescriptors}) + { + if ($PropertyDescriptor->GetClass() eq "Basic" && + $PropertyDescriptor->GetType() eq "DT") + { + $HasDT = 1; + } + } + if ($HasDT) + { + print <<"EOF"; +<script type='text/javascript'></script> +EOF + } + + print "<div class='CollectionBlock'>\n"; + $self->CallGenerateFormStart(); + $self->CallGenerateErrorDiv(); + + print "<table border='0' cellpadding='5' cellspacing='0' summary='" . + "Overview of " . $Collection->GetCollectionName() . "'>\n"; + print "<thead>\n"; + my $ItemActions = $self->CallGetItemActions(); + $self->CallGenerateHeaderRow($PropertyDescriptors, $ItemActions); + print "</thead>\n"; + + print "<tbody>\n"; + my $DetailsPage = $self->CallGetDetailsPage(); + my $Row = 0; + my $Keys = $self->CallSortKeys($self->{Collection}->GetKeys()); + foreach my $Key (@$Keys) + { + my $Class = ($Row % 2) == 0 ? "even" : "odd"; + my $Item = $self->{Collection}->GetItem($Key); + $self->CallGenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, + $Class, $ItemActions); + $Row++; + } + if (@$Keys == 0) { - if ($self->CallDisplayProperty($PropertyDescriptor)) - { - $self->CallGenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); - } + print "<tr class='even'><td colspan='0'>No entries</td></tr>\n"; } - print "</tr>\n"; -} - -sub CallGenerateDataCell($$$$) -{ - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; - return $self->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); -} - -sub GenerateDataCell($$$$) -{ - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; + print "</tbody>\n"; + print "</table>\n"; - print "<td>"; - my $NeedLink; - if ($PropertyDescriptor->GetIsKey() && $DetailsPage) + if (@$ItemActions != 0 && @$Keys != 0) { - $NeedLink = 1; - } - else + print <<EOF; +<div class='CollectionBlockActions'> +<script type='text/javascript'> + +</script> +EOF + print "For selected ", $self->{Collection}->GetCollectionName() . ":"; + foreach my $Action (@$ItemActions) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) - { - $Query .= "&" . $MasterColNames->[$ColIndex] . "=" . - uri_escape($MasterColValues->[$ColIndex]); - } + print " <input type='submit' name='Action' value='" . + $self->escapeHTML($Action) . "' />"; } - print "<a href='", $self->escapeHTML($Query), "'>"; + print "\n"; + print "</div>\n"; } - print $self->CallGetEscapedDisplayValue($Item, $PropertyDescriptor); - if ($NeedLink) + + my $Actions = $self->CallGetActions(); + if (@$Actions != 0) { - print "</a>"; + print "<div class='CollectionBlockActions'>\n"; + foreach my $Action (@$Actions) + { + print "<input type='submit' name='Action' value='$Action' />\n"; + } + print "</div>\n"; } - print "</td>\n"; -} - -sub CallGetDetailsPage($) -{ - my ($self) = @_; - return $self->GetDetailsPage(); + $self->CallGenerateErrorPopup(undef); + $self->CallGenerateFormEnd(); + print "</div>\n"; } -sub GetDetailsPage($) -{ - my ($self) = @_; - return $self->{Collection}->GetItemName() . "Details.pl"; -} +# +# Per-item actions handling +# sub CallGetItemActions($) { @@ -388,6 +529,32 @@ sub GetItemActions($) return ["Delete"]; } +sub CallOnItemAction($$$) +{ + my ($self, $Item, $Action) = @_; + + return $self->OnItemAction($Item, $Action); +} + +sub OnItemAction($$$) +{ + my ($self, $Item, $Action) = @_; + + if ($Action eq "Delete") + { + my $ErrMessage = $self->{Collection}->DeleteItem($Item); + $self->{EnclosingPage}->{ErrMessage} = $ErrMessage; + return ! defined($ErrMessage); + } + + return 1; +} + + +# +# Actions handling +# + sub CallGetActions($) { my ($self) = @_; @@ -421,108 +588,6 @@ sub GetActions($) return \@Actions; } -sub CallDisplayProperty($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $self->DisplayProperty($PropertyDescriptor); -} - -sub DisplayProperty($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $PropertyDescriptor->GetClass ne "Detailref"; -} - -sub CallGetDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - return $self->GetDisplayValue($Item, $PropertyDescriptor); -} - -sub GetDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - my $PropertyName = $PropertyDescriptor->GetName(); - my $Value = $Item->$PropertyName; - - if ($PropertyDescriptor->GetClass() eq "Itemref") - { - if (defined($Value)) - { - foreach $PropertyDescriptor (@{$Value->GetPropertyDescriptors()}) - { - if ($PropertyDescriptor->GetIsKey()) - { - $PropertyName = $PropertyDescriptor->GetName(); - $Value = $Value->$PropertyName; - last; - } - } - } - } - - if ($PropertyDescriptor->GetClass() eq "Basic") - { - if ($PropertyDescriptor->GetType() eq "B") - { - $Value = ($Value ? "Yes" : "No"); - } - elsif ($PropertyDescriptor->GetType() eq "DT") - { - if (defined($Value)) - { - $Value = - "<noscript><div>" . - strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . -"<script type='text/javascript'></script>\n"; - } - } - } - - return $Value; -} - -sub CallGetEscapedDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - return $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); -} - -sub GetEscapedDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - my $PropertyName = $PropertyDescriptor->GetName(); - my $Value = $Item->$PropertyName; - - if ($PropertyDescriptor->GetClass() eq "Basic" && - $PropertyDescriptor->GetType() eq "DT") - { - if (defined($Value)) - { - $Value = "<script type='text/javascript'></script><noscript><div>" . - strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . - "</div></noscript>\n"; - } - } - else - { - $Value = $self->escapeHTML($self->CallGetDisplayValue($Item, - $PropertyDescriptor)); - } - - return $Value; -} - sub OnAction($$) { my ($self, $Action) = @_; @@ -553,39 +618,4 @@ sub OnAction($$) } } -sub CallOnItemAction($$$) -{ - my ($self, $Item, $Action) = @_; - - return $self->OnItemAction($Item, $Action); -} - -sub OnItemAction($$$) -{ - my ($self, $Item, $Action) = @_; - - if ($Action eq "Delete") - { - my $ErrMessage = $self->{Collection}->DeleteItem($Item); - $self->{EnclosingPage}->{ErrMessage} = $ErrMessage; - return ! defined($ErrMessage); - } - - return 1; -} - -sub CallSortKeys($$) -{ - my ($self, $Keys) = @_; - - return $self->SortKeys($Keys); -} - -sub SortKeys($$) -{ - my ($self, $Keys) = @_; - - return $Keys; -} - 1; diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index 13ad5a875..94d5f8672 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -31,39 +31,49 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); -sub CallGenerateFormStart($) +sub CallGetDetailsPage($) { my ($self) = @_; - $self->{EnclosingPage}->GenerateFormStart($self); + return $self->{EnclosingPage}->GetDetailsPage($self); } -sub CallGenerateFormEnd($) + +# +# Item properties support +# + +sub CallDisplayProperty($$) { - my ($self) = @_; + my ($self, $PropertyDescriptor) = @_; - $self->{EnclosingPage}->GenerateFormEnd($self); + return $self->{EnclosingPage}->DisplayProperty($self, $PropertyDescriptor); } -sub CallGenerateHeaderCell($$) +sub CallSortKeys($$) { - my ($self, $PropertyDescriptor) = @_; + my ($self, $Keys) = @_; - return $self->{EnclosingPage}->GenerateHeaderCell($self, $PropertyDescriptor); + return $self->{EnclosingPage}->SortKeys($self, $Keys); } -sub CallGenerateHeaderRow($$$) +sub CallGetDisplayValue($$$) { - my ($self, $PropertyDescriptors, $ItemActions) = @_; + my ($self, $Item, $PropertyDescriptor) = @_; - $self->{EnclosingPage}->GenerateHeaderRow($self, $PropertyDescriptors, $ItemActions); + return $self->{EnclosingPage}->GetDisplayValue($self, $Item, $PropertyDescriptor); } -sub CallGenerateDataRow($$$$$$) + +# +# Item cell generation +# + +sub CallGenerateHeaderCell($$) { - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; + my ($self, $PropertyDescriptor) = @_; - $self->{EnclosingPage}->GenerateDataRow($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); + return $self->{EnclosingPage}->GenerateHeaderCell($self, $PropertyDescriptor); } sub CallGenerateDataCell($$$$) @@ -73,39 +83,49 @@ sub CallGenerateDataCell($$$$) return $self->{EnclosingPage}->GenerateDataCell($self, $Item, $PropertyDescriptor, $DetailsPage); } -sub CallGetDetailsPage($) + +# +# Collection table generation +# + +sub CallGenerateFormStart($) { my ($self) = @_; - return $self->{EnclosingPage}->GetDetailsPage($self); + $self->{EnclosingPage}->GenerateFormStart($self); } -sub CallGetItemActions($) +sub CallGenerateHeaderRow($$$) { - my ($self) = @_; + my ($self, $PropertyDescriptors, $ItemActions) = @_; - return $self->{EnclosingPage}->GetItemActions($self); + $self->{EnclosingPage}->GenerateHeaderRow($self, $PropertyDescriptors, $ItemActions); } -sub CallGetActions($) +sub CallGenerateDataRow($$$$$$) { - my ($self) = @_; + my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - return $self->{EnclosingPage}->GetActions($self); + $self->{EnclosingPage}->GenerateDataRow($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } -sub CallDisplayProperty($$) +sub CallGenerateFormEnd($) { - my ($self, $PropertyDescriptor) = @_; + my ($self) = @_; - return $self->{EnclosingPage}->DisplayProperty($self, $PropertyDescriptor); + $self->{EnclosingPage}->GenerateFormEnd($self); } -sub CallGetDisplayValue($$$) + +# +# Per-item actions handling +# + +sub CallGetItemActions($) { - my ($self, $Item, $PropertyDescriptor) = @_; + my ($self) = @_; - return $self->{EnclosingPage}->GetDisplayValue($self, $Item, $PropertyDescriptor); + return $self->{EnclosingPage}->GetItemActions($self); } sub CallOnItemAction($$$) @@ -115,11 +135,16 @@ sub CallOnItemAction($$$) return $self->{EnclosingPage}->OnItemAction($self, $Item, $Action); } -sub CallSortKeys($$) + +# +# Actions handling +# + +sub CallGetActions($) { - my ($self, $Keys) = @_; + my ($self) = @_; - return $self->{EnclosingPage}->SortKeys($self, $Keys); + return $self->{EnclosingPage}->GetActions($self); } 1; diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 72bba1bc4..993f18685 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -42,58 +42,51 @@ sub _initialize($$$$) $self->SUPER::_initialize($Request, $RequiredRole); } -sub GeneratePage($) +sub CreateCollectionBlock($$) { - my ($self) = @_; - - if ($self->GetParam("Action")) - { - my $CollectionBlock = $self->CreateCollectionBlock($self->{Collection}); - $self->{ActionPerformed} = $self->OnAction($CollectionBlock, - $self->GetParam("Action")); - } + my ($self, $Collection) = @_; - $self->SUPER::GeneratePage(); + return ObjectModel::CGI::CollectionBlockForPage->new($Collection, $self); } -sub GenerateTitle($) +sub GetDetailsPage($$) { - my ($self) = @_; + my ($self, $CollectionBlock) = @_; - my $Title = $self->GetTitle(); - if ($Title) - { - print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; - } + return $CollectionBlock->GetDetailsPage(); } -sub GenerateBody($) + +# +# Item properties support +# + +sub DisplayProperty($$$) { - my ($self) = @_; + my ($self, $CollectionBlock, $PropertyDescriptor) = @_; - print "<div class='CollectionPageBody'>\n"; - $self->GenerateTitle(); - print "<div class='Content'>\n"; - my $CollectionBlock = $self->CreateCollectionBlock($self->{Collection}); - $CollectionBlock->GenerateList(); - print "</div>\n"; - print "</div>\n"; + return $CollectionBlock->DisplayProperty($PropertyDescriptor); } -sub GenerateFormStart($$) +sub SortKeys($$$) { - my ($self, $CollectionBlock) = @_; + my ($self, $CollectionBlock, $Keys) = @_; - $CollectionBlock->GenerateFormStart(); + return $CollectionBlock->SortKeys($Keys); } -sub GenerateFormEnd($$) +sub GetDisplayValue($$$$) { - my ($self, $CollectionBlock) = @_; + my ($self, $CollectionBlock, $Item, $PropertyDescriptor) = @_; - $CollectionBlock->GenerateFormEnd(); + return $CollectionBlock->GetDisplayValue($Item, $PropertyDescriptor); } + +# +# Item cell generation +# + sub GenerateHeaderCell($$$) { my ($self, $CollectionBlock, $PropertyDescriptor) = @_; @@ -101,6 +94,18 @@ sub GenerateHeaderCell($$$) $CollectionBlock->GenerateHeaderCell($PropertyDescriptor); } +sub GenerateDataCell($$$$$) +{ + my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + + $CollectionBlock->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); +} + + +# +# Collection table generation +# + sub GenerateHeaderRow($$$$) { my ($self, $CollectionBlock, $PropertyDescriptors, $ItemActions) = @_; @@ -115,60 +120,80 @@ sub GenerateDataRow($$$$$$$) $CollectionBlock->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } -sub GenerateDataCell($$$$$) + +# +# HTML page generation +# + +sub GetTitle($) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self) = @_; - $CollectionBlock->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); + return ucfirst($self->{Collection}->GetCollectionName()); } -sub CreateCollectionBlock($$) +sub GenerateTitle($) { - my ($self, $Collection) = @_; + my ($self) = @_; - return ObjectModel::CGI::CollectionBlockForPage->new($Collection, $self); + my $Title = $self->GetTitle(); + if ($Title) + { + print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; + } } -sub GetDetailsPage($$) +sub GenerateFormStart($$) { my ($self, $CollectionBlock) = @_; - return $CollectionBlock->GetDetailsPage(); + $CollectionBlock->GenerateFormStart(); } -sub GetTitle($) +sub GenerateBody($) { my ($self) = @_; - return ucfirst($self->{Collection}->GetCollectionName()); + print "<div class='CollectionPageBody'>\n"; + $self->GenerateTitle(); + print "<div class='Content'>\n"; + my $CollectionBlock = $self->CreateCollectionBlock($self->{Collection}); + $CollectionBlock->GenerateList(); + print "</div>\n"; + print "</div>\n"; } -sub GetItemActions($$) +sub GenerateFormEnd($$) { my ($self, $CollectionBlock) = @_; - return $CollectionBlock->GetItemActions(); + $CollectionBlock->GenerateFormEnd(); } -sub GetActions($$) +sub GeneratePage($) { - my ($self, $CollectionBlock) = @_; + my ($self) = @_; - return $CollectionBlock->GetActions(); + if ($self->GetParam("Action")) + { + my $CollectionBlock = $self->CreateCollectionBlock($self->{Collection}); + $self->{ActionPerformed} = $self->OnAction($CollectionBlock, + $self->GetParam("Action")); + } + + $self->SUPER::GeneratePage(); } -sub DisplayProperty($$$) -{ - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; - return $CollectionBlock->DisplayProperty($PropertyDescriptor); -} +# +# Per-item actions handling +# -sub OnAction($$$) +sub GetItemActions($$) { - my ($self, $CollectionBlock, $Action) = @_; + my ($self, $CollectionBlock) = @_; - $CollectionBlock->OnAction($Action); + return $CollectionBlock->GetItemActions(); } sub OnItemAction($$$$) @@ -178,18 +203,23 @@ sub OnItemAction($$$$) return $CollectionBlock->OnItemAction($Item, $Action); } -sub GetDisplayValue($$$$) + +# +# Actions handling +# + +sub GetActions($$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptor) = @_; + my ($self, $CollectionBlock) = @_; - return $CollectionBlock->GetDisplayValue($Item, $PropertyDescriptor); + return $CollectionBlock->GetActions(); } -sub SortKeys($$$) +sub OnAction($$$) { - my ($self, $CollectionBlock, $Keys) = @_; + my ($self, $CollectionBlock, $Action) = @_; - return $CollectionBlock->SortKeys($Keys); + $CollectionBlock->OnAction($Action); } 1; diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index bc8ce478c..588ea55b7 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -44,6 +44,11 @@ sub _initialize($$$$) $self->{Method} = "post"; } + +# +# Property handling +# + sub GetPropertyDescriptors($) { my ($self) = @_; @@ -67,121 +72,42 @@ sub GetPropertyDescriptorByName($$) return undef; } -sub GeneratePage($) -{ - my ($self) = @_; - - if ($self->GetParam("Action")) - { - $self->{ActionPerformed} = $self->OnAction($self->GetParam("Action")); - } - - $self->SUPER::GeneratePage(); -} - -sub GenerateTitle($) -{ - my ($self) = @_; - - my $Title = $self->GetTitle(); - if ($Title) - { - print "<h1 id='PageTitle'>", $self->CGI->escapeHTML($Title), "</h1>\n"; - } -} - -sub GenerateBody($) -{ - my ($self) = @_; - - print "<div class='ItemBody'>\n"; - $self->GenerateTitle(); - print "<div class='Content'>\n"; - my $Text = $self->GetHeaderText(); - if ($Text) - { - print "<p>$Text</p>\n"; - } - $self->GenerateFormStart(); - $self->GenerateErrorDiv(); - - $self->GenerateFields(); - $self->GenerateRequiredLegend(); - - if (defined $self->{ErrMessage}) - { - if (defined $self->{ErrField}) - { - my $PropertyDescriptor = $self->GetPropertyDescriptorByName($self->{ErrField}); - if ($PropertyDescriptor and !$self->DisplayProperty($PropertyDescriptor)) - { - $self->{ErrMessage} = "Internal error?\n$self->{ErrMessage}"; - } - } - $self->GenerateErrorPopup(); - } - $self->GenerateActions(); - $self->GenerateFormEnd(); - $Text = $self->GetFooterText(); - if ($Text) - { - print "<p>$Text</p>\n"; - } - print "</div>\n"; - print "</div>\n"; -} - -sub GenerateFormStart($) -{ - my ($self) = @_; - print "<form action='" . $ENV{"SCRIPT_NAME"} . - "' method='$self->{Method}' enctype='multipart/form-data'>\n"; -} - -sub GenerateFields($) +sub DisplayProperty($$) { - my ($self) = @_; + my ($self, $PropertyDescriptor) = @_; - my $PropertyDescriptors = $self->GetPropertyDescriptors(); - foreach my $PropertyDescriptor (@{$PropertyDescriptors}) - { - my $Display = $self->DisplayProperty($PropertyDescriptor); - $self->GenerateField($PropertyDescriptor, $Display) if ($Display); - } + return # Detailref fields point to a Collection of objects matching the + # primary key of this form data. As such they can neither be shown + # nor edited. + $PropertyDescriptor->GetClass() eq "Detailref" ? "" : + # Itemref fields are keys identifying other objects and thus would + # require careful validation if edited. Requiring users to manually + # type the appropriate key value would also be cumbersome so this is + # currently not supported. But they can be displayed. + $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" : + # All other properties can be edited... + $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : + $PropertyDescriptor->GetType() ne "S" ? "rw" : + # ...except autoincrement ones (shown as <unset> if undefined) + "ro"; } -sub GenerateRequiredLegend($) +sub GetPropertyValue($$) { - my ($self) = @_; - - if ($self->{HasRequired}) - { - print "<div class='ItemProperty'><label><span class='Required'>*</span></label>Required field</div>\n"; - } + #my ($self, $PropertyDescriptor) = @_; + return undef; } -sub GenerateActions($) -{ - my ($self) = @_; - print "<div class='ItemActions'>\n"; - foreach my $Action (@{$self->GetActions()}) - { - print "<input type='submit' name='Action' value='$Action'/>\n"; - } - print "</div>\n"; -} +# +# Form field support +# -sub GenerateFormEnd($) +sub GetDisplayName($$) { - #my ($self) = @_; - print "</form>\n"; -} + my ($self, $PropertyDescriptor) = @_; -sub GetPropertyValue($$) -{ - #my ($self, $PropertyDescriptor) = @_; - return undef; + return $PropertyDescriptor->GetDisplayName(); } sub GetDisplayValue($$) @@ -197,13 +123,6 @@ sub GetDisplayValue($$) return $Value; } -sub GetDisplayName($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $PropertyDescriptor->GetDisplayName(); -} - sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; @@ -216,6 +135,17 @@ sub GetInputType($$) "text"; } +sub GenerateRequired($$) +{ + my ($self, $PropertyDescriptor) = @_; + + if ($PropertyDescriptor->GetIsRequired()) + { + $self->{HasRequired} = 1; + print " <a class='Required' title='Required field'>*</a>"; + } +} + sub GenerateField($$$) { my ($self, $PropertyDescriptor, $Display) = @_; @@ -300,27 +230,66 @@ sub GenerateField($$$) print "</div>\n"; } -sub GenerateRequired($$) + +# +# HTML form page generation +# + +sub GetTitle($) { - my ($self, $PropertyDescriptor) = @_; + #my ($self) = @_; + return undef; +} - if ($PropertyDescriptor->GetIsRequired()) +sub GenerateTitle($) +{ + my ($self) = @_; + + my $Title = $self->GetTitle(); + if ($Title) { - $self->{HasRequired} = 1; - print " <a class='Required' title='Required field'>*</a>"; + print "<h1 id='PageTitle'>", $self->CGI->escapeHTML($Title), "</h1>\n"; } } -sub GetTitle($) +sub GetHeaderText($) { #my ($self) = @_; return undef; } -sub GetHeaderText($) +sub GenerateFormStart($) +{ + my ($self) = @_; + print "<form action='" . $ENV{"SCRIPT_NAME"} . + "' method='$self->{Method}' enctype='multipart/form-data'>\n"; +} + +sub GenerateFields($) +{ + my ($self) = @_; + + foreach my $PropertyDescriptor (@{$self->GetPropertyDescriptors()}) + { + my $Display = $self->DisplayProperty($PropertyDescriptor); + $self->GenerateField($PropertyDescriptor, $Display) if ($Display); + } +} + +sub GenerateRequiredLegend($) +{ + my ($self) = @_; + + if ($self->{HasRequired}) + { + print "<div class='ItemProperty'><label><span class='Required'>*</span></label>Required field</div>\n"; + } +} + +sub GenerateFormEnd($) { #my ($self) = @_; - return undef; + print "</form>\n"; } sub GetFooterText($) @@ -329,30 +298,81 @@ sub GetFooterText($) return undef; } -sub DisplayProperty($$) +sub GenerateBody($) { - my ($self, $PropertyDescriptor) = @_; + my ($self) = @_; - return # Detailref fields point to a Collection of objects matching the - # primary key of this form data. As such they can neither be shown - # nor edited. - $PropertyDescriptor->GetClass() eq "Detailref" ? "" : - # Itemref fields are keys identifying other objects and thus would - # require careful validation if edited. Requiring users to manually - # type the appropriate key value would also be cumbersome so this is - # currently not supported. But they can be displayed. - $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" : - # All other properties can be edited... - $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : - $PropertyDescriptor->GetType() ne "S" ? "rw" : - # ...except autoincrement ones (shown as <unset> if undefined) - "ro"; + print "<div class='ItemBody'>\n"; + $self->GenerateTitle(); + print "<div class='Content'>\n"; + my $Text = $self->GetHeaderText(); + if ($Text) + { + print "<p>$Text</p>\n"; + } + $self->GenerateFormStart(); + $self->GenerateErrorDiv(); + + $self->GenerateFields(); + $self->GenerateRequiredLegend(); + + if (defined $self->{ErrMessage}) + { + if (defined $self->{ErrField}) + { + my $PropertyDescriptor = $self->GetPropertyDescriptorByName($self->{ErrField}); + if ($PropertyDescriptor and !$self->DisplayProperty($PropertyDescriptor)) + { + $self->{ErrMessage} = "Internal error?\n$self->{ErrMessage}"; + } + } + $self->GenerateErrorPopup(); + } + $self->GenerateActions(); + $self->GenerateFormEnd(); + $Text = $self->GetFooterText(); + if ($Text) + { + print "<p>$Text</p>\n"; + } + print "</div>\n"; + print "</div>\n"; } -sub GetActions($) +sub GeneratePage($) { - #my ($self) = @_; - return []; + my ($self) = @_; + + if ($self->GetParam("Action")) + { + $self->{ActionPerformed} = $self->OnAction($self->GetParam("Action")); + } + + $self->SUPER::GeneratePage(); +} + + +# +# Validating and saving the form content +# + +sub Validate($) +{ + my ($self) = @_; + + foreach my $PropertyDescriptor (@{$self->GetPropertyDescriptors()}) + { + my $Value = $self->GetParam($PropertyDescriptor->GetName()); + my $ErrMessage = $PropertyDescriptor->ValidateValue($Value, 1); + if ($ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + $self->{ErrField} = $PropertyDescriptor->GetName(); + return !1; + } + } + + return 1; } sub SaveProperty($$$) @@ -394,31 +414,34 @@ sub Save($) return 1; } -sub OnAction($$) -{ - my ($self, $Action) = @_; - die "No action defined for $Action"; +# +# Actions handling +# + +sub GetActions($) +{ + #my ($self) = @_; + return []; } -sub Validate($) +sub GenerateActions($) { my ($self) = @_; - my $PropertyDescriptors = $self->GetPropertyDescriptors(); - foreach my $PropertyDescriptor (@{$PropertyDescriptors}) + print "<div class='ItemActions'>\n"; + foreach my $Action (@{$self->GetActions()}) { - my $Value = $self->GetParam($PropertyDescriptor->GetName()); - my $ErrMessage = $PropertyDescriptor->ValidateValue($Value, 1); - if ($ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = $PropertyDescriptor->GetName(); - return !1; - } + print "<input type='submit' name='Action' value='$Action'/>\n"; } + print "</div>\n"; +} - return 1; +sub OnAction($$) +{ + my ($self, $Action) = @_; + + die "No action defined for $Action"; } 1; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 09dfc0496..c0105f7d6 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -55,28 +55,10 @@ sub _initialize($$$$) } } -sub GenerateFormStart($) -{ - my ($self) = @_; - - $self->SUPER::GenerateFormStart(); - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) - { - foreach my $ColIndex (0 .. @$MasterColNames) - { - print "<div><input type='hidden' name='", $MasterColNames->[$ColIndex], - "' value='", $self->escapeHTML($MasterColValues->[$ColIndex]), - "' /></div>\n"; - } - } - if (! $self->{Item}->GetIsNew()) - { - print "<div><input type='hidden' name='Key' value='", - $self->escapeHTML($self->{Item}->GetKey()), "' /></div>\n"; - } -} +# +# Property handling +# sub GetPropertyValue($$) { @@ -86,14 +68,6 @@ sub GetPropertyValue($$) return $self->{Item}->$PropertyName; } -sub GetTitle($) -{ - my ($self) = @_; - - return $self->GetParam("Key") ? $self->GetParam("Key") : - "Add " . $self->{Collection}->GetItemName(); -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -111,40 +85,72 @@ sub DisplayProperty($$) $Display; } -sub GetActions($) + +# +# Form page generation +# + +sub GetTitle($) { my ($self) = @_; - my @Actions = @{$self->SUPER::GetActions()}; - push @Actions, "Save", "Cancel"; - - return \@Actions; + return $self->GetParam("Key") ? $self->GetParam("Key") : + "Add " . $self->{Collection}->GetItemName(); } -sub SaveProperty($$$) +sub GenerateFormStart($) { - my ($self, $PropertyDescriptor, $Value) = @_; + my ($self) = @_; - if ($PropertyDescriptor->GetClass() eq "Basic" && - $PropertyDescriptor->GetType() eq "B" && $Value) + $self->SUPER::GenerateFormStart(); + + my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); + if (defined($MasterColNames)) { - $Value = 1; + foreach my $ColIndex (0 .. @$MasterColNames) + { + print "<div><input type='hidden' name='", $MasterColNames->[$ColIndex], + "' value='", $self->escapeHTML($MasterColValues->[$ColIndex]), + "' /></div>\n"; + } + } + if (! $self->{Item}->GetIsNew()) + { + print "<div><input type='hidden' name='Key' value='", + $self->escapeHTML($self->{Item}->GetKey()), "' /></div>\n"; } +} - my $PropertyName = $PropertyDescriptor->GetName(); - $self->{Item}->$PropertyName($Value); - return 1; -} +# +# Actions handling +# -sub Save($) +sub GetActions($) { my ($self) = @_; - return !1 if (!$self->SUPER::Save()); + my @Actions = @{$self->SUPER::GetActions()}; + push @Actions, "Save", "Cancel"; - (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); - return !defined $self->{ErrMessage}; + return \@Actions; +} + +sub RedirectToList($) +{ + my ($self) = @_; + + my $Target = $self->{Collection}->GetCollectionName() . "List.pl"; + my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); + if (defined($MasterColNames)) + { + foreach my $ColIndex (0 .. @$MasterColNames - 1) + { + $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . + "=" . url_escape($MasterColValues->[$ColIndex]); + } + } + return $self->Redirect($Target); } sub OnAction($$) @@ -164,21 +170,35 @@ sub OnAction($$) return $self->SUPER::OnAction($Action); } -sub RedirectToList($) + +# +# Validating and saving the form content +# + +sub SaveProperty($$$) { - my ($self) = @_; + my ($self, $PropertyDescriptor, $Value) = @_; - my $Target = $self->{Collection}->GetCollectionName() . "List.pl"; - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) + if ($PropertyDescriptor->GetClass() eq "Basic" && + $PropertyDescriptor->GetType() eq "B" && $Value) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) - { - $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . - "=" . url_escape($MasterColValues->[$ColIndex]); - } + $Value = 1; } - return $self->Redirect($Target); + + my $PropertyName = $PropertyDescriptor->GetName(); + $self->{Item}->$PropertyName($Value); + + return 1; +} + +sub Save($) +{ + my ($self) = @_; + + return !1 if (!$self->SUPER::Save()); + + (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); + return !defined $self->{ErrMessage}; } 1; diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index b0450d0e7..1e8f55d31 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -55,6 +55,37 @@ sub _initialize($$$) #my ($self, $Request, $RequiredRole) = @_; } +sub SetPageBaseCreator($) +{ + ($PageBaseCreator) = @_; +} + +sub GetPageBase($) +{ + my ($self) = @_; + + return $self->{PageBase}; +} + +sub CGI($) +{ + my ($self) = @_; + + return $self->{CGIObj}; +} + +sub escapeHTML($$) +{ + my ($self, $String) = @_; + + return $self->{CGIObj}->escapeHTML($String); +} + + +# +# CGI parameters support +# + =pod =over 12 @@ -120,48 +151,84 @@ sub SetParam($$$) } } -sub CGI($) + +# +# Session support +# + +sub UnsetCookies($) { my ($self) = @_; - return $self->{CGIObj}; + $self->{PageBase}->UnsetCookies($self); } -sub escapeHTML($$) +sub SetCookies($) { - my ($self, $String) = @_; + my ($self) = @_; - return $self->{CGIObj}->escapeHTML($String); + $self->{PageBase}->SetCookies($self); } -sub GetPageBase($) +sub GetCurrentSession($) { my ($self) = @_; - return $self->{PageBase}; + return $self->{PageBase}->GetCurrentSession(); } -sub GenerateHttpHeaders($) +sub SetCurrentSession($$) +{ + my ($self, $Session) = @_; + + $self->{PageBase}->SetCurrentSession($self, $Session); +} + +sub Redirect($$) +{ + my ($self, $Location) = @_; + + return $self->{PageBase}->Redirect($self, $Location); +} + + +# +# Error handling framework +# + +sub GetErrField($) { my ($self) = @_; - $self->{PageBase}->GenerateHttpHeaders($self); + return $self->{ErrField}; } -sub UnsetCookies($) +sub GetErrMessage($) { my ($self) = @_; - $self->{PageBase}->UnsetCookies($self); + return $self->{ErrMessage}; } -sub SetCookies($) +sub GenerateErrorDiv($) { my ($self) = @_; - $self->{PageBase}->SetCookies($self); + $self->{PageBase}->GenerateErrorDiv($self); +} + +sub GenerateErrorPopup($) +{ + my ($self) = @_; + + $self->{PageBase}->GenerateErrorPopup($self); } + +# +# HTML page generation +# + =pod =over 12 @@ -197,39 +264,32 @@ sub GetTitle($) return undef; } -sub GenerateHeader($) -{ - my ($self) = @_; - - $self->{PageBase}->GenerateHeader($self); -} - -sub GenerateFooter($) +sub GenerateHttpHeaders($) { my ($self) = @_; - $self->{PageBase}->GenerateFooter($self); + $self->{PageBase}->GenerateHttpHeaders($self); } -sub GenerateErrorDiv($) +sub GenerateHeader($) { my ($self) = @_; - $self->{PageBase}->GenerateErrorDiv($self); + $self->{PageBase}->GenerateHeader($self); } -sub GenerateErrorPopup($) +sub GenerateBody($) { my ($self) = @_; - $self->{PageBase}->GenerateErrorPopup($self); + die "Pure virtual function " . ref($self) . "::GenerateBody called"; } -sub GenerateBody($) +sub GenerateFooter($) { my ($self) = @_; - die "Pure virtual function " . ref($self) . "::GenerateBody called"; + $self->{PageBase}->GenerateFooter($self); } sub GeneratePage($) @@ -242,44 +302,4 @@ sub GeneratePage($) $self->GenerateFooter(); } -sub Redirect($$) -{ - my ($self, $Location) = @_; - - return $self->{PageBase}->Redirect($self, $Location); -} - -sub GetCurrentSession($) -{ - my ($self) = @_; - - return $self->{PageBase}->GetCurrentSession(); -} - -sub SetCurrentSession($$) -{ - my ($self, $Session) = @_; - - $self->{PageBase}->SetCurrentSession($self, $Session); -} - -sub GetErrMessage($) -{ - my ($self) = @_; - - return $self->{ErrMessage}; -} - -sub GetErrField($) -{ - my ($self) = @_; - - return $self->{ErrField}; -} - -sub SetPageBaseCreator($) -{ - ($PageBaseCreator) = @_; -} - 1; diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index b7edd8fca..b36b28d9a 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -69,40 +69,16 @@ sub _initialize($$$$) #my ($self, $Page, $Request, $RequiredRole) = @_; } -sub CheckSecurePage($$) +sub CreatePageBase($$$@) { - my ($self, $Page) = @_; - - if ($UseSSL && ! SecureConnection()) - { - exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); - } + #my ($Page, $Request, $RequiredRole) = @_; + return WineTestBot::CGI::PageBase->new(@_); } -sub GenerateHttpHeaders($) -{ - my ($self) = @_; - - my $Request = $self->{Request}; - - # Date in the past - $Request->headers_out->add("Expires", "Sun, 25 Jul 1997 05:00:00 GMT"); - - # always modified - $Request->headers_out->add("Last-Modified", (scalar gmtime) . " GMT"); - - # HTTP/1.1 - $Request->headers_out->add("Cache-Control", "no-cache, must-revalidate, " . - "post-check=0, pre-check=0"); - - # HTTP/1.0 - $Request->headers_out->add("Pragma", "no-cache"); - # Force char set - $Request->content_type("text/html; charset=UTF-8"); - - $self->SetCookies(); -} +# +# Session support +# sub UnsetCookies($) { @@ -175,7 +151,7 @@ sub SetCookies($) $Expire = undef; } } - + $Cookie = CGI::Cookie->new(-Name => "SessionActive", -Value => $SessionPermanent, -Expires => $Expire, @@ -189,6 +165,139 @@ sub SetCookies($) } } +sub GetCurrentSession($) +{ + my ($self) = @_; + + if ($UseSSL && ! SecureConnection()) + { + return undef; + } + + if (! defined($self->{Session})) + { + my %Cookies = CGI::Cookie->fetch($self->{Request}); + if (defined($Cookies{"SessionId"})) + { + my $SessionId = $Cookies{"SessionId"}->value; + my $Sessions = CreateSessions(); + $self->{Session} = $Sessions->GetItem($SessionId); + } + } + + return $self->{Session}; +} + +sub SetCurrentSession($$$) +{ + my ($self, $Page, $Session) = @_; + + $self->{Session} = $Session; + if (! defined($Session)) + { + $self->UnsetCookies(); + } +} + +sub SessionActive($) +{ + my ($self) = @_; + + if (defined($self->GetCurrentSession())) + { + return 1; + } + + my %Cookies = CGI::Cookie->fetch($self->{Request}); + if ($UseSSL && ! SecureConnection() && defined($Cookies{"SessionActive"})) + { + return 1; + } + + return !1; +} + +sub Redirect($$$) +{ + my ($self, $Page, $Location) = @_; + + $self->SetCookies(); + if (substr($Location, 0, 4) ne "http") + { + # Use the same protocol as for the current page. To force switching to + # https the caller should use MakeSecureURL(). + my $Protocol = SecureConnection() ? "https://" : "http://"; + if (substr($Location, 0, 1) ne "/") + { + # Despite its name, Request->uri only contains the path portion of the + # URI, excluding the protocol, hostname and parameters! + my $URI = $self->{Request}->uri; + $URI =~ s=^(.*)/[^/]*$=$1/$Location=; + $Location = $URI; + } + $Location = $Protocol . $ENV{"HTTP_HOST"} . $Location; + } + $self->{Request}->headers_out->set("Location", $Location); + $self->{Request}->status(Apache2::Const::REDIRECT); + return 0; # a suitable exit code +} + +sub CheckSecurePage($$) +{ + my ($self, $Page) = @_; + + if ($UseSSL && ! SecureConnection()) + { + exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); + } +} + + +# +# Error handling framework +# + +sub GenerateErrorDiv($$) +{ + my ($self, $Page) = @_; + + my $ErrMessage = $Page->GetErrMessage(); + if ($ErrMessage) + { + print "<noscript>\n"; + print "<div id='errormessage'>", $Page->CGI->escapeHTML($ErrMessage), "</div>\n"; + print "</noscript>\n"; + } +} + +sub GenerateErrorPopup($$) +{ + my ($self, $Page) = @_; + + my $ErrMessage = $Page->GetErrMessage(); + if ($ErrMessage) + { + print "<script type='text/javascript'>\n"; + print "\n"; + print "</script>\n"; + } +} + + +# +# HTML page generation +# + sub GetPageTitle($$) { my ($self, $Page) = @_; @@ -199,6 +308,43 @@ sub GetPageTitle($$) return $Title; } +sub GenerateHttpHeaders($) +{ + my ($self) = @_; + + my $Request = $self->{Request}; + + # Date in the past + $Request->headers_out->add("Expires", "Sun, 25 Jul 1997 05:00:00 GMT"); + + # always modified + $Request->headers_out->add("Last-Modified", (scalar gmtime) . " GMT"); + + # HTTP/1.1 + $Request->headers_out->add("Cache-Control", "no-cache, must-revalidate, " . + "post-check=0, pre-check=0"); + + # HTTP/1.0 + $Request->headers_out->add("Pragma", "no-cache"); + + # Force char set + $Request->content_type("text/html; charset=UTF-8"); + + $self->SetCookies(); +} + +sub GetOnLoadJavascriptFunction($$) +{ + my ($self, $Page) = @_; + + if ($Page->GetErrMessage()) + { + return "ShowError()"; + } + + return undef; +} + sub GenerateHeader($$) { my ($self, $Page) = @_; @@ -213,7 +359,7 @@ sub GenerateHeader($$) <link rel='stylesheet' href='/${ProjectName}TestBot.css' type='text/css' media='screen'> </head> EOF - + print "<body"; my $OnLoadJavascriptFunction = $self->GetOnLoadJavascriptFunction($Page); if ($OnLoadJavascriptFunction) @@ -323,6 +469,13 @@ EOF EOF } +sub GenerateBody($) +{ + my ($self) = @_; + + die "Pure virtual function " . ref($self) . "::GenerateBody called"; +} + sub GenerateFooter($) { my ($self) = @_; @@ -338,142 +491,4 @@ sub GenerateFooter($) EOF } -sub GenerateErrorDiv($$) -{ - my ($self, $Page) = @_; - - my $ErrMessage = $Page->GetErrMessage(); - if ($ErrMessage) - { - print "<noscript>\n"; - print "<div id='errormessage'>", $Page->CGI->escapeHTML($ErrMessage), "</div>\n"; - print "</noscript>\n"; - } -} - -sub GenerateErrorPopup($$) -{ - my ($self, $Page) = @_; - - my $ErrMessage = $Page->GetErrMessage(); - if ($ErrMessage) - { - print "<script type='text/javascript'>\n"; - print "\n"; - print "</script>\n"; - } -} - -sub GenerateBody($) -{ - my ($self) = @_; - - die "Pure virtual function " . ref($self) . "::GenerateBody called"; -} - -sub GetOnLoadJavascriptFunction($$) -{ - my ($self, $Page) = @_; - - if ($Page->GetErrMessage()) - { - return "ShowError()"; - } - - return undef; -} - -sub Redirect($$$) -{ - my ($self, $Page, $Location) = @_; - - $self->SetCookies(); - if (substr($Location, 0, 4) ne "http") - { - # Use the same protocol as for the current page. To force switching to - # https the caller should use MakeSecureURL(). - my $Protocol = SecureConnection() ? "https://" : "http://"; - if (substr($Location, 0, 1) ne "/") - { - # Despite its name, Request->uri only contains the path portion of the - # URI, excluding the protocol, hostname and parameters! - my $URI = $self->{Request}->uri; - $URI =~ s=^(.*)/[^/]*$=$1/$Location=; - $Location = $URI; - } - $Location = $Protocol . $ENV{"HTTP_HOST"} . $Location; - } - $self->{Request}->headers_out->set("Location", $Location); - $self->{Request}->status(Apache2::Const::REDIRECT); - return 0; # a suitable exit code -} - -sub GetCurrentSession($) -{ - my ($self) = @_; - - if ($UseSSL && ! SecureConnection()) - { - return undef; - } - - if (! defined($self->{Session})) - { - my %Cookies = CGI::Cookie->fetch($self->{Request}); - if (defined($Cookies{"SessionId"})) - { - my $SessionId = $Cookies{"SessionId"}->value; - my $Sessions = CreateSessions(); - $self->{Session} = $Sessions->GetItem($SessionId); - } - } - - return $self->{Session}; -} - -sub SetCurrentSession($$$) -{ - my ($self, $Page, $Session) = @_; - - $self->{Session} = $Session; - if (! defined($Session)) - { - $self->UnsetCookies(); - } -} - -sub SessionActive($) -{ - my ($self) = @_; - - if (defined($self->GetCurrentSession())) - { - return 1; - } - - my %Cookies = CGI::Cookie->fetch($self->{Request}); - if ($UseSSL && ! SecureConnection() && defined($Cookies{"SessionActive"})) - { - return 1; - } - - return !1; -} - -sub CreatePageBase($$$@) -{ - #my ($Page, $Request, $RequiredRole) = @_; - return WineTestBot::CGI::PageBase->new(@_); -} - 1; -- 2.30.2

1 1

[tools] testbot: Tweak the Collection formatting.
by Francois Gouget 24 Mar '22

24 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is really just cosmetic and should not make any difference to how the website works. --- testbot/lib/ObjectModel/Collection.pm | 68 +++++---------------------- 1 file changed, 13 insertions(+), 55 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 782f32c23..dd0be12d5 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -195,7 +195,6 @@ sub Load($) my ($self) = @_; $self->GetBackEnd()->LoadCollection($self); - $self->{Loaded} = 1; } @@ -252,11 +251,7 @@ sub GetKeys($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } - + $self->Load() if (!$self->{Loaded}); return $self->GetKeysNoLoad(); } @@ -370,16 +365,9 @@ sub ItemExists($$) { my ($self, $Key) = @_; - if (! defined($Key)) - { - return !1; - } - - if (! $self->{Loaded}) - { - $self->Load(); - } + return !1 if (!defined $Key); + $self->Load() if (!$self->{Loaded}); return exists($self->{Items}{$Key}); } @@ -399,11 +387,7 @@ sub GetItems($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } - + $self->Load() if (!$self->{Loaded}); my @Items = values %{$self->{Items}}; return \@Items; } @@ -422,11 +406,7 @@ sub GetItemsCount($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } - + $self->Load() if (!$self->{Loaded}); return scalar(keys %{$self->{Items}}); } @@ -444,10 +424,7 @@ sub IsEmpty($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } + $self->Load() if (!$self->{Loaded}); # Even though scalar(hash) does not return the number of items in Perl 5.20 # (and cannot generally be compared to numbers), it evaluates to true for @@ -468,7 +445,6 @@ sub SplitKey($$) my ($self, $CombinedKey) = @_; my @KeyComponents = split /#@#/, $CombinedKey; - return @KeyComponents; } @@ -564,11 +540,7 @@ sub Save($) my ($self) = @_; my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Validate(); - if (! defined($ErrMessage)) - { - $self->SaveNoValidate(); - } - + $self->SaveNoValidate() if (!defined $ErrMessage); return ($ErrKey, $ErrProperty, $ErrMessage); } @@ -637,16 +609,11 @@ sub DeleteItem($$) my ($self, $Item) = @_; my $ErrMessage = $Item->OnDelete(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); + my $Key = $Item->GetKey(); $ErrMessage = $self->GetBackEnd()->DeleteItem($Item); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); my $FullKey = $self->GetFullKey($Key); if (defined $FullKey) @@ -663,24 +630,15 @@ sub DeleteAll($) { my ($self) = @_; - if (! $self->{Loaded}) - { - $self->Load(); - } + $self->Load() if (!$self->{Loaded}); foreach my $Item (values %{$self->{Items}}) { my $ErrMessage = $Item->OnDelete(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); } my $ErrMessage = $self->GetBackEnd()->DeleteAll($self); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + return $ErrMessage if (defined $ErrMessage); my $ScopeItems = $self->{AllScopeItems}->{ref($self)}; foreach my $Key (keys %{$self->{Items}}) -- 2.30.2

1 0

[PATCH vkd3d 2/2] tests: Test signalling a fence to a lower value after a GPU wait.
by Henri Verbeet 24 Mar '22

24 Mar '22

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Ensures the new fence implementation using timeline semaphores handles this correctly. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 230634. v2: Unmodified. tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2059b182..486c0093 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33373,6 +33373,12 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xffff0000, 0); release_resource_readback(&rb); + /* signal to a lower value after a GPU wait was used (test timeline semaphore replacement) */ + hr = ID3D12Fence_Signal(fence, 0); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == 0, "Got unexpected value %"PRIu64".\n", value); + hr = ID3D12Fence_Signal(fence, 6); ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); update_buffer_data(cb, 0, sizeof(green), &green); -- 2.20.1

1 0

[PATCH vkd3d v2 1/2] vkd3d: Use Vulkan null descriptors if EXT_robustness2 is available.
by Conor McCarthy 24 Mar '22

24 Mar '22

This implements all remaining unsupported image view dimensions and saves a small amount of resources because null buffers and images are no longer needed. It matches the D3D12 requirement that all reads return zero, which is not strictly true of the existing implementation using resources of small but non-zero size. Warnings on null view creation are silenced because there should no longer be a difference from D3D12 behaviour. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- README | 2 +- configure.ac | 2 +- libs/vkd3d/device.c | 8 ++++ libs/vkd3d/resource.c | 76 +++++++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 1 + 5 files changed, 61 insertions(+), 28 deletions(-) diff --git a/README b/README index 066a24bc..465d5f91 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ similar, but not identical, to Direct3D 12. Building vkd3d ============== -Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.1.113). +Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.2.139). Vkd3d generates some of its headers from IDL files. If you are using the release tarballs, then these headers are pre-generated and are included. If diff --git a/configure.ac b/configure.ac index 53029d2c..308bdda1 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,7 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \ -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) -VKD3D_CHECK_VULKAN_HEADER_VERSION([113], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.113 is required.])]) +VKD3D_CHECK_VULKAN_HEADER_VERSION([139], [AC_MSG_ERROR([Vulkan headers are too old, 1.2.139 is required.])]) AC_CHECK_DECL([SpvCapabilityDemoteToHelperInvocationEXT],, [AC_MSG_ERROR([SPIR-V headers are too old.])], [ #ifdef HAVE_SPIRV_UNIFIED1_SPIRV_H diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d1629284..eb470c12 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -135,6 +135,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), VK_EXTENSION(EXT_DEPTH_CLIP_ENABLE, EXT_depth_clip_enable), VK_EXTENSION(EXT_DESCRIPTOR_INDEXING, EXT_descriptor_indexing), + VK_EXTENSION(EXT_ROBUSTNESS_2, EXT_robustness2), VK_EXTENSION(EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION, EXT_shader_demote_to_helper_invocation), VK_EXTENSION(EXT_SHADER_STENCIL_EXPORT, EXT_shader_stencil_export), VK_EXTENSION(EXT_TEXEL_BUFFER_ALIGNMENT, EXT_texel_buffer_alignment), @@ -797,6 +798,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceConditionalRenderingFeaturesEXT conditional_rendering_features; VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features; VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features; + VkPhysicalDeviceRobustness2FeaturesEXT robustness2_features; VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT demote_features; VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT texel_buffer_alignment_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; @@ -813,6 +815,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *vertex_divisor_properties; VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT *buffer_alignment_properties; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features; + VkPhysicalDeviceRobustness2FeaturesEXT *robustness2_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *buffer_alignment_features; VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT *demote_features; @@ -827,6 +830,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i conditional_rendering_features = &info->conditional_rendering_features; depth_clip_features = &info->depth_clip_features; descriptor_indexing_features = &info->descriptor_indexing_features; + robustness2_features = &info->robustness2_features; descriptor_indexing_properties = &info->descriptor_indexing_properties; maintenance3_properties = &info->maintenance3_properties; demote_features = &info->demote_features; @@ -845,6 +849,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vk_prepend_struct(&info->features2, depth_clip_features); descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; vk_prepend_struct(&info->features2, descriptor_indexing_features); + robustness2_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT; + vk_prepend_struct(&info->features2, robustness2_features); demote_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT; vk_prepend_struct(&info->features2, demote_features); buffer_alignment_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT; @@ -1577,6 +1583,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->EXT_conditional_rendering = false; if (!physical_device_info->depth_clip_features.depthClipEnable) vulkan_info->EXT_depth_clip_enable = false; + if (!physical_device_info->robustness2_features.nullDescriptor) + vulkan_info->EXT_robustness2 = false; if (!physical_device_info->demote_features.shaderDemoteToHelperInvocation) vulkan_info->EXT_shader_demote_to_helper_invocation = false; if (!physical_device_info->texel_buffer_alignment_features.texelBufferAlignment) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index cbbd4170..3c4aa53d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2423,10 +2423,10 @@ bool vkd3d_create_buffer_view(struct d3d12_device *device, VkBuffer vk_buffer, c VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkBufferView vk_view = VK_NULL_HANDLE; struct vkd3d_view *object; - VkBufferView vk_view; - if (!vkd3d_create_vk_buffer_view(device, vk_buffer, format, offset, size, &vk_view)) + if (vk_buffer && !vkd3d_create_vk_buffer_view(device, vk_buffer, format, offset, size, &vk_view)) return false; if (!(object = vkd3d_view_create(VKD3D_VIEW_TYPE_BUFFER))) @@ -2711,28 +2711,31 @@ bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format = desc->format; struct VkImageViewCreateInfo view_desc; + VkImageView vk_view = VK_NULL_HANDLE; struct vkd3d_view *object; - VkImageView vk_view; VkResult vr; - view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; - view_desc.pNext = NULL; - view_desc.flags = 0; - view_desc.image = vk_image; - view_desc.viewType = desc->view_type; - view_desc.format = format->vk_format; - vkd3d_set_view_swizzle_for_format(&view_desc.components, format, desc->allowed_swizzle); - if (desc->allowed_swizzle) - vk_component_mapping_compose(&view_desc.components, &desc->components); - view_desc.subresourceRange.aspectMask = desc->vk_image_aspect; - view_desc.subresourceRange.baseMipLevel = desc->miplevel_idx; - view_desc.subresourceRange.levelCount = desc->miplevel_count; - view_desc.subresourceRange.baseArrayLayer = desc->layer_idx; - view_desc.subresourceRange.layerCount = desc->layer_count; - if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, &vk_view))) < 0) - { - WARN("Failed to create Vulkan image view, vr %d.\n", vr); - return false; + if (vk_image) + { + view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; + view_desc.pNext = NULL; + view_desc.flags = 0; + view_desc.image = vk_image; + view_desc.viewType = desc->view_type; + view_desc.format = format->vk_format; + vkd3d_set_view_swizzle_for_format(&view_desc.components, format, desc->allowed_swizzle); + if (desc->allowed_swizzle) + vk_component_mapping_compose(&view_desc.components, &desc->components); + view_desc.subresourceRange.aspectMask = desc->vk_image_aspect; + view_desc.subresourceRange.baseMipLevel = desc->miplevel_idx; + view_desc.subresourceRange.levelCount = desc->miplevel_count; + view_desc.subresourceRange.baseArrayLayer = desc->layer_idx; + view_desc.subresourceRange.layerCount = desc->layer_count; + if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, &vk_view))) < 0) + { + WARN("Failed to create Vulkan image view, vr %d.\n", vr); + return false; + } } if (!(object = vkd3d_view_create(VKD3D_VIEW_TYPE_IMAGE))) @@ -2782,7 +2785,7 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, /* NULL descriptor */ buffer_info->buffer = device->null_resources.vk_buffer; buffer_info->offset = 0; - buffer_info->range = VKD3D_NULL_BUFFER_SIZE; + buffer_info->range = VK_WHOLE_SIZE; } descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_CBV; @@ -2815,7 +2818,8 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { case D3D12_SRV_DIMENSION_BUFFER: - WARN("Creating NULL buffer SRV %#x.\n", desc->Format); + if (!device->vk_info.EXT_robustness2) + WARN("Creating NULL buffer SRV %#x.\n", desc->Format); if (vkd3d_create_buffer_view(device, null_resources->vk_buffer, vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), @@ -2838,11 +2842,19 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, break; default: + if (device->vk_info.EXT_robustness2) + { + vk_image = VK_NULL_HANDLE; + /* view_type is not used for Vulkan null descriptors, but make it valid. */ + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + } FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); return; } - WARN("Creating NULL SRV %#x.\n", desc->ViewDimension); + if (!device->vk_info.EXT_robustness2) + WARN("Creating NULL SRV %#x.\n", desc->ViewDimension); vkd3d_desc.format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, false); vkd3d_desc.miplevel_idx = 0; @@ -3052,7 +3064,8 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { case D3D12_UAV_DIMENSION_BUFFER: - WARN("Creating NULL buffer UAV %#x.\n", desc->Format); + if (!device->vk_info.EXT_robustness2) + WARN("Creating NULL buffer UAV %#x.\n", desc->Format); if (vkd3d_create_buffer_view(device, null_resources->vk_storage_buffer, vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), @@ -3075,11 +3088,19 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, break; default: + if (device->vk_info.EXT_robustness2) + { + vk_image = VK_NULL_HANDLE; + /* view_type is not used for Vulkan null descriptors, but make it valid. */ + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + } FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); return; } - WARN("Creating NULL UAV %#x.\n", desc->ViewDimension); + if (!device->vk_info.EXT_robustness2) + WARN("Creating NULL UAV %#x.\n", desc->ViewDimension); vkd3d_desc.format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, false); vkd3d_desc.miplevel_idx = 0; @@ -4421,6 +4442,9 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, memset(null_resources, 0, sizeof(*null_resources)); + if (device->vk_info.EXT_robustness2) + return S_OK; + memset(&heap_properties, 0, sizeof(heap_properties)); heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c28eb234..796dfefd 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -131,6 +131,7 @@ struct vkd3d_vulkan_info bool EXT_debug_marker; bool EXT_depth_clip_enable; bool EXT_descriptor_indexing; + bool EXT_robustness2; bool EXT_shader_demote_to_helper_invocation; bool EXT_shader_stencil_export; bool EXT_texel_buffer_alignment; -- 2.34.1

3 4

[PATCH 1/2] wined3d: Flush on texture download to avoid stalling on readout.
by Jan Sikorski 24 Mar '22

24 Mar '22

Fixes a stall during a map operation in The Evil Within. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fdd2c70c667..ebe770af0d2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5163,6 +5163,8 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, bo_stage_flags, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + /* Start the download so we don't stall waiting for the result. */ + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); } } -- 2.32.0

2 3

[PATCH] dlls/windows.globalization: don't allocate a partial structure
by Eric Pouech 24 Mar '22

24 Mar '22

GCC 11 complains about accessing struct hstring_vector (-Warray-bounds) when the allocation is made for a 0-sized vector so ensure that we always allocate a memory block to fit a whole structure Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windows.globalization/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 3e5a59bde14..363e0150af1 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -213,8 +213,10 @@ static const struct IVectorView_HSTRINGVtbl hstring_vector_vtbl = static HRESULT hstring_vector_create(HSTRING *values, SIZE_T count, IVectorView_HSTRING **out) { struct hstring_vector *impl; - - if (!(impl = malloc(offsetof(struct hstring_vector, values[count])))) return E_OUTOFMEMORY; + /* always allocate at least the full structure to avoid GCC11 warnings */ + if (!(impl = malloc(max(offsetof(struct hstring_vector, values[count]), + sizeof(struct hstring_vector))))) + return E_OUTOFMEMORY; impl->ref = 1; impl->IVectorView_HSTRING_iface.lpVtbl = &hstring_vector_vtbl;

6 11

[PATCH 1/3] programs/cmd: %time% should have 1/100s resolution.
by Francois Gouget 24 Mar '22

24 Mar '22

Stub out the subsecond decimals. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52719 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- GetTimeFormatEx() does not support formatting fractions of a second. So just stub out that until there is a need for it. At least now echo %time% can be used to see where a batch file spends its time. --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ programs/cmd/wcmdmain.c | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f410e55166..8133268d2dd 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1789,6 +1789,15 @@ set /a WINE_foo=5 set /a WINE_bar=WINE_foo=6 call :checkenvvars WINE_foo 6 WINE_bar 6 +echo --- Magic environment variables +echo Century=%date:~6,2% + +set WINE_foo=%time:~7,1% +if not defined WINE_foo echo "No seconds in %%time%%" + +set WINE_foo=%random% +if %WINE_foo% equ %random% echo "%%random%% is not random" + echo --- for /F mkdir foobar & cd foobar echo ------ string argument diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b6e0914112..e95fa0256b1 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1216,6 +1216,8 @@ WINE_foo correctly 7 WINE_foo correctly 8(a)or_broken@ERROR: WINE_foo incorrectly 4 [8] WINE_foo correctly 6(a)or_broken@ERROR: WINE_foo incorrectly 5 [6] WINE_bar correctly 6(a)or_broken@ERROR: WINE_bar incorrectly 5 [6] +--- Magic environment variables +Century=20 --- for /F ------ string argument a diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index af54b209d83..cd083449ffe 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -621,8 +621,11 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR startchar) NULL, thisVarContents, MAXSTRING); len = lstrlenW(thisVarContents); } else if (WCMD_is_magic_envvar(thisVar, L"TIME")) { - GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, NULL, + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, NULL, thisVarContents, MAXSTRING); + /* FIXME This should have 1/100s precision as well as a localized + * decimal separator */ + lstrcatW(thisVarContents, L".00"); len = lstrlenW(thisVarContents); } else if (WCMD_is_magic_envvar(thisVar, L"CD")) { GetCurrentDirectoryW(MAXSTRING, thisVarContents); -- 2.30.2

2 6

[PATCH] dwrite.idl [out] parameters
by Thomas Linder Puls 24 Mar '22

24 Mar '22

2 1

[PATCH] light.msstyles: Add Menu stub class.
by Zhiyi Zhang 24 Mar '22

24 Mar '22

Fix DTS Master Audio Suite save file button can not be clicked. The application queries for Vista+ Menu class because Wine's default system version is set to Windows 7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52667 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index fc6d196ad0c..5073ad935b4 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -398,6 +398,10 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; Menu\r\n" +"[Menu]\r\n" +"BgType = None\r\n" + "\r\n; Progress\r\n" "[Progress]\r\n" "ProgressChunkSize = 1\r\n" -- 2.32.0

1 0