April 2022 - Wine-Devel - list.winehq.org

[PATCH 1/4] include: Add CWMAEncMediaObject class declaration to wmcodecdsp.idl.
by Rémi Bernon April 5, 2022

April 5, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index ae2a42419b4..4ad965ab3d9 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -45,6 +45,11 @@ coclass CMSH264DecoderMFT {} ] coclass CWMADecMediaObject {}; +[ + uuid(70f598e9-f4ab-495a-99e2-a7c4d3d89abf) +] +coclass CWMAEncMediaObject {}; + [ uuid(93af0c51-2275-45d2-a35b-f2ba21caed00) ] -- 2.35.1

1 3

[PATCH 1/6] kernel32/tests: Add console reallocation tests.
by Torge Matthies April 5, 2022

April 5, 2022

Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/kernel32/tests/console.c | 46 +++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 98692760acf..9195ac204f7 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4689,7 +4689,7 @@ static void copy_change_subsystem(const char* in, const char* out, DWORD subsyst CloseHandle(hFile); } -static BOOL check_whether_child_attached(const char* exec, DWORD flags) +static BOOL check_subprocess(const char* exec, const char* verb, DWORD flags) { STARTUPINFOA si = { sizeof(si) }; PROCESS_INFORMATION info; @@ -4698,7 +4698,7 @@ static BOOL check_whether_child_attached(const char* exec, DWORD flags) BOOL res; DWORD ret; - sprintf(buf, "\"%s\" console check_console", exec); + sprintf(buf, "\"%s\" console %s", exec, verb); res = CreateProcessA(NULL, buf, NULL, NULL, FALSE, flags, NULL, NULL, &si, &info); ok(res, "CreateProcess failed: %lu %s\n", GetLastError(), buf); CloseHandle(info.hThread); @@ -4711,6 +4711,18 @@ static BOOL check_whether_child_attached(const char* exec, DWORD flags) return exit_code != 0; } +static BOOL check_whether_child_attached(const char* exec, DWORD flags) +{ + return check_subprocess(exec, "check_console", flags); +} + +static BOOL check_same_console(const char* exec, DWORD flags) +{ + char buf[MAX_PATH]; + sprintf(buf, "check_same_console %lx", GetCurrentProcessId()); + return check_subprocess(exec, buf, flags); +} + static void test_CreateProcessCUI(void) { char guiexec[MAX_PATH]; @@ -4726,14 +4738,33 @@ static void test_CreateProcessCUI(void) strcat(cuiexec, "console_cui.exe"); copy_change_subsystem(argv[0], cuiexec, IMAGE_SUBSYSTEM_WINDOWS_CUI); + AllocConsole(); + + res = check_same_console(cuiexec, 0); + ok(res, "Expected child to be attached to the same console\n"); + res = check_same_console(cuiexec, DETACHED_PROCESS); + ok(!res, "Expected child to be attached to a different console\n"); + res = check_same_console(cuiexec, CREATE_NO_WINDOW); + todo_wine ok(!res, "Expected child to be attached to a different console\n"); + res = check_same_console(cuiexec, CREATE_NO_WINDOW|DETACHED_PROCESS); + ok(!res, "Expected child to be attached to a different console\n"); + res = check_same_console(cuiexec, CREATE_NO_WINDOW|CREATE_NEW_CONSOLE); + ok(!res, "Expected child to be attached to a different console\n"); + FreeConsole(); res = check_whether_child_attached(guiexec, DETACHED_PROCESS); ok(!res, "Don't expecting child to be attached to a console\n"); + res = check_whether_child_attached(guiexec, CREATE_NO_WINDOW); + ok(!res, "Don't expecting child to be attached to a console\n"); res = check_whether_child_attached(guiexec, 0); ok(!res, "Don't expecting child to be attached to a console\n"); res = check_whether_child_attached(cuiexec, DETACHED_PROCESS); ok(!res, "Don't expecting child to be attached to a console\n"); + res = check_whether_child_attached(cuiexec, CREATE_NO_WINDOW); + ok(res, "Expecting child to be attached to a console\n"); + res = check_whether_child_attached(cuiexec, CREATE_NO_WINDOW|DETACHED_PROCESS); + ok(!res, "Don't expecting child to be attached to a console\n"); res = check_whether_child_attached(cuiexec, 0); ok(res, "Expecting child to be attached to a console\n"); @@ -4774,6 +4805,17 @@ START_TEST(console) ExitProcess(GetConsoleCP() != 0); } + if (argc > 3 && !strcmp(argv[2], "check_same_console")) + { + DWORD parent_pid, count, pids[2]; + sscanf(argv[3], "%lx", &parent_pid); + count = GetConsoleProcessList(pids, ARRAY_SIZE(pids)); + while (count--) + if (pids[count] == parent_pid) + ExitProcess(1); + ExitProcess(0); + } + test_current = argc >= 3 && !strcmp(argv[2], "--current"); using_pseudo_console = argc >= 3 && !strcmp(argv[2], "--pseudo-console"); -- 2.35.1

3 7

[PATCH 1/2] kernel32/tests: Add more CreateProcess console management tests.
by Jacek Caban April 5, 2022

April 5, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> - check for console bits after create process - add tests for CREATE_NO_WINDOW flag in CreateProcess Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Eric, I simplified check_child_console_bits error handling a bit. We already test for success with ok() macro, so there is no need to check it again. dlls/kernel32/tests/console.c | 91 +++++++++++++++++++++++++++++------ 1 file changed, 77 insertions(+), 14 deletions(-)

