May 2022 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/scripts: Add a script to create the initial administrator account.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: tools Branch: master Commit: ea19f51d1f170918b87fd1d5d7325fcc60cf96d4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ea19f51d1f170918b87fd1d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 30 17:36:58 2022 +0200 testbot/scripts: Add a script to create the initial administrator account. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 18 ++---- testbot/scripts/CreateAdmin | 147 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 13 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 7565d6b..46edeea 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 0000000..163b445 --- /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;

1 0

Francois Gouget : testbot: Unify the Job cancel and restart actions.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: tools Branch: master Commit: 9925dc0c1389bc3c99430de5a6ad6e381300cfed URL: https://source.winehq.org/git/tools.git/?a=commit;h=9925dc0c1389bc3c99430de… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 30 18:04:07 2022 +0200 testbot: Unify the Job cancel and restart actions. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 7880b8e..da72ffb 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 de73425..82221c9 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 99c68bc..87a5694 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); }

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateHullShader().
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 1a869de18772b630acea5b9143fcd3ccaa3ff659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a869de18772b630acea5b91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 15:02:24 2022 +0300 d3d11: Always initialize out shader pointer in CreateHullShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7b1c1b9bae0..286874af993 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3569,6 +3569,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device2 *if TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index eb3ac35b824..690f468e6cf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4825,6 +4825,7 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ID3D11GeometryShader *gs; ID3D11VertexShader *vs; ID3D11PixelShader *ps; + ID3D11HullShader *hs; HRESULT hr; device_desc.feature_level = &feature_level; @@ -5000,6 +5001,12 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ID3D11GeometryShader_Release(gs); } + /* Hull shader */ + hs = (void *)0xdeadbeef; + hr = ID3D11Device_CreateHullShader(device, gs_4_0, sizeof(gs_4_0), NULL, &hs); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!hs, "Unexpected pointer %p.\n", hs); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); }

1 0

Gabriel Ivăncescu : mshtml: Abort on a cancelled async request properly.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 740d4ea14f23c1d10cc0a88c4cbd041e7af93eda URL: https://source.winehq.org/git/wine.git/?a=commit;h=740d4ea14f23c1d10cc0a88c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:54:28 2022 +0300 mshtml: Abort on a cancelled async request properly. Gecko can cancel an async request sometime between async_start_doc_binding registers it and on_start_nsrequest actually processes it. The latter should not attempt to continue in this case. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 1 + dlls/mshtml/navigate.c | 4 ++++ dlls/mshtml/nsio.c | 3 +++ 3 files changed, 8 insertions(+) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 26a337fe470..9a043864927 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -51,6 +51,7 @@ typedef struct { nsIURI *referrer; char *content_type; char *charset; + nsresult status; UINT32 response_status; char *response_status_text; REQUEST_METHOD request_method; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index d5ec368e375..e6f203535b7 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -981,6 +981,10 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) { nsresult nsres; + /* Async request can be cancelled before we got to it */ + if(NS_FAILED(This->nschannel->status)) + return E_ABORT; /* FIXME: map status to HRESULT */ + This->nschannel->binding = This; /* FIXME: it's needed for http connections from BindToObject. */ diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e0b8bedf79c..e1a1d6e3b53 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -610,6 +610,9 @@ static nsresult NSAPI nsChannel_Cancel(nsIHttpChannel *iface, nsresult aStatus) TRACE("(%p)->(%08lx)\n", This, aStatus); + if(NS_FAILED(aStatus)) + This->status = aStatus; + if(This->binding && This->binding->bsc.binding) IBinding_Abort(This->binding->bsc.binding); else

1 0

