- Wine-Devel - list.winehq.org

[tools] testbot/web: Use AddError() in the login and related pages.
by Francois Gouget July 7, 2022

July 7, 2022

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 July 7, 2022

July 7, 2022

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 July 7, 2022

July 7, 2022

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 July 7, 2022

July 7, 2022

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) July 7, 2022

July 7, 2022

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 July 7, 2022

July 7, 2022

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) July 7, 2022

July 7, 2022

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

[PATCH] include/winnt.h: Fix a typo in _InterlockedXor64() intrinsic declaration.
by Dmitry Timoshkov July 7, 2022

July 7, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 50f6452b145..5de6884e7de 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6421,7 +6421,7 @@ DECLSPEC_NORETURN void __fastfail(unsigned int); #pragma intrinsic(_InterlockedExchangePointer) #pragma intrinsic(_InterlockedIncrement64) #pragma intrinsic(_InterlockedOr64) -#pragma intrinsic(_InterlockedXord64) +#pragma intrinsic(_InterlockedXor64) __int64 _InterlockedAnd64(__int64 volatile *, __int64); void * _InterlockedCompareExchangePointer(void *volatile*,void*,void*); -- 2.36.1

1 0

[PATCH 0/7] MR391: scrrun: Implement MoveFolder().
by Robert Wilhelm (＠sloper42) July 7, 2022

July 7, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52128 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/391

3 9

[PATCH v2 0/4] MR395: win32u: Move reading and writing mode from registry out of graphics drivers.
by Rémi Bernon July 7, 2022

July 7, 2022

What was initially in https://gitlab.winehq.org/wine/wine/-/merge_requests/355, with the test failures hopefully fixed. -- v2: win32u: Move writing mode to registry out of graphics drivers. win32u: Move NtUserChangeDisplaySettings mode validation to a separate helper. win32u: Move reading mode from registry out of graphics drivers. win32u: Fix NtUserChangeDisplaySettings comment. https://gitlab.winehq.org/wine/wine/-/merge_requests/395

2 5