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

[PATCH 0/1] MR398: xactengine3_7/tests: Test notifications when loading a wave bank.
by Giovanni Mascellani (＠giomasce) 07 Jul '22

07 Jul '22

"The King of Fighters '98 Ultimate Match Final Edition" depends on this behavior. At least, the build I have is; it seems other builds are not. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/398

3 2

[tools] testbot/web: Use AddError() for the user details page.
by Francois Gouget 07 Jul '22

07 Jul '22

This replaces SetError() and direct field access. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/UserDetails.pl | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 833a36d14f..da8cebf2f1 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -88,10 +88,10 @@ sub OnItemAction($$$) return 1 if ($self->{User}->Roles->HasItem($Item->Name)); $self->{User}->AddRole($Item); - my $ErrMessage = $self->{User}->Roles->Save(); + my ($_ErrKey, $ErrProperty, $ErrMessage) = $self->{User}->Roles->Save(); if (defined $ErrMessage) { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); + $self->{EnclosingPage}->AddError($ErrMessage, $ErrProperty); return 0; } NotifyAdministrator("New administrator user: $self->{UserName}", @@ -100,13 +100,12 @@ sub OnItemAction($$$) } if ($self->{RW} and $Action eq "Remove role") { - my $UserRole = $self->{User}->Roles->GetItem($Item->Name); + my $Roles = $self->{User}->Roles; + my $UserRole = $Roles->GetItem($Item->Name); return 1 if (!$UserRole); - my $ErrMessage = $self->{User}->Roles->DeleteItem($UserRole); - if (defined $ErrMessage) + if ($self->{EnclosingPage}->AddError($Roles->DeleteItem($UserRole))) { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); return 0; } NotifyAdministrator("Removed an administrator: $self->{UserName}", @@ -114,7 +113,7 @@ sub OnItemAction($$$) return 1; } - $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); + $self->{EnclosingPage}->AddError("No per-Item action defined for $Action"); return 0; } @@ -194,8 +193,7 @@ sub OnApprove($) my ($self) = @_; return !1 if (!$self->Save()); - $self->{ErrMessage} = $self->{Item}->Approve(); - return !1 if (defined $self->{ErrMessage}); + return !1 if ($self->AddError($self->{Item}->Approve())); exit($self->RedirectToParent()); } @@ -204,8 +202,12 @@ sub OnReject($) my ($self) = @_; $self->{Item}->Status('deleted'); - ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); - return !1 if (defined $self->{ErrMessage}); + my ($ErrProperty, $ErrMessage) = $self->{Item}->Save(); + if (defined $ErrMessage) + { + $self->AddError($ErrMessage, $ErrProperty); + return !1; + } # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); exit($self->RedirectToParent()); -- 2.30.2

1 0

[tools] testbot/web: Use AddError() and ResetErrors() on the submit job page.
by Francois Gouget 07 Jul '22

07 Jul '22

