- Wine-devel - list.winehq.org

[PATCH 1/3] jscript: Don't allow starting script using state from uninitialized.
by Gabriel Ivăncescu 30 May '22

30 May '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 2 +- dlls/jscript/tests/jscript.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8cf141d..d6028e6 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -824,7 +824,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s switch(ss) { case SCRIPTSTATE_STARTED: case SCRIPTSTATE_CONNECTED: /* FIXME */ - if(This->ctx->state == SCRIPTSTATE_CLOSED) + if(This->ctx->state == SCRIPTSTATE_UNINITIALIZED || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; exec_queued_code(This); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 8c985e5..8723541 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -863,6 +863,12 @@ static void test_jscript_uninitializing(void) hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08lx\n", hres); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_STARTED) returned: %08lx\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_CONNECTED) returned: %08lx\n", hres); + SET_EXPECT(GetLCID); SET_EXPECT(OnStateChange_INITIALIZED); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); -- 2.34.1

2 4

[tools] testbot: Fix the type of inherited auto-increment columns.
by Francois Gouget 30 May '22

30 May '22

Some objects, such as jobs, use a database-generated auto-increment integer as their primary key. However objects that 'inherit' such primary keys, such as Steps, do not. So the corresponding property descriptor should be a regular integer. Otherwise the DBIBackend will try to fetch a unique id that does not exist. Fortunately this issue has so far been masked by the 'master columns' mechanism. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Records.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index fd8e574ea..6002d1c2f 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -83,7 +83,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Value", "Value", !1, !1, "A", 64), ); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("RecordGroupId", "Group id", 1, 1, "S", 10), + CreateBasicPropertyDescriptor("RecordGroupId", "Group id", 1, 1, "N", 10), @PropertyDescriptors ); diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 0f65d631c..860dc4920 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -247,7 +247,7 @@ my @PropertyDescriptors = ( ); SetDetailrefKeyPrefix("Step", @PropertyDescriptors); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 10), + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), @PropertyDescriptors ); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5cc2cc667..50ce9604a 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -368,7 +368,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 10), + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), @PropertyDescriptors ); -- 2.30.2

1 0

[tools] testbot/orm: Add documentation to the database backend.
by Francois Gouget 30 May '22

30 May '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 107 ++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index dc527d465..94e4be6b7 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -63,6 +63,17 @@ sub GetDb($) return $self->{Db}; } +=pod +=over 12 + +=item C<ToDb()> + +Convert the property value to a format suitable for the database. +This is only needed for boolean and timestamp properties. + +=back +=cut + sub ToDb($$$) { my ($self, $Value, $PropertyDescriptor) = @_; @@ -101,6 +112,16 @@ sub ToDb($$$) return $Value; } +=pod +=over 12 + +=item C<FromDb()> + +Convert the database values to a format suitable for Perl. See ToDb(). + +=back +=cut + sub FromDb($$$) { my ($self, $Value, $PropertyDescriptor) = @_; @@ -132,6 +153,18 @@ sub FromDb($$$) return $Value; } +=pod +=over 12 + +=item C<BuildKeyWhere()> + +Augments the specified WHERE clause with statements to match the key columns. +It is up to the caller to then append the corresponding key components to the +query's data array. + +=back +=cut + sub BuildKeyWhere($$$) { my ($self, $PropertyDescriptors, $Where) = @_; @@ -154,6 +187,17 @@ sub BuildKeyWhere($$$) return $Where; } +=pod +=over 12 + +=item C<BuildFieldList()> + +Build the comma-separated SELECT list of columns to load from the database. +Note that only the non-master columns are loaded. + +=back +=cut + sub BuildFieldList($$) { my ($self, $PropertyDescriptors) = @_; @@ -277,6 +321,19 @@ sub GetFilterWhere($$$) die "unsupported '$Filter->{Type}' filter type"; } +=pod +=over 12 + +=item C<LoadCollection()> + +Loads the collection from the corresponding database table, filtering it on +both the master columns and the collection's filter if any. + +Note that only the non-master columns are loaded (see BuildFieldList()). + +=back +=cut + sub LoadCollection($$) { my ($self, $Collection) = @_; @@ -346,6 +403,8 @@ By design this method will not check if the Item is already present in the Collection scope. Such checks belong in the higher levels. This method will however put the Item in the Collection's scope. +Note that only the non-master columns are loaded (see BuildFieldList()). + =back =cut @@ -395,6 +454,17 @@ sub LoadItem($$$) return $Item; } +=pod +=over 12 + +=item C<BuildInsertStatement()> + +Builds the SQL statement for saving new Items to the database. +This can be reused multiple times when saving a collection. + +=back +=cut + sub BuildInsertStatement($$$$) { my ($self, $TableName, $PropertyDescriptors, $MasterColNames) = @_; @@ -432,6 +502,18 @@ sub BuildInsertStatement($$$$) return "INSERT INTO $TableName ($Fields) VALUES($PlaceHolders)"; } +=pod +=over 12 + +=item C<GetInsertData()> + +Builds a data array suitable for use with the SQL statement returned by +BuildInsertStatement() for the specified Item. This simply includes all +of the object's properties. + +=back +=cut + sub GetInsertData($$$) { my ($self, $MasterColValues, $Item) = @_; @@ -454,6 +536,17 @@ sub GetInsertData($$$) return \@Data; } +=pod +=over 12 + +=item C<BuildUpdateStatement()> + +Builds the SQL statement for saving *modified* Items to the database. +This can be reused multiple times when saving a collection. + +=back +=cut + sub BuildUpdateStatement($$$$) { my ($self, $TableName, $PropertyDescriptors, $MasterColNames) = @_; @@ -484,6 +577,20 @@ sub BuildUpdateStatement($$$$) return "UPDATE $TableName SET $Fields WHERE $Where"; } +=pod +=over 12 + +=item C<GetUpdateData()> + +Returns a data array suitable for use with the SQL statement returned by +BuildUpdateStatement() for the specified Item. It is composed of: +* The non-key properties for the SET part of the statement since only those + could have been modified. +* The key properties for the WHERE part of the statement. + +=back +=cut + sub GetUpdateData($$$) { my ($self, $MasterColValues, $Item) = @_; -- 2.30.2