1 0

[tools 1/2] testbot/web: Add MakeOfficialURL() for sending URLs to third-parties.
by Francois Gouget April 5, 2022

April 5, 2022

It should be used whenever sending a URL to a third-party. Also document SecureConnection() and MakeSecureURL(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 38 +++++++++++++++++++++++++++++--- testbot/web/Register.pl | 5 ++--- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 13529c323..bc501ff32 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -27,7 +27,8 @@ WineTestBot::Utils - Utility functions =cut use Exporter 'import'; -our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString +our @EXPORT = qw(SecureConnection MakeSecureURL MakeOfficialURL GetTaskURL + GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir GetMTime DurationToString BuildEMailRecipient IsValidFileName BuildTag SanitizeTag LocaleName NotifyAdministrator @@ -50,7 +51,8 @@ use WineTestBot::Config; Returns true if the user accessed the website over a secure connection. -This relies on the web server setting the $HTTPS environment variable. +This relies on the web server setting the $HTTPS environment variable for CGI +scripts. =back =cut @@ -69,12 +71,16 @@ Builds a URL that accesses this website using https if possible. The parameter should be an absolute path that includes neither the protocol nor the hostname. -Note that this method uses $HTTP_HOST which may not match the official website +This relies on the web server setting the $HTTP_HOST environment variable for +CGI scripts. However $HTTP_HOST which may not match the official website hostname. As such this should only be used for providing URLs back to the user accessing the website, not for URLs sent to third-parties. +See also MakeOfficialURL(). + =back =cut + sub MakeSecureURL($) { my ($URL) = @_; @@ -83,6 +89,32 @@ sub MakeSecureURL($) return $Protocol . ($ENV{"HTTP_HOST"} || $WebHostName) . $URL; } +=pod +=over 12 + +=item C<MakeOfficialURL()> + +Creates a URL pointing to the official website. +The parameter should be an absolute path that includes neither the protocol +nor the hostname. + +This is the method to use in non-CGI scripts and to build URLs sent to any +third-party (e.g. via email); where a third party is any user other than the +one currently browsing the website. + +See also MakeSecureURL(). + +=back +=cut + +sub MakeOfficialURL($) +{ + my ($URL) = @_; + + my $Protocol = $UseSSL ? "https://" : "http://"; + return "$Protocol$WebHostName$URL"; +} + sub GetTaskURL($$$;$$) { my ($JobId, $StepNo, $TaskNo, $ShowScreenshot, $LogName) = @_; diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index bbea0eb12..b10be75e7 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -139,9 +139,8 @@ sub OnSendRequest($) { $Msg .= "Remarks:\n" . $self->GetParam("Remarks") . "\n"; } - my $URL = ($UseSSL ? "https://" : "http://") . $WebHostName . - "/admin/UserDetails.pl?Key=" . uri_escape($self->GetParam("Name")); - $Msg .= "\nTo approve or deny the request, please go to " . $URL; + my $URL = MakeOfficialURL("/admin/UserDetails.pl?Key=". uri_escape($self->GetParam("Name"))); + $Msg .= "\nTo approve or deny the request, please go to $URL"; NotifyAdministrator("winetestbot account request", $Msg); return 1; -- 2.30.2

1 1

[tools] testbot/cgi: Let FormPage operate in read-only mode.
by Francois Gouget April 5, 2022

April 5, 2022

The FormPage is in read-write mode by default as this is the most common case, but calling SetReadWrite(0) puts it in read-only mode where it shows the field values but does not allow modifying them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This will be useful for the failure blacklist details page as it will operate either in read-only mode or in read-write mode. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 27 +++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index dfcd55e12..c6a8c6bf1 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -70,6 +70,8 @@ properties that the form should show or allow editing, as specified by DisplayProperty(). It may be undefined if determining the property list is delegated to GetPropertyDescriptors(). +By default the form allows modifying the field values. + See also Page::new(). =back @@ -82,11 +84,30 @@ sub _initialize($$$$) $self->SUPER::_initialize($Request, $RequiredRole); $self->{PropertyDescriptors} = $PropertyDescriptors; + $self->{RW} = 1; $self->{HasRequired} = !1; $self->{ActionPerformed} = !1; $self->{Method} = "post"; } +=pod +=over 12 + +=item C<SetReadWrite()> + +If set to true, the form allows editing the fields. +Otherwise it only shows their values. + +=back +=cut + +sub SetReadWrite($$) +{ + my ($self, $RW) = @_; + + $self->{RW} = $RW; +} + # # Property handling @@ -167,10 +188,12 @@ sub DisplayProperty($$) # 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... + # All other properties can displayed, + !$self->{RW} ? "ro" : + # and even edited if in read-write mode... $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : $PropertyDescriptor->GetType() ne "S" ? "rw" : - # ...except autoincrement ones (shown as <unset> if undefined) + # ...except autoincrement ones "ro"; } -- 2.30.2

1 0

[tools] testbot: Add Collection::GetSortedItems().
by Francois Gouget April 5, 2022

April 5, 2022

This provides a default comparison function for items, letting them override it as appropriate for subclasses. Collection::GetSortedItems() then returns the collection's items sorted according to that order. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 22 +++++++++++ testbot/lib/ObjectModel/Item.pm | 53 ++++++++++++++++++++++++++ testbot/lib/WineTestBot/Patches.pm | 10 ++--- testbot/lib/WineTestBot/SpecialJobs.pm | 15 ++------ testbot/lib/WineTestBot/VMs.pm | 12 ++++++ 5 files changed, 94 insertions(+), 18 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index dd0be12d5..93a4502ef 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -395,6 +395,28 @@ sub GetItems($) =pod =over 12 +=item C<GetSortedItems()> + +Returns all the Item objects present in the Collection in the order defined +by the Item's Compare() method. + +See also GetItems() for the exact set of items being returned. + +=back +=cut + +sub GetSortedItems($$) +{ + my ($self, $Items) = @_; + + $self->Load() if (!$self->{Loaded}); + my @SortedItems = sort { $a->Compare($b) } values %{$self->{Items}}; + return \@SortedItems; +} + +=pod +=over 12 + =item C<GetItemsCount()> Returns how many Items are present in the Collection. diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index fb125f015..9cec7b47b 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -363,6 +363,59 @@ sub GetKey($) return $Key; } +=pod +=over 12 + +=item C<Compare()> + +$A->Compare($B) return a negative, zero or positive value depending on whether +$A is less than, equal to, or greater than $B respectively. + +Neither object can be undefined, and both must be of the same type. + +The comparison is based on the Item's key fields which are compared in their +order in the property descriptors list, and based on their types (so numeric +comparison for numeric values, and alphabetical otherwise). + +Note that the comparison is not particularly optimised so if it is called +many times it would probably be more efficient to redefine it. + +=back +=cut + +sub Compare($$) +{ + my ($self, $B) = @_; + + foreach my $PropertyDescriptor (@{$self->{PropertyDescriptors}}) + { + next if (!$PropertyDescriptor->GetIsKey()); + + my $ColNames = $PropertyDescriptor->GetColNames(); + if ($PropertyDescriptor->GetClass() eq "Basic") + { + my $ColName = $ColNames->[0]; + my $ColType = $PropertyDescriptor->GetType(); + return ($ColType eq "N" or $ColType eq "S" or $ColType eq "DT") ? + $self->{ColValues}{$ColName} <=> $B->{ColValues}{$ColName} : + $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + } + if ($PropertyDescriptor->GetClass() eq "Enum") + { + my $ColName = $ColNames->[0]; + return $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + } + + # A Detailref cannot be a key so this is an Itemref + foreach my $ColName (@$ColNames) + { + my $Cmp = $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + return $Cmp if ($Cmp); + } + } + return 0; +} + sub GetFullKey($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index cc0fbe94a..6891fa509 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -268,12 +268,11 @@ sub Submit($$;$) my $WinVMs = CreateVMs(); $WinVMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); $WinVMs->AddFilter("Role", ["base"]); - my $SortedKeys = $WinVMs->SortKeysBySortOrder($WinVMs->GetKeys()); + my $SortedVMs = $WinVMs->GetSortedItems(); my $Tasks; - foreach my $VMKey (@$SortedKeys) + foreach my $VM (@$SortedVMs) { - my $VM = $WinVMs->GetItem($VMKey); my ($ErrMessage, $Missions) = ParseMissionStatement($VM->Missions); next if (defined $ErrMessage); @@ -338,12 +337,11 @@ sub Submit($$;$) my $WineVMs = CreateVMs(); $WineVMs->AddFilter("Type", ["wine"]); $WineVMs->AddFilter("Role", ["base"]); - my $SortedKeys = $WineVMs->SortKeysBySortOrder($WineVMs->GetKeys()); + my $SortedVMs = $WineVMs->GetSortedItems(); my $Tasks; - foreach my $VMKey (@$SortedKeys) + foreach my $VM (@$SortedVMs) { - my $VM = $WineVMs->GetItem($VMKey); my ($ErrMessage, $Missions) = ParseMissionStatement($VM->Missions); next if (defined $ErrMessage); diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index 360e1ffe8..e8677ecfd 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -54,10 +54,7 @@ sub GetReconfigVMs($$) $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); $VMs->AddFilter("Type", [$VMType]); $VMs->FilterEnabledRole(); - - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - my @SortedVMs = map { $VMs->GetItem($_) } @$SortedKeys; - return \@SortedVMs; + return $VMs->GetSortedItems(); } sub AddReconfigJob($$$) @@ -132,10 +129,7 @@ sub GetWindowsTestVMs($$$) { $VMs->FilterEnabledRole(); } - - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - my @SortedVMs = map { $VMs->GetItem($_) } @$SortedKeys; - return \@SortedVMs; + return $VMs->GetSortedItems(); } sub AddWindowsTestJob($$$$$) @@ -219,10 +213,7 @@ sub GetWineTestVMs($) $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); $VMs->AddFilter("Type", ["wine"]); $VMs->FilterEnabledRole(); - - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - my @SortedVMs = map { $VMs->GetItem($_) } @$SortedKeys; - return \@SortedVMs; + return $VMs->GetSortedItems(); } sub AddWineTestJob($$) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 65f633354..ee0c1be24 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -177,6 +177,18 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +sub Compare($$) +{ + my ($self, $B) = @_; + + # Sort retired and deleted VMs last + my %RoleOrders = ("retired" => 1, "deleted" => 2); + + return ($RoleOrders{$self->Role} || 0) <=> ($RoleOrders{$B->Role} || 0) || + $self->SortOrder <=> $B->SortOrder || + $self->Name <=> $B->Name; +} + sub HasEnabledRole($) { my ($self) = @_; -- 2.30.2

1 0

[tools] testbot/cgi: Replace CollectionPage with SimpleCollectionPage.
by Francois Gouget April 5, 2022

April 5, 2022

The old CollectionPage is not used anymore so replace it with the new implementation. This means CollectionBlockForPage and the CallXxx() trampolines are not needed anymore either. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Removes quite a bit of code. Yay! --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 169 +++-------------- .../ObjectModel/CGI/CollectionBlockForPage.pm | 154 --------------- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 179 ++++-------------- .../ObjectModel/CGI/SimpleCollectionPage.pm | 138 -------------- testbot/web/JobDetails.pl | 4 +- testbot/web/PatchesList.pl | 4 +- testbot/web/admin/BranchesList.pl | 4 +- testbot/web/admin/UsersList.pl | 4 +- testbot/web/admin/VMsList.pl | 4 +- 9 files changed, 73 insertions(+), 587 deletions(-) delete mode 100644 testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm delete mode 100644 testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index cbe22f90f..40ad61b2b 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -37,32 +37,6 @@ Also, because this is only one part of a web page, some methods, such as those dealing with errors, are delegated to the EnclosingPage object which must implement the ObjectModel::CGI::Page interface. -Other methods are designed so they can be overridden by the enclosing page as -a way to allow it to modify how the collection block looks or behaves. These -methods can be identified by their CallXxx() trampoline. The override -mechanism works as follows: -- The CollectionBlock class and any subclass should never call overridable - methods directly. Instead they should call the corresponding CallXxx() - trampoline. -- The CollectionBlock class provides a default CallXxx() implementation which - simply calls the corresponding Xxx() method. This allows using the - CollectionBlock as is. -- Pages that want to customize the CollectionBlock behavior should use the - CollectionBlockForPage class instead. That class provides an alternative - implementation for each CallXxx(...) method that calls - $self->{EnclosingPage}->Xxx($CollectionBlock, ...). Note how the Xxx() - method in the enclosing page gets an extra parameter so it can both know - which collection block it received the call from, and call the collection - block methods. -- The page should in turn provide implementations for all the Xxx() methods. - The simplest way to do so is for such pages use CollectionPage as their base - class. CollectionPage provides default Xxx($CollectionBlock,...) - implementations that just reflect these calls back to - $CollectionBlock->Xxx(). - -Of course an alternative way for a page to customize the collection block -behavior is to subclass it and use that subclass instead. - =cut package ObjectModel::CGI::CollectionBlock; @@ -118,13 +92,6 @@ sub Create($$@) return ObjectModel::CGI::CollectionBlock->new(@_); } -sub CallGetDetailsPage($) -{ - my ($self) = @_; - - return $self->GetDetailsPage(); -} - sub GetDetailsPage($) { my ($self) = @_; @@ -144,14 +111,14 @@ sub escapeHTML($$) # Error handling framework # -sub CallGenerateErrorDiv($) +sub GenerateErrorDiv($) { my ($self) = @_; $self->{EnclosingPage}->GenerateErrorDiv(); } -sub CallGenerateErrorPopup($) +sub GenerateErrorPopup($) { my ($self) = @_; @@ -163,13 +130,6 @@ sub CallGenerateErrorPopup($) # Individual item property support # -sub CallDisplayProperty($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $self->DisplayProperty($PropertyDescriptor); -} - =pod =over 12 @@ -190,13 +150,6 @@ sub DisplayProperty($$) return $PropertyDescriptor->GetClass ne "Detailref"; } -sub CallSortKeys($$) -{ - my ($self, $Keys) = @_; - - return $self->SortKeys($Keys); -} - sub SortKeys($$) { my ($self, $Keys) = @_; @@ -204,13 +157,6 @@ sub SortKeys($$) return $Keys; } -sub CallGetDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - return $self->GetDisplayValue($Item, $PropertyDescriptor); -} - sub GetDisplayValue($$$) { my ($self, $Item, $PropertyDescriptor) = @_; @@ -258,13 +204,6 @@ sub GetDisplayValue($$$) return $Value; } -sub CallGetEscapedDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - return $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); -} - sub GetEscapedDisplayValue($$$) { my ($self, $Item, $PropertyDescriptor) = @_; @@ -286,8 +225,7 @@ sub GetEscapedDisplayValue($$$) } else { - $Value = $self->escapeHTML($self->CallGetDisplayValue($Item, - $PropertyDescriptor)); + $Value = $self->escapeHTML($self->GetDisplayValue($Item, $PropertyDescriptor)); } return $Value; @@ -298,13 +236,6 @@ sub GetEscapedDisplayValue($$$) # Item cell generation # -sub CallGenerateHeaderCell($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $self->GenerateHeaderCell($PropertyDescriptor); -} - sub GenerateHeaderCell($$) { my ($self, $PropertyDescriptor) = @_; @@ -312,13 +243,6 @@ sub GenerateHeaderCell($$) "</th>\n"; } -sub CallGenerateDataCell($$$$) -{ - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; - - return $self->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); -} - sub GenerateDataCell($$$$) { my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; @@ -347,7 +271,7 @@ sub GenerateDataCell($$$$) } print "<a href='", $self->escapeHTML($Query), "'>"; } - print $self->CallGetEscapedDisplayValue($Item, $PropertyDescriptor); + print $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); if ($NeedLink) { print "</a>"; @@ -360,13 +284,6 @@ sub GenerateDataCell($$$$) # Collection table generation # -sub CallGenerateFormStart($) -{ - my ($self) = @_; - - $self->GenerateFormStart(); -} - sub GenerateFormStart($) { my ($self) = @_; @@ -384,13 +301,6 @@ sub GenerateFormStart($) } } -sub CallGenerateHeaderRow($$$) -{ - my ($self, $PropertyDescriptors, $ItemActions) = @_; - - $self->GenerateHeaderRow($PropertyDescriptors, $ItemActions); -} - sub GenerateHeaderRow($$$) { my ($self, $PropertyDescriptors, $ItemActions) = @_; @@ -402,9 +312,9 @@ sub GenerateHeaderRow($$$) } foreach my $PropertyDescriptor (@$PropertyDescriptors) { - if ($self->CallDisplayProperty($PropertyDescriptor)) + if ($self->DisplayProperty($PropertyDescriptor)) { - $self->CallGenerateHeaderCell($PropertyDescriptor); + $self->GenerateHeaderCell($PropertyDescriptor); } } @@ -419,13 +329,6 @@ sub SelName($$) return "sel_" . $Key; } -sub CallGenerateDataRow($$$$$$) -{ - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - - $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); -} - sub GenerateDataRow($$$$$$) { my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; @@ -438,21 +341,14 @@ sub GenerateDataRow($$$$$$) } foreach my $PropertyDescriptor (@$PropertyDescriptors) { - if ($self->CallDisplayProperty($PropertyDescriptor)) + if ($self->DisplayProperty($PropertyDescriptor)) { - $self->CallGenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); + $self->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); } } print "</tr>\n"; } -sub CallGenerateFormEnd($) -{ - my ($self) = @_; - - $self->GenerateFormEnd(); -} - sub GenerateFormEnd($) { #my ($self) = @_; @@ -503,26 +399,26 @@ EOF } print "<div class='CollectionBlock'>\n"; - $self->CallGenerateFormStart(); - $self->CallGenerateErrorDiv(); + $self->GenerateFormStart(); + $self->GenerateErrorDiv(); 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); + my $ItemActions = $self->GetItemActions(); + $self->GenerateHeaderRow($PropertyDescriptors, $ItemActions); print "</thead>\n"; print "<tbody>\n"; - my $DetailsPage = $self->CallGetDetailsPage(); + my $DetailsPage = $self->GetDetailsPage(); my $Row = 0; - my $Keys = $self->CallSortKeys($self->{Collection}->GetKeys()); + my $Keys = $self->SortKeys($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); + $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, + $Class, $ItemActions); $Row++; } if (@$Keys == 0) @@ -563,7 +459,7 @@ EOF print "</div>\n"; } - my $Actions = $self->CallGetActions(); + my $Actions = $self->GetActions(); if (@$Actions != 0) { print "<div class='CollectionBlockActions'>\n"; @@ -574,8 +470,8 @@ EOF print "</div>\n"; } - $self->CallGenerateErrorPopup(undef); - $self->CallGenerateFormEnd(); + $self->GenerateErrorPopup(undef); + $self->GenerateFormEnd(); print "</div>\n"; } @@ -584,13 +480,6 @@ EOF # Per-item actions handling # -sub CallGetItemActions($) -{ - my ($self) = @_; - - return $self->GetItemActions(); -} - =pod =over 12 @@ -613,13 +502,6 @@ sub GetItemActions($) return ["Delete"]; } -sub CallOnItemAction($$$) -{ - my ($self, $Item, $Action) = @_; - - return $self->OnItemAction($Item, $Action); -} - =pod =over 12 @@ -661,13 +543,6 @@ sub OnItemAction($$$) # Actions handling # -sub CallGetActions($) -{ - my ($self) = @_; - - return $self->GetActions(); -} - =pod =over 12 @@ -685,7 +560,7 @@ sub GetActions($) { my ($self) = @_; - return $self->CallGetDetailsPage() ? + return $self->GetDetailsPage() ? ["Add ". $self->{Collection}->GetItemName()] : []; } @@ -714,7 +589,7 @@ sub OnAction($$) if ($Action eq "Add " . $self->{Collection}->GetItemName()) { - my $Target = $self->CallGetDetailsPage(); + my $Target = $self->GetDetailsPage(); my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { @@ -732,7 +607,7 @@ sub OnAction($$) if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key))) { my $Item = $self->{Collection}->GetItem($Key); - return 0 if (!$self->CallOnItemAction($Item, $Action)); + return 0 if (!$self->OnItemAction($Item, $Action)); } } return 1; diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm deleted file mode 100644 index 5bdc7d32e..000000000 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ /dev/null @@ -1,154 +0,0 @@ -# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- -# Collection block for list pages -# -# Copyright 2009 Ge van Geldorp -# Copyright 2014, 2017-2018, 2022 Francois Gouget -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - -use strict; - -package ObjectModel::CGI::CollectionBlockForPage; - -=head1 NAME - -ObjectModel::CGI::CollectionBlockForPage - Collection block for list pages - -Allows the CollectionPage class to provide implementations for most of the -CollectionBlock methods. See CollectionBlock for details. - -=cut - -use ObjectModel::CGI::CollectionBlock; -our @ISA = qw(ObjectModel::CGI::CollectionBlock); - - -sub CallGetDetailsPage($) -{ - my ($self) = @_; - - return $self->{EnclosingPage}->GetDetailsPage($self); -} - - -# -# Item properties support -# - -sub CallDisplayProperty($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $self->{EnclosingPage}->DisplayProperty($self, $PropertyDescriptor); -} - -sub CallSortKeys($$) -{ - my ($self, $Keys) = @_; - - return $self->{EnclosingPage}->SortKeys($self, $Keys); -} - -sub CallGetDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - return $self->{EnclosingPage}->GetDisplayValue($self, $Item, $PropertyDescriptor); -} - - -# -# Item cell generation -# - -sub CallGenerateHeaderCell($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $self->{EnclosingPage}->GenerateHeaderCell($self, $PropertyDescriptor); -} - -sub CallGenerateDataCell($$$$) -{ - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; - - return $self->{EnclosingPage}->GenerateDataCell($self, $Item, $PropertyDescriptor, $DetailsPage); -} - - -# -# Collection table generation -# - -sub CallGenerateFormStart($) -{ - my ($self) = @_; - - $self->{EnclosingPage}->GenerateFormStart($self); -} - -sub CallGenerateHeaderRow($$$) -{ - my ($self, $PropertyDescriptors, $ItemActions) = @_; - - $self->{EnclosingPage}->GenerateHeaderRow($self, $PropertyDescriptors, $ItemActions); -} - -sub CallGenerateDataRow($$$$$$) -{ - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - - $self->{EnclosingPage}->GenerateDataRow($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); -} - -sub CallGenerateFormEnd($) -{ - my ($self) = @_; - - $self->{EnclosingPage}->GenerateFormEnd($self); -} - - -# -# Per-item actions handling -# - -sub CallGetItemActions($) -{ - my ($self) = @_; - - return $self->{EnclosingPage}->GetItemActions($self); -} - -sub CallOnItemAction($$$) -{ - my ($self, $Item, $Action) = @_; - - return $self->{EnclosingPage}->OnItemAction($self, $Item, $Action); -} - - -# -# Actions handling -# - -sub CallGetActions($) -{ - my ($self) = @_; - - return $self->{EnclosingPage}->GetActions($self); -} - -1; diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index ddbbd663e..2de667b89 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -26,106 +26,65 @@ package ObjectModel::CGI::CollectionPage; ObjectModel::CGI::CollectionPage - Base class for list pages -Generates a page containing a single collection block. +A page containing a single collection block. -It uses the CollectionBlockForPage class which means CollectionPage implements -both the ObjectModel::CGI::Page and ObjectModel::CGI::CollectionBlock -interfaces. The latter allows it to customize the collection block without -having to define a CollectionBlock subclass. +The CollectionPage instances have the following properties: +=over +=item Collection +The collection containing the items to be shown in the CollectionBlock widget. + +=item CollectionBlock +The widget showing the items in the specified collection. + +=item ActionPerformed +Set to true if an action was specified and succeeded. +=back =cut use ObjectModel::CGI::Page; our @ISA = qw(ObjectModel::CGI::Page); -use ObjectModel::CGI::CollectionBlockForPage; - - -sub _initialize($$$$) -{ - my ($self, $Request, $RequiredRole, $Collection) = @_; - - $self->{Collection} = $Collection; - - $self->SUPER::_initialize($Request, $RequiredRole); -} - -sub CreateCollectionBlock($$) -{ - my ($self, $Collection) = @_; - - return ObjectModel::CGI::CollectionBlockForPage->new($Collection, $self); -} - -sub GetDetailsPage($$) -{ - my ($self, $CollectionBlock) = @_; - - return $CollectionBlock->GetDetailsPage(); -} - - -# -# Item properties support -# - -sub DisplayProperty($$$) -{ - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; - - return $CollectionBlock->DisplayProperty($PropertyDescriptor); -} - -sub SortKeys($$$) -{ - my ($self, $CollectionBlock, $Keys) = @_; - - return $CollectionBlock->SortKeys($Keys); -} +# Use require to avoid overriding Page::new() +require ObjectModel::CGI::CollectionBlock; -sub GetDisplayValue($$$$) -{ - my ($self, $CollectionBlock, $Item, $PropertyDescriptor) = @_; - - return $CollectionBlock->GetDisplayValue($Item, $PropertyDescriptor); -} +=pod +=over 12 -# -# Item cell generation -# - -sub GenerateHeaderCell($$$) -{ - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; +=item C<_initialize()> - $CollectionBlock->GenerateHeaderCell($PropertyDescriptor); -} +Sets up the new page object. -sub GenerateDataCell($$$$$) -{ - my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; +Parameters: +=over - $CollectionBlock->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); -} +=item Request +=item RequiredRole +See Page::new(). +=item Collection +This is the collection of items that should be shown in the CollectionBlock +widget. -# -# Collection table generation -# +=item BlockCreator +If undefined the page will create an instance of the CollectionBlock class. +Otherwise it will use this function to create the CollectionBlock widget, thus +enabling use of a CollectionBlock subclass. -sub GenerateHeaderRow($$$$) -{ - my ($self, $CollectionBlock, $PropertyDescriptors, $ItemActions) = @_; +=back - $CollectionBlock->GenerateHeaderRow($PropertyDescriptors, $ItemActions); -} +=back +=cut -sub GenerateDataRow($$$$$$$) +sub _initialize($$$$;$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; + my ($self, $Request, $RequiredRole, $Collection, $BlockCreator) = @_; - $CollectionBlock->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); + $self->{Collection} = $Collection; + $BlockCreator ||= \&ObjectModel::CGI::CollectionBlock::Create; + $self->{CollectionBlock} = &$BlockCreator($Collection, $self); + $self->SUPER::_initialize($Request, $RequiredRole); } @@ -153,13 +112,6 @@ sub GenerateTitle($) } } -sub GenerateFormStart($$) -{ - my ($self, $CollectionBlock) = @_; - - $CollectionBlock->GenerateFormStart(); -} - sub GenerateBody($) { my ($self) = @_; @@ -167,69 +119,20 @@ sub GenerateBody($) print "<div class='CollectionPageBody'>\n"; $self->GenerateTitle(); print "<div class='Content'>\n"; - my $CollectionBlock = $self->CreateCollectionBlock($self->{Collection}); - $CollectionBlock->GenerateList(); + $self->{CollectionBlock}->GenerateList(); print "</div>\n"; print "</div>\n"; } -sub GenerateFormEnd($$) -{ - my ($self, $CollectionBlock) = @_; - - $CollectionBlock->GenerateFormEnd(); -} - sub GeneratePage($) { my ($self) = @_; if ($self->GetParam("Action")) { - my $CollectionBlock = $self->CreateCollectionBlock($self->{Collection}); - $self->{ActionPerformed} = $self->OnAction($CollectionBlock, - $self->GetParam("Action")); + $self->{ActionPerformed} = $self->{CollectionBlock}->OnAction($self->GetParam("Action")); } - $self->SUPER::GeneratePage(); } - -# -# Per-item actions handling -# - -sub GetItemActions($$) -{ - my ($self, $CollectionBlock) = @_; - - return $CollectionBlock->GetItemActions(); -} - -sub OnItemAction($$$$) -{ - my ($self, $CollectionBlock, $Item, $Action) = @_; - - return $CollectionBlock->OnItemAction($Item, $Action); -} - - -# -# Actions handling -# - -sub GetActions($$) -{ - my ($self, $CollectionBlock) = @_; - - return $CollectionBlock->GetActions(); -} - -sub OnAction($$$) -{ - my ($self, $CollectionBlock, $Action) = @_; - - $CollectionBlock->OnAction($Action); -} - 1; diff --git a/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm b/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm deleted file mode 100644 index 76e4d5195..000000000 --- a/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm +++ /dev/null @@ -1,138 +0,0 @@ -# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- -# Base class for list pages -# -# Copyright 2009 Ge van Geldorp -# Copyright 2014, 2017-2018, 2022 Francois Gouget -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - -use strict; - -package ObjectModel::CGI::SimpleCollectionPage; - -=head1 NAME - -ObjectModel::CGI::SimpleCollectionPage - Base class for list pages - -A page containing a single collection block. - -The SimpleCollectionPage instances have the following properties: -=over -=item Collection -The collection containing the items to be shown in the CollectionBlock widget. - -=item CollectionBlock -The widget showing the items in the specified collection. - -=item ActionPerformed -Set to true if an action was specified and succeeded. -=back - -=cut - -use ObjectModel::CGI::Page; -our @ISA = qw(ObjectModel::CGI::Page); - -# Use require to avoid overriding Page::new() -require ObjectModel::CGI::CollectionBlock; - - -=pod -=over 12 - -=item C<_initialize()> - -Sets up the new page object. - -Parameters: -=over - -=item Request -=item RequiredRole -See Page::new(). - -=item Collection -This is the collection of items that should be shown in the CollectionBlock -widget. - -=item BlockCreator -If undefined the page will create an instance of the CollectionBlock class. -Otherwise it will use this function to create the CollectionBlock widget, thus -enabling use of a CollectionBlock subclass. - -=back - -=back -=cut - -sub _initialize($$$$;$) -{ - my ($self, $Request, $RequiredRole, $Collection, $BlockCreator) = @_; - - $self->{Collection} = $Collection; - $BlockCreator ||= \&ObjectModel::CGI::CollectionBlock::Create; - $self->{CollectionBlock} = &$BlockCreator($Collection, $self); - $self->SUPER::_initialize($Request, $RequiredRole); -} - - -# -# HTML page generation -# - -sub GetTitle($) -{ - my ($self) = @_; - - my $Title = ucfirst($self->{Collection}->GetCollectionName()); - $Title =~ s/([a-z])([A-Z])/$1 $2/g; - return $Title; -} - -sub GenerateTitle($) -{ - my ($self) = @_; - - my $Title = $self->GetTitle(); - if ($Title) - { - print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; - } -} - -sub GenerateBody($) -{ - my ($self) = @_; - - print "<div class='CollectionPageBody'>\n"; - $self->GenerateTitle(); - print "<div class='Content'>\n"; - $self->{CollectionBlock}->GenerateList(); - print "</div>\n"; - print "</div>\n"; -} - -sub GeneratePage($) -{ - my ($self) = @_; - - if ($self->GetParam("Action")) - { - $self->{ActionPerformed} = $self->{CollectionBlock}->OnAction($self->GetParam("Action")); - } - $self->SUPER::GeneratePage(); -} - -1; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ccd40443a..ae99b212c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -300,8 +300,8 @@ sub OnAction($$) package JobDetailsPage; -use ObjectModel::CGI::SimpleCollectionPage; -our @ISA = qw(ObjectModel::CGI::SimpleCollectionPage); +use ObjectModel::CGI::CollectionPage; +our @ISA = qw(ObjectModel::CGI::CollectionPage); use URI::Escape; diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index e756a76ff..49e16d8d2 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -79,10 +79,10 @@ sub GetActions($) package main; -use ObjectModel::CGI::SimpleCollectionPage; +use ObjectModel::CGI::CollectionPage; use WineTestBot::Patches; my $Request = shift; -my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "", CreatePatches(), \&PatchesBlock::Create); +my $Page = ObjectModel::CGI::CollectionPage->new($Request, "", CreatePatches(), \&PatchesBlock::Create); $Page->SetRefreshInterval(60); $Page->GeneratePage(); diff --git a/testbot/web/admin/BranchesList.pl b/testbot/web/admin/BranchesList.pl index 037023762..27d17fa57 100644 --- a/testbot/web/admin/BranchesList.pl +++ b/testbot/web/admin/BranchesList.pl @@ -22,9 +22,9 @@ use strict; package main; -use ObjectModel::CGI::SimpleCollectionPage; +use ObjectModel::CGI::CollectionPage; use WineTestBot::Branches; my $Request = shift; -my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateBranches()); +my $Page = ObjectModel::CGI::CollectionPage->new($Request, "admin", CreateBranches()); $Page->GeneratePage(); diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 08ae5bffb..f54def261 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -126,9 +126,9 @@ sub OnItemAction($$$) package main; -use ObjectModel::CGI::SimpleCollectionPage; +use ObjectModel::CGI::CollectionPage; use WineTestBot::Users; my $Request = shift; -my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateUsers(), \&UsersBlock::Create); +my $Page = ObjectModel::CGI::CollectionPage->new($Request, "admin", CreateUsers(), \&UsersBlock::Create); $Page->GeneratePage(); diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index d957b4472..cfd5b91f5 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -73,9 +73,9 @@ sub OnItemAction($$$) package main; -use ObjectModel::CGI::SimpleCollectionPage; +use ObjectModel::CGI::CollectionPage; use WineTestBot::VMs; my $Request = shift; -my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateVMs(), \&VMsBlock::Create); +my $Page = ObjectModel::CGI::CollectionPage->new($Request, "admin", CreateVMs(), \&VMsBlock::Create); $Page->GeneratePage(); -- 2.30.2

1 0

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Abort when an unexpected type appears.
by Giovanni Mascellani April 5, 2022

April 5, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index fa845dc4..af5c777f 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1468,7 +1468,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; default: - break; + assert(0); } break; @@ -1494,7 +1494,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; default: - break; + assert(0); } break; @@ -1520,7 +1520,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; default: - break; + assert(0); } break; -- 2.35.1