This replaces a lot of direct field accesses. Also clearly identify unused variables. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 100 ++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 63 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index c5423c7951..4368aeeb30 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -77,16 +77,14 @@ sub _Upload($) { umask($OldUMask); delete $self->{FileName}; - $self->{ErrField} = "File"; - $self->{ErrMessage} = "Unable to save the uploaded file"; + $self->AddError("Unable to save the uploaded file", "File"); return undef; } } else { delete $self->{FileName}; - $self->{ErrField} = "File"; - $self->{ErrMessage} = "Unable to upload the file"; + $self->AddError("Unable to upload the file", "File"); return undef; } return 1; @@ -102,8 +100,7 @@ sub _GetFileType($) my $Fh; if (!sysopen($Fh, $self->_GetStagingFilePath(), O_RDONLY)) { - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "Unable to open '$self->{FileName}'"; + $self->AddError("Unable to open '$self->{FileName}'", "FileName"); return undef; } @@ -153,8 +150,7 @@ sub _GetFileType($) if ($self->{FileType} !~ /^(?:exe32|exe64|patch)$/) { - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "Unsupported file type"; + $self->SerError("FileName", "Unsupported file type"); return undef; } @@ -169,14 +165,12 @@ sub _AnalyzePatch($) if (!$self->{Impacts}->{TestBuild}) { - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "'$self->{FileName}' is not a valid patch"; + $self->AddError("'$self->{FileName}' is not a valid patch", "FileName"); return undef; } if ($self->{Impacts}->{PatchedModuleOrTests} == 0) { - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "The patch does not directly impact the Wine dlls and programs"; + $self->AddError("The patch does not directly impact the Wine dlls and programs", "FileName"); return undef; } return 1; @@ -194,23 +188,20 @@ sub _ValidateFileName($) if (!defined $self->{FileName}) { delete $self->{FileName}; - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "You must provide a file to test"; + $self->AddError("You must provide a file to test", "FileName"); return undef; } if (!IsValidFileName($self->{FileName})) { delete $self->{FileName}; - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "The filename contains invalid characters"; + $self->AddError("The filename contains invalid characters", "FileName"); return undef; } my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($self->{FileName})) { delete $self->{FileName}; - $self->{ErrField} = "FileName"; - $self->{ErrMessage} = "The filename is too long"; + $self->AddError("The filename is too long", "FileName"); return undef; } @@ -290,7 +281,7 @@ sub _ValidateVMSelection($;$) if (@Deselected) { - $self->{ErrMessage} = "The following VMs are incompatible and have been deselected: @Deselected"; + $self->AddError("The following VMs are incompatible and have been deselected: @Deselected"); return undef; } return 1; @@ -337,8 +328,7 @@ sub _ValidateTestExecutable($;$) if (!defined $self->{TestExecutable}) { - $self->{ErrField} = "TestExecutable"; - $self->{ErrMessage} = "You must specify the test executable filename"; + $self->AddError("You must specify the test executable filename", "TestExecutable"); return undef; } elsif (!$self->{TestExecutables}->{$self->{TestExecutable}} or @@ -346,8 +336,7 @@ sub _ValidateTestExecutable($;$) # to defend against malicious patches. !IsValidFileName($self->{TestExecutable})) { - $self->{ErrField} = "TestExecutable"; - $self->{ErrMessage} = "Invalid test executable filename"; + $self->AddError("Invalid test executable filename", "TestExecutable"); return undef; } @@ -393,14 +382,12 @@ sub Validate($) { # Note that Page 1 should have provided a default # so there is no reason for it to still be undefined. - $self->{ErrField} = "Branch"; - $self->{ErrMessage} = "You must specify the branch to test"; + $self->AddError("You must specify the branch to test", "Branch"); return undef; } if (!CreateBranches()->GetItem($self->{Branch})) { - $self->{ErrField} = "Branch"; - $self->{ErrMessage} = "The '$self->{Branch}' branch does not exist"; + $self->AddError("The '$self->{Branch}' branch does not exist", "Branch"); return undef; } } @@ -410,7 +397,7 @@ sub Validate($) return undef if (!$self->_ValidateVMSelection()); if (!$self->{CheckedVMCount}) { - $self->{ErrMessage} = "Select at least one VM"; + $self->AddError("Select at least one VM"); return undef; } } @@ -424,18 +411,17 @@ sub Validate($) !$self->{Run64} and $self->{ShowRun64}) { # Don't set ErrField since Run32 and Run64 may be hidden - $self->{ErrMessage} = "You must at least pick one of the 32 or 64 bit tests to run on the selected Windows VMs."; + $self->AddError("You must at least pick one of the 32 or 64 bit tests to run on the selected Windows VMs."); return undef; } if ($self->{CmdLineArg} eq "" and !$self->{NoCmdLineArgWarn}) { - $self->{ErrMessage} = "You did not specify a command line argument. ". - "This is most likely not correct, so please ". - "fix this. If you are sure that you really don't ". - 'want a command line argument, press "Submit" '. - "again."; - $self->{ErrField} = "CmdLineArg"; + $self->AddError("You did not specify a command line argument. ". + "This is most likely not correct, so please ". + "fix this. If you are sure that you really don't ". + 'want a command line argument, press "Submit" again.', + "CmdLineArg"); $self->{NoCmdLineArgWarn} = 1; return undef; } @@ -969,8 +955,7 @@ sub OnUnset($) if (!$self->_ValidateFileName()) { # Ignore the error. What counts is not using a suspicious FileName. - delete $self->{ErrField}; - delete $self->{ErrMessage}; + $self->ResetErrors(); } elsif (defined $self->{FileName}) { @@ -1012,12 +997,8 @@ sub OnSinglePage($) my ($self) = @_; # The checks and defaults are the same as for Page1Next() - if (!$self->OnPage1Next()) - { - # But ignore all errors. The user can change everything anyway. - delete $self->{ErrField}; - delete $self->{ErrMessage}; - } + # But ignore all errors. The user can change everything anyway. + $self->ResetErrors() if (!$self->OnPage1Next()); $self->_SetPage(4); return 1; @@ -1151,7 +1132,7 @@ sub _SubmitJob($$) } if (defined $ErrMessage) { - $self->{ErrMessage} = $ErrMessage; + $self->AddError($ErrMessage); return !1; } } @@ -1210,7 +1191,7 @@ sub _SubmitJob($$) my ($ErrMessage, $Missions) = ParseMissionStatement($WineMissions{$VM}); if (defined $ErrMessage) { - $self->{ErrMessage} = $ErrMessage; + $self->AddError($ErrMessage); return !1; } my $Missions = $Missions->[0]; @@ -1229,34 +1210,32 @@ sub _SubmitJob($$) } # Now save it all (or whatever's left to save) - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - $self->{ErrMessage} = $ErrMessage; + $self->AddError($ErrMessage); return undef; } # Stage the test patch/executable so the job can pick it up if (!rename($Staging, "$DataDir/staging/job". $NewJob->Id ."_$self->{FileName}")) { - $self->{ErrMessage} = "Could not stage '$self->{FileName}': $!\n"; + $self->AddError("Could not stage '$self->{FileName}': $!"); return undef; } # Switch Status to staging to indicate we are done setting up the job $NewJob->Status("staging"); - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - $self->{ErrMessage} = $ErrMessage; + $self->AddError($ErrMessage); return undef; } # Notify engine - my $ErrMessage = RescheduleJobs(); - if (defined $ErrMessage) + if ($self->AddError(RescheduleJobs())) { - $self->{ErrMessage} = $ErrMessage; $self->_SetPage(0); $self->{JobKey} = $NewJob->GetKey(); return undef; @@ -1277,15 +1256,15 @@ sub OnSubmit($) my $Staging = CreateNewLink($OldStaging, "$DataDir/staging", "-websubmit2_$self->{FileName}"); if (!defined $Staging) { - $self->{ErrMessage} = "Could not rename '$self->{FileName}': $!"; + $self->AddError("Could not rename '$self->{FileName}': $!"); return undef; } if (!unlink $OldStaging) { unlink $Staging; - $self->{ErrMessage} = $!{ENOENT} ? + $self->AddError($!{ENOENT} ? "$self->{FileName} has already been submitted or has expired" : - "Could not remove the staging '$self->{FileName}' file: $!"; + "Could not remove the staging '$self->{FileName}' file: $!"); return undef; } @@ -1303,13 +1282,8 @@ sub OnSetShowAllVMs($$) my ($self, $Value) = @_; # Call _ValidateVMSelection() to identify incompatible VMs so they are not - # marked as Checked - if (!$self->_ValidateVMSelection("deselect")) - { - # Ignore errors - delete $self->{ErrField}; - delete $self->{ErrMessage}; - } + # marked as Checked but ignore errors. + $self->ResetErrors() if (!$self->_ValidateVMSelection("deselect")); $self->{ShowAll} = $Value; return undef; -- 2.30.2

1 0

[tools] testbot/web: Use AddError() in the login and related pages.
by Francois Gouget 07 Jul '22

07 Jul '22

This is better than direct field access. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Feedback.pl | 3 +-- testbot/web/ForgotPassword.pl | 12 ++---------- testbot/web/Login.pl | 6 ++---- testbot/web/Register.pl | 3 +-- testbot/web/ResetPassword.pl | 24 ++++++++++-------------- 5 files changed, 16 insertions(+), 32 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 6185d26d22..23e1944028 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -86,8 +86,7 @@ sub OnSend($) my $FeedA = $self->GetParam("FeedA"); if ($FeedA !~ /$RegistrationARE/) { - $self->{ErrMessage} = "Wrong 'captcha' answer. Please try again."; - $self->{ErrField} = "Captcha"; + $self->AddError("Wrong 'captcha' answer. Please try again.", "Captcha"); return !1; } } diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index 190985264e..ee175d3d44 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -82,21 +82,13 @@ sub OnResetPassword($) my $Keys = $Users->GetKeys; if (scalar @$Keys == 0) { - $self->{ErrField} = "Name"; - $self->{ErrMessage} = "Unknown username or email address"; + $self->AddError("Unknown username or email address", "Name"); return !1; } $User = $Users->GetItem($Keys->[0]); } - $self->{ErrMessage} = $User->SendResetCode(); - if (defined($self->{ErrMessage})) - { - $self->{ErrField} = "Name"; - return !1; - } - - return 1; + return $self->AddError($User->SendResetCode(), "Name") ? !1 : 1; } sub OnAction($$) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 7b9a6ffebf..9380583a06 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -106,8 +106,7 @@ sub OnLogIn($) $self->GetParam("Password")); if ($ErrMessage) { - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = "Name"; + $self->AddError($ErrMessage, "Name"); return !1; } @@ -116,8 +115,7 @@ sub OnLogIn($) defined($self->GetParam("AutoLogin"))); if ($ErrMessage) { - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = "Name"; + $self->AddError($ErrMessage, "Name"); return !1; } diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index b31dc14c19..667a19b099 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -116,8 +116,7 @@ sub OnSendRequest($) my $RegA = $self->GetParam("RegA"); if ($RegA !~ /$RegistrationARE/) { - $self->{ErrMessage} = "Wrong 'captcha' answer. Please try again."; - $self->{ErrField} = "Captcha"; + $self->AddError("Wrong 'captcha' answer. Please try again.", "Captcha"); return !1; } } diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 081e27f199..65dcdd539d 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -85,8 +85,7 @@ sub Validate($) if ($self->GetParam("Password1") ne $self->GetParam("Password2")) { - $self->{ErrField} = "Password1"; - $self->{ErrMessage} = "Passwords don't match"; + $self->AddError("Passwords don't match", "Password1"); return !1; } @@ -108,24 +107,22 @@ sub OnChangePassword($) my $User = $Users->GetItem($self->GetParam("Name")); if (! defined($User)) { - $self->{ErrField} = "Name"; - $self->{ErrMessage} = "Unknown username or incorrect activation code"; + $self->AddError("Unknown username or incorrect activation code", "Name"); return !1; } - $self->{ErrMessage} = $User->ResetPassword($self->GetParam("ResetCode"), - $self->GetParam("Password1")); - if (defined($self->{ErrMessage})) + my $ErrMessage = $User->ResetPassword($self->GetParam("ResetCode"), + $self->GetParam("Password1")); + if (defined $ErrMessage) { - $self->{ErrField} = "Name"; + $self->AddError($ErrMessage, "Name"); return !1; } - my ($ErrMessage, $User) = $Users->Authenticate($self->GetParam("Name"), + ($ErrMessage, my $User) = $Users->Authenticate($self->GetParam("Name"), $self->GetParam("Password1")); - if ($ErrMessage) + if (defined $ErrMessage) { - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = "Name"; + $self->AddError($ErrMessage, "Name"); return !1; } @@ -134,8 +131,7 @@ sub OnChangePassword($) defined($self->GetParam("AutoLogin"))); if ($ErrMessage) { - $self->{ErrMessage} = $ErrMessage; - $self->{ErrField} = "Name"; + $self->AddError($ErrMessage, "Name"); return !1; } -- 2.30.2