1 0

[tools] testbot: Use GetSortedItems() to sort the Steps.
by Francois Gouget 30 May '22

30 May '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index e4d76d356..617222233 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -218,8 +218,7 @@ sub UpdateStatus($) my %Has; my $Steps = $self->Steps->Clone(); - my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; - foreach my $Step (@SortedSteps) + foreach my $Step (@{$Steps->GetSortedItems()}) { my $Skip; if ($Step->PreviousNo) @@ -419,8 +418,7 @@ sub Restart($) } my $Steps = $self->Steps; - my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; - foreach my $Step (@SortedSteps) + foreach my $Step (@{$Steps->GetSortedItems()}) { my $Tasks = $Step->Tasks; foreach my $Task (@{$Tasks->GetItems()}) -- 2.30.2

1 0

[PATCH 0/6] MR154: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 30 May '22

30 May '22

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

3 7

[tools 1/2] testbot: Unify the Job cancel and restart actions.
by Francois Gouget 30 May '22

30 May '22

Most of the code can be shared and this simplifies expanding the set of job control actions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 42 +++------ testbot/lib/WineTestBot/Engine/Notify.pm | 29 ++---- testbot/web/JobDetails.pl | 107 ++++++----------------- 3 files changed, 43 insertions(+), 135 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 7880b8e80..da72ffb47 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -329,50 +329,31 @@ sub HandleJobStatusChange($$$) return "1OK"; } -sub HandleJobCancel($) +sub HandleJobControl($) { - my ($JobKey) = @_; + my ($Action, $JobKey) = @_; - my $Job = CreateJobs()->GetItem($JobKey); - if (! $Job) + if ($Action !~ /^(cancel|restart)$/) { - LogMsg "JobCancel for nonexistent job $JobKey\n"; - return "0Job $JobKey not found"; + LogMsg "Invalid $Action JobControl command\n"; + return "0Invalid $Action JobControl command"; } - # We've already determined that JobKey is valid, untaint it - $JobKey =~ m/^(.*)$/; - $JobKey = $1; - - my $ErrMessage = $Job->Cancel(); - if (defined($ErrMessage)) - { - LogMsg "Cancel problem: $ErrMessage\n"; - return "0$ErrMessage"; - } - - ScheduleJobs(); - - return "1OK"; -} - -sub HandleJobRestart($) -{ - my ($JobKey) = @_; + $Action = $1; my $Job = CreateJobs()->GetItem($JobKey); - if (! $Job) + if (!$Job) { - LogMsg "JobRestart for nonexistent job $JobKey\n"; + LogMsg "$Action JobControl for nonexistent job $JobKey\n"; return "0Job $JobKey not found"; } # We've already determined that JobKey is valid, untaint it $JobKey =~ m/^(.*)$/; $JobKey = $1; - my $ErrMessage = $Job->Restart(); + my $ErrMessage = $Action eq "cancel" ? $Job->Cancel() : $Job->Restart(); if (defined($ErrMessage)) { - LogMsg "Restart problem: $ErrMessage\n"; + LogMsg "$Action problem: $ErrMessage\n"; return "0$ErrMessage"; } @@ -567,8 +548,7 @@ sub HandleGetScreenshot($) my %Handlers=( "getscreenshot" => \&HandleGetScreenshot, - "jobcancel" => \&HandleJobCancel, - "jobrestart" => \&HandleJobRestart, + "jobcontrol" => \&HandleJobControl, "jobstatuschange" => \&HandleJobStatusChange, "ping" => \&HandlePing, "shutdown" => \&HandleShutdown, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index de7342564..82221c9ed 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -29,8 +29,8 @@ WineTestBot::Engine::Notify - Engine notification use Exporter 'import'; our $RunningInEngine; -our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobCancel - JobRestart RescheduleJobs VMStatusChange +our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobControl + RescheduleJobs VMStatusChange WinePatchMLSubmission WinePatchWebSubmission GetScreenshot); our @EXPORT_OK = qw($RunningInEngine); @@ -115,31 +115,14 @@ sub JobStatusChange($$$) return substr($Reply, 1); } -sub JobCancel($) +sub JobControl($$) { - my ($JobKey) = @_; + my ($Action, $JobKey) = @_; - my $Reply = SendCmdReceiveReply("jobcancel $JobKey\n"); + my $Reply = SendCmdReceiveReply("jobcontrol $Action $JobKey\n"); if (length($Reply) < 1) { - return "The Engine did not acknowledge the JobCancel command"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - -sub JobRestart($) -{ - my ($JobKey) = @_; - - my $Reply = SendCmdReceiveReply("jobrestart $JobKey\n"); - if (length($Reply) < 1) - { - return "The Engine did not acknowledge the JobRestart command"; + return "The Engine did not acknowledge the $Action JobControl command"; } if (substr($Reply, 0, 1) eq "1") { diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 99c68bcb8..87a56941e 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -158,73 +158,33 @@ sub GetItemActions($) # Actions handling # -sub GetActions($) +sub CanDoJobControl($$) { - my ($self) = @_; - - # These are mutually exclusive - return ["Cancel job"] if (!defined $self->CanCancel()); - return ["Restart job"] if (!defined $self->CanRestart()); - return []; -} - -sub CanCancel($) -{ - my ($self) = @_; + my ($self, $Action) = @_; my $Job = $self->{EnclosingPage}->GetJob(); - my $Status = $Job->Status; - if ($Status ne "queued" && $Status ne "running") - { - return "Job already $Status"; - } - my $Session = $self->{EnclosingPage}->GetCurrentSession(); - if (! defined($Session)) + my $CurrentUser = $Session->User if (defined $Session); + if (!$CurrentUser or + (!$CurrentUser->HasRole("admin") and + $Job->User->GetKey() ne $CurrentUser->GetKey())) { - return "You are not authorized to cancel this job"; - } - my $CurrentUser = $Session->User; - if (! $CurrentUser->HasRole("admin") && - $Job->User->GetKey() ne $CurrentUser->GetKey()) - { - return "You are not authorized to cancel this job"; + return "You are not authorized to $Action this job"; } - return undef; + my %AllowedStatus = ( + "cancel" => {"queued" => 1, "running" => 1}, + "restart" => {"boterror" => 1, "canceled" => 1}, + ); + return $AllowedStatus{$Action}->{$Job->Status} ? undef : + "Cannot $Action a ". $Job->Status ." job"; } -sub CanRestart($) +sub OnJobControl($$) { - my ($self) = @_; - - my $Job = $self->{EnclosingPage}->GetJob(); - my $Status = $Job->Status; - if ($Status ne "boterror" && $Status ne "canceled") - { - return "Not a failed / canceled Job"; - } - - my $Session = $self->{EnclosingPage}->GetCurrentSession(); - if (! defined($Session)) - { - return "You are not authorized to restart this job"; - } - my $CurrentUser = $Session->User; - if (! $CurrentUser->HasRole("admin") && - $Job->User->GetKey() ne $CurrentUser->GetKey()) # FIXME: Admin only? - { - return "You are not authorized to restart this job"; - } - - return undef; -} - -sub OnCancel($) -{ - my ($self) = @_; + my ($self, $Action) = @_; - my $ErrMessage = $self->CanCancel(); + my $ErrMessage = $self->CanDoJobControl($Action); if (defined $ErrMessage) { $self->{EnclosingPage}->SetError(undef, $ErrMessage); @@ -232,7 +192,7 @@ sub OnCancel($) } my $JobId = $self->{EnclosingPage}->GetJob()->Id; - $ErrMessage = JobCancel($JobId); + $ErrMessage = JobControl($Action, $JobId); if (defined $ErrMessage) { $self->{EnclosingPage}->SetError(undef, $ErrMessage); @@ -240,43 +200,28 @@ sub OnCancel($) } # Ideally this would use something like GetMoreInfoLink() to rebuild a Get - # URL to preserve which logs and screenshots have been expanded. But the - # anchor would likely be lost anyway. + # URL to preserve which logs and screenshots have been expanded. But if the + # job got restarted those would be gone anyway. # So just do a basic reload to refresh the tasks' status. exit($self->{EnclosingPage}->Redirect($ENV{"SCRIPT_NAME"} ."?Key=$JobId")); } -sub OnRestart($) +sub GetActions($) { my ($self) = @_; - my $ErrMessage = $self->CanRestart(); - if (defined $ErrMessage) - { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); - return !1; - } - - my $JobId = $self->{EnclosingPage}->GetJob()->Id; - $ErrMessage = JobRestart($JobId); - if (defined $ErrMessage) - { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); - return !1; - } - - # Reload to refresh the tasks' status. Note that all logs and screenshots - # have been cleared so there is no point specifying which one to open or - # adding an anchor. - exit($self->{EnclosingPage}->Redirect($ENV{"SCRIPT_NAME"} ."?Key=$JobId")); + # These are mutually exclusive + return ["Cancel job"] if (!defined $self->CanDoJobControl("cancel")); + return ["Restart job"] if (!defined $self->CanDoJobControl("restart")); + return []; } sub OnAction($$) { my ($self, $Action) = @_; - return $Action eq "Cancel job" ? $self->OnCancel() : - $Action eq "Restart job" ? $self->OnRestart() : + return $Action eq "Cancel job" ? $self->OnJobControl("cancel") : + $Action eq "Restart job" ? $self->OnJobControl("restart") : $self->SUPER::OnAction($Action); } -- 2.30.2

1 1

[PATCH v2 0/10] MR146: kerberos: Add wow64 support.
by Nikolay Sivov (＠nsivov) 30 May '22

30 May '22

-- v2: kerberos: Add wow64 support to the unixlib. kerberos: Separate ticket query function from call handler. kerberos: Pass input/output buffers directly for initialize_context() call. kerberos: Pass input/output buffers directly for unseal_message() call. kerberos: Pass input/output buffers directly for seal_message() call. kerberos: Pass input/output buffers directly for verify_signature() call. https://gitlab.winehq.org/wine/wine/-/merge_requests/146

3 12

[PATCH 0/10] MR146: kerberos: Add wow64 support.
by Nikolay Sivov (＠nsivov) 30 May '22

30 May '22

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

3 11

[tools] testbot/scripts: Add a script to create the initial administrator account.
by Francois Gouget 30 May '22

30 May '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/doc/INSTALL.txt | 18 ++--- testbot/scripts/CreateAdmin | 147 ++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 13 deletions(-) create mode 100755 testbot/scripts/CreateAdmin diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 7565d6b4d..46edeea52 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -52,19 +52,11 @@ General setup for the web site: - Copy lib/WineTestBot/ConfigLocalTemplate.pl to ConfigLocal.pl in TestBot's root directory and fill in the options for your site. - Restart Apache, you should now be able to browse to the home page. -- Register a new account for yourself. -- Using the mysql client, set the ResetCode in your Users entry to a - known value, e.g. - mysql> update Users set ResetCode = 'a' where Name = '<username>'; -- Browse to http://server.name/ResetPassword.pl and enter your username, - the resetcode you just updated and a new password. -- Make yourself admin by adding a row to UserRoles: - mysql> insert into UserRoles values('<username>', 'admin'); -- If you want to be able to submit jobs from the same account you will likely - need to also give it the 'wine-devel' role: - mysql> insert into UserRoles values('<username>', wine-devel); -- When you refresh the home page, you should now have an "Admin" menu - in the sidebar. +- Run the script below to create an administrator account for yourself. Once + you have followed the script's instructions you should have an "Admin" menu + on the home page sidebar. + + $HOME/tools/testbot/scripts/CreateAdmin <your-admin-account> Janitorial tasks: - Run the Janitor.pl script once per day to perform the janitorial diff --git a/testbot/scripts/CreateAdmin b/testbot/scripts/CreateAdmin new file mode 100755 index 000000000..163b445a1 --- /dev/null +++ b/testbot/scripts/CreateAdmin @@ -0,0 +1,147 @@ +#!/usr/bin/perl -Tw +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# +# Creates an administrator user for the initial setup. +# +# Copyright 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; + +sub BEGIN +{ + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } +} +my $Name0 = $0; +$Name0 =~ s+^.*/++; + + +use WineTestBot::Roles; +use WineTestBot::Users; +use WineTestBot::Log; +use WineTestBot::Utils; + + +# +# Logging and error handling helpers +# + +sub Error(@) +{ + print STDERR "$Name0:error: ", @_; + LogMsg @_; +} + + +# +# Setup and command line processing +# + +my ($OptUserName, $Usage); +while (@ARGV) +{ + my $Arg = shift @ARGV; + if ($Arg =~ /^(?:-\?|-h|--help)$/) + { + $Usage = 0; + last; + } + elsif ($Arg =~ /^-/) + { + Error "unknown option '$Arg'\n"; + $Usage = 2; + last; + } + elsif (!defined $OptUserName) + { + $OptUserName = $Arg; + } + else + { + Error "unexpected argument '$Arg'\n"; + $Usage = 2; + last; + } +} + +# Check parameters +if (!defined $Usage) +{ + if (!defined $OptUserName) + { + Error "You must specify the user name\n"; + $Usage = 2; + } +} +if (defined $Usage) +{ + print "Usage: $Name0 [--help] USERNAME\n"; + print "\n"; + print "Creates an administrator account. Instructions for logging in will be provided on stdout.\n"; + print "\n"; + print "Where:\n"; + print " USERNAME The administrator account name.\n"; + print " --help Shows this usage message.\n"; + exit $Usage; +} + + +# +# Create the administrator +# + +my $Users = CreateUsers(); +my $User = $Users->Add(); +$User->Name($OptUserName); +$User->EMail("$OptUserName\@localhost"); +my $ResetCode = GenerateRandomString(32); +$User->ResetCode($ResetCode); +$User->AddDefaultRoles(); +$User->AddRole(CreateRoles()->GetItem("admin")); + +NotifyAdministrator("Creating an administrator account for $OptUserName", + "Creating an administrator account for $OptUserName.\n"); + +my ($_ErrKey, $ErrProperty, $ErrMessage) = $Users->Save(); +if (defined $ErrMessage) +{ + Error "Could not create the $OptUserName user: $ErrMessage\n"; + exit 1; +} + + +my $URL = MakeOfficialURL("/ResetPassword.pl"); +print <<EOF; +You can now log in using the following information +URL: $URL +Username: $OptUserName +ResetCode: $ResetCode + +Then use your fresh administrator powers to set your email address, +your real name, and adjust your roles as appropriate. +EOF + +exit 0; -- 2.30.2

1 0

[PATCH v2 0/4] MR151: ntdll: Improve heap block size compat.
by Rémi Bernon 30 May '22

30 May '22

-- v2: ntdll: Improve block size rounding compatibility. ntdll: Remove unnecessary constants and typedefs. ntdll: Remove tail checking on large blocks. ntdll: Use a fixed block tail size. https://gitlab.winehq.org/wine/wine/-/merge_requests/151

2 7