Gabriel Ivăncescu : mshtml: Return actual status in nsChannel_GetStatus.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: c9c50cd4f1c5cf399c976c350524ada6d0748e38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9c50cd4f1c5cf399c976c35… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 26 19:54:29 2022 +0300 mshtml: Return actual status in nsChannel_GetStatus. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e1a1d6e3b53..f1859e2a383 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -599,9 +599,9 @@ static nsresult NSAPI nsChannel_GetStatus(nsIHttpChannel *iface, nsresult *aStat { nsChannel *This = impl_from_nsIHttpChannel(iface); - WARN("(%p)->(%p) returning NS_OK\n", This, aStatus); + TRACE("(%p)->(%p) returning %#lx\n", This, aStatus, This->status); - return *aStatus = NS_OK; + return *aStatus = This->status; } static nsresult NSAPI nsChannel_Cancel(nsIHttpChannel *iface, nsresult aStatus)

1 0

Nikolay Sivov : secur32: Add explicit output parameter for create_session() request.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 2c44e881522cfea795b635448dffa129e9453e30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c44e881522cfea795b63544… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 10:35:45 2022 +0300 secur32: Add explicit output parameter for create_session() request. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 1 + dlls/secur32/schannel_gnutls.c | 23 +++++++++++++---------- dlls/secur32/secur32_priv.h | 1 + 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5d6e8763095..0973b3c2399 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -821,6 +821,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( create_params.transport = &ctx->transport; create_params.cred = cred; + create_params.session = &ctx->transport.session; if (GNUTLS_CALL( create_session, &create_params )) { schan_free_handle(handle, SCHAN_HANDLE_CTX); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 131b40a45d3..2e462b409d8 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -480,18 +480,20 @@ static NTSTATUS schan_create_session( void *args ) { const struct create_session_params *params = args; schan_credentials *cred = params->cred; - gnutls_session_t *s = (gnutls_session_t*)&params->transport->session; char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; BOOL using_vers_all = FALSE, disabled; unsigned int i, flags = (cred->credential_use == SECPKG_CRED_INBOUND) ? GNUTLS_SERVER : GNUTLS_CLIENT; + gnutls_session_t s; int err; + *params->session = 0; + if (cred->enabled_protocols & (SP_PROT_DTLS1_0_CLIENT | SP_PROT_DTLS1_2_CLIENT)) { flags |= GNUTLS_DATAGRAM | GNUTLS_NONBLOCK; } - err = pgnutls_init(s, flags); + err = pgnutls_init(&s, flags); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -524,27 +526,28 @@ static NTSTATUS schan_create_session( void *args ) } TRACE("Using %s priority\n", debugstr_a(priority)); - err = pgnutls_priority_set_direct(*s, priority, NULL); + err = pgnutls_priority_set_direct(s, priority, NULL); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); - pgnutls_deinit(*s); + pgnutls_deinit(s); return STATUS_INTERNAL_ERROR; } - err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, + err = pgnutls_credentials_set(s, GNUTLS_CRD_CERTIFICATE, (gnutls_certificate_credentials_t)cred->credentials); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); - pgnutls_deinit(*s); + pgnutls_deinit(s); return STATUS_INTERNAL_ERROR; } - pgnutls_transport_set_pull_function(*s, pull_adapter); - if (flags & GNUTLS_DATAGRAM) pgnutls_transport_set_pull_timeout_function(*s, pull_timeout); - pgnutls_transport_set_push_function(*s, push_adapter); - pgnutls_transport_set_ptr(*s, (gnutls_transport_ptr_t)params->transport); + pgnutls_transport_set_pull_function(s, pull_adapter); + if (flags & GNUTLS_DATAGRAM) pgnutls_transport_set_pull_timeout_function(s, pull_timeout); + pgnutls_transport_set_push_function(s, push_adapter); + pgnutls_transport_set_ptr(s, (gnutls_transport_ptr_t)params->transport); + *params->session = (ULONG_PTR)s; return STATUS_SUCCESS; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index e4fa0381433..e58303a4e1b 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -126,6 +126,7 @@ struct create_session_params { struct schan_transport *transport; schan_credentials *cred; + schan_session *session; }; struct free_certificate_credentials_params

1 0