1 0

[tools] testbot/web: Use AddError() in the job details page.
by Francois Gouget 07 Jul '22

07 Jul '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 6d3f13cd04..3fbdb427e6 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -185,20 +185,10 @@ sub OnJobControl($$) { my ($self, $Action) = @_; - my $ErrMessage = $self->CanDoJobControl($Action); - if (defined $ErrMessage) - { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); - return !1; - } + return !1 if ($self->{EnclosingPage}->AddError($self->CanDoJobControl($Action))); my $JobId = $self->{EnclosingPage}->GetJob()->Id; - $ErrMessage = JobControl($Action, $JobId); - if (defined $ErrMessage) - { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); - return !1; - } + return !1 if ($self->{EnclosingPage}->AddError(JobControl($Action, $JobId))); # Ideally this would use something like GetMoreInfoLink() to rebuild a Get # URL to preserve which logs and screenshots have been expanded. But if the -- 2.30.2

1 0

[tools] testbot/cgi: Use AddError() to report collection block errors.
by Francois Gouget 07 Jul '22

07 Jul '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 0f0a3bd6bb..bbff74c6b3 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -600,16 +600,10 @@ sub OnItemAction($$$) if ($self->{RW} and $Action eq "Delete") { - my $ErrMessage = $self->{Collection}->DeleteItem($Item); - if (defined $ErrMessage) - { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); - return 0; - } - return 1; + return $self->{EnclosingPage}->AddError($self->{Collection}->DeleteItem($Item)) ? 0 : 1; } - $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); + $self->{EnclosingPage}->AddError("No per-Item action defined for $Action"); return 0; } -- 2.30.2