5 26

[PATCH 1/5] msvcrt/tests: Add test for ioinfo->exflag.
by Paul Gofman April 5, 2022

April 5, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msvcrt/tests/file.c | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index bc26f90643e..78ed8931d7a 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -37,6 +37,20 @@ #include <locale.h> #include <winternl.h> +#define WX_OPEN 0x01 +#define WX_ATEOF 0x02 +#define WX_READNL 0x04 +#define WX_PIPE 0x08 +#define WX_DONTINHERIT 0x10 +#define WX_APPEND 0x20 +#define WX_TTY 0x40 +#define WX_TEXT 0x80 + +#define EF_UTF8 0x01 +#define EF_UTF16 0x02 +#define EF_CRIT_INIT 0x04 +#define EF_UNK_UNICODE 0x08 + #define MSVCRT_FD_BLOCK_SIZE 32 typedef struct { HANDLE handle; @@ -2851,6 +2865,40 @@ static void test_open_hints(void) unlink(tempfile); } +static void test_ioinfo_flags(void) +{ + HANDLE handle; + ioinfo *info; + char *tempf; + int tempfd; + + tempf = _tempnam(".","wne"); + + tempfd = _open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_WTEXT, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + + handle = (HANDLE)_get_osfhandle(tempfd); + info = &__pioinfo[tempfd / MSVCRT_FD_BLOCK_SIZE][tempfd % MSVCRT_FD_BLOCK_SIZE]; + ok(!!info, "NULL info.\n"); + ok(info->handle == handle, "Unexpected handle %p, expected %p.\n", info->handle, handle); + ok(info->exflag == (EF_UTF16 | EF_CRIT_INIT | EF_UNK_UNICODE), "Unexpected exflag %#x.\n", info->exflag); + ok(info->wxflag == (WX_TEXT | WX_OPEN), "Unexpected wxflag %#x.\n", info->wxflag); + + close(tempfd); + + ok(info->handle == INVALID_HANDLE_VALUE, "Unexpected handle %p.\n", info->handle); + ok(info->exflag == (EF_UTF16 | EF_CRIT_INIT | EF_UNK_UNICODE), "Unexpected exflag %#x.\n", info->exflag); + ok(!info->wxflag, "Unexpected wxflag %#x.\n", info->wxflag); + + info = &__pioinfo[(tempfd + 4) / MSVCRT_FD_BLOCK_SIZE][(tempfd + 4) % MSVCRT_FD_BLOCK_SIZE]; + ok(!!info, "NULL info.\n"); + ok(info->handle == INVALID_HANDLE_VALUE, "Unexpected handle %p.\n", info->handle); + ok(!info->exflag, "Unexpected exflag %#x.\n", info->exflag); + + unlink(tempf); + free(tempf); +} + START_TEST(file) { int arg_c; @@ -2925,6 +2973,7 @@ START_TEST(file) test_lseek(); test_fopen_hints(); test_open_hints(); + test_ioinfo_flags(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order -- 2.35.1

2 9

[PATCH 10/10] user32: Use NtUserMessageCall for SendMessageCallbackA implementation.
by Jacek Caban April 5, 2022

April 5, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 570 +---------------------------------- dlls/win32u/message.c | 2 +- dlls/win32u/sysparams.c | 3 - dlls/win32u/win32u_private.h | 1 - include/ntuser.h | 1 - 5 files changed, 4 insertions(+), 573 deletions(-)

3 2