Nikolay Sivov : secur32: Use CRT allocation functions for get_key_blob().
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: afed805be5c5db303f94ed11474e29f693cafdf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afed805be5c5db303f94ed11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 10:35:46 2022 +0300 secur32: Use CRT allocation functions for get_key_blob(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 0973b3c2399..618982d889e 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -444,40 +444,38 @@ static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) { char *str; if (!CryptGetProvParam(keyctx.hCryptProv, PP_CONTAINER, NULL, &size, 0)) return NULL; - if (!(str = RtlAllocateHeap(GetProcessHeap(), 0, size))) return NULL; + if (!(str = malloc(size))) return NULL; if (!CryptGetProvParam(keyctx.hCryptProv, PP_CONTAINER, (BYTE *)str, &size, 0)) return NULL; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - if (!(ret = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(L"Software\\Wine\\Crypto\\RSA\\") + len * sizeof(WCHAR)))) + if (!(ret = malloc(sizeof(L"Software\\Wine\\Crypto\\RSA\\") + len * sizeof(WCHAR)))) { - RtlFreeHeap(GetProcessHeap(), 0, str); + free(str); return NULL; } wcscpy(ret, L"Software\\Wine\\Crypto\\RSA\\"); MultiByteToWideChar(CP_ACP, 0, str, -1, ret + wcslen(ret), len); - RtlFreeHeap(GetProcessHeap(), 0, str); + free(str); } else if (CertGetCertificateContextProperty(ctx, CERT_KEY_PROV_INFO_PROP_ID, NULL, &prov_size)) { - if (!(prov = RtlAllocateHeap(GetProcessHeap(), 0, prov_size))) return NULL; + if (!(prov = malloc(prov_size))) return NULL; if (!CertGetCertificateContextProperty(ctx, CERT_KEY_PROV_INFO_PROP_ID, prov, &prov_size)) { - RtlFreeHeap(GetProcessHeap(), 0, prov); + free(prov); return NULL; } - if (!(ret = RtlAllocateHeap(GetProcessHeap(), 0, - sizeof(L"Software\\Wine\\Crypto\\RSA\\") + wcslen(prov->pwszContainerName) * sizeof(WCHAR)))) + if (!(ret = malloc(sizeof(L"Software\\Wine\\Crypto\\RSA\\") + wcslen(prov->pwszContainerName) * sizeof(WCHAR)))) { - RtlFreeHeap(GetProcessHeap(), 0, prov); + free(prov); return NULL; } wcscpy(ret, L"Software\\Wine\\Crypto\\RSA\\"); wcscat(ret, prov->pwszContainerName); - RtlFreeHeap(GetProcessHeap(), 0, prov); + free(prov); } - if (!ret && GetUserNameW(username, &len) && - (ret = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(L"Software\\Wine\\Crypto\\RSA\\") + len * sizeof(WCHAR)))) + if (!ret && GetUserNameW(username, &len) && (ret = malloc(sizeof(L"Software\\Wine\\Crypto\\RSA\\") + len * sizeof(WCHAR)))) { wcscpy(ret, L"Software\\Wine\\Crypto\\RSA\\"); wcscat(ret, username); @@ -492,16 +490,15 @@ static BYTE *get_key_blob(const CERT_CONTEXT *ctx, DWORD *size) BYTE *buf, *ret = NULL; DATA_BLOB blob_in, blob_out; DWORD spec = 0, type, len; + LSTATUS retval; WCHAR *path; HKEY hkey; if (!(path = get_key_container_path(ctx))) return NULL; - if (RegOpenKeyExW(HKEY_CURRENT_USER, path, 0, KEY_READ, &hkey)) - { - RtlFreeHeap(GetProcessHeap(), 0, path); + retval = RegOpenKeyExW(HKEY_CURRENT_USER, path, 0, KEY_READ, &hkey); + free(path); + if (retval) return NULL; - } - RtlFreeHeap(GetProcessHeap(), 0, path); if (!RegQueryValueExW(hkey, L"KeyExchangeKeyPair", 0, &type, NULL, &len)) spec = AT_KEYEXCHANGE; else if (!RegQueryValueExW(hkey, L"SignatureKeyPair", 0, &type, NULL, &len)) spec = AT_SIGNATURE; @@ -511,7 +508,7 @@ static BYTE *get_key_blob(const CERT_CONTEXT *ctx, DWORD *size) return NULL; } - if (!(buf = RtlAllocateHeap(GetProcessHeap(), 0, len + MAX_LEAD_BYTES))) + if (!(buf = malloc(len + MAX_LEAD_BYTES))) { RegCloseKey(hkey); return NULL; @@ -531,7 +528,7 @@ static BYTE *get_key_blob(const CERT_CONTEXT *ctx, DWORD *size) ret = buf; } } - else RtlFreeHeap(GetProcessHeap(), 0, buf); + else free(buf); RegCloseKey(hkey); return ret; @@ -593,7 +590,7 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const void *schanCred, params.key_size = key_size; params.key_blob = key_blob; if (GNUTLS_CALL( allocate_certificate_credentials, &params )) goto fail; - RtlFreeHeap(GetProcessHeap(), 0, key_blob); + free(key_blob); handle = schan_alloc_handle(creds, SCHAN_HANDLE_CRED); if (handle == SCHAN_INVALID_HANDLE) goto fail; @@ -612,7 +609,7 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const void *schanCred, fail: free(creds); - RtlFreeHeap(GetProcessHeap(), 0, key_blob); + free(key_blob); return SEC_E_INTERNAL_ERROR; }