1 0

[tools] testbot: Clean up the Authenticate() and NewSession() methods.
by Francois Gouget 07 Jul '22

07 Jul '22

Make sure all Authenticate() methods return an (error, user) pair instead of just an error string. The result is the same but it's better to be consistent. Clearly identify unused variables and tweak the formatting a bit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/Sessions.pm | 3 +- testbot/lib/WineTestBot/Users.pm | 52 ++++++------------------- 2 files changed, 13 insertions(+), 42 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 8594cfcdf0..afe78d0632 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -131,8 +131,7 @@ sub NewSession($$$) $Session->User($User); $Session->Permanent($Permanent); - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); - + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $self->Save(); return ($ErrMessage, $Session); } diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 70d0d7b75e..e9d68b09c0 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -223,15 +223,10 @@ sub Authenticate($$) if (! $self->Activated()) { - if ($self->WaitingForApproval()) - { - return ("Your account has not been approved yet", undef); - } - else - { - return ("You need to activate your account, see email for instructions", - undef); - } + return ($self->WaitingForApproval() ? + "Your account has not been approved yet" : + "You need to activate your account, see email for instructions", + undef); } my $CorrectHashedPassword = $self->Password; @@ -352,41 +347,22 @@ sub AuthenticateLDAP($$$) my ($self, $Name, $Password) = @_; my $LDAP = Net::LDAP->new($LDAPServer); - if (! defined($LDAP)) - { - return ("Can't connect to LDAP server: $@", undef); - } + return ("Can't connect to LDAP server: $@", undef) if (!$LDAP); my $BindDN = $LDAPBindDN; $BindDN =~ s/%USERNAME%/$Name/; my $Msg = $LDAP->bind($BindDN, password => $Password); - if ($Msg->code) - { - return "Unknown username or incorrect password"; - } + return ("Unknown username or incorrect password", undef) if ($Msg->code); my $User = $self->GetItem($Name); - if (defined($User)) - { - return (undef, $User); - } + return (undef, $User) if (defined $User); $User = $self->Add(); my $ErrMessage = $User->FromLDAP($LDAP, $Name); - if ($ErrMessage) - { - return $ErrMessage; - } - - my $ErrKey; - my $ErrProperty; - ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); - if ($ErrMessage) - { - return $ErrMessage; - } + return ($ErrMessage, undef) if ($ErrMessage); - return (undef, $User); + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); + return $ErrMessage ? ($ErrMessage, undef) : (undef, $User); } sub AuthenticateBuiltin($$$) @@ -394,12 +370,8 @@ sub AuthenticateBuiltin($$$) my ($self, $Name, $Password) = @_; my $User = $self->GetItem($Name); - if (! defined($User)) - { - return "Unknown username or incorrect password"; - } - - return $User->Authenticate($Password); + return $User ? $User->Authenticate($Password) : + ("Unknown username or incorrect password", undef); } sub Authenticate($$$) -- 2.30.2

1 0

[PATCH 0/1] MR397: regedit: Replace heap_x*() functions with malloc(), realloc() and free()
by Hugh McMaster (＠hmc) 07 Jul '22

07 Jul '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/397

2 1

[PATCH 0/1] MR379: wined3d: Don't transition GENERAL layouts for blits.
by Stefan Dösinger 07 Jul '22

07 Jul '22

On Radeon GPUs VK_IMAGE_LAYOUT_GENERAL images don't use Delta Color Compression, but SRC/DST optimal images do. Transitioning from GENERAL to SRC/DST causes a big performance hit. As a next step we should try harder to avoid VK_IMAGE_LAYOUT_GENERAL. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- This is an updated version of Merge Request #4, with fixes for the regression in World of Tanks I noticed. This improves Rocket League from 50fps to 67fps when it is GPU limited. Using VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL instead of GENERAL further improves it to 80 fps. Switching from COLOR_ATTACHMENT_OPTIMAL to SRC/DST optimal seems cheap (it just stays compressed), but first we need logic to transition BIND_RENDER_TARGET | BIND_SHADER_RESOURCE textures between COLOR_ATTACHMENT_OPTIMAL and SHADER_READ_ONLY_OPTIMAL. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/379

3 3

[PATCH v2 0/7] MR391: scrrun: Implement MoveFolder().
by Robert Wilhelm (＠sloper42) 07 Jul '22

07 Jul '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52128 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> -- v2: scrrun: Support wildcards in MoveFolder(). scrrun: Move source dir into destination dir if destination ends with separator in MoveFolder(). https://gitlab.winehq.org/wine/wine/-/merge_requests/391

3 8