1 0

Nikolay Sivov : secur32: Zero initialize context for create_session() call.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: d92866863f6b5ca01675254ad315659b40f88ed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d92866863f6b5ca01675254a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 10:35:47 2022 +0300 secur32: Zero initialize context for create_session() call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 618982d889e..30c86c724b4 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -806,9 +806,8 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INVALID_HANDLE; } - if (!(ctx = malloc(sizeof(*ctx)))) return SEC_E_INSUFFICIENT_MEMORY; + if (!(ctx = calloc(1, sizeof(*ctx)))) return SEC_E_INSUFFICIENT_MEMORY; - ctx->cert = NULL; handle = schan_alloc_handle(ctx, SCHAN_HANDLE_CTX); if (handle == SCHAN_INVALID_HANDLE) {

1 0

Nikolay Sivov : d3d11: Always initialize out shader pointer in CreateComputeShader().
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: 7d7d16623393a9eefad0eb12ed5ad02376bc36bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d7d16623393a9eefad0eb12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 15:13:56 2022 +0300 d3d11: Always initialize out shader pointer in CreateComputeShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b73df94b50c..3f08ae5f4f0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3615,6 +3615,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device2 TRACE("iface %p, byte_code %p, byte_code_length %Iu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); + *shader = NULL; + if (class_linkage) FIXME("Class linkage is not implemented yet.\n"); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 06cb2bc4273..9a1bd88dc8b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4823,6 +4823,7 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) struct device_desc device_desc; ID3D11Device *device, *tmp; ID3D11GeometryShader *gs; + ID3D11ComputeShader *cs; ID3D11VertexShader *vs; ID3D11DomainShader *ds; ID3D11PixelShader *ps; @@ -5014,6 +5015,12 @@ static void test_create_shader(const D3D_FEATURE_LEVEL feature_level) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); ok(!ds, "Unexpected pointer %p.\n", ds); + /* Compute shader */ + ds = (void *)0xdeadbeef; + hr = ID3D11Device_CreateComputeShader(device, gs_4_0, sizeof(gs_4_0), NULL, &cs); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!cs, "Unexpected pointer %p.\n", cs); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); }

1 0

Nikolay Sivov : secur32: Simplify get_session_peer_certificate unixlib interface.
by Alexandre Julliard May 27, 2022

May 27, 2022

Module: wine Branch: master Commit: b255160168d0b8428fbe3f28a43a028bdc1c3aa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b255160168d0b8428fbe3f28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 27 10:35:42 2022 +0300 secur32: Simplify get_session_peer_certificate unixlib interface. Use single buffer for returned certificate blobs, instead of an array of CERT_BLOB that contains pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 18 +++++++++++------- dlls/secur32/schannel_gnutls.c | 14 +++++++------- dlls/secur32/secur32_priv.h | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 6ab5507becf..2e663872f71 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1026,7 +1026,6 @@ static SECURITY_STATUS ensure_remote_cert(struct schan_context *ctx) HCERTSTORE store; PCCERT_CONTEXT cert = NULL; SECURITY_STATUS status; - CERT_BLOB *certs; ULONG count, size = 0; struct get_session_peer_certificate_params params = { ctx->transport.session, NULL, &size, &count }; @@ -1036,28 +1035,33 @@ static SECURITY_STATUS ensure_remote_cert(struct schan_context *ctx) status = GNUTLS_CALL( get_session_peer_certificate, &params ); if (status != SEC_E_BUFFER_TOO_SMALL) goto done; - if (!(certs = malloc( size ))) + if (!(params.buffer = malloc( size ))) { status = SEC_E_INSUFFICIENT_MEMORY; goto done; } - params.certs = certs; status = GNUTLS_CALL( get_session_peer_certificate, &params ); if (status == SEC_E_OK) { unsigned int i; + ULONG *sizes; + BYTE *blob; + + sizes = (ULONG *)params.buffer; + blob = params.buffer + count * sizeof(*sizes); + for (i = 0; i < count; i++) { - if (!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, certs[i].pbData, - certs[i].cbData, CERT_STORE_ADD_REPLACE_EXISTING, - i ? NULL : &cert)) + if (!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, blob, sizes[i], + CERT_STORE_ADD_REPLACE_EXISTING, i ? NULL : &cert)) { if (i) CertFreeCertificateContext(cert); return GetLastError(); } + blob += sizes[i]; } } - free(certs); + free(params.buffer); done: ctx->cert = cert; CertCloseStore(store, 0); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 0145c59e0f0..7c6a0bc0cfc 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -792,28 +792,28 @@ static NTSTATUS schan_get_session_peer_certificate( void *args ) { const struct get_session_peer_certificate_params *params = args; gnutls_session_t s = (gnutls_session_t)params->session; - CERT_BLOB *certs = params->certs; const gnutls_datum_t *datum; unsigned int i, size; BYTE *ptr; unsigned int count; + ULONG *sizes; if (!(datum = pgnutls_certificate_get_peers(s, &count))) return SEC_E_INTERNAL_ERROR; - size = count * sizeof(certs[0]); + size = count * sizeof(*sizes); for (i = 0; i < count; i++) size += datum[i].size; - if (!certs || *params->bufsize < size) + if (!params->buffer || *params->bufsize < size) { *params->bufsize = size; return SEC_E_BUFFER_TOO_SMALL; } - ptr = (BYTE *)&certs[count]; + sizes = (ULONG *)params->buffer; + ptr = params->buffer + count * sizeof(*sizes); for (i = 0; i < count; i++) { - certs[i].cbData = datum[i].size; - certs[i].pbData = ptr; - memcpy(certs[i].pbData, datum[i].data, datum[i].size); + sizes[i] = datum[i].size; + memcpy(ptr, datum[i].data, datum[i].size); ptr += datum[i].size; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index be375618266..5c35e4244c8 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -145,7 +145,7 @@ struct get_connection_info_params struct get_session_peer_certificate_params { schan_session session; - CERT_BLOB *certs; + BYTE *buffer; /* Starts with array of ULONG sizes, followed by contiguous data blob. */ ULONG *bufsize; ULONG *retcount; };

1 0