- wine-devel - winehq.org

Re: [PATCH v2 0/1] MR153: include: Mark IPersistFolder3::InitializeEx's optional parameters as [unique]. - approved
by Alexandre Julliard (＠julliard) 30 May '22

30 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/153

1 0

Re: [PATCH v3 0/1] MR152: include: Make IShellItem::BindToHandler's pbc parameter as [unique]. - approved
by Alexandre Julliard (＠julliard) 30 May '22

30 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/152

1 0

Re: [PATCH v2 0/1] MR150: win32u: Create a dummy bitmap for display device contexts. - approved
by Alexandre Julliard (＠julliard) 30 May '22

30 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/150

1 0

[PATCH 0/1] MR155: ntdll: Fix reading state Information from IOSB.
by Jinoh Kang (＠iamahuman) 30 May '22

30 May '22

Enforce proper atomic update so that other threads do not read stale data from IO_STATUS_BLOCK. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/155

2 1

[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 (＠rbernon) 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

3 7

[PATCH vkd3d] vkd3d: Replace descriptor mutexes with atomic operations.
by Conor McCarthy 30 May '22

30 May '22

Atomic ops can be used if the descriptor struct elements are replaced with a pointer to an allocated object. SRV, UAV and sampler descriptors already had view object pointers, so this doesn't affect performance for them, but CBVs now require dereferencing another (possibly distant) memory location in addition to the descriptor, which is not great for memory cache efficiency when copying CBVs. However, the descriptor heap buffer is now much smaller, and in most cases it's probably a good tradeoff for removing mutexes. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- include/private/vkd3d_common.h | 13 + include/vkd3d_windows.h | 1 + libs/vkd3d/command.c | 90 ++++--- libs/vkd3d/device.c | 58 ++--- libs/vkd3d/resource.c | 423 +++++++++++++++------------------ libs/vkd3d/vkd3d_private.h | 119 +++++++--- 6 files changed, 379 insertions(+), 325 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index c041b52d..e4a636c4 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -219,6 +219,10 @@ static inline LONG InterlockedAdd(LONG volatile *x, LONG val) { return __sync_add_and_fetch(x, val); } +static inline LONG InterlockedCompareExchange(LONG volatile *x, LONG xchg, LONG cmp) +{ + return __sync_val_compare_and_swap(x, cmp, xchg); +} # else # error "InterlockedIncrement() not implemented for this platform" # endif /* HAVE_SYNC_ADD_AND_FETCH */ @@ -231,6 +235,15 @@ static inline LONG InterlockedDecrement(LONG volatile *x) # else # error "InterlockedDecrement() not implemented for this platform" # endif + +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) +static inline PVOID InterlockedExchangePointer(PVOID volatile *x, PVOID val) +{ + return __atomic_exchange_n(x, val, __ATOMIC_SEQ_CST); +} +# else +# error "InterlockedExchangePointer() not implemented for this platform" +# endif #endif /* _WIN32 */ static inline void vkd3d_parse_version(const char *version, int *major, int *minor) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 002ff667..7570113b 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -103,6 +103,7 @@ typedef unsigned short WCHAR; typedef wchar_t WCHAR; # endif /* VKD3D_WIN32_WCHAR */ typedef void *HANDLE; +typedef void *PVOID; /* GUID */ # ifdef __WIDL__ diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d0782e5a..2f518af9 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1525,13 +1525,13 @@ static bool d3d12_command_allocator_add_descriptor_pool(struct d3d12_command_all } static bool d3d12_command_allocator_add_view(struct d3d12_command_allocator *allocator, - struct vkd3d_view *view) + struct vkd3d_view_desc *view) { if (!vkd3d_array_reserve((void **)&allocator->views, &allocator->views_size, allocator->view_count + 1, sizeof(*allocator->views))) return false; - vkd3d_view_incref(view); + vkd3d_desc_incref(view); allocator->views[allocator->view_count++] = view; return true; @@ -1718,7 +1718,7 @@ static void d3d12_command_allocator_free_resources(struct d3d12_command_allocato for (i = 0; i < allocator->view_count; ++i) { - vkd3d_view_decref(allocator->views[i], device); + vkd3d_view_desc_decref(allocator->views[i], device); } allocator->view_count = 0; @@ -2868,28 +2868,31 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des unsigned int index, bool use_array) { uint32_t descriptor_range_magic = range->descriptor_magic; - const struct vkd3d_view *view = descriptor->u.view_info.view; + union d3d12_desc_object u = descriptor->u; uint32_t vk_binding = range->binding; + VkDescriptorType vk_descriptor_type; uint32_t set = range->set; - if (descriptor->magic != descriptor_range_magic) + if (!u.header || u.header->magic != descriptor_range_magic) return false; + vk_descriptor_type = u.header->vk_descriptor_type; + vk_descriptor_write->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; vk_descriptor_write->pNext = NULL; vk_descriptor_write->dstSet = vk_descriptor_sets[set]; vk_descriptor_write->dstBinding = use_array ? vk_binding : vk_binding + index; vk_descriptor_write->dstArrayElement = use_array ? index : 0; vk_descriptor_write->descriptorCount = 1; - vk_descriptor_write->descriptorType = descriptor->vk_descriptor_type; + vk_descriptor_write->descriptorType = vk_descriptor_type; vk_descriptor_write->pImageInfo = NULL; vk_descriptor_write->pBufferInfo = NULL; vk_descriptor_write->pTexelBufferView = NULL; - switch (descriptor->magic) + switch (u.header->magic) { case VKD3D_DESCRIPTOR_MAGIC_CBV: - vk_descriptor_write->pBufferInfo = &descriptor->u.vk_cbv_info; + vk_descriptor_write->pBufferInfo = &u.cb_desc->vk_cbv_info; break; case VKD3D_DESCRIPTOR_MAGIC_SRV: @@ -2900,8 +2903,8 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des * in pairs in one set. */ if (range->descriptor_count == UINT_MAX) { - if (descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER - && descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) + if (vk_descriptor_type != VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER + && vk_descriptor_type != VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) { vk_descriptor_write->dstSet = vk_descriptor_sets[set + 1]; vk_descriptor_write->dstBinding = 0; @@ -2911,21 +2914,21 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des { if (!use_array) vk_descriptor_write->dstBinding = vk_binding + 2 * index; - if (descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER - && descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) + if (vk_descriptor_type != VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER + && vk_descriptor_type != VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) ++vk_descriptor_write->dstBinding; } - if (descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER - || descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) + if (vk_descriptor_type == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER + || vk_descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) { - vk_descriptor_write->pTexelBufferView = &view->u.vk_buffer_view; + vk_descriptor_write->pTexelBufferView = &u.view_desc->view.u.vk_buffer_view; } else { vk_image_info->sampler = VK_NULL_HANDLE; - vk_image_info->imageView = view->u.vk_image_view; - vk_image_info->imageLayout = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV + vk_image_info->imageView = u.view_desc->view.u.vk_image_view; + vk_image_info->imageLayout = u.header->magic == VKD3D_DESCRIPTOR_MAGIC_SRV ? VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_GENERAL; vk_descriptor_write->pImageInfo = vk_image_info; @@ -2933,7 +2936,7 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des break; case VKD3D_DESCRIPTOR_MAGIC_SAMPLER: - vk_image_info->sampler = view->u.vk_sampler; + vk_image_info->sampler = u.view_desc->view.u.vk_sampler; vk_image_info->imageView = VK_NULL_HANDLE; vk_image_info->imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -2941,7 +2944,7 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des break; default: - ERR("Invalid descriptor %#x.\n", descriptor->magic); + ERR("Invalid descriptor %#x.\n", u.header->magic); return false; } @@ -2996,6 +2999,11 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list for (j = 0; j < descriptor_count; ++j, ++descriptor) { unsigned int register_idx = range->base_register_idx + j; + union d3d12_desc_object u = descriptor->u; + VkBufferView vk_counter_view; + + vk_counter_view = (u.header && u.header->magic == VKD3D_DESCRIPTOR_MAGIC_UAV) + ? u.view_desc->view.vk_counter_view : VK_NULL_HANDLE; /* Track UAV counters. */ if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) @@ -3005,8 +3013,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list if (state->uav_counters.bindings[k].register_space == range->register_space && state->uav_counters.bindings[k].register_index == register_idx) { - VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - ? descriptor->u.view_info.view->vk_counter_view : VK_NULL_HANDLE; if (bindings->vk_uav_counter_views[k] != vk_counter_view) bindings->uav_counters_dirty = true; bindings->vk_uav_counter_views[k] = vk_counter_view; @@ -3016,7 +3022,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list } /* Not all descriptors are necessarily populated if the range is unbounded. */ - if (descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_FREE) + if (!u.header) continue; if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write, current_image_info, @@ -4956,8 +4962,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); const struct d3d12_rtv_desc *rtv_desc; const struct d3d12_dsv_desc *dsv_desc; + struct vkd3d_view_desc *view; VkFormat prev_dsv_format; - struct vkd3d_view *view; unsigned int i; TRACE("iface %p, render_target_descriptor_count %u, render_target_descriptors %p, " @@ -5003,7 +5009,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi WARN("Failed to add view.\n"); } - list->rtvs[i] = view->u.vk_image_view; + list->rtvs[i] = view->view.u.vk_image_view; list->fb_width = max(list->fb_width, rtv_desc->width); list->fb_height = max(list->fb_height, rtv_desc->height); list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); @@ -5027,7 +5033,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->dsv = VK_NULL_HANDLE; } - list->dsv = view->u.vk_image_view; + list->dsv = view->view.u.vk_image_view; list->fb_width = max(list->fb_width, dsv_desc->width); list->fb_height = max(list->fb_height, dsv_desc->height); list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); @@ -5049,7 +5055,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi static void d3d12_command_list_clear(struct d3d12_command_list *list, const struct VkAttachmentDescription *attachment_desc, const struct VkAttachmentReference *color_reference, const struct VkAttachmentReference *ds_reference, - struct vkd3d_view *view, size_t width, size_t height, unsigned int layer_count, + struct vkd3d_view_desc *view, size_t width, size_t height, unsigned int layer_count, const union VkClearValue *clear_value, unsigned int rect_count, const D3D12_RECT *rects) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; @@ -5119,7 +5125,7 @@ static void d3d12_command_list_clear(struct d3d12_command_list *list, fb_desc.flags = 0; fb_desc.renderPass = vk_render_pass; fb_desc.attachmentCount = 1; - fb_desc.pAttachments = &view->u.vk_image_view; + fb_desc.pAttachments = &view->view.u.vk_image_view; fb_desc.width = width; fb_desc.height = height; fb_desc.layers = layer_count; @@ -5322,7 +5328,7 @@ static void vkd3d_uav_clear_state_get_image_pipeline(const struct vkd3d_uav_clea } static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, - struct d3d12_resource *resource, struct vkd3d_view *view, const VkClearColorValue *clear_colour, + struct d3d12_resource *resource, struct vkd3d_view_desc *view_desc, const VkClearColorValue *clear_colour, unsigned int rect_count, const D3D12_RECT *rects) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; @@ -5332,6 +5338,7 @@ static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, VkDescriptorImageInfo image_info; D3D12_RECT full_rect, curr_rect; VkWriteDescriptorSet write_set; + const struct vkd3d_view *view; d3d12_command_list_track_resource_usage(list, resource); d3d12_command_list_end_current_render_pass(list); @@ -5340,8 +5347,9 @@ static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, d3d12_command_list_invalidate_bindings(list, list->state); d3d12_command_list_invalidate_root_parameters(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE); - if (!d3d12_command_allocator_add_view(list->allocator, view)) + if (!d3d12_command_allocator_add_view(list->allocator, view_desc)) WARN("Failed to add view.\n"); + view = &view_desc->view; clear_args.colour = *clear_colour; @@ -5454,18 +5462,21 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID const UINT values[4], UINT rect_count, const D3D12_RECT *rects) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); + struct vkd3d_view_desc *descriptor, *uint_view = NULL; struct d3d12_device *device = list->device; - struct vkd3d_view *view, *uint_view = NULL; struct vkd3d_texture_view_desc view_desc; const struct vkd3d_format *uint_format; struct d3d12_resource *resource_impl; + const struct vkd3d_view *view; VkClearColorValue colour; TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); resource_impl = unsafe_impl_from_ID3D12Resource(resource); - view = d3d12_desc_from_cpu_handle(cpu_handle)->u.view_info.view; + if (!(descriptor = d3d12_desc_from_cpu_handle(cpu_handle)->u.view_desc)) + return; + view = &descriptor->view; memcpy(colour.uint32, values, sizeof(colour.uint32)); if (view->format->type != VKD3D_FORMAT_TYPE_UINT) @@ -5479,8 +5490,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID if (d3d12_resource_is_buffer(resource_impl)) { - if (!vkd3d_create_buffer_view(device, resource_impl->u.vk_buffer, uint_format, - view->info.buffer.offset, view->info.buffer.size, &uint_view)) + if (!vkd3d_create_buffer_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_UAV, resource_impl->u.vk_buffer, + uint_format, view->info.buffer.offset, view->info.buffer.size, &uint_view)) { ERR("Failed to create buffer view.\n"); return; @@ -5496,19 +5507,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID view_desc.layer_idx = view->info.texture.layer_idx; view_desc.layer_count = view->info.texture.layer_count; - if (!vkd3d_create_texture_view(device, resource_impl->u.vk_image, &view_desc, &uint_view)) + if (!vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_UAV, resource_impl->u.vk_image, &view_desc, &uint_view)) { ERR("Failed to create image view.\n"); return; } } - view = uint_view; + descriptor = uint_view; } - d3d12_command_list_clear_uav(list, resource_impl, view, &colour, rect_count, rects); + d3d12_command_list_clear_uav(list, resource_impl, descriptor, &colour, rect_count, rects); if (uint_view) - vkd3d_view_decref(uint_view, device); + vkd3d_view_desc_decref(uint_view, device); } static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList2 *iface, @@ -5517,14 +5528,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(I { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); struct d3d12_resource *resource_impl; + struct vkd3d_view_desc *view; VkClearColorValue colour; - struct vkd3d_view *view; TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); resource_impl = unsafe_impl_from_ID3D12Resource(resource); - view = d3d12_desc_from_cpu_handle(cpu_handle)->u.view_info.view; + if (!(view = d3d12_desc_from_cpu_handle(cpu_handle)->u.view_desc)) + return; memcpy(colour.float32, values, sizeof(colour.float32)); d3d12_command_list_clear_uav(list, resource_impl, view, &colour, rect_count, rects); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index eaedc444..7b56e033 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2575,6 +2575,25 @@ static void vkd3d_init_descriptor_pool_sizes(VkDescriptorPoolSize *pool_sizes, VKD3D_MAX_VIRTUAL_HEAP_DESCRIPTORS_PER_TYPE); }; +static void vkd3d_desc_object_cache_init(struct vkd3d_desc_object_cache *cache) +{ + vkd3d_mutex_init(&cache->mutex); + cache->cache = NULL; + cache->capacity = 0; + cache->count = 0; + cache->reserve = 0; +} + +static void vkd3d_desc_object_cache_cleanup(struct vkd3d_desc_object_cache *cache) +{ + size_t i; + + vkd3d_mutex_destroy(&cache->mutex); + for (i = 0; i < cache->count; ++i) + vkd3d_free(cache->cache[i]); + vkd3d_free(cache->cache); +} + /* ID3D12Device */ static inline struct d3d12_device *impl_from_ID3D12Device(ID3D12Device *iface) { @@ -2615,7 +2634,6 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) { struct d3d12_device *device = impl_from_ID3D12Device(iface); ULONG refcount = InterlockedDecrement(&device->refcount); - size_t i; TRACE("%p decreasing refcount to %u.\n", device, refcount); @@ -2634,8 +2652,8 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_render_pass_cache_cleanup(&device->render_pass_cache, device); d3d12_device_destroy_pipeline_cache(device); d3d12_device_destroy_vkd3d_queues(device); - for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i) - vkd3d_mutex_destroy(&device->desc_mutex[i]); + vkd3d_desc_object_cache_cleanup(&device->view_desc_cache); + vkd3d_desc_object_cache_cleanup(&device->cbuffer_desc_cache); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); if (device->parent) IUnknown_Release(device->parent); @@ -3548,32 +3566,20 @@ static void d3d12_desc_buffered_copy_atomic(struct d3d12_desc *dst, const struct { struct d3d12_desc_copy_location *location; enum vkd3d_vk_descriptor_set_index set; - struct vkd3d_mutex *mutex; + union d3d12_desc_object src_u; - mutex = d3d12_device_get_descriptor_mutex(device, src); - vkd3d_mutex_lock(mutex); - - if (src->magic == VKD3D_DESCRIPTOR_MAGIC_FREE) + if (!(src_u.object = d3d12_desc_get_object_ref(src, device))) { - /* Source must be unlocked first, and therefore can't be used as a null source. */ - static const struct d3d12_desc null = {0}; - vkd3d_mutex_unlock(mutex); - d3d12_desc_write_atomic(dst, &null, device); + d3d12_desc_destroy(dst, device); return; } - set = vkd3d_vk_descriptor_set_index_from_vk_descriptor_type(src->vk_descriptor_type); + set = vkd3d_vk_descriptor_set_index_from_vk_descriptor_type(src_u.header->vk_descriptor_type); location = &locations[set][infos[set].count++]; + location->src = src_u; - location->src = *src; - - if (location->src.magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) - vkd3d_view_incref(location->src.u.view_info.view); - - vkd3d_mutex_unlock(mutex); - - infos[set].uav_counter |= (location->src.magic == VKD3D_DESCRIPTOR_MAGIC_UAV) - && !!location->src.u.view_info.view->vk_counter_view; + infos[set].uav_counter |= (src_u.header->magic == VKD3D_DESCRIPTOR_MAGIC_UAV) + && !!src_u.view_desc->view.vk_counter_view; location->dst = dst; if (infos[set].count == ARRAY_SIZE(locations[0])) @@ -3633,8 +3639,7 @@ static void d3d12_device_vk_heaps_copy_descriptors(struct d3d12_device *device, * mutex is only intended to prevent use-after-free of the vkd3d_view caused by a * race condition in the calling app. It is unnecessary to protect this test as it's * the app's race condition, not ours. */ - if (dst[dst_idx].magic == src[src_idx].magic && (dst[dst_idx].magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) - && dst[dst_idx].u.view_info.written_serial_id == src[src_idx].u.view_info.view->serial_id) + if (dst[dst_idx].u.object == src[src_idx].u.object) continue; d3d12_desc_buffered_copy_atomic(&dst[dst_idx], &src[src_idx], locations, infos, descriptor_heap, device); } @@ -4242,7 +4247,6 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, { const struct vkd3d_vk_device_procs *vk_procs; HRESULT hr; - size_t i; device->ID3D12Device_iface.lpVtbl = &d3d12_device_vtbl; device->refcount = 1; @@ -4285,8 +4289,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, device->blocked_queue_count = 0; - for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i) - vkd3d_mutex_init(&device->desc_mutex[i]); + vkd3d_desc_object_cache_init(&device->view_desc_cache); + vkd3d_desc_object_cache_init(&device->cbuffer_desc_cache); vkd3d_init_descriptor_pool_sizes(device->vk_pool_sizes, &device->vk_info.descriptor_limits); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 68c28cd1..cb465fea 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2078,57 +2078,128 @@ ULONG vkd3d_resource_decref(ID3D12Resource *resource) return d3d12_resource_decref(impl_from_ID3D12Resource(resource)); } -/* CBVs, SRVs, UAVs */ -static struct vkd3d_view *vkd3d_view_create(enum vkd3d_view_type type) +/* Objects are cached so that vkd3d_desc_incref() can safely check the refcount + * of an object freed by another thread. */ +static void *vkd3d_desc_object_cache_get(struct vkd3d_desc_object_cache *cache, size_t size) { - struct vkd3d_view *view; + void *object = NULL; - if ((view = vkd3d_malloc(sizeof(*view)))) + vkd3d_mutex_lock(&cache->mutex); + + if (cache->count) + { + object = cache->cache[--cache->count]; + } + else + { + object = vkd3d_malloc(size); + ++cache->reserve; + } + + vkd3d_mutex_unlock(&cache->mutex); + return object; +} + +static void vkd3d_desc_object_cache_put(struct vkd3d_desc_object_cache *cache, void *object) +{ + vkd3d_mutex_lock(&cache->mutex); + + if (!vkd3d_array_reserve((void **)&cache->cache, &cache->capacity, max(cache->count + 1, cache->reserve), + sizeof(*cache->cache))) + { + ERR("Failed to allocate cache.\n"); + vkd3d_free(object); + return; + } + else { - view->refcount = 1; - view->type = type; - view->serial_id = InterlockedIncrement64(&object_global_serial_id); - view->vk_counter_view = VK_NULL_HANDLE; + cache->cache[cache->count++] = object; } - return view; + + vkd3d_mutex_unlock(&cache->mutex); } -void vkd3d_view_incref(struct vkd3d_view *view) +static struct vkd3d_cbuffer_desc *vkd3d_cbuffer_desc_create(struct d3d12_device *device) { - InterlockedIncrement(&view->refcount); + struct vkd3d_cbuffer_desc *desc; + + if (!(desc = vkd3d_desc_object_cache_get(&device->cbuffer_desc_cache, sizeof(*desc)))) + return NULL; + + desc->h.magic = VKD3D_DESCRIPTOR_MAGIC_CBV; + desc->h.vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + desc->h.refcount = 1; + + return desc; } -static void vkd3d_view_destroy(struct vkd3d_view *view, struct d3d12_device *device) +static struct vkd3d_view_desc *vkd3d_view_desc_create(uint32_t magic, VkDescriptorType vk_descriptor_type, + enum vkd3d_view_type type, struct d3d12_device *device) +{ + struct vkd3d_view_desc *desc; + + if (!(desc = vkd3d_desc_object_cache_get(&device->view_desc_cache, sizeof(*desc)))) + { + ERR("Failed to allocate descriptor object.\n"); + return NULL; + } + + desc->h.magic = magic; + desc->h.vk_descriptor_type = vk_descriptor_type; + desc->h.refcount = 1; + desc->view.type = type; + desc->view.vk_counter_view = VK_NULL_HANDLE; + + return desc; +} + +static void vkd3d_view_desc_destroy(struct vkd3d_view_desc *view, struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; TRACE("Destroying view %p.\n", view); - switch (view->type) + switch (view->view.type) { case VKD3D_VIEW_TYPE_BUFFER: - VK_CALL(vkDestroyBufferView(device->vk_device, view->u.vk_buffer_view, NULL)); + VK_CALL(vkDestroyBufferView(device->vk_device, view->view.u.vk_buffer_view, NULL)); break; case VKD3D_VIEW_TYPE_IMAGE: - VK_CALL(vkDestroyImageView(device->vk_device, view->u.vk_image_view, NULL)); + VK_CALL(vkDestroyImageView(device->vk_device, view->view.u.vk_image_view, NULL)); break; case VKD3D_VIEW_TYPE_SAMPLER: - VK_CALL(vkDestroySampler(device->vk_device, view->u.vk_sampler, NULL)); + VK_CALL(vkDestroySampler(device->vk_device, view->view.u.vk_sampler, NULL)); break; default: - WARN("Unhandled view type %d.\n", view->type); + WARN("Unhandled view type %d.\n", view->view.type); } - if (view->vk_counter_view) - VK_CALL(vkDestroyBufferView(device->vk_device, view->vk_counter_view, NULL)); + if (view->view.vk_counter_view) + VK_CALL(vkDestroyBufferView(device->vk_device, view->view.vk_counter_view, NULL)); - vkd3d_free(view); + vkd3d_desc_object_cache_put(&device->view_desc_cache, view); } -void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) +void vkd3d_view_desc_decref(struct vkd3d_view_desc *view, struct d3d12_device *device) { - if (!InterlockedDecrement(&view->refcount)) - vkd3d_view_destroy(view, device); + if (!InterlockedDecrement(&view->h.refcount)) + vkd3d_view_desc_destroy(view, device); +} + +void d3d12_desc_replace(struct d3d12_desc *dst, void *desc, struct d3d12_device *device) +{ + union d3d12_desc_object u; + + if (!(u.object = InterlockedExchangePointer(&dst->u.object, desc))) + return; + + if (InterlockedDecrement(&u.header->refcount)) + return; + + if (u.header->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) + vkd3d_view_desc_destroy(u.view_desc, device); + else + vkd3d_desc_object_cache_put(&device->cbuffer_desc_cache, u.object); } /* TODO: write null descriptors to all applicable sets (invalid behaviour workaround). */ @@ -2137,14 +2208,14 @@ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descrip { unsigned int i, info_index = 0, write_index = 0; - switch (locations[0].src.vk_descriptor_type) + switch (locations[0].src.header->vk_descriptor_type) { case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: for (; write_index < write_count; ++write_index) { descriptor_set->vk_descriptor_writes[write_index].pBufferInfo = &descriptor_set->vk_buffer_infos[info_index]; for (i = 0; i < descriptor_set->vk_descriptor_writes[write_index].descriptorCount; ++i, ++info_index) - descriptor_set->vk_buffer_infos[info_index] = locations[info_index].src.u.vk_cbv_info; + descriptor_set->vk_buffer_infos[info_index] = locations[info_index].src.cb_desc->vk_cbv_info; } break; case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: @@ -2153,7 +2224,7 @@ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descrip { descriptor_set->vk_descriptor_writes[write_index].pImageInfo = &descriptor_set->vk_image_infos[info_index]; for (i = 0; i < descriptor_set->vk_descriptor_writes[write_index].descriptorCount; ++i, ++info_index) - descriptor_set->vk_image_infos[info_index].imageView = locations[info_index].src.u.view_info.view->u.vk_image_view; + descriptor_set->vk_image_infos[info_index].imageView = locations[info_index].src.view_desc->view.u.vk_image_view; } break; case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: @@ -2162,7 +2233,7 @@ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descrip { descriptor_set->vk_descriptor_writes[write_index].pTexelBufferView = &descriptor_set->vk_buffer_views[info_index]; for (i = 0; i < descriptor_set->vk_descriptor_writes[write_index].descriptorCount; ++i, ++info_index) - descriptor_set->vk_buffer_views[info_index] = locations[info_index].src.u.view_info.view->u.vk_buffer_view; + descriptor_set->vk_buffer_views[info_index] = locations[info_index].src.view_desc->view.u.vk_buffer_view; } break; case VK_DESCRIPTOR_TYPE_SAMPLER: @@ -2170,11 +2241,11 @@ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descrip { descriptor_set->vk_descriptor_writes[write_index].pImageInfo = &descriptor_set->vk_image_infos[info_index]; for (i = 0; i < descriptor_set->vk_descriptor_writes[write_index].descriptorCount; ++i, ++info_index) - descriptor_set->vk_image_infos[info_index].sampler = locations[info_index].src.u.view_info.view->u.vk_sampler; + descriptor_set->vk_image_infos[info_index].sampler = locations[info_index].src.view_desc->view.u.vk_sampler; } break; default: - ERR("Unhandled descriptor type %#x.\n", locations[0].src.vk_descriptor_type); + ERR("Unhandled descriptor type %#x.\n", locations[0].src.header->vk_descriptor_type); break; } } @@ -2220,46 +2291,45 @@ static void d3d12_desc_write_vk_heap_null_descriptor(struct d3d12_descriptor_hea } } -/* dst and src contain the same data unless another thread overwrites dst. The array index is - * calculated from dst, and src is thread safe. */ -static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct d3d12_desc *src, - struct d3d12_device *device) +void d3d12_desc_write_vk_heap(const struct d3d12_desc *src, void *object, struct d3d12_device *device) { struct d3d12_descriptor_heap_vk_set *descriptor_set; struct d3d12_descriptor_heap *descriptor_heap; const struct vkd3d_vk_device_procs *vk_procs; + union d3d12_desc_object u; bool is_null = false; - descriptor_heap = vkd3d_gpu_descriptor_allocator_heap_from_descriptor(&device->gpu_descriptor_allocator, dst); + u.object = object; + descriptor_heap = vkd3d_gpu_descriptor_allocator_heap_from_descriptor(&device->gpu_descriptor_allocator, src); descriptor_set = &descriptor_heap->vk_descriptor_sets[vkd3d_vk_descriptor_set_index_from_vk_descriptor_type( - src->vk_descriptor_type)]; + u.header->vk_descriptor_type)]; vk_procs = &device->vk_procs; vkd3d_mutex_lock(&descriptor_heap->vk_sets_mutex); - descriptor_set->vk_descriptor_writes[0].dstArrayElement = dst + descriptor_set->vk_descriptor_writes[0].dstArrayElement = src - (const struct d3d12_desc *)descriptor_heap->descriptors; descriptor_set->vk_descriptor_writes[0].descriptorCount = 1; - switch (src->vk_descriptor_type) + switch (u.header->vk_descriptor_type) { case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: - descriptor_set->vk_descriptor_writes[0].pBufferInfo = &src->u.vk_cbv_info; - is_null = !src->u.vk_cbv_info.buffer; + descriptor_set->vk_descriptor_writes[0].pBufferInfo = &u.cb_desc->vk_cbv_info; + is_null = !u.cb_desc->vk_cbv_info.buffer; break; case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: - is_null = !(descriptor_set->vk_image_infos[0].imageView = src->u.view_info.view->u.vk_image_view); + is_null = !(descriptor_set->vk_image_infos[0].imageView = u.view_desc->view.u.vk_image_view); break; case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: - descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &src->u.view_info.view->u.vk_buffer_view; - is_null = !src->u.view_info.view->u.vk_buffer_view; + descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &u.view_desc->view.u.vk_buffer_view; + is_null = !u.view_desc->view.u.vk_buffer_view; break; case VK_DESCRIPTOR_TYPE_SAMPLER: - descriptor_set->vk_image_infos[0].sampler = src->u.view_info.view->u.vk_sampler; + descriptor_set->vk_image_infos[0].sampler = u.view_desc->view.u.vk_sampler; break; default: - ERR("Unhandled descriptor type %#x.\n", src->vk_descriptor_type); + ERR("Unhandled descriptor type %#x.\n", u.header->vk_descriptor_type); break; } if (is_null && device->vk_info.EXT_robustness2) @@ -2272,75 +2342,19 @@ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, descriptor_set->vk_descriptor_writes, 0, NULL)); - if (src->magic == VKD3D_DESCRIPTOR_MAGIC_UAV && src->u.view_info.view->vk_counter_view) + if (u.header->magic == VKD3D_DESCRIPTOR_MAGIC_UAV && u.view_desc->view.vk_counter_view) { descriptor_set = &descriptor_heap->vk_descriptor_sets[VKD3D_SET_INDEX_UAV_COUNTER]; - descriptor_set->vk_descriptor_writes[0].dstArrayElement = dst + descriptor_set->vk_descriptor_writes[0].dstArrayElement = src - (const struct d3d12_desc *)descriptor_heap->descriptors; descriptor_set->vk_descriptor_writes[0].descriptorCount = 1; - descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &src->u.view_info.view->vk_counter_view; + descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &u.view_desc->view.vk_counter_view; VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, descriptor_set->vk_descriptor_writes, 0, NULL)); } vkd3d_mutex_unlock(&descriptor_heap->vk_sets_mutex); } -static void d3d12_desc_write_atomic_d3d12_only(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device) -{ - struct vkd3d_view *defunct_view; - struct vkd3d_mutex *mutex; - - mutex = d3d12_device_get_descriptor_mutex(device, dst); - vkd3d_mutex_lock(mutex); - - if (!(dst->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) || InterlockedDecrement(&dst->u.view_info.view->refcount)) - { - *dst = *src; - vkd3d_mutex_unlock(mutex); - return; - } - - defunct_view = dst->u.view_info.view; - *dst = *src; - vkd3d_mutex_unlock(mutex); - - /* Destroy the view after unlocking to reduce wait time. */ - vkd3d_view_destroy(defunct_view, device); -} - -void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, - struct d3d12_device *device) -{ - struct vkd3d_view *defunct_view = NULL; - struct vkd3d_mutex *mutex; - - mutex = d3d12_device_get_descriptor_mutex(device, dst); - vkd3d_mutex_lock(mutex); - - /* Nothing to do for VKD3D_DESCRIPTOR_MAGIC_CBV. */ - if ((dst->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) - && !InterlockedDecrement(&dst->u.view_info.view->refcount)) - defunct_view = dst->u.view_info.view; - - *dst = *src; - - vkd3d_mutex_unlock(mutex); - - /* Destroy the view after unlocking to reduce wait time. */ - if (defunct_view) - vkd3d_view_destroy(defunct_view, device); - - if (device->use_vk_heaps && dst->magic) - d3d12_desc_write_vk_heap(dst, src, device); -} - -static void d3d12_desc_destroy(struct d3d12_desc *descriptor, struct d3d12_device *device) -{ - static const struct d3d12_desc null_desc = {0}; - - d3d12_desc_write_atomic(descriptor, &null_desc, device); -} - void d3d12_desc_copy_vk_heap_range(struct d3d12_desc_copy_location *locations, const struct d3d12_desc_copy_info *info, struct d3d12_descriptor_heap *descriptor_heap, enum vkd3d_vk_descriptor_set_index set, struct d3d12_device *device) @@ -2353,7 +2367,7 @@ void d3d12_desc_copy_vk_heap_range(struct d3d12_desc_copy_location *locations, c for (i = 0, write_count = 0; i < info->count; ++i) { - d3d12_desc_write_atomic_d3d12_only(locations[i].dst, &locations[i].src, device); + d3d12_desc_replace(locations[i].dst, locations[i].src.object, device); if (i && locations[i].dst == locations[i - 1].dst + 1) { @@ -2377,9 +2391,11 @@ void d3d12_desc_copy_vk_heap_range(struct d3d12_desc_copy_location *locations, c for (i = 0, write_count = 0; i < info->count; ++i) { - if (!locations[i].src.u.view_info.view->vk_counter_view) + VkBufferView vk_counter_view; + + if (!(vk_counter_view = locations[i].src.view_desc->view.vk_counter_view)) continue; - descriptor_set->vk_buffer_views[write_count] = locations[i].src.u.view_info.view->vk_counter_view; + descriptor_set->vk_buffer_views[write_count] = vk_counter_view; descriptor_set->vk_descriptor_writes[write_count].pTexelBufferView = &descriptor_set->vk_buffer_views[write_count]; descriptor_set->vk_descriptor_writes[write_count].dstArrayElement = locations[i].dst - (const struct d3d12_desc *)descriptor_heap->descriptors; @@ -2395,22 +2411,14 @@ void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device) { struct d3d12_desc tmp; - struct vkd3d_mutex *mutex; assert(dst != src); - /* Shadow of the Tomb Raider and possibly other titles sometimes destroy - * and rewrite a descriptor in another thread while it is being copied. */ - mutex = d3d12_device_get_descriptor_mutex(device, src); - vkd3d_mutex_lock(mutex); - - if (src->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) - vkd3d_view_incref(src->u.view_info.view); - - tmp = *src; - - vkd3d_mutex_unlock(mutex); - + /* Shadow of the Tomb Raider and possibly other titles sometimes copy a + * descriptor to the same location concurrently in multiple threads. It + * doesn't seem to copy from a location while destroying it in another + * thread, but we handle this too. */ + tmp.u.object = d3d12_desc_get_object_ref(src, device); d3d12_desc_write_atomic(dst, &tmp, device); } @@ -2472,36 +2480,39 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, return vr == VK_SUCCESS; } -bool vkd3d_create_buffer_view(struct d3d12_device *device, VkBuffer vk_buffer, const struct vkd3d_format *format, - VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view) +bool vkd3d_create_buffer_view_desc(struct d3d12_device *device, uint32_t magic, VkBuffer vk_buffer, + const struct vkd3d_format *format, VkDeviceSize offset, VkDeviceSize size, + struct vkd3d_view_desc **view_desc) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkBufferView vk_view = VK_NULL_HANDLE; - struct vkd3d_view *object; + struct vkd3d_view_desc *object; if (vk_buffer && !vkd3d_create_vk_buffer_view(device, vk_buffer, format, offset, size, &vk_view)) return false; - if (!(object = vkd3d_view_create(VKD3D_VIEW_TYPE_BUFFER))) + if (!(object = vkd3d_view_desc_create(magic, magic == VKD3D_DESCRIPTOR_MAGIC_UAV + ? VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER : VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, + VKD3D_VIEW_TYPE_BUFFER, device))) { VK_CALL(vkDestroyBufferView(device->vk_device, vk_view, NULL)); return false; } - object->u.vk_buffer_view = vk_view; - object->format = format; - object->info.buffer.offset = offset; - object->info.buffer.size = size; - *view = object; + object->view.u.vk_buffer_view = vk_view; + object->view.format = format; + object->view.info.buffer.offset = offset; + object->view.info.buffer.size = size; + *view_desc = object; return true; } #define VKD3D_VIEW_RAW_BUFFER 0x1 static bool vkd3d_create_buffer_view_for_resource(struct d3d12_device *device, - struct d3d12_resource *resource, DXGI_FORMAT view_format, + uint32_t magic, struct d3d12_resource *resource, DXGI_FORMAT view_format, unsigned int offset, unsigned int size, unsigned int structure_stride, - unsigned int flags, struct vkd3d_view **view) + unsigned int flags, struct vkd3d_view_desc **view_desc) { const struct vkd3d_format *format; VkDeviceSize element_size; @@ -2530,8 +2541,8 @@ static bool vkd3d_create_buffer_view_for_resource(struct d3d12_device *device, assert(d3d12_resource_is_buffer(resource)); - return vkd3d_create_buffer_view(device, resource->u.vk_buffer, - format, offset * element_size, size * element_size, view); + return vkd3d_create_buffer_view_desc(device, magic, resource->u.vk_buffer, + format, offset * element_size, size * element_size, view_desc); } static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, @@ -2758,14 +2769,14 @@ static void vkd3d_texture_view_desc_normalise(struct vkd3d_texture_view_desc *de desc->layer_count = max_layer_count; } -bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, - const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) +bool vkd3d_create_texture_view_desc(struct d3d12_device *device, uint32_t magic, VkImage vk_image, + const struct vkd3d_texture_view_desc *desc, struct vkd3d_view_desc **view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format = desc->format; struct VkImageViewCreateInfo view_desc; VkImageView vk_view = VK_NULL_HANDLE; - struct vkd3d_view *object; + struct vkd3d_view_desc *object; VkResult vr; if (vk_image) @@ -2791,18 +2802,19 @@ bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, } } - if (!(object = vkd3d_view_create(VKD3D_VIEW_TYPE_IMAGE))) + if (!(object = vkd3d_view_desc_create(magic, magic == VKD3D_DESCRIPTOR_MAGIC_UAV ? VK_DESCRIPTOR_TYPE_STORAGE_IMAGE + : VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, VKD3D_VIEW_TYPE_IMAGE, device))) { VK_CALL(vkDestroyImageView(device->vk_device, vk_view, NULL)); return false; } - object->u.vk_image_view = vk_view; - object->format = format; - object->info.texture.vk_view_type = desc->view_type; - object->info.texture.miplevel_idx = desc->miplevel_idx; - object->info.texture.layer_idx = desc->layer_idx; - object->info.texture.layer_count = desc->layer_count; + object->view.u.vk_image_view = vk_view; + object->view.format = format; + object->view.info.texture.vk_view_type = desc->view_type; + object->view.info.texture.miplevel_idx = desc->miplevel_idx; + object->view.info.texture.layer_idx = desc->layer_idx; + object->view.info.texture.layer_count = desc->layer_count; *view = object; return true; } @@ -2811,6 +2823,7 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, struct d3d12_device *device, const D3D12_CONSTANT_BUFFER_VIEW_DESC *desc) { struct VkDescriptorBufferInfo *buffer_info; + struct vkd3d_cbuffer_desc *cb_desc; struct d3d12_resource *resource; if (!desc) @@ -2819,13 +2832,19 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, return; } + if (!(cb_desc = vkd3d_cbuffer_desc_create(device))) + { + ERR("Failed to allocate descriptor object.\n"); + return; + } + if (desc->SizeInBytes & (D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT - 1)) { WARN("Size is not %u bytes aligned.\n", D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT); return; } - buffer_info = &descriptor->u.vk_cbv_info; + buffer_info = &cb_desc->vk_cbv_info; if (desc->BufferLocation) { resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, desc->BufferLocation); @@ -2841,8 +2860,7 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, buffer_info->range = VK_WHOLE_SIZE; } - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_CBV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + descriptor->u.cb_desc = cb_desc; } static unsigned int vkd3d_view_flags_from_d3d12_buffer_srv_flags(D3D12_BUFFER_SRV_FLAGS flags) @@ -2859,7 +2877,6 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, { struct vkd3d_null_resources *null_resources = &device->null_resources; struct vkd3d_texture_view_desc vkd3d_desc; - struct vkd3d_view *view; VkImage vk_image; if (!desc) @@ -2874,15 +2891,9 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, if (!device->vk_info.EXT_robustness2) WARN("Creating NULL buffer SRV %#x.\n", desc->Format); - if (vkd3d_create_buffer_view(device, null_resources->vk_buffer, + vkd3d_create_buffer_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_SRV, null_resources->vk_buffer, vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), - 0, VKD3D_NULL_BUFFER_SIZE, &view)) - { - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; - } + 0, VKD3D_NULL_BUFFER_SIZE, &descriptor->u.view_desc); return; case D3D12_SRV_DIMENSION_TEXTURE2D: @@ -2920,20 +2931,13 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, vkd3d_desc.components.a = VK_COMPONENT_SWIZZLE_ZERO; vkd3d_desc.allowed_swizzle = true; - if (!vkd3d_create_texture_view(device, vk_image, &vkd3d_desc, &view)) - return; - - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; + vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_SRV, vk_image, &vkd3d_desc, &descriptor->u.view_desc); } static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) { - struct vkd3d_view *view; unsigned int flags; if (!desc) @@ -2949,15 +2953,9 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, } flags = vkd3d_view_flags_from_d3d12_buffer_srv_flags(desc->u.Buffer.Flags); - if (!vkd3d_create_buffer_view_for_resource(device, resource, desc->Format, + vkd3d_create_buffer_view_for_resource(device, VKD3D_DESCRIPTOR_MAGIC_SRV, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, - desc->u.Buffer.StructureByteStride, flags, &view)) - return; - - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; + desc->u.Buffer.StructureByteStride, flags, &descriptor->u.view_desc); } static VkImageAspectFlags vk_image_aspect_flags_from_d3d12_plane_slice(const struct vkd3d_format *format, @@ -2986,7 +2984,6 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) { struct vkd3d_texture_view_desc vkd3d_desc; - struct vkd3d_view *view; if (!resource) { @@ -3082,13 +3079,8 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, } } - if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) - return; - - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; + vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_SRV, resource->u.vk_image, &vkd3d_desc, + &descriptor->u.view_desc); } static unsigned int vkd3d_view_flags_from_d3d12_buffer_uav_flags(D3D12_BUFFER_UAV_FLAGS flags) @@ -3105,7 +3097,6 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, { struct vkd3d_null_resources *null_resources = &device->null_resources; struct vkd3d_texture_view_desc vkd3d_desc; - struct vkd3d_view *view; VkImage vk_image; if (!desc) @@ -3120,15 +3111,9 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, if (!device->vk_info.EXT_robustness2) WARN("Creating NULL buffer UAV %#x.\n", desc->Format); - if (vkd3d_create_buffer_view(device, null_resources->vk_storage_buffer, + vkd3d_create_buffer_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_UAV, null_resources->vk_storage_buffer, vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), - 0, VKD3D_NULL_BUFFER_SIZE, &view)) - { - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; - } + 0, VKD3D_NULL_BUFFER_SIZE, &descriptor->u.view_desc); return; case D3D12_UAV_DIMENSION_TEXTURE2D: @@ -3166,20 +3151,14 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, vkd3d_desc.components.a = VK_COMPONENT_SWIZZLE_A; vkd3d_desc.allowed_swizzle = false; - if (!vkd3d_create_texture_view(device, vk_image, &vkd3d_desc, &view)) - return; - - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; + vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_UAV, vk_image, &vkd3d_desc, &descriptor->u.view_desc); } static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, struct d3d12_resource *counter_resource, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { - struct vkd3d_view *view; + struct vkd3d_view_desc *view_desc; unsigned int flags; if (!desc) @@ -3195,16 +3174,11 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ } flags = vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->u.Buffer.Flags); - if (!vkd3d_create_buffer_view_for_resource(device, resource, desc->Format, + if (!vkd3d_create_buffer_view_for_resource(device, VKD3D_DESCRIPTOR_MAGIC_UAV, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, - desc->u.Buffer.StructureByteStride, flags, &view)) + desc->u.Buffer.StructureByteStride, flags, &view_desc)) return; - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; - if (counter_resource) { const struct vkd3d_format *format; @@ -3214,13 +3188,16 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); if (!vkd3d_create_vk_buffer_view(device, counter_resource->u.vk_buffer, format, - desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view->vk_counter_view)) + desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view_desc->view.vk_counter_view)) { WARN("Failed to create counter buffer view.\n"); - view->vk_counter_view = VK_NULL_HANDLE; - d3d12_desc_destroy(descriptor, device); + view_desc->view.vk_counter_view = VK_NULL_HANDLE; + vkd3d_view_desc_decref(view_desc, device); + return; } } + + descriptor->u.view_desc = view_desc; } static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, @@ -3228,7 +3205,6 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { struct vkd3d_texture_view_desc vkd3d_desc; - struct vkd3d_view *view; if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; @@ -3273,13 +3249,8 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, } } - if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) - return; - - descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; - descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - descriptor->u.view_info.view = view; - descriptor->u.view_info.written_serial_id = view->serial_id; + vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_UAV, resource->u.vk_image, &vkd3d_desc, + &descriptor->u.view_desc); } void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, @@ -3414,7 +3385,7 @@ static VkResult d3d12_create_sampler(struct d3d12_device *device, D3D12_FILTER f void d3d12_desc_create_sampler(struct d3d12_desc *sampler, struct d3d12_device *device, const D3D12_SAMPLER_DESC *desc) { - struct vkd3d_view *view; + struct vkd3d_view_desc *view_desc; if (!desc) { @@ -3428,21 +3399,19 @@ void d3d12_desc_create_sampler(struct d3d12_desc *sampler, FIXME("Ignoring border color {%.8e, %.8e, %.8e, %.8e}.\n", desc->BorderColor[0], desc->BorderColor[1], desc->BorderColor[2], desc->BorderColor[3]); - if (!(view = vkd3d_view_create(VKD3D_VIEW_TYPE_SAMPLER))) + if (!(view_desc = vkd3d_view_desc_create(VKD3D_DESCRIPTOR_MAGIC_SAMPLER, VK_DESCRIPTOR_TYPE_SAMPLER, + VKD3D_VIEW_TYPE_SAMPLER, device))) return; if (d3d12_create_sampler(device, desc->Filter, desc->AddressU, desc->AddressV, desc->AddressW, desc->MipLODBias, desc->MaxAnisotropy, - desc->ComparisonFunc, desc->MinLOD, desc->MaxLOD, &view->u.vk_sampler) < 0) + desc->ComparisonFunc, desc->MinLOD, desc->MaxLOD, &view_desc->view.u.vk_sampler) < 0) { - vkd3d_free(view); + vkd3d_free(view_desc); return; } - sampler->magic = VKD3D_DESCRIPTOR_MAGIC_SAMPLER; - sampler->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLER; - sampler->u.view_info.view = view; - sampler->u.view_info.written_serial_id = view->serial_id; + sampler->u.view_desc = view_desc; } HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, @@ -3467,7 +3436,7 @@ static void d3d12_rtv_desc_destroy(struct d3d12_rtv_desc *rtv, struct d3d12_devi if (rtv->magic != VKD3D_DESCRIPTOR_MAGIC_RTV) return; - vkd3d_view_decref(rtv->view, device); + vkd3d_view_desc_decref(rtv->view, device); memset(rtv, 0, sizeof(*rtv)); } @@ -3475,7 +3444,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc) { struct vkd3d_texture_view_desc vkd3d_desc; - struct vkd3d_view *view; + struct vkd3d_view_desc *view; d3d12_rtv_desc_destroy(rtv_desc, device); @@ -3543,7 +3512,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev assert(d3d12_resource_is_texture(resource)); - if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) + if (!vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_RTV, resource->u.vk_image, &vkd3d_desc, &view)) return; rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; @@ -3562,7 +3531,7 @@ static void d3d12_dsv_desc_destroy(struct d3d12_dsv_desc *dsv, struct d3d12_devi if (dsv->magic != VKD3D_DESCRIPTOR_MAGIC_DSV) return; - vkd3d_view_decref(dsv->view, device); + vkd3d_view_desc_decref(dsv->view, device); memset(dsv, 0, sizeof(*dsv)); } @@ -3570,7 +3539,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) { struct vkd3d_texture_view_desc vkd3d_desc; - struct vkd3d_view *view; + struct vkd3d_view_desc *view; d3d12_dsv_desc_destroy(dsv_desc, device); @@ -3628,7 +3597,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev assert(d3d12_resource_is_texture(resource)); - if (!vkd3d_create_texture_view(device, resource->u.vk_image, &vkd3d_desc, &view)) + if (!vkd3d_create_texture_view_desc(device, VKD3D_DESCRIPTOR_MAGIC_DSV, resource->u.vk_image, &vkd3d_desc, &view)) return; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f00181a2..6df777ca 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -660,9 +660,7 @@ enum vkd3d_view_type struct vkd3d_view { - LONG refcount; enum vkd3d_view_type type; - uint64_t serial_id; union { VkBufferView vk_buffer_view; @@ -688,9 +686,6 @@ struct vkd3d_view } info; }; -void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device); -void vkd3d_view_incref(struct vkd3d_view *view); - struct vkd3d_texture_view_desc { VkImageViewType view_type; @@ -704,28 +699,79 @@ struct vkd3d_texture_view_desc bool allowed_swizzle; }; -bool vkd3d_create_buffer_view(struct d3d12_device *device, VkBuffer vk_buffer, const struct vkd3d_format *format, - VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view); -bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, - const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view); +struct vkd3d_desc_header +{ + uint32_t magic; + LONG refcount; + VkDescriptorType vk_descriptor_type; +}; + +struct vkd3d_view_desc +{ + struct vkd3d_desc_header h; + struct vkd3d_view view; +}; -struct vkd3d_view_info +struct vkd3d_cbuffer_desc { - uint64_t written_serial_id; - struct vkd3d_view *view; + struct vkd3d_desc_header h; + VkDescriptorBufferInfo vk_cbv_info; }; struct d3d12_desc { - uint32_t magic; - VkDescriptorType vk_descriptor_type; - union + union d3d12_desc_object { - VkDescriptorBufferInfo vk_cbv_info; - struct vkd3d_view_info view_info; + struct vkd3d_desc_header *header; + struct vkd3d_view_desc *view_desc; + struct vkd3d_cbuffer_desc *cb_desc; + void *object; } u; }; +bool vkd3d_create_buffer_view_desc(struct d3d12_device *device, uint32_t magic, VkBuffer vk_buffer, + const struct vkd3d_format *format, VkDeviceSize offset, VkDeviceSize size, + struct vkd3d_view_desc **view_desc); +bool vkd3d_create_texture_view_desc(struct d3d12_device *device, uint32_t magic, VkImage vk_image, + const struct vkd3d_texture_view_desc *desc, struct vkd3d_view_desc **view); + +void vkd3d_view_desc_decref(struct vkd3d_view_desc *view_desc, struct d3d12_device *device); +void d3d12_desc_replace(struct d3d12_desc *dst, void *desc, struct d3d12_device *device); + +static inline bool vkd3d_desc_incref(void *desc) +{ + struct vkd3d_desc_header *h = desc; + LONG refcount; + + do + { + refcount = h->refcount; + /* Avoid incrementing a freed object. Reading the value is safe because objects are recycled. */ + if (refcount <= 0) + return false; + } + while (InterlockedCompareExchange(&h->refcount, refcount + 1, refcount) != refcount); + + return true; +} + +static inline void *d3d12_desc_get_object_ref(const volatile struct d3d12_desc *src, struct d3d12_device *device) +{ + void *desc; + + do + { + desc = src->u.object; + } while (desc && !vkd3d_desc_incref(desc)); + + return desc; +} + +static inline void d3d12_desc_destroy(struct d3d12_desc *descriptor, struct d3d12_device *device) +{ + d3d12_desc_replace(descriptor, NULL, device); +} + static inline struct d3d12_desc *d3d12_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle) { return (struct d3d12_desc *)cpu_handle.ptr; @@ -746,7 +792,7 @@ void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *d struct d3d12_resource *resource, struct d3d12_resource *counter_resource, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc); void d3d12_desc_create_sampler(struct d3d12_desc *sampler, struct d3d12_device *device, const D3D12_SAMPLER_DESC *desc); -void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device); +void d3d12_desc_write_vk_heap(const struct d3d12_desc *src, void *object, struct d3d12_device *device); bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, D3D12_GPU_VIRTUAL_ADDRESS gpu_address, VkBufferView *vk_buffer_view); @@ -761,7 +807,7 @@ struct d3d12_rtv_desc uint64_t width; unsigned int height; unsigned int layer_count; - struct vkd3d_view *view; + struct vkd3d_view_desc *view; struct d3d12_resource *resource; }; @@ -781,7 +827,7 @@ struct d3d12_dsv_desc uint64_t width; unsigned int height; unsigned int layer_count; - struct vkd3d_view *view; + struct vkd3d_view_desc *view; struct d3d12_resource *resource; }; @@ -861,7 +907,7 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, struct d3d12_desc_copy_location { - struct d3d12_desc src; + union d3d12_desc_object src; struct d3d12_desc *dst; }; @@ -1156,7 +1202,7 @@ struct d3d12_command_allocator size_t descriptor_pools_size; size_t descriptor_pool_count; - struct vkd3d_view **views; + struct vkd3d_view_desc **views; size_t views_size; size_t view_count; @@ -1450,6 +1496,15 @@ struct vkd3d_uav_clear_state HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); void vkd3d_uav_clear_state_cleanup(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); +struct vkd3d_desc_object_cache +{ + struct vkd3d_mutex mutex; + void **cache; + size_t capacity; + size_t count; + size_t reserve; +}; + #define VKD3D_DESCRIPTOR_POOL_COUNT 6 /* ID3D12Device */ @@ -1468,7 +1523,8 @@ struct d3d12_device struct vkd3d_gpu_va_allocator gpu_va_allocator; struct vkd3d_mutex mutex; - struct vkd3d_mutex desc_mutex[8]; + struct vkd3d_desc_object_cache view_desc_cache; + struct vkd3d_desc_object_cache cbuffer_desc_cache; struct vkd3d_render_pass_cache render_pass_cache; VkPipelineCache vk_pipeline_cache; @@ -1542,17 +1598,16 @@ static inline unsigned int d3d12_device_get_descriptor_handle_increment_size(str return ID3D12Device_GetDescriptorHandleIncrementSize(&device->ID3D12Device_iface, descriptor_type); } -static inline struct vkd3d_mutex *d3d12_device_get_descriptor_mutex(struct d3d12_device *device, - const struct d3d12_desc *descriptor) +static inline void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, + struct d3d12_device *device) { - STATIC_ASSERT(!(ARRAY_SIZE(device->desc_mutex) & (ARRAY_SIZE(device->desc_mutex) - 1))); - uintptr_t idx = (uintptr_t)descriptor; - - idx ^= idx >> 12; - idx ^= idx >> 6; - idx ^= idx >> 3; + void *object = src->u.object; - return &device->desc_mutex[idx & (ARRAY_SIZE(device->desc_mutex) - 1)]; + /* Write the Vulkan descriptor first. Otherwise, while it's unlikely the dst + * and src would be destroyed before the write occurs, it is possible. */ + if (device->use_vk_heaps && object) + d3d12_desc_write_vk_heap(dst, object, device); + d3d12_desc_replace(dst, object, device); } /* utils */ -- 2.36.1

1 0

[PATCH 5/5] mscms: Use CRT memory allocation functions.
by Hans Leidekker 30 May '22

30 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/handle.c | 16 +++-- dlls/mscms/profile.c | 166 ++++++++++++++++--------------------------- 2 files changed, 72 insertions(+), 110 deletions(-) diff --git a/dlls/mscms/handle.c b/dlls/mscms/handle.c index bd6851b8a37..2ff71464e59 100644 --- a/dlls/mscms/handle.c +++ b/dlls/mscms/handle.c @@ -49,11 +49,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mscms); void free_handle_tables( void ) { - HeapFree( GetProcessHeap(), 0, profiletable ); + free( profiletable ); profiletable = NULL; num_profile_handles = 0; - HeapFree( GetProcessHeap(), 0, transformtable ); + free( transformtable ); transformtable = NULL; num_transform_handles = 0; @@ -112,12 +112,13 @@ static HPROFILE alloc_profile_handle( void ) } if (!profiletable) { - p = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, count * sizeof(struct profile) ); + p = calloc( count, sizeof(*p) ); } else { count = num_profile_handles * 2; - p = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, profiletable, count * sizeof(struct profile) ); + p = realloc( profiletable, count * sizeof(*p) ); + if (p) memset( p + num_profile_handles, 0, num_profile_handles * sizeof(*p) ); } if (!p) return NULL; @@ -173,7 +174,7 @@ BOOL close_profile( HPROFILE handle ) CloseHandle( profile->file ); } if (profile->cmsprofile) cmsCloseProfile( profile->cmsprofile ); - HeapFree( GetProcessHeap(), 0, profile->data ); + free( profile->data ); memset( profile, 0, sizeof(struct profile) ); @@ -193,12 +194,13 @@ static HTRANSFORM alloc_transform_handle( void ) } if (!transformtable) { - p = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, count * sizeof(*p) ); + p = calloc( count, sizeof(*p) ); } else { count = num_transform_handles * 2; - p = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, transformtable, count * sizeof(*p) ); + p = realloc( transformtable, count * sizeof(*p) ); + if (p) memset( p + num_transform_handles, 0, num_transform_handles * sizeof(*p) ); } if (!p) return NULL; diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 2c20b857a81..b23ad5bbe10 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -32,22 +33,20 @@ #include "mscms_priv.h" -static void basename( LPCWSTR path, LPWSTR name ) +static void basename( const WCHAR *path, WCHAR *name ) { - INT i = lstrlenW( path ); - + int i = lstrlenW( path ); while (i > 0 && path[i - 1] != '\\' && path[i - 1] != '/') i--; lstrcpyW( name, &path[i] ); } -static inline LPWSTR strdupW( LPCSTR str ) +static inline WCHAR *strdupW( const char *str ) { - LPWSTR ret = NULL; + WCHAR *ret = NULL; if (str) { - DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); + int len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if ((ret = malloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); } return ret; } @@ -83,19 +82,19 @@ BOOL WINAPI AssociateColorProfileWithDeviceA( PCSTR machine, PCSTR profile, PCST } len = MultiByteToWideChar( CP_ACP, 0, profile, -1, NULL, 0 ); - if (!(profileW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + if (!(profileW = malloc( len * sizeof(WCHAR) ))) return FALSE; MultiByteToWideChar( CP_ACP, 0, profile, -1, profileW, len ); len = MultiByteToWideChar( CP_ACP, 0, device, -1, NULL, 0 ); - if ((deviceW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if ((deviceW = malloc( len * sizeof(WCHAR) ))) { MultiByteToWideChar( CP_ACP, 0, device, -1, deviceW, len ); ret = AssociateColorProfileWithDeviceW( NULL, profileW, deviceW ); } - HeapFree( GetProcessHeap(), 0, profileW ); - HeapFree( GetProcessHeap(), 0, deviceW ); + free( profileW ); + free( deviceW ); return ret; } @@ -187,19 +186,19 @@ BOOL WINAPI DisassociateColorProfileFromDeviceA( PCSTR machine, PCSTR profile, P } len = MultiByteToWideChar( CP_ACP, 0, profile, -1, NULL, 0 ); - if (!(profileW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + if (!(profileW = malloc( len * sizeof(WCHAR) ))) return FALSE; MultiByteToWideChar( CP_ACP, 0, profile, -1, profileW, len ); len = MultiByteToWideChar( CP_ACP, 0, device, -1, NULL, 0 ); - if ((deviceW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if ((deviceW = malloc( len * sizeof(WCHAR) ))) { MultiByteToWideChar( CP_ACP, 0, device, -1, deviceW, len ); ret = DisassociateColorProfileFromDeviceW( NULL, profileW, deviceW ); } - HeapFree( GetProcessHeap(), 0, profileW ); - HeapFree( GetProcessHeap(), 0, deviceW ); + free( profileW ); + free( deviceW ); return ret; } @@ -249,8 +248,7 @@ BOOL WINAPI GetColorDirectoryA( PCSTR machine, PSTR buffer, PDWORD size ) sizeW = *size * sizeof(WCHAR); - bufferW = HeapAlloc( GetProcessHeap(), 0, sizeW ); - if (bufferW) + if ((bufferW = malloc( sizeW ))) { if ((ret = GetColorDirectoryW( NULL, bufferW, &sizeW ))) { @@ -259,8 +257,7 @@ BOOL WINAPI GetColorDirectoryA( PCSTR machine, PSTR buffer, PDWORD size ) if (!len) ret = FALSE; } else *size = sizeW / sizeof(WCHAR); - - HeapFree( GetProcessHeap(), 0, bufferW ); + free( bufferW ); } return ret; } @@ -530,8 +527,7 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile return ret; } - profileW = HeapAlloc( GetProcessHeap(), 0, sizeW ); - if (profileW) + if ((profileW = malloc( sizeW ))) { if ((ret = GetStandardColorSpaceProfileW( NULL, id, profileW, &sizeW ))) { @@ -540,8 +536,7 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile if (!len) ret = FALSE; } else *size = sizeW / sizeof(WCHAR); - - HeapFree( GetProcessHeap(), 0, profileW ); + free( profileW ); } return ret; } @@ -780,8 +775,7 @@ BOOL WINAPI EnumColorProfilesA( PCSTR machine, PENUMTYPEA record, PBYTE buffer, find = FindFirstFileA( glob, &data ); if (find == INVALID_HANDLE_VALUE) return FALSE; - profiles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(char *) + 1 ); - if (!profiles) goto exit; + if (!(profiles = calloc( 1, sizeof(char *) + 1 ))) goto exit; memcpy( &recordW, record, sizeof(ENUMTYPEA) ); if (record->pDeviceName) @@ -790,19 +784,14 @@ BOOL WINAPI EnumColorProfilesA( PCSTR machine, PENUMTYPEA record, PBYTE buffer, if (!(recordW.pDeviceName = deviceW)) goto exit; } - fileW = strdupW( data.cFileName ); - if (!fileW) goto exit; + if (!(fileW = strdupW( data.cFileName ))) goto exit; - ret = header_from_file( fileW, &header ); - if (ret) + if ((ret = header_from_file( fileW, &header ))) { - match = match_profile( &recordW, &header ); - if (match) + if ((match = match_profile( &recordW, &header ))) { len = sizeof(char) * (lstrlenA( data.cFileName ) + 1); - profiles[count] = HeapAlloc( GetProcessHeap(), 0, len ); - - if (!profiles[count]) goto exit; + if (!(profiles[count] = malloc( len ))) goto exit; else { TRACE( "matching profile: %s\n", debugstr_a(data.cFileName) ); @@ -812,33 +801,26 @@ BOOL WINAPI EnumColorProfilesA( PCSTR machine, PENUMTYPEA record, PBYTE buffer, } } } - HeapFree( GetProcessHeap(), 0, fileW ); + free( fileW ); fileW = NULL; while (FindNextFileA( find, &data )) { - fileW = strdupW( data.cFileName ); - if (!fileW) goto exit; - - ret = header_from_file( fileW, &header ); - if (!ret) + if (!(fileW = strdupW( data.cFileName ))) goto exit; + if (!(ret = header_from_file( fileW, &header ))) { - HeapFree( GetProcessHeap(), 0, fileW ); + free( fileW ); continue; } - match = match_profile( &recordW, &header ); - if (match) + if ((match = match_profile( &recordW, &header ))) { - char **tmp = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - profiles, sizeof(char *) * (count + 1) ); + char **tmp = realloc( profiles, sizeof(char *) * (count + 1) ); if (!tmp) goto exit; else profiles = tmp; len = sizeof(char) * (lstrlenA( data.cFileName ) + 1); - profiles[count] = HeapAlloc( GetProcessHeap(), 0, len ); - - if (!profiles[count]) goto exit; + if (!(profiles[count] = malloc( len ))) goto exit; else { TRACE( "matching profile: %s\n", debugstr_a(data.cFileName) ); @@ -847,7 +829,7 @@ BOOL WINAPI EnumColorProfilesA( PCSTR machine, PENUMTYPEA record, PBYTE buffer, count++; } } - HeapFree( GetProcessHeap(), 0, fileW ); + free( fileW ); fileW = NULL; } @@ -874,11 +856,10 @@ BOOL WINAPI EnumColorProfilesA( PCSTR machine, PENUMTYPEA record, PBYTE buffer, if (number) *number = count; exit: - for (i = 0; i < count; i++) - HeapFree( GetProcessHeap(), 0, profiles[i] ); - HeapFree( GetProcessHeap(), 0, profiles ); - HeapFree( GetProcessHeap(), 0, deviceW ); - HeapFree( GetProcessHeap(), 0, fileW ); + for (i = 0; i < count; i++) free( profiles[i] ); + free( profiles ); + free( deviceW ); + free( fileW ); FindClose( find ); return ret; @@ -930,19 +911,14 @@ BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, find = FindFirstFileW( glob, &data ); if (find == INVALID_HANDLE_VALUE) return FALSE; - profiles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR *) + 1 ); - if (!profiles) goto exit; + if (!(profiles = calloc( 1, sizeof(WCHAR *) + 1 ))) goto exit; - ret = header_from_file( data.cFileName, &header ); - if (ret) + if ((ret = header_from_file( data.cFileName, &header ))) { - match = match_profile( record, &header ); - if (match) + if ((match = match_profile( record, &header ))) { len = sizeof(WCHAR) * (lstrlenW( data.cFileName ) + 1); - profiles[count] = HeapAlloc( GetProcessHeap(), 0, len ); - - if (!profiles[count]) goto exit; + if (!(profiles[count] = malloc( len ))) goto exit; else { TRACE( "matching profile: %s\n", debugstr_w(data.cFileName) ); @@ -955,21 +931,16 @@ BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, while (FindNextFileW( find, &data )) { - ret = header_from_file( data.cFileName, &header ); - if (!ret) continue; + if (!(ret = header_from_file( data.cFileName, &header ))) continue; - match = match_profile( record, &header ); - if (match) + if ((match = match_profile( record, &header ))) { - WCHAR **tmp = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - profiles, sizeof(WCHAR *) * (count + 1) ); + WCHAR **tmp = realloc( profiles, sizeof(WCHAR *) * (count + 1) ); if (!tmp) goto exit; else profiles = tmp; len = sizeof(WCHAR) * (lstrlenW( data.cFileName ) + 1); - profiles[count] = HeapAlloc( GetProcessHeap(), 0, len ); - - if (!profiles[count]) goto exit; + if (!(profiles[count] = malloc( len ))) goto exit; else { TRACE( "matching profile: %s\n", debugstr_w(data.cFileName) ); @@ -1003,9 +974,8 @@ BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, if (number) *number = count; exit: - for (i = 0; i < count; i++) - HeapFree( GetProcessHeap(), 0, profiles[i] ); - HeapFree( GetProcessHeap(), 0, profiles ); + for (i = 0; i < count; i++) free( profiles[i] ); + free( profiles ); FindClose( find ); return ret; @@ -1027,14 +997,11 @@ BOOL WINAPI InstallColorProfileA( PCSTR machine, PCSTR profile ) if (machine || !profile) return FALSE; len = MultiByteToWideChar( CP_ACP, 0, profile, -1, NULL, 0 ); - profileW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - - if (profileW) + if ((profileW = malloc( len * sizeof(WCHAR) ))) { MultiByteToWideChar( CP_ACP, 0, profile, -1, profileW, len ); - ret = InstallColorProfileW( NULL, profileW ); - HeapFree( GetProcessHeap(), 0, profileW ); + free( profileW ); } return ret; } @@ -1065,7 +1032,6 @@ BOOL WINAPI InstallColorProfileW( PCWSTR machine, PCWSTR profile ) if (!GetColorDirectoryW( machine, dest, &size )) return FALSE; basename( profile, base ); - lstrcatW( dest, L"\\" ); lstrcatW( dest, base ); @@ -1225,15 +1191,11 @@ BOOL WINAPI UninstallColorProfileA( PCSTR machine, PCSTR profile, BOOL delete ) if (machine || !profile) return FALSE; len = MultiByteToWideChar( CP_ACP, 0, profile, -1, NULL, 0 ); - profileW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - - if (profileW) + if ((profileW = malloc( len * sizeof(WCHAR) ))) { MultiByteToWideChar( CP_ACP, 0, profile, -1, profileW, len ); - ret = UninstallColorProfileW( NULL, profileW , delete ); - - HeapFree( GetProcessHeap(), 0, profileW ); + free( profileW ); } return ret; } @@ -1260,7 +1222,6 @@ BOOL WINAPI UninstallColorProfileW( PCWSTR machine, PCWSTR profile, BOOL delete if (machine || !profile) return FALSE; if (delete) return DeleteFileW( profile ); - return TRUE; } @@ -1269,7 +1230,7 @@ static BOOL profile_AtoW( const PROFILE *in, PROFILE *out ) int len; if (!in->pProfileData) return FALSE; len = MultiByteToWideChar( CP_ACP, 0, in->pProfileData, -1, NULL, 0 ); - if (!(out->pProfileData = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + if (!(out->pProfileData = malloc( len * sizeof(WCHAR) ))) return FALSE; out->cbDataSize = len * sizeof(WCHAR); MultiByteToWideChar( CP_ACP, 0, in->pProfileData, -1, out->pProfileData, len ); out->dwType = in->dwType; @@ -1296,7 +1257,7 @@ HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing if (!profile_AtoW( profile, &profileW )) return FALSE; handle = OpenColorProfileW( &profileW, access, sharing, creation ); - HeapFree( GetProcessHeap(), 0, profileW.pProfileData ); + free( profileW.pProfileData ); return handle; } @@ -1339,12 +1300,12 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing { /* FIXME: access flags not implemented for memory based profiles */ - if (!(data = HeapAlloc( GetProcessHeap(), 0, profile->cbDataSize ))) return NULL; + if (!(data = malloc( profile->cbDataSize ))) return NULL; memcpy( data, profile->pProfileData, profile->cbDataSize ); if (!(cmsprofile = cmsOpenProfileFromMem( data, profile->cbDataSize ))) { - HeapFree( GetProcessHeap(), 0, data ); + free( data ); return FALSE; } size = profile->cbDataSize; @@ -1370,14 +1331,14 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if (!GetColorDirectoryW( NULL, NULL, &size ) && GetLastError() == ERROR_MORE_DATA) { size += (lstrlenW( profile->pProfileData ) + 2) * sizeof(WCHAR); - if (!(path = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + if (!(path = malloc( size ))) return NULL; GetColorDirectoryW( NULL, path, &size ); PathAddBackslashW( path ); lstrcatW( path, profile->pProfileData ); } else return NULL; handle = CreateFileW( path, flags, sharing, NULL, creation, 0, NULL ); - HeapFree( GetProcessHeap(), 0, path ); + free( path ); } if (handle == INVALID_HANDLE_VALUE) { @@ -1390,7 +1351,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing CloseHandle( handle ); return NULL; } - if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) + if (!(data = malloc( size ))) { ERR( "Unable to allocate memory for color profile\n" ); CloseHandle( handle ); @@ -1399,15 +1360,14 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if (!ReadFile( handle, data, size, &read, NULL ) || read != size) { ERR( "Unable to read color profile\n" ); - CloseHandle( handle ); - HeapFree( GetProcessHeap(), 0, data ); + free( data ); return NULL; } if (!(cmsprofile = cmsOpenProfileFromMem( data, size ))) { CloseHandle( handle ); - HeapFree( GetProcessHeap(), 0, data ); + free( data ); return NULL; } } @@ -1426,7 +1386,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if ((hprof = create_profile( &prof ))) return hprof; cmsCloseProfile( cmsprofile ); - HeapFree( GetProcessHeap(), 0, data ); + free( data ); CloseHandle( handle ); return NULL; } @@ -1509,9 +1469,9 @@ HPROFILE WINAPI WcsOpenColorProfileA( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp ret = WcsOpenColorProfileW( &cdmW, &campW, &gmmpW, access, sharing, creation, flags ); done: - HeapFree( GetProcessHeap(), 0, cdmW.pProfileData ); - HeapFree( GetProcessHeap(), 0, campW.pProfileData ); - HeapFree( GetProcessHeap(), 0, gmmpW.pProfileData ); + free( cdmW.pProfileData ); + free( campW.pProfileData ); + free( gmmpW.pProfileData ); return ret; } -- 2.30.2

1 0

[PATCH 4/5] mscms: Get rid of an unused structure.
by Hans Leidekker 30 May '22

30 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/mscms_priv.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index 7a4a35ebc24..29895fb8ae8 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -65,19 +65,4 @@ extern BOOL set_tag_data( const struct profile *, TAGTYPE, DWORD, const void *, extern void get_profile_header( const struct profile *, PROFILEHEADER * ) DECLSPEC_HIDDEN; extern void set_profile_header( const struct profile *, const PROFILEHEADER * ) DECLSPEC_HIDDEN; -struct lcms_funcs -{ - void * (CDECL *open_profile)( void *data, DWORD size ); - void (CDECL *close_profile)( void *profile ); - void * (CDECL *create_transform)( void *output, void *target, DWORD intent ); - void * (CDECL *create_multi_transform)( void *profiles, DWORD count, DWORD intent ); - BOOL (CDECL *translate_bits)( void *transform, void *srcbits, BMFORMAT input, - void *dstbits, BMFORMAT output, DWORD size ); - BOOL (CDECL *translate_colors)( void *transform, COLOR *in, DWORD count, COLORTYPE input_type, - COLOR *out, COLORTYPE output_type ); - void (CDECL *close_transform)( void *transform ); -}; - -extern const struct lcms_funcs *lcms_funcs; - extern const char *dbgstr_tag(DWORD) DECLSPEC_HIDDEN; -- 2.30.2

1 0

[PATCH 3/5] mscms/tests: Get rid of workarounds for old Windows versions.
by Hans Leidekker 30 May '22

30 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/tests/Makefile.in | 2 +- dlls/mscms/tests/profile.c | 546 +++++++++++++---------------------- 2 files changed, 195 insertions(+), 353 deletions(-) diff --git a/dlls/mscms/tests/Makefile.in b/dlls/mscms/tests/Makefile.in index 2d229c049ab..5dd9975434a 100644 --- a/dlls/mscms/tests/Makefile.in +++ b/dlls/mscms/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mscms.dll -IMPORTS = advapi32 +IMPORTS = mscms user32 advapi32 C_SRCS = \ profile.c diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e5f924fb2da..c579dc86540 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -30,79 +30,6 @@ #include "wine/test.h" -static HMODULE hmscms; -static HMODULE huser32; - -static BOOL (WINAPI *pAssociateColorProfileWithDeviceA)(PCSTR,PCSTR,PCSTR); -static BOOL (WINAPI *pCloseColorProfile)(HPROFILE); -static HTRANSFORM (WINAPI *pCreateMultiProfileTransform)(PHPROFILE,DWORD,PDWORD,DWORD,DWORD,DWORD); -static BOOL (WINAPI *pDeleteColorTransform)(HTRANSFORM); -static BOOL (WINAPI *pDisassociateColorProfileFromDeviceA)(PCSTR,PCSTR,PCSTR); -static BOOL (WINAPI *pGetColorDirectoryA)(PCHAR,PCHAR,PDWORD); -static BOOL (WINAPI *pGetColorDirectoryW)(PWCHAR,PWCHAR,PDWORD); -static BOOL (WINAPI *pGetColorProfileElement)(HPROFILE,TAGTYPE,DWORD,PDWORD,PVOID,PBOOL); -static BOOL (WINAPI *pGetColorProfileElementTag)(HPROFILE,DWORD,PTAGTYPE); -static BOOL (WINAPI *pGetColorProfileFromHandle)(HPROFILE,PBYTE,PDWORD); -static BOOL (WINAPI *pGetColorProfileHeader)(HPROFILE,PPROFILEHEADER); -static BOOL (WINAPI *pGetCountColorProfileElements)(HPROFILE,PDWORD); -static BOOL (WINAPI *pGetStandardColorSpaceProfileA)(PCSTR,DWORD,PSTR,PDWORD); -static BOOL (WINAPI *pGetStandardColorSpaceProfileW)(PCWSTR,DWORD,PWSTR,PDWORD); -static BOOL (WINAPI *pEnumColorProfilesA)(PCSTR,PENUMTYPEA,PBYTE,PDWORD,PDWORD); -static BOOL (WINAPI *pEnumColorProfilesW)(PCWSTR,PENUMTYPEW,PBYTE,PDWORD,PDWORD); -static BOOL (WINAPI *pInstallColorProfileA)(PCSTR,PCSTR); -static BOOL (WINAPI *pInstallColorProfileW)(PCWSTR,PCWSTR); -static BOOL (WINAPI *pIsColorProfileTagPresent)(HPROFILE,TAGTYPE,PBOOL); -static HPROFILE (WINAPI *pOpenColorProfileA)(PPROFILE,DWORD,DWORD,DWORD); -static HPROFILE (WINAPI *pOpenColorProfileW)(PPROFILE,DWORD,DWORD,DWORD); -static BOOL (WINAPI *pSetColorProfileElement)(HPROFILE,TAGTYPE,DWORD,PDWORD,PVOID); -static BOOL (WINAPI *pSetColorProfileHeader)(HPROFILE,PPROFILEHEADER); -static BOOL (WINAPI *pSetStandardColorSpaceProfileA)(PCSTR,DWORD,PSTR); -static BOOL (WINAPI *pSetStandardColorSpaceProfileW)(PCWSTR,DWORD,PWSTR); -static BOOL (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG); -static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); -static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); - -static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); - -#define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ - if (!p##func) return FALSE; - -static BOOL init_function_ptrs( void ) -{ - GETFUNCPTR( AssociateColorProfileWithDeviceA ) - GETFUNCPTR( CloseColorProfile ) - GETFUNCPTR( CreateMultiProfileTransform ) - GETFUNCPTR( DeleteColorTransform ) - GETFUNCPTR( DisassociateColorProfileFromDeviceA ) - GETFUNCPTR( GetColorDirectoryA ) - GETFUNCPTR( GetColorDirectoryW ) - GETFUNCPTR( GetColorProfileElement ) - GETFUNCPTR( GetColorProfileElementTag ) - GETFUNCPTR( GetColorProfileFromHandle ) - GETFUNCPTR( GetColorProfileHeader ) - GETFUNCPTR( GetCountColorProfileElements ) - GETFUNCPTR( GetStandardColorSpaceProfileA ) - GETFUNCPTR( GetStandardColorSpaceProfileW ) - GETFUNCPTR( EnumColorProfilesA ) - GETFUNCPTR( EnumColorProfilesW ) - GETFUNCPTR( InstallColorProfileA ) - GETFUNCPTR( InstallColorProfileW ) - GETFUNCPTR( IsColorProfileTagPresent ) - GETFUNCPTR( OpenColorProfileA ) - GETFUNCPTR( OpenColorProfileW ) - GETFUNCPTR( SetColorProfileElement ) - GETFUNCPTR( SetColorProfileHeader ) - GETFUNCPTR( SetStandardColorSpaceProfileA ) - GETFUNCPTR( SetStandardColorSpaceProfileW ) - GETFUNCPTR( UninstallColorProfileA ) - GETFUNCPTR( UninstallColorProfileW ) - GETFUNCPTR( TranslateBitmapBits ) - - pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" ); - - return TRUE; -} - static const char machine[] = "dummy"; static const WCHAR machineW[] = L"dummy"; @@ -161,26 +88,24 @@ static void test_GetColorDirectoryA(void) char buffer[MAX_PATH]; /* Parameter checks */ - - ret = pGetColorDirectoryA( NULL, NULL, NULL ); + ret = GetColorDirectoryA( NULL, NULL, NULL ); ok( !ret, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryA( NULL, NULL, &size ); + ret = GetColorDirectoryA( NULL, NULL, &size ); ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryA( NULL, buffer, &size ); + ret = GetColorDirectoryA( NULL, buffer, &size ); ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); size = 1; - ret = pGetColorDirectoryA( NULL, buffer, &size ); + ret = GetColorDirectoryA( NULL, buffer, &size ); ok( !ret && size > 0, "GetColorDirectoryA() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ - size = sizeof(buffer); - ret = pGetColorDirectoryA( NULL, buffer, &size ); + ret = GetColorDirectoryA( NULL, buffer, &size ); ok( ret && size > 0, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); } @@ -191,28 +116,24 @@ static void test_GetColorDirectoryW(void) WCHAR buffer[MAX_PATH]; /* Parameter checks */ - - /* This one crashes win2k - ret = pGetColorDirectoryW( NULL, NULL, NULL ); + ret = GetColorDirectoryW( NULL, NULL, NULL ); ok( !ret, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); - */ size = 0; - ret = pGetColorDirectoryW( NULL, NULL, &size ); + ret = GetColorDirectoryW( NULL, NULL, &size ); ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorDirectoryW( NULL, buffer, &size ); + ret = GetColorDirectoryW( NULL, buffer, &size ); ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); size = 1; - ret = pGetColorDirectoryW( NULL, buffer, &size ); + ret = GetColorDirectoryW( NULL, buffer, &size ); ok( !ret && size > 0, "GetColorDirectoryW() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ - size = sizeof(buffer); - ret = pGetColorDirectoryW( NULL, buffer, &size ); + ret = GetColorDirectoryW( NULL, buffer, &size ); ok( ret && size > 0, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); } @@ -232,31 +153,29 @@ static void test_GetColorProfileElement( char *standardprofile ) profile.pProfileData = standardprofile; profile.cbDataSize = strlen(standardprofile); - handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + handle = OpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ - - ret = pGetColorProfileElement( handle, tag, 0, NULL, NULL, &ref ); + ret = GetColorProfileElement( handle, tag, 0, NULL, NULL, &ref ); ok( !ret, "GetColorProfileElement() succeeded (%lu)\n", GetLastError() ); - ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, NULL ); + ret = GetColorProfileElement( handle, tag, 0, &size, NULL, NULL ); ok( !ret, "GetColorProfileElement() succeeded (%lu)\n", GetLastError() ); size = 0; - ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, &ref ); + ret = GetColorProfileElement( handle, tag, 0, &size, NULL, &ref ); ok( !ret, "GetColorProfileElement() succeeded\n" ); ok( size > 0, "wrong size\n" ); /* Functional checks */ - size = sizeof(buffer); - ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); + ret = GetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); ok( ret, "GetColorProfileElement() failed %lu\n", GetLastError() ); ok( size > 0, "wrong size\n" ); ok( !memcmp( buffer, expect, sizeof(expect)-1 ), "Unexpected tag data\n" ); - pCloseColorProfile( handle ); + CloseColorProfile( handle ); } } @@ -274,29 +193,27 @@ static void test_GetColorProfileElementTag( char *standardprofile ) profile.pProfileData = standardprofile; profile.cbDataSize = strlen(standardprofile); - handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + handle = OpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ - - ret = pGetColorProfileElementTag( NULL, index, &tag ); + ret = GetColorProfileElementTag( NULL, index, &tag ); ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); - ret = pGetColorProfileElementTag( handle, 0, &tag ); + ret = GetColorProfileElementTag( handle, 0, &tag ); ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); - ret = pGetColorProfileElementTag( handle, index, NULL ); + ret = GetColorProfileElementTag( handle, index, NULL ); ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); - ret = pGetColorProfileElementTag( handle, 18, NULL ); + ret = GetColorProfileElementTag( handle, 18, NULL ); ok( !ret, "GetColorProfileElementTag() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ - - while ((ret = pGetColorProfileElementTag( handle, index, &tag )) && tag != expect) index++; + while ((ret = GetColorProfileElementTag( handle, index, &tag )) && tag != expect) index++; ok( ret && tag == expect, "GetColorProfileElementTag() failed (%lu)\n", GetLastError() ); - pCloseColorProfile( handle ); + CloseColorProfile( handle ); } } @@ -315,29 +232,25 @@ static void test_GetColorProfileFromHandle( char *testprofile ) profile.pProfileData = testprofile; profile.cbDataSize = strlen(testprofile); - handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + handle = OpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ - size = 0; - - ret = pGetColorProfileFromHandle( handle, NULL, &size ); + ret = GetColorProfileFromHandle( handle, NULL, &size ); ok( !ret && size > 0, "GetColorProfileFromHandle() failed (%lu)\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, size ); - if (buffer) { - ret = pGetColorProfileFromHandle( NULL, buffer, &size ); + ret = GetColorProfileFromHandle( NULL, buffer, &size ); ok( !ret, "GetColorProfileFromHandle() succeeded (%lu)\n", GetLastError() ); - ret = pGetColorProfileFromHandle( handle, buffer, NULL ); + ret = GetColorProfileFromHandle( handle, buffer, NULL ); ok( !ret, "GetColorProfileFromHandle() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ - - ret = pGetColorProfileFromHandle( handle, buffer, &size ); + ret = GetColorProfileFromHandle( handle, buffer, &size ); ok( ret && size > 0, "GetColorProfileFromHandle() failed (%lu)\n", GetLastError() ); header = (PROFILEHEADER *)buffer; @@ -350,11 +263,10 @@ static void test_GetColorProfileFromHandle( char *testprofile ) ok( header->phIlluminant.ciexyzX == 0xd6f60000, "wrong phIlluminant.ciexyzX %lx\n", header->phIlluminant.ciexyzX ); ok( header->phIlluminant.ciexyzY == 0x00000100, "wrong phIlluminant.ciexyzY %lx\n", header->phIlluminant.ciexyzY ); ok( header->phIlluminant.ciexyzZ == 0x2dd30000, "wrong phIlluminant.ciexyzZ %lx\n", header->phIlluminant.ciexyzZ ); - HeapFree( GetProcessHeap(), 0, buffer ); } - pCloseColorProfile( handle ); + CloseColorProfile( handle ); } } @@ -371,26 +283,24 @@ static void test_GetColorProfileHeader( char *testprofile ) profile.pProfileData = testprofile; profile.cbDataSize = strlen(testprofile); - handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + handle = OpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ - - ret = pGetColorProfileHeader( NULL, NULL ); + ret = GetColorProfileHeader( NULL, NULL ); ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); - ret = pGetColorProfileHeader( NULL, &header ); + ret = GetColorProfileHeader( NULL, &header ); ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); if (0) /* Crashes on Vista */ { - ret = pGetColorProfileHeader( handle, NULL ); - ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); + ret = GetColorProfileHeader( handle, NULL ); + ok( !ret, "GetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); } /* Functional checks */ - - ret = pGetColorProfileHeader( handle, &header ); + ret = GetColorProfileHeader( handle, &header ); ok( ret, "GetColorProfileHeader() failed (%lu)\n", GetLastError() ); ok( header.phClass == 0x6d6e7472, "wrong phClass %#lx\n", header.phClass ); @@ -403,7 +313,7 @@ static void test_GetColorProfileHeader( char *testprofile ) ok( header.phIlluminant.ciexyzY == 0x00010000, "wrong phIlluminant.ciexyzY %#lx\n", header.phIlluminant.ciexyzY ); ok( header.phIlluminant.ciexyzZ == 0x0000d32d, "wrong phIlluminant.ciexyzZ %#lx\n", header.phIlluminant.ciexyzZ ); - pCloseColorProfile( handle ); + CloseColorProfile( handle ); } } @@ -420,24 +330,22 @@ static void test_GetCountColorProfileElements( char *standardprofile ) profile.pProfileData = standardprofile; profile.cbDataSize = strlen(standardprofile); - handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + handle = OpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ - - ret = pGetCountColorProfileElements( NULL, &count ); + ret = GetCountColorProfileElements( NULL, &count ); ok( !ret, "GetCountColorProfileElements() succeeded (%lu)\n", GetLastError() ); - ret = pGetCountColorProfileElements( handle, NULL ); + ret = GetCountColorProfileElements( handle, NULL ); ok( !ret, "GetCountColorProfileElements() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ - - ret = pGetCountColorProfileElements( handle, &count ); + ret = GetCountColorProfileElements( handle, &count ); ok( ret && count > 15 && count < 20, "GetCountColorProfileElements() failed (%lu) %lu\n", GetLastError(), count ); - pCloseColorProfile( handle ); + CloseColorProfile( handle ); } } @@ -448,75 +356,70 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) CHAR oldprofile[MAX_PATH]; CHAR newprofile[MAX_PATH]; - /* Parameter checks */ - /* Single invalid parameter checks: */ - size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ - ret = pGetStandardColorSpaceProfileA(machine, LCS_sRGB, newprofile, &size); + ret = GetStandardColorSpaceProfileA(machine, LCS_sRGB, newprofile, &size); ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ - ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &size); + ret = GetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &size); ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ - ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, NULL); + ret = GetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, NULL); ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ - ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, NULL, &size); + ret = GetStandardColorSpaceProfileA(NULL, LCS_sRGB, NULL, &size); ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, &size); + ret = GetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, &size); ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); /* Several invalid parameter checks: */ - size = 0; SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileA(machine, 0, newprofile, &size); + ret = GetStandardColorSpaceProfileA(machine, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* maybe 2nd and then 4th param, */ - ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, NULL); + ret = GetStandardColorSpaceProfileA(NULL, 0, newprofile, NULL); ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileA(NULL, 0, NULL, &size); + ret = GetStandardColorSpaceProfileA(NULL, 0, NULL, &size); ok( !ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND), "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ - ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &size); + ret = GetStandardColorSpaceProfileA(NULL, 0, newprofile, &size); if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); else ok( !lstrcmpiA( newprofile, "" ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileA() returns %d (GLE=%lu)\n", ret, GetLastError() ); /* Functional checks */ - size = sizeof(oldprofile); - ret = pGetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile, &size ); + ret = GetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile, &size ); ok( ret, "GetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); - ret = pSetStandardColorSpaceProfileA( NULL, LCS_sRGB, standardprofile ); + ret = SetStandardColorSpaceProfileA( NULL, LCS_sRGB, standardprofile ); if (!ret && (GetLastError() == ERROR_ACCESS_DENIED)) { skip("Not enough rights for SetStandardColorSpaceProfileA\n"); @@ -525,10 +428,10 @@ static void test_GetStandardColorSpaceProfileA( char *standardprofile ) ok( ret, "SetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); size = sizeof(newprofile); - ret = pGetStandardColorSpaceProfileA( NULL, LCS_sRGB, newprofile, &size ); + ret = GetStandardColorSpaceProfileA( NULL, LCS_sRGB, newprofile, &size ); ok( ret, "GetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); - ret = pSetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile ); + ret = SetStandardColorSpaceProfileA( NULL, LCS_sRGB, oldprofile ); ok( ret, "SetStandardColorSpaceProfileA() failed (%lu)\n", GetLastError() ); } @@ -540,77 +443,69 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) WCHAR newprofile[MAX_PATH]; CHAR newprofileA[MAX_PATH]; - /* Parameter checks */ - /* Single invalid parameter checks: */ - size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ - ret = pGetStandardColorSpaceProfileW(machineW, LCS_sRGB, newprofile, &size); + ret = GetStandardColorSpaceProfileW(machineW, LCS_sRGB, newprofile, &size); ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ - ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &size); + ret = GetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &size); ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ - ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); - ok( (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) || - broken(ret), /* Win98 and WinME */ + ret = GetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); + ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ - ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, NULL, &size); - ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || - broken(GetLastError() == 0xfaceabee) /* win98 */, + ret = GetStandardColorSpaceProfileW(NULL, LCS_sRGB, NULL, &size); + ok( !ret, "GetStandardColorSpaceProfileW succeeded\n" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ - ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, NULL); + ret = GetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, NULL); ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param. */ - ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, &size); - ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); + ret = GetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, &size); + ok( !ret, "GetStandardColorSpaceProfileW succeeded\n" ); ok( GetLastError() == ERROR_MORE_DATA || - GetLastError() == ERROR_INSUFFICIENT_BUFFER || - broken(GetLastError() == 0xfaceabee) /* win98 */, + GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); /* Several invalid parameter checks: */ - size = 0; SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileW(machineW, 0, newprofile, &size); + ret = GetStandardColorSpaceProfileW(machineW, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* maybe 2nd and then 4th param, */ - ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, NULL); + ret = GetStandardColorSpaceProfileW(NULL, 0, newprofile, NULL); ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileW(NULL, 0, NULL, &size); - ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); + ret = GetStandardColorSpaceProfileW(NULL, 0, NULL, &size); + ok( !ret, "GetStandardColorSpaceProfileW succeeded\n" ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || - GetLastError() == ERROR_FILE_NOT_FOUND || - broken(GetLastError() == 0xfaceabee) /* win98 */, + GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns GLE=%lu\n", GetLastError() ); size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ - ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); + ret = GetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%lu)\n", ret, GetLastError() ); else @@ -621,13 +516,12 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) } /* Functional checks */ - size = sizeof(oldprofile); - ret = pGetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile, &size ); + ret = GetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile, &size ); ok( ret, "GetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); - ret = pSetStandardColorSpaceProfileW( NULL, LCS_sRGB, standardprofileW ); + ret = SetStandardColorSpaceProfileW( NULL, LCS_sRGB, standardprofileW ); if (!ret && (GetLastError() == ERROR_ACCESS_DENIED)) { skip("Not enough rights for SetStandardColorSpaceProfileW\n"); @@ -636,10 +530,10 @@ static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) ok( ret, "SetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); size = sizeof(newprofile); - ret = pGetStandardColorSpaceProfileW( NULL, LCS_sRGB, newprofile, &size ); + ret = GetStandardColorSpaceProfileW( NULL, LCS_sRGB, newprofile, &size ); ok( ret, "GetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); - ret = pSetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile ); + ret = SetStandardColorSpaceProfileW( NULL, LCS_sRGB, oldprofile ); ok( ret, "SetStandardColorSpaceProfileW() failed (%lu)\n", GetLastError() ); } @@ -651,9 +545,7 @@ static void test_EnumColorProfilesA( char *standardprofile ) BYTE *buffer; /* Parameter checks */ - memset( &record, 0, sizeof(ENUMTYPEA) ); - record.dwSize = sizeof(ENUMTYPEA); record.dwVersion = ENUM_TYPE_VERSION; record.dwFields |= ET_DATACOLORSPACE; @@ -661,33 +553,32 @@ static void test_EnumColorProfilesA( char *standardprofile ) total = 0; SetLastError( 0xdeadbeef ); - ret = pEnumColorProfilesA( NULL, &record, NULL, &total, &number ); + ret = EnumColorProfilesA( NULL, &record, NULL, &total, &number ); ok( !ret, "EnumColorProfilesA succeeded\n" ); if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, total ); size = total; - ret = pEnumColorProfilesA( machine, &record, buffer, &size, &number ); + ret = EnumColorProfilesA( machine, &record, buffer, &size, &number ); ok( !ret, "EnumColorProfilesA succeeded\n" ); - ret = pEnumColorProfilesA( NULL, NULL, buffer, &size, &number ); + ret = EnumColorProfilesA( NULL, NULL, buffer, &size, &number ); ok( !ret, "EnumColorProfilesA succeeded\n" ); - ret = pEnumColorProfilesA( NULL, &record, buffer, NULL, &number ); + ret = EnumColorProfilesA( NULL, &record, buffer, NULL, &number ); ok( !ret, "EnumColorProfilesA succeeded\n" ); - ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); + ret = EnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesA failed %lu\n", GetLastError() ); size = 0; - ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); + ret = EnumColorProfilesA( NULL, &record, buffer, &size, &number ); ok( !ret, "EnumColorProfilesA succeeded\n" ); /* Functional checks */ - size = total; - ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); + ret = EnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesA failed %lu\n", GetLastError() ); @@ -702,9 +593,7 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) BYTE *buffer; /* Parameter checks */ - memset( &record, 0, sizeof(ENUMTYPEW) ); - record.dwSize = sizeof(ENUMTYPEW); record.dwVersion = ENUM_TYPE_VERSION; record.dwFields |= ET_DATACOLORSPACE; @@ -712,33 +601,32 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) total = 0; SetLastError( 0xdeadbeef ); - ret = pEnumColorProfilesW( NULL, &record, NULL, &total, &number ); + ret = EnumColorProfilesW( NULL, &record, NULL, &total, &number ); ok( !ret, "EnumColorProfilesW succeeded\n" ); if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, total * sizeof(WCHAR) ); size = total; - ret = pEnumColorProfilesW( machineW, &record, buffer, &size, &number ); + ret = EnumColorProfilesW( machineW, &record, buffer, &size, &number ); ok( !ret, "EnumColorProfilesW succeeded\n" ); - ret = pEnumColorProfilesW( NULL, NULL, buffer, &size, &number ); + ret = EnumColorProfilesW( NULL, NULL, buffer, &size, &number ); ok( !ret, "EnumColorProfilesW succeeded\n" ); - ret = pEnumColorProfilesW( NULL, &record, buffer, NULL, &number ); + ret = EnumColorProfilesW( NULL, &record, buffer, NULL, &number ); ok( !ret, "EnumColorProfilesW succeeded\n" ); - ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); + ret = EnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesW failed %lu\n", GetLastError() ); size = 0; - ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); + ret = EnumColorProfilesW( NULL, &record, buffer, &size, &number ); ok( !ret, "EnumColorProfilesW succeeded\n" ); /* Functional checks */ - size = total; - ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); + ret = EnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesW failed %lu\n", GetLastError() ); @@ -750,24 +638,22 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile BOOL ret; /* Parameter checks */ - - ret = pInstallColorProfileA( NULL, NULL ); + ret = InstallColorProfileA( NULL, NULL ); ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); - ret = pInstallColorProfileA( machine, NULL ); + ret = InstallColorProfileA( machine, NULL ); ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); - ret = pInstallColorProfileA( NULL, machine ); + ret = InstallColorProfileA( NULL, machine ); ok( !ret, "InstallColorProfileA() succeeded (%lu)\n", GetLastError() ); if (standardprofile) { - ret = pInstallColorProfileA( NULL, standardprofile ); + ret = InstallColorProfileA( NULL, standardprofile ); ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); } /* Functional checks */ - if (testprofile) { CHAR dest[MAX_PATH], base[MAX_PATH]; @@ -775,7 +661,7 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile HANDLE handle; SetLastError(0xdeadbeef); - ret = pInstallColorProfileA( NULL, testprofile ); + ret = InstallColorProfileA( NULL, testprofile ); if (!ret && (GetLastError() == ERROR_ACCESS_DENIED)) { skip("Not enough rights for InstallColorProfileA\n"); @@ -783,7 +669,7 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile } ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); - ret = pGetColorDirectoryA( NULL, dest, &size ); + ret = GetColorDirectoryA( NULL, dest, &size ); ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, base ); @@ -795,8 +681,8 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile handle = CreateFileA( dest, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); - - ret = pUninstallColorProfileA( NULL, dest, TRUE ); + + ret = UninstallColorProfileA( NULL, dest, TRUE ); ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); } } @@ -806,24 +692,22 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi BOOL ret; /* Parameter checks */ - - ret = pInstallColorProfileW( NULL, NULL ); + ret = InstallColorProfileW( NULL, NULL ); ok( !ret, "InstallColorProfileW() succeeded (%lu)\n", GetLastError() ); - ret = pInstallColorProfileW( machineW, NULL ); + ret = InstallColorProfileW( machineW, NULL ); ok( !ret, "InstallColorProfileW() succeeded (%lu)\n", GetLastError() ); - ret = pInstallColorProfileW( NULL, machineW ); + ret = InstallColorProfileW( NULL, machineW ); ok( !ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); if (standardprofileW) { - ret = pInstallColorProfileW( NULL, standardprofileW ); + ret = InstallColorProfileW( NULL, standardprofileW ); ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); } /* Functional checks */ - if (testprofileW) { WCHAR dest[MAX_PATH], base[MAX_PATH]; @@ -831,7 +715,7 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi HANDLE handle; SetLastError(0xdeadbeef); - ret = pInstallColorProfileW( NULL, testprofileW ); + ret = InstallColorProfileW( NULL, testprofileW ); if (!ret && (GetLastError() == ERROR_ACCESS_DENIED)) { skip("Not enough rights for InstallColorProfileW\n"); @@ -839,11 +723,10 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi } ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); - ret = pGetColorDirectoryW( NULL, dest, &size ); + ret = GetColorDirectoryW( NULL, dest, &size ); ok( ret, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); MSCMS_basenameW( testprofileW, base ); - lstrcatW( dest, L"\\" ); lstrcatW( dest, base ); @@ -852,7 +735,7 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi ok( handle != INVALID_HANDLE_VALUE, "Couldn't find the profile (%lu)\n", GetLastError() ); CloseHandle( handle ); - ret = pUninstallColorProfileW( NULL, dest, TRUE ); + ret = UninstallColorProfileW( NULL, dest, TRUE ); ok( ret, "UninstallColorProfileW() failed (%lu)\n", GetLastError() ); } } @@ -870,30 +753,26 @@ static void test_IsColorProfileTagPresent( char *standardprofile ) profile.pProfileData = standardprofile; profile.cbDataSize = strlen(standardprofile); - handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + handle = OpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Parameter checks */ - tag = 0; - - ret = pIsColorProfileTagPresent( handle, tag, &present ); + ret = IsColorProfileTagPresent( handle, tag, &present ); ok( !(ret && present), "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); tag = 0x63707274; /* 'cprt' */ - - ret = pIsColorProfileTagPresent( NULL, tag, &present ); + ret = IsColorProfileTagPresent( NULL, tag, &present ); ok( !ret, "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); - ret = pIsColorProfileTagPresent( handle, tag, NULL ); + ret = IsColorProfileTagPresent( handle, tag, NULL ); ok( !ret, "IsColorProfileTagPresent() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ - - ret = pIsColorProfileTagPresent( handle, tag, &present ); + ret = IsColorProfileTagPresent( handle, tag, &present ); ok( ret && present, "IsColorProfileTagPresent() failed (%lu)\n", GetLastError() ); - pCloseColorProfile( handle ); + CloseColorProfile( handle ); } } @@ -908,51 +787,49 @@ static void test_OpenColorProfileA( char *standardprofile ) profile.cbDataSize = 0; /* Parameter checks */ - - handle = pOpenColorProfileA( NULL, 0, 0, 0 ); + handle = OpenColorProfileA( NULL, 0, 0, 0 ); ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); - handle = pOpenColorProfileA( &profile, 0, 0, 0 ); + handle = OpenColorProfileA( &profile, 0, 0, 0 ); ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); - handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); + handle = OpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); - handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, 0 ); + handle = OpenColorProfileA( &profile, PROFILE_READWRITE, 0, 0 ); ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); - ok ( !pCloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); + ok( !CloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); if (standardprofile) { profile.pProfileData = standardprofile; profile.cbDataSize = strlen(standardprofile); - handle = pOpenColorProfileA( &profile, 0, 0, 0 ); + handle = OpenColorProfileA( &profile, 0, 0, 0 ); ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); - handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); + handle = OpenColorProfileA( &profile, PROFILE_READ, 0, 0 ); ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); - handle = pOpenColorProfileA( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); + handle = OpenColorProfileA( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); ok( handle == NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); /* Functional checks */ - - handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + handle = OpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); - ret = pCloseColorProfile( handle ); + ret = CloseColorProfile( handle ); ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = (void *)"sRGB Color Space Profile.icm"; profile.cbDataSize = sizeof("sRGB Color Space Profile.icm"); - handle = pOpenColorProfileA( &profile, PROFILE_READ, FILE_SHARE_READ, OPEN_EXISTING ); + handle = OpenColorProfileA( &profile, PROFILE_READ, FILE_SHARE_READ, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); - ret = pCloseColorProfile( handle ); + ret = CloseColorProfile( handle ); ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); } } @@ -968,41 +845,39 @@ static void test_OpenColorProfileW( WCHAR *standardprofileW ) profile.cbDataSize = 0; /* Parameter checks */ - - handle = pOpenColorProfileW( NULL, 0, 0, 0 ); + handle = OpenColorProfileW( NULL, 0, 0, 0 ); ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); - handle = pOpenColorProfileW( &profile, 0, 0, 0 ); + handle = OpenColorProfileW( &profile, 0, 0, 0 ); ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); - handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); + handle = OpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); - handle = pOpenColorProfileW( &profile, PROFILE_READWRITE, 0, 0 ); + handle = OpenColorProfileW( &profile, PROFILE_READWRITE, 0, 0 ); ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); - ok ( !pCloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); + ok( !CloseColorProfile( NULL ), "CloseColorProfile() succeeded\n" ); if (standardprofileW) { profile.pProfileData = standardprofileW; profile.cbDataSize = lstrlenW(standardprofileW) * sizeof(WCHAR); - handle = pOpenColorProfileW( &profile, 0, 0, 0 ); + handle = OpenColorProfileW( &profile, 0, 0, 0 ); ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); - handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); + handle = OpenColorProfileW( &profile, PROFILE_READ, 0, 0 ); ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); - handle = pOpenColorProfileW( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); + handle = OpenColorProfileW( &profile, PROFILE_READ|PROFILE_READWRITE, 0, 0 ); ok( handle == NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); /* Functional checks */ - - handle = pOpenColorProfileW( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + handle = OpenColorProfileW( &profile, PROFILE_READ, 0, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileW() failed (%lu)\n", GetLastError() ); - ret = pCloseColorProfile( handle ); + ret = CloseColorProfile( handle ); ok( ret, "CloseColorProfile() failed (%lu)\n", GetLastError() ); } } @@ -1025,45 +900,42 @@ static void test_SetColorProfileElement( char *testprofile ) profile.cbDataSize = strlen(testprofile); /* Parameter checks */ - - handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + handle = OpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); - ret = pSetColorProfileElement( handle, tag, 0, &size, data ); + ret = SetColorProfileElement( handle, tag, 0, &size, data ); ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); + CloseColorProfile( handle ); - pCloseColorProfile( handle ); - - handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); + handle = OpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); - ret = pSetColorProfileElement( NULL, 0, 0, NULL, NULL ); + ret = SetColorProfileElement( NULL, 0, 0, NULL, NULL ); ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); - ret = pSetColorProfileElement( handle, 0, 0, NULL, NULL ); + ret = SetColorProfileElement( handle, 0, 0, NULL, NULL ); ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); - ret = pSetColorProfileElement( handle, tag, 0, NULL, NULL ); + ret = SetColorProfileElement( handle, tag, 0, NULL, NULL ); ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); - ret = pSetColorProfileElement( handle, tag, 0, &size, NULL ); + ret = SetColorProfileElement( handle, tag, 0, &size, NULL ); ok( !ret, "SetColorProfileElement() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ - size = sizeof(data); - ret = pSetColorProfileElement( handle, tag, 0, &size, data ); + ret = SetColorProfileElement( handle, tag, 0, &size, data ); ok( ret, "SetColorProfileElement() failed %lu\n", GetLastError() ); size = sizeof(buffer); - ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); + ret = GetColorProfileElement( handle, tag, 0, &size, buffer, &ref ); ok( ret, "GetColorProfileElement() failed %lu\n", GetLastError() ); ok( size > 0, "wrong size\n" ); ok( !memcmp( data, buffer, sizeof(data) ), "Unexpected tag data, expected %s, got %s (%lu)\n", data, buffer, GetLastError() ); - pCloseColorProfile( handle ); + CloseColorProfile( handle ); } } @@ -1103,38 +975,33 @@ static void test_SetColorProfileHeader( char *testprofile ) header.phCreator = 0x48502020; /* Parameter checks */ - - handle = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + handle = OpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); - ret = pSetColorProfileHeader( handle, &header ); + ret = SetColorProfileHeader( handle, &header ); ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); + CloseColorProfile( handle ); - pCloseColorProfile( handle ); - - handle = pOpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); + handle = OpenColorProfileA( &profile, PROFILE_READWRITE, 0, OPEN_EXISTING ); ok( handle != NULL, "OpenColorProfileA() failed (%lu)\n", GetLastError() ); - ret = pSetColorProfileHeader( NULL, NULL ); + ret = SetColorProfileHeader( NULL, NULL ); ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); - ret = pSetColorProfileHeader( handle, NULL ); + ret = SetColorProfileHeader( handle, NULL ); ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); - ret = pSetColorProfileHeader( NULL, &header ); + ret = SetColorProfileHeader( NULL, &header ); ok( !ret, "SetColorProfileHeader() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ - - ret = pSetColorProfileHeader( handle, &header ); + ret = SetColorProfileHeader( handle, &header ); ok( ret, "SetColorProfileHeader() failed (%lu)\n", GetLastError() ); - ret = pGetColorProfileHeader( handle, &header ); + ret = GetColorProfileHeader( handle, &header ); ok( ret, "GetColorProfileHeader() failed (%lu)\n", GetLastError() ); - ok( !memcmp( &header, rgbheader, sizeof(rgbheader) ), "Unexpected header data\n" ); - - pCloseColorProfile( handle ); + CloseColorProfile( handle ); } } @@ -1143,15 +1010,13 @@ static void test_UninstallColorProfileA( char *testprofile ) BOOL ret; /* Parameter checks */ - - ret = pUninstallColorProfileA( NULL, NULL, FALSE ); + ret = UninstallColorProfileA( NULL, NULL, FALSE ); ok( !ret, "UninstallColorProfileA() succeeded (%lu)\n", GetLastError() ); - ret = pUninstallColorProfileA( machine, NULL, FALSE ); + ret = UninstallColorProfileA( machine, NULL, FALSE ); ok( !ret, "UninstallColorProfileA() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ - if (testprofile) { CHAR dest[MAX_PATH], base[MAX_PATH]; @@ -1159,7 +1024,7 @@ static void test_UninstallColorProfileA( char *testprofile ) HANDLE handle; SetLastError(0xdeadbeef); - ret = pInstallColorProfileA( NULL, testprofile ); + ret = InstallColorProfileA( NULL, testprofile ); if (!ret && (GetLastError() == ERROR_ACCESS_DENIED)) { skip("Not enough rights for InstallColorProfileA\n"); @@ -1167,15 +1032,14 @@ static void test_UninstallColorProfileA( char *testprofile ) } ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); - ret = pGetColorDirectoryA( NULL, dest, &size ); + ret = GetColorDirectoryA( NULL, dest, &size ); ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, base ); - lstrcatA( dest, "\\" ); lstrcatA( dest, base ); - ret = pUninstallColorProfileA( NULL, dest, TRUE ); + ret = UninstallColorProfileA( NULL, dest, TRUE ); ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); /* Check if the profile is really gone */ @@ -1190,15 +1054,13 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) BOOL ret; /* Parameter checks */ - - ret = pUninstallColorProfileW( NULL, NULL, FALSE ); + ret = UninstallColorProfileW( NULL, NULL, FALSE ); ok( !ret, "UninstallColorProfileW() succeeded (%lu)\n", GetLastError() ); - ret = pUninstallColorProfileW( machineW, NULL, FALSE ); + ret = UninstallColorProfileW( machineW, NULL, FALSE ); ok( !ret, "UninstallColorProfileW() succeeded (%lu)\n", GetLastError() ); /* Functional checks */ - if (testprofileW) { WCHAR dest[MAX_PATH], base[MAX_PATH]; @@ -1208,7 +1070,7 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) int bytes_copied; SetLastError(0xdeadbeef); - ret = pInstallColorProfileW( NULL, testprofileW ); + ret = InstallColorProfileW( NULL, testprofileW ); if (!ret && (GetLastError() == ERROR_ACCESS_DENIED)) { skip("Not enough rights for InstallColorProfileW\n"); @@ -1216,15 +1078,14 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) } ok( ret, "InstallColorProfileW() failed (%lu)\n", GetLastError() ); - ret = pGetColorDirectoryW( NULL, dest, &size ); + ret = GetColorDirectoryW( NULL, dest, &size ); ok( ret, "GetColorDirectoryW() failed (%lu)\n", GetLastError() ); MSCMS_basenameW( testprofileW, base ); - lstrcatW( dest, L"\\" ); lstrcatW( dest, base ); - ret = pUninstallColorProfileW( NULL, dest, TRUE ); + ret = UninstallColorProfileW( NULL, dest, TRUE ); ok( ret, "UninstallColorProfileW() failed (%lu)\n", GetLastError() ); bytes_copied = WideCharToMultiByte(CP_ACP, 0, dest, -1, destA, MAX_PATH, NULL, NULL); @@ -1244,69 +1105,69 @@ static void test_AssociateColorProfileWithDeviceA( char *testprofile ) DISPLAY_DEVICEA display, monitor; BOOL res; - if (testprofile && pEnumDisplayDevicesA) + if (testprofile) { display.cb = sizeof( DISPLAY_DEVICEA ); - res = pEnumDisplayDevicesA( NULL, 0, &display, 0 ); + res = EnumDisplayDevicesA( NULL, 0, &display, 0 ); ok( res, "Can't get display info\n" ); monitor.cb = sizeof( DISPLAY_DEVICEA ); - res = pEnumDisplayDevicesA( display.DeviceName, 0, &monitor, 0 ); + res = EnumDisplayDevicesA( display.DeviceName, 0, &monitor, 0 ); if (res) { SetLastError(0xdeadbeef); - ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, NULL ); + ret = AssociateColorProfileWithDeviceA( "machine", testprofile, NULL ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); - ret = pAssociateColorProfileWithDeviceA( "machine", NULL, monitor.DeviceID ); + ret = AssociateColorProfileWithDeviceA( "machine", NULL, monitor.DeviceID ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); - ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, monitor.DeviceID ); + ret = AssociateColorProfileWithDeviceA( "machine", testprofile, monitor.DeviceID ); error = GetLastError(); ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %lu\n", error ); - ret = pInstallColorProfileA( NULL, testprofile ); + ret = InstallColorProfileA( NULL, testprofile ); ok( ret, "InstallColorProfileA() failed (%lu)\n", GetLastError() ); - ret = pGetColorDirectoryA( NULL, profile, &size ); + ret = GetColorDirectoryA( NULL, profile, &size ); ok( ret, "GetColorDirectoryA() failed (%lu)\n", GetLastError() ); MSCMS_basenameA( testprofile, basename ); lstrcatA( profile, "\\" ); lstrcatA( profile, basename ); - ret = pAssociateColorProfileWithDeviceA( NULL, profile, monitor.DeviceID ); + ret = AssociateColorProfileWithDeviceA( NULL, profile, monitor.DeviceID ); ok( ret, "AssociateColorProfileWithDevice() failed (%lu)\n", GetLastError() ); SetLastError(0xdeadbeef); - ret = pDisassociateColorProfileFromDeviceA( "machine", profile, NULL ); + ret = DisassociateColorProfileFromDeviceA( "machine", profile, NULL ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); - ret = pDisassociateColorProfileFromDeviceA( "machine", NULL, monitor.DeviceID ); + ret = DisassociateColorProfileFromDeviceA( "machine", NULL, monitor.DeviceID ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error ); SetLastError(0xdeadbeef); - ret = pDisassociateColorProfileFromDeviceA( "machine", profile, monitor.DeviceID ); + ret = DisassociateColorProfileFromDeviceA( "machine", profile, monitor.DeviceID ); error = GetLastError(); ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %lu\n", error ); - ret = pDisassociateColorProfileFromDeviceA( NULL, profile, monitor.DeviceID ); + ret = DisassociateColorProfileFromDeviceA( NULL, profile, monitor.DeviceID ); ok( ret, "DisassociateColorProfileFromDeviceA() failed (%lu)\n", GetLastError() ); - ret = pUninstallColorProfileA( NULL, profile, TRUE ); + ret = UninstallColorProfileA( NULL, profile, TRUE ); ok( ret, "UninstallColorProfileA() failed (%lu)\n", GetLastError() ); } else @@ -1321,7 +1182,7 @@ static BOOL have_profile(void) HANDLE handle; WIN32_FIND_DATAA data; - if (!pGetColorDirectoryA( NULL, glob, &size )) return FALSE; + if (!GetColorDirectoryA( NULL, glob, &size )) return FALSE; lstrcatA( glob, "\\*.icm" ); handle = FindFirstFileA( glob, &data ); if (handle == INVALID_HANDLE_VALUE) return FALSE; @@ -1342,22 +1203,22 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp profile.pProfileData = standardprofile; profile.cbDataSize = strlen(standardprofile); - handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + handle[0] = OpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); ok( handle[0] != NULL, "got %lu\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = testprofile; profile.cbDataSize = strlen(testprofile); - handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); + handle[1] = OpenColorProfileA( &profile, PROFILE_READ, 0, OPEN_EXISTING ); ok( handle[1] != NULL, "got %lu\n", GetLastError() ); - transform = pCreateMultiProfileTransform( handle, 2, intents, 2, 0, 0 ); + transform = CreateMultiProfileTransform( handle, 2, intents, 2, 0, 0 ); ok( transform != NULL, "got %lu\n", GetLastError() ); - pDeleteColorTransform( transform ); - pCloseColorProfile( handle[0] ); - pCloseColorProfile( handle[1] ); + DeleteColorTransform( transform ); + CloseColorProfile( handle[0] ); + CloseColorProfile( handle[1] ); } } @@ -1380,42 +1241,42 @@ static void test_TranslateBitmapBits( char *standardprofile, char *testprofile ) profile.pProfileData = standardprofile; profile.cbDataSize = strlen(standardprofile); - handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + handle[0] = OpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); ok( handle[0] != NULL, "got %lu\n", GetLastError() ); profile.dwType = PROFILE_FILENAME; profile.pProfileData = testprofile; profile.cbDataSize = strlen(testprofile); - handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + handle[1] = OpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); ok( handle[1] != NULL, "got %lu\n", GetLastError() ); - transform = pCreateMultiProfileTransform( handle, 2, &intent, 1, 0, 0 ); + transform = CreateMultiProfileTransform( handle, 2, &intent, 1, 0, 0 ); ok( transform != NULL, "got %lu\n", GetLastError() ); memset( destbits, 0, sizeof(destbits) ); - ret = pTranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xBGRQUADS, 4, NULL, 0 ); + ret = TranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xBGRQUADS, 4, NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); ok( !memcmp(expect_destbits, destbits, sizeof(expect_destbits)), "unexpected destbits\n" ); memset( destbits, 0, sizeof(destbits) ); - ret = pTranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xRGBQUADS, 4, NULL, 0 ); + ret = TranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xRGBQUADS, 4, NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); ok( !memcmp(expect_destbits2, destbits, sizeof(expect_destbits2)), "unexpected destbits\n" ); memset( destbits, 0, sizeof(destbits) ); - ret = pTranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_RGBTRIPLETS, 3, NULL, 0 ); + ret = TranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_RGBTRIPLETS, 3, NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); ok( !memcmp(expect_destbits3, destbits, sizeof(expect_destbits3)), "unexpected destbits\n" ); memset( destbits, 0, sizeof(destbits) ); - ret = pTranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_BGRTRIPLETS, 3, NULL, 0 ); + ret = TranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_BGRTRIPLETS, 3, NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); ok( !memcmp(expect_destbits4, destbits, sizeof(expect_destbits4)), "unexpected destbits\n" ); - pDeleteColorTransform( transform ); - pCloseColorProfile( handle[0] ); - pCloseColorProfile( handle[1] ); + DeleteColorTransform( transform ); + CloseColorProfile( handle[0] ); + CloseColorProfile( handle[1] ); } START_TEST(profile) @@ -1428,23 +1289,6 @@ START_TEST(profile) WCHAR *standardprofileW = NULL, *testprofileW = NULL; UINT ret; - hmscms = LoadLibraryA( "mscms.dll" ); - if (!hmscms) return; - - huser32 = LoadLibraryA( "user32.dll" ); - if (!huser32) - { - FreeLibrary( hmscms ); - return; - } - - if (!init_function_ptrs()) - { - FreeLibrary( huser32 ); - FreeLibrary( hmscms ); - return; - } - /* See if we can find the standard color profile */ ret = GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", ret, GetLastError()); @@ -1531,6 +1375,4 @@ START_TEST(profile) test_TranslateBitmapBits( standardprofile, testprofile ); if (testprofile) DeleteFileA( testprofile ); - FreeLibrary( huser32 ); - FreeLibrary( hmscms ); } -- 2.30.2

1 0

[PATCH 2/5] mscms: make the correct value for bmformat.
by Hans Leidekker 30 May '22

30 May '22

From: Zhao Yi <zhaoyi(a)uniontech.com> Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/tests/profile.c | 8 ++++---- dlls/mscms/transform.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 025b1531796..e5f924fb2da 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -1396,22 +1396,22 @@ static void test_TranslateBitmapBits( char *standardprofile, char *testprofile ) memset( destbits, 0, sizeof(destbits) ); ret = pTranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xBGRQUADS, 4, NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); - todo_wine ok( !memcmp(expect_destbits, destbits, sizeof(expect_destbits)), "unexpected destbits\n" ); + ok( !memcmp(expect_destbits, destbits, sizeof(expect_destbits)), "unexpected destbits\n" ); memset( destbits, 0, sizeof(destbits) ); ret = pTranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xRGBQUADS, 4, NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); - todo_wine ok( !memcmp(expect_destbits2, destbits, sizeof(expect_destbits2)), "unexpected destbits\n" ); + ok( !memcmp(expect_destbits2, destbits, sizeof(expect_destbits2)), "unexpected destbits\n" ); memset( destbits, 0, sizeof(destbits) ); ret = pTranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_RGBTRIPLETS, 3, NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); - todo_wine ok( !memcmp(expect_destbits3, destbits, sizeof(expect_destbits3)), "unexpected destbits\n" ); + ok( !memcmp(expect_destbits3, destbits, sizeof(expect_destbits3)), "unexpected destbits\n" ); memset( destbits, 0, sizeof(destbits) ); ret = pTranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_BGRTRIPLETS, 3, NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); - todo_wine ok( !memcmp(expect_destbits4, destbits, sizeof(expect_destbits4)), "unexpected destbits\n" ); + ok( !memcmp(expect_destbits4, destbits, sizeof(expect_destbits4)), "unexpected destbits\n" ); pDeleteColorTransform( transform ); pCloseColorProfile( handle[0] ); diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..22901ad721c 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format ) switch (format) { - case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; - case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; + case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break; case BM_GRAY: ret = TYPE_GRAY_8; break; - case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; - case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; - case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; + case BM_xRGBQUADS: ret = TYPE_BGRA_8; break; + case BM_xBGRQUADS: ret = TYPE_RGBA_8; break; + case BM_KYMCQUADS: ret = TYPE_CMYK_8; break; default: if (!quietfixme) { -- 2.30.2

1 0

[PATCH 1/5] mscms/tests: Add TranslateBitmapBits tests.
by Hans Leidekker 30 May '22

30 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/tests/profile.c | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..025b1531796 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -58,6 +58,7 @@ static BOOL (WINAPI *pSetColorProfileElement)(HPROFILE,TAGTYPE,DWORD,PDWORD, static BOOL (WINAPI *pSetColorProfileHeader)(HPROFILE,PPROFILEHEADER); static BOOL (WINAPI *pSetStandardColorSpaceProfileA)(PCSTR,DWORD,PSTR); static BOOL (WINAPI *pSetStandardColorSpaceProfileW)(PCWSTR,DWORD,PWSTR); +static BOOL (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG); static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); @@ -95,6 +96,7 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( SetStandardColorSpaceProfileW ) GETFUNCPTR( UninstallColorProfileA ) GETFUNCPTR( UninstallColorProfileW ) + GETFUNCPTR( TranslateBitmapBits ) pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" ); @@ -1359,6 +1361,63 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp } } +static void test_TranslateBitmapBits( char *standardprofile, char *testprofile ) +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intent = INTENT_PERCEPTUAL; + BYTE srcbits[] = {0x00, 0x00, 0xff}, srcbits2[] = {0xcc, 0x00, 0x00, 0xff}, destbits[4]; + const BYTE expect_destbits[] = {0xff, 0x00, 0x00, 0x00}; + const BYTE expect_destbits2[] = {0x00, 0x00, 0xff, 0x00}; + const BYTE expect_destbits3[] = {0xcc, 0x00, 0x00}; + const BYTE expect_destbits4[] = {0x00, 0x00, 0xcc}; + BOOL ret; + + if (!standardprofile) return; + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standardprofile; + profile.cbDataSize = strlen(standardprofile); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = testprofile; + profile.cbDataSize = strlen(testprofile); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, &intent, 1, 0, 0 ); + ok( transform != NULL, "got %lu\n", GetLastError() ); + + memset( destbits, 0, sizeof(destbits) ); + ret = pTranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xBGRQUADS, 4, NULL, 0 ); + ok( ret, "got %lu\n", GetLastError() ); + todo_wine ok( !memcmp(expect_destbits, destbits, sizeof(expect_destbits)), "unexpected destbits\n" ); + + memset( destbits, 0, sizeof(destbits) ); + ret = pTranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xRGBQUADS, 4, NULL, 0 ); + ok( ret, "got %lu\n", GetLastError() ); + todo_wine ok( !memcmp(expect_destbits2, destbits, sizeof(expect_destbits2)), "unexpected destbits\n" ); + + memset( destbits, 0, sizeof(destbits) ); + ret = pTranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_RGBTRIPLETS, 3, NULL, 0 ); + ok( ret, "got %lu\n", GetLastError() ); + todo_wine ok( !memcmp(expect_destbits3, destbits, sizeof(expect_destbits3)), "unexpected destbits\n" ); + + memset( destbits, 0, sizeof(destbits) ); + ret = pTranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_BGRTRIPLETS, 3, NULL, 0 ); + ok( ret, "got %lu\n", GetLastError() ); + todo_wine ok( !memcmp(expect_destbits4, destbits, sizeof(expect_destbits4)), "unexpected destbits\n" ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); +} + START_TEST(profile) { UINT len; @@ -1469,6 +1528,7 @@ START_TEST(profile) test_AssociateColorProfileWithDeviceA( testprofile ); test_CreateMultiProfileTransform( standardprofile, testprofile ); + test_TranslateBitmapBits( standardprofile, testprofile ); if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); -- 2.30.2

1 0

[PATCH 1/3] conhost: Save console settings as global defaults on first run
by Hugh McMaster 30 May '22

30 May '22

On Windows, HKCU\Console holds global default settings, while subkeys hold any app-specific settings that differ from the defaults. Wine's conhost.exe implementation currently saves all console settings to an app-specific subkey on the first run, while global defaults are only saved to HKCU\Console if the user selects 'Set Defaults' from the pop-up menu and saves new settings. This is the opposite of console behaviour on Windows. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 5e8c3e15a4f..019925789fd 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -850,7 +850,7 @@ static void set_first_font( struct console *console, struct console_config *conf if (fc.pass > 5) ERR("Unable to find a valid console font\n"); - /* Save font configuration to the registry */ + /* Update active configuration */ config->cell_width = console->active->font.width; config->cell_height = console->active->font.height; config->font_pitch_family = console->active->font.pitch_family; @@ -858,7 +858,8 @@ static void set_first_font( struct console *console, struct console_config *conf console->active->font.face_len * sizeof(WCHAR) ); config->face_name[console->active->font.face_len] = 0; - save_config( console->window->config_key, config ); + /* Save default console configuration to the registry */ + save_config( NULL, config ); } /* Sets the font specified in the LOGFONT as the new console font */ -- 2.36.1

2 5

[PATCH v3 4/4] mshtml/tests: Add HTMLStorage tests.
by Hans Leidekker 30 May '22

30 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/tests/misc.c | 190 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 1702a24c804..410d24884ee 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "mshtml.h" #include "initguid.h" #include "optary.h" @@ -106,11 +107,200 @@ static void test_HTMLLoadOptions(void) IHtmlLoadOptions_Release(loadopts); } +static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) +{ + BSTR url; + IBindCtx *bc; + IMoniker *url_mon; + IPersistMoniker *persist_mon; + IHTMLDocument2 *doc; + HRESULT hres; + + hres = CreateBindCtx(0, &bc); + ok(hres == S_OK, "CreateBindCtx failed: 0x%08lx\n", hres); + + url = SysAllocString(start_url); + hres = CreateURLMoniker(NULL, url, &url_mon); + ok(hres == S_OK, "CreateURLMoniker failed: 0x%08lx\n", hres); + + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, + CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, + (void**)&doc); + ok(hres == S_OK, "CoCreateInstance failed: 0x%08lx\n", hres); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker, + (void**)&persist_mon); + ok(hres == S_OK, "IHTMLDocument2_QueryInterface failed: 0x%08lx\n", hres); + + hres = IPersistMoniker_Load(persist_mon, FALSE, url_mon, bc, + STGM_SHARE_EXCLUSIVE | STGM_READWRITE); + ok(hres == S_OK, "IPersistMoniker_Load failed: 0x%08lx\n", hres); + + IPersistMoniker_Release(persist_mon); + IMoniker_Release(url_mon); + IBindCtx_Release(bc); + SysFreeString(url); + return doc; +} + +static HRESULT get_localstorage(IHTMLDocument2 *doc, IHTMLStorage **storage) +{ + IHTMLWindow2 *window; + IHTMLWindow6 *window6; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); + ok(window != NULL, "window == NULL\n"); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow6, (void**)&window6); + IHTMLWindow2_Release(window); + if(FAILED(hres)) { + win_skip("IHTMLWindow6 not supported\n"); + return hres; + } + + hres = IHTMLWindow6_get_localStorage(window6, storage); + ok(hres == S_OK, "get_localStorage failed: %08lx\n", hres); + ok(*storage != NULL, "*storage == NULL\n"); + + IHTMLWindow6_Release(window6); + return hres; +} + +static void test_HTMLStorage(void) +{ + IHTMLDocument2 *doc, *doc2; + IHTMLStorage *storage, *storage2; + VARIANT var; + BSTR key, value; + HRESULT hres; + + doc = create_doc_from_url(L"http://www.codeweavers.com/"); + doc2 = create_doc_from_url(L"http://www.codeweavers.com/"); + + hres = get_localstorage(doc, &storage); + ok(hres == S_OK, "got %08lx\n", hres); + + hres = get_localstorage(doc2, &storage2); + ok(hres == S_OK, "got %08lx\n", hres); + + key = SysAllocString(L""); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + key = SysAllocString(L"undefined"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + value = SysAllocString(L"null"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"null"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + SysFreeString(value); + + key = SysAllocString(L"winetest"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + /* retrieve value from different storage instance */ + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"winetest"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + SysFreeString(value); + + /* item doesn't exist */ + key = SysAllocString(L"nosuch"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + + hres = IHTMLStorage_getItem(storage, NULL, NULL); + ok(hres == E_POINTER, "getItem returned: %08lx\n", hres); + + hres = IHTMLStorage_getItem(storage, key, NULL); + ok(hres == E_POINTER, "getItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, NULL, &var); + ok(hres == S_OK, "getItem returned: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + hres = IHTMLStorage_setItem(storage, NULL, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + key = SysAllocString(L"winetest2"); + hres = IHTMLStorage_setItem(storage, key, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_setItem(storage, NULL, key); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + + hres = IHTMLStorage_removeItem(storage, NULL); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + /* Unicode characters */ + key = SysAllocString(L"winetest"); + value = SysAllocString(L"\x20ac"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + key = SysAllocString(L"\x20ac"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + IHTMLStorage_Release(storage); + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc); + IHTMLDocument2_Release(doc2); +} + START_TEST(misc) { CoInitialize(NULL); test_HTMLLoadOptions(); + test_HTMLStorage(); CoUninitialize(); } -- 2.30.2

2 1

[PATCH v3 3/4] mshtml: Implement HTMLStorage_removeItem().
by Hans Leidekker 30 May '22

30 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 56 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index f7b92114622..1983d87a296 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -454,11 +454,63 @@ static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BST return hres; } +static HRESULT remove_item(const WCHAR *filename, BSTR key) +{ + IXMLDOMDocument *doc; + IXMLDOMNode *root = NULL, *node = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_document(filename, &doc); + if(hres != S_OK) + return hres; + + hres = get_root_node(doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_removeChild(root, node, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_document(doc, filename); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + return hres; +} + static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrKey)); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(bstrKey)); + + if(!This->filename) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + WaitForSingleObject(This->mutex, INFINITE); + hres = remove_item(This->filename, bstrKey); + ReleaseMutex(This->mutex); + + return hres; } static HRESULT WINAPI HTMLStorage_clear(IHTMLStorage *iface) -- 2.30.2

2 1

[PATCH v3 2/4] mshtml: Implement HTMLStorage_setItem().
by Hans Leidekker 30 May '22

30 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 113 +++++++++++++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 8ef92453b95..f7b92114622 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -338,11 +338,120 @@ static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VAR return hres; } +static HRESULT set_attribute(IXMLDOMElement *elem, const WCHAR *name, BSTR value) +{ + BSTR str; + VARIANT var; + HRESULT hres; + + str = SysAllocString(name); + if(!str) + return E_OUTOFMEMORY; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = value; + + hres = IXMLDOMElement_setAttribute(elem, str, var); + SysFreeString(str); + return hres; +} + +static HRESULT save_document(IXMLDOMDocument *doc, const WCHAR *filename) +{ + VARIANT var; + HRESULT hres; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(filename); + if(!V_BSTR(&var)) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_save(doc, var); + SysFreeString(V_BSTR(&var)); + return hres; +} + +static HRESULT set_item(const WCHAR *filename, BSTR key, BSTR value) +{ + IXMLDOMDocument *doc; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_document(filename, &doc); + if(hres != S_OK) + return hres; + + hres = get_root_node(doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + }else { + BSTR str = SysAllocString(L"item"); + hres = IXMLDOMDocument_createElement(doc, str, &elem); + SysFreeString(str); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"name", key); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + + hres = IXMLDOMNode_appendChild(root, (IXMLDOMNode*)elem, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_document(doc, filename); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + return hres; +} + static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); + + if(!This->filename) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + WaitForSingleObject(This->mutex, INFINITE); + hres = set_item(This->filename, bstrKey, bstrValue); + ReleaseMutex(This->mutex); + + return hres; } static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) -- 2.30.2

3 2

[PATCH v3 1/4] mshtml: Implement HTMLStorage_getItem().
by Hans Leidekker 30 May '22

30 May '22

v2: Store filename. v3: Store mutex. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 269 ++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlwindow.c | 4 +- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 267 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 95f7ae5cd16..8ef92453b95 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "shlobj.h" #include "wine/debug.h" @@ -35,6 +36,8 @@ typedef struct { DispatchEx dispex; IHTMLStorage IHTMLStorage_iface; LONG ref; + WCHAR *filename; + HANDLE mutex; } HTMLStorage; static inline HTMLStorage *impl_from_IHTMLStorage(IHTMLStorage *iface) @@ -83,6 +86,8 @@ static ULONG WINAPI HTMLStorage_Release(IHTMLStorage *iface) if(!ref) { release_dispex(&This->dispex); + heap_free(This->filename); + CloseHandle(This->mutex); heap_free(This); } @@ -121,6 +126,103 @@ static HRESULT WINAPI HTMLStorage_Invoke(IHTMLStorage *iface, DISPID dispIdMembe pDispParams, pVarResult, pExcepInfo, puArgErr); } +static BOOL create_path(const WCHAR *path) +{ + BOOL ret = TRUE; + WCHAR *new_path; + int len; + + new_path = heap_alloc((wcslen(path) + 1) * sizeof(WCHAR)); + if(!new_path) + return FALSE; + wcscpy(new_path, path); + + while((len = wcslen(new_path)) && new_path[len - 1] == '\\') + new_path[len - 1] = 0; + + while(!CreateDirectoryW(new_path, NULL)) { + WCHAR *slash; + DWORD error = GetLastError(); + if(error == ERROR_ALREADY_EXISTS) break; + if(error != ERROR_PATH_NOT_FOUND) { + ret = FALSE; + break; + } + slash = wcsrchr(new_path, '\\'); + if(!slash) { + ret = FALSE; + break; + } + len = slash - new_path; + new_path[len] = 0; + if(!create_path(new_path)) { + ret = FALSE; + break; + } + new_path[len] = '\\'; + } + heap_free(new_path); + return ret; +} + +static HRESULT open_document(const WCHAR *filename, IXMLDOMDocument **ret) +{ + IXMLDOMDocument *doc = NULL; + HRESULT hres = E_OUTOFMEMORY; + WCHAR *ptr, *path; + VARIANT var; + VARIANT_BOOL success; + + path = heap_strdupW(filename); + if(!path) + return E_OUTOFMEMORY; + + *(ptr = wcsrchr(path, '\\')) = 0; + if(!create_path(path)) + goto done; + + if(GetFileAttributesW(filename) == INVALID_FILE_ATTRIBUTES) { + DWORD count; + HANDLE file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + if(file == INVALID_HANDLE_VALUE) { + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + if(!WriteFile(file, "<root/>", sizeof("<root/>") - 1, &count, NULL)) { + CloseHandle(file); + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + CloseHandle(file); + } + + hres = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); + if(hres != S_OK) + goto done; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(filename); + if(!V_BSTR(&var)) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMDocument_load(doc, var, &success); + if(hres == S_FALSE || success == VARIANT_FALSE) + hres = E_FAIL; + + SysFreeString(V_BSTR(&var)); + +done: + heap_free(path); + if(hres == S_OK) + *ret = doc; + else if(doc) + IXMLDOMDocument_Release(doc); + + return hres; +} + static HRESULT WINAPI HTMLStorage_get_length(IHTMLStorage *iface, LONG *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); @@ -142,14 +244,98 @@ static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) return E_NOTIMPL; } -static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *p) +static BSTR build_query(const WCHAR *key) +{ + static const WCHAR fmt[] = L"item[@name='%s']"; + const WCHAR *str = key ? key : L""; + UINT len = ARRAY_SIZE(fmt) + wcslen(str); + BSTR ret = SysAllocStringLen(NULL, len); + + if(ret) swprintf(ret, len, fmt, str); + return ret; +} + +static HRESULT get_root_node(IXMLDOMDocument *doc, IXMLDOMNode **root) +{ + HRESULT hres; + BSTR str; + + str = SysAllocString(L"root"); + if(!str) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_selectSingleNode(doc, str, root); + SysFreeString(str); + return hres; +} + +static HRESULT get_item(const WCHAR *filename, BSTR key, VARIANT *value) +{ + IXMLDOMDocument *doc; + BSTR query = NULL; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + HRESULT hres; + + hres = open_document(filename, &doc); + if(hres != S_OK) + return hres; + + hres = get_root_node(doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = IXMLDOMElement_getAttribute(elem, (BSTR)L"value", value); + }else { + V_VT(value) = VT_NULL; + hres = S_OK; + } + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + return hres; +} + +static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *value) { HTMLStorage *This = impl_from_IHTMLStorage(iface); + HRESULT hres; - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), p); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), value); - V_VT(p) = VT_NULL; - return S_OK; + if(!value) + return E_POINTER; + + if(!This->filename) { + FIXME("session storage not supported\n"); + V_VT(value) = VT_NULL; + return S_OK; + } + + WaitForSingleObject(This->mutex, INFINITE); + hres = get_item(This->filename, bstrKey, value); + ReleaseMutex(This->mutex); + + return hres; } static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) @@ -201,7 +387,59 @@ static dispex_static_data_t HTMLStorage_dispex = { HTMLStorage_iface_tids }; -HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) +static WCHAR *build_filename(IUri *uri) +{ + static const WCHAR store[] = L"\\Microsoft\\Internet Explorer\\DOMStore\\"; + WCHAR path[MAX_PATH], *ret; + BSTR hostname; + HRESULT hres; + int len; + + hres = IUri_GetHost(uri, &hostname); + if(hres != S_OK) + return NULL; + + if(!SHGetSpecialFolderPathW(NULL, path, CSIDL_LOCAL_APPDATA, TRUE)) { + ERR("Can't get folder path %lu\n", GetLastError()); + SysFreeString(hostname); + return NULL; + } + + len = wcslen(path); + if(len + ARRAY_SIZE(store) > ARRAY_SIZE(path)) { + ERR("Path too long\n"); + SysFreeString(hostname); + return NULL; + } + memcpy(path + len, store, sizeof(store)); + + len += ARRAY_SIZE(store); + ret = heap_alloc((len + wcslen(hostname) + ARRAY_SIZE(L".xml")) * sizeof(WCHAR)); + if(!ret) { + SysFreeString(hostname); + return NULL; + } + + wcscpy(ret, path); + wcscat(ret, hostname); + wcscat(ret, L".xml"); + + SysFreeString(hostname); + return ret; +} + +static WCHAR *build_mutexname(const WCHAR *filename) +{ + WCHAR *ret, *ptr; + ret = heap_strdupW(filename); + if(!ret) + return NULL; + for(ptr = ret; *ptr; ptr++) + if(*ptr == '\\') *ptr = '_'; + return ret; +} + +HRESULT create_html_storage(compat_mode_t compat_mode, IUri *uri, IHTMLStorage **p) { HTMLStorage *storage; @@ -209,6 +447,27 @@ HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) if(!storage) return E_OUTOFMEMORY; + if(uri) { + WCHAR *mutexname; + if(!(storage->filename = build_filename(uri))) { + heap_free(storage); + return E_OUTOFMEMORY; + } + mutexname = build_mutexname(storage->filename); + if(!mutexname) { + heap_free(storage->filename); + heap_free(storage); + return E_OUTOFMEMORY; + } + storage->mutex = CreateMutexW(NULL, FALSE, mutexname); + heap_free(mutexname); + if(!storage->mutex) { + heap_free(storage->filename); + heap_free(storage); + return HRESULT_FROM_WIN32(GetLastError()); + } + } + storage->IHTMLStorage_iface.lpVtbl = &HTMLStorageVtbl; storage->ref = 1; init_dispatch(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex, compat_mode); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 235e29a3070..ef5d80ff512 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2143,7 +2143,7 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS HRESULT hres; hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - &This->inner_window->session_storage); + NULL, &This->inner_window->session_storage); if(FAILED(hres)) return hres; } @@ -2163,7 +2163,7 @@ static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLSto HRESULT hres; hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - &This->inner_window->local_storage); + This->inner_window->base.outer_window->uri, &This->inner_window->local_storage); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0a7c3a2556e..ca637e5efd0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -944,7 +944,7 @@ HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**) DE HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; void detach_dom_implementation(IHTMLDOMImplementation*) DECLSPEC_HIDDEN; -HRESULT create_html_storage(compat_mode_t,IHTMLStorage**) DECLSPEC_HIDDEN; +HRESULT create_html_storage(compat_mode_t,IUri*,IHTMLStorage**) DECLSPEC_HIDDEN; void HTMLDocument_Persist_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_OleCmd_Init(HTMLDocument*) DECLSPEC_HIDDEN; -- 2.30.2

2 1

[PATCH 0/1] MR153: include: Mark IPersistFolder3::InitializeEx's optional parameters as [unique].
by Jinoh Kang (＠iamahuman) 30 May '22

30 May '22

The Windows SDK headers makes it clear that the IBindCtx and ppfti parameters of InitializeEx are optional. Bring Wine's definition in sync with those. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/153

3 2

[PATCH v2 0/1] MR152: include: Make IShellItem::BindToHandler's pbc parameter as [unique].
by Jinoh Kang (＠iamahuman) 30 May '22

30 May '22

The Windows SDK headers makes it clear that the IBindCtx parameter of BindToHandler is optional. Bring Wine's definition in sync with those. Thanks @nsivov for pointing this out. -- v2: include: Mark IShellItem::BindToHandler's pbc parameter as [unique]. https://gitlab.winehq.org/wine/wine/-/merge_requests/152

3 2

[PATCH 0/1] MR152: include: Make IShellItem::BindToHandler's pbc parameter as [unique].
by Jinoh Kang (＠iamahuman) 30 May '22

30 May '22

The Windows SDK headers makes it clear that the IBindCtx parameter of BindToHandler is optional. Bring Wine's definition in sync with those. Thanks @nsivov for pointing this out. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/152

2 1

[PATCH 0/1] MR150: win32u: Create a dummy bitmap for display device contexts.
by Zhiyi Zhang (＠zhiyi) 30 May '22

30 May '22

On Windows 7 and older versions of Windows, calling GetCurrentObject(hdc, OBJ_BITMAP) for a display device context will return a valid handle. However, this handle will fail for GetObject(). On newer versions of Windows, GetCurrentObject(hdc, OBJ_BITMAP) for display device contexts returns a bitmap of virtual screen size and its size changes after display mode changes. This behavior is tested in the _check_display_dc() function in user32/tests/monitor.c. The screen shot function of WeChat depends on GetObject() to either return failure or a valid size for the bitmap from display device contexts. Since Wine currently report Windows 7 as default and to save memory, the Windows 7 behavior is implemented. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/150

3 2

[PATCH 2/2]mscms: make the correct value for bmformat.
by Zhao Yi 30 May '22

30 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/transform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..22901ad721c 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format ) switch (format) { - case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; - case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; + case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break; case BM_GRAY: ret = TYPE_GRAY_8; break; - case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; - case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; - case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; + case BM_xRGBQUADS: ret = TYPE_BGRA_8; break; + case BM_xBGRQUADS: ret = TYPE_RGBA_8; break; + case BM_KYMCQUADS: ret = TYPE_CMYK_8; break; default: if (!quietfixme) { -- 2.20.1

1 0

[PATCH 0/5] MR151: ntdll: Improve heap block size compat.
by Rémi Bernon (＠rbernon) 30 May '22

30 May '22

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

3 7

[PATCH v3] ntdll: Avoid reqeuests with null pointer but invalid size.
by Bernhard Übelacker 30 May '22

30 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51770 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- v1: https://www.winehq.org/pipermail/wine-devel/2021-December/202913.html https://www.winehq.org/pipermail/wine-devel/2022-April/213866.html https://www.winehq.org/pipermail/wine-devel/2022-April/214075.html v2: Validate pointer before calling wine_server_add_data. https://www.winehq.org/pipermail/wine-devel/2022-April/214306.html https://www.winehq.org/pipermail/wine-devel/2022-May/215635.html v3: Move check to DeviceIoControl. Always use fixed values for IOCTL_STORAGE_GET_DEVICE_NUMBER. Remove warning at expected hang. --- dlls/kernel32/tests/volume.c | 16 ++++++++++++++++ dlls/kernelbase/file.c | 5 +++++ 2 files changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 9166cf228d9..4bee4207a37 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -618,6 +618,7 @@ static void test_disk_query_property(void) STORAGE_PROPERTY_QUERY query = {0}; STORAGE_DESCRIPTOR_HEADER header = {0}; STORAGE_DEVICE_DESCRIPTOR descriptor = {0}; + STORAGE_DEVICE_NUMBER device_number = {0}; HANDLE handle; DWORD error; DWORD size; @@ -654,6 +655,21 @@ static void test_disk_query_property(void) ok(descriptor.Version == sizeof(descriptor), "got descriptor.Version %ld\n", descriptor.Version); ok(descriptor.Size >= sizeof(descriptor), "got descriptor.Size %ld\n", descriptor.Size); + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 0, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + + /* unclean call with valid in_buffer=NULL but incorrect in_size=4 */ + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 4, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + CloseHandle(handle); } diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 8ae982294f6..21df197da2c 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -4111,6 +4111,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeviceIoControl( HANDLE handle, DWORD code, void * TRACE( "(%p,%lx,%p,%ld,%p,%ld,%p,%p)\n", handle, code, in_buff, in_count, out_buff, out_count, returned, overlapped ); + if (code == IOCTL_STORAGE_GET_DEVICE_NUMBER) { + in_buff = NULL; + in_count = 0; + } + if (overlapped) { piosb = (IO_STATUS_BLOCK *)overlapped; -- 2.35.1

1 0

[PATCH v2] ntdll: Avoid reqeuests with null pointer but invalid size.
by Bernhard Übelacker 30 May '22

30 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51770 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- v1: https://www.winehq.org/pipermail/wine-devel/2021-December/202913.html https://www.winehq.org/pipermail/wine-devel/2022-April/213866.html v2: Validate pointer before calling wine_server_add_data. --- dlls/kernel32/tests/volume.c | 16 ++++++++++++++++ dlls/ntdll/unix/file.c | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 9166cf228d9..4bee4207a37 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -618,6 +618,7 @@ static void test_disk_query_property(void) STORAGE_PROPERTY_QUERY query = {0}; STORAGE_DESCRIPTOR_HEADER header = {0}; STORAGE_DEVICE_DESCRIPTOR descriptor = {0}; + STORAGE_DEVICE_NUMBER device_number = {0}; HANDLE handle; DWORD error; DWORD size; @@ -654,6 +655,21 @@ static void test_disk_query_property(void) ok(descriptor.Version == sizeof(descriptor), "got descriptor.Version %ld\n", descriptor.Version); ok(descriptor.Size >= sizeof(descriptor), "got descriptor.Size %ld\n", descriptor.Size); + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 0, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + + /* unclean call with valid in_buffer=NULL but incorrect in_size=4 */ + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 4, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + CloseHandle(handle); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cc8bf0c6e82..92b67280500 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4893,7 +4893,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, { req->code = code; req->async = server_async( handle, &async->io, event, apc, apc_context, iosb_client_ptr(io) ); - wine_server_add_data( req, in_buffer, in_size ); + if (in_buffer) wine_server_add_data( req, in_buffer, in_size ); if ((code & 3) != METHOD_BUFFERED) wine_server_add_data( req, out_buffer, out_size ); wine_server_set_reply( req, out_buffer, out_size ); status = virtual_locked_server_call( req ); @@ -4913,6 +4913,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (status != STATUS_PENDING) free( async ); + if (wait_handle && status == STATUS_ACCESS_VIOLATION) + ERR("Sending request failed but wait requested. Expect the application to hang.\n"); if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT) ); return status; } -- 2.35.1

2 2

[PATCH 0/1] MR148: ntoskrnl: Add ExNotifyCallback stub.
by Alex Henrie (＠alexhenrie) 29 May '22

29 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53051 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/148

2 1

[PATCH 0/6] MR147: d2d1: Implement bitmap mapping methods.
by Nikolay Sivov (＠nsivov) 29 May '22

29 May '22

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

4 7

[PATCH 1/2] scrrun: Check for null arguments in MoveFile.
by Robert Wilhelm 28 May '22

28 May '22

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 3 +++ dlls/scrrun/tests/filesystem.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d7ad255e517..35b43e2f124 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3758,6 +3758,9 @@ static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR source, BSTR de { TRACE("%p %s %s\n", iface, debugstr_w(source), debugstr_w(destination)); + if(!source || !destination) + return E_INVALIDARG; + return MoveFileW(source, destination) ? S_OK : create_error(GetLastError()); } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 79af87591ff..1ba0e81a2d1 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2591,6 +2591,13 @@ static void test_MoveFile(void) hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); + + str = SysAllocString(L"null.txt"); + hr = IFileSystem3_MoveFile(fs3, str, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + hr = IFileSystem3_MoveFile(fs3, NULL, str); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + SysFreeString(str); } static void test_DoOpenPipeStream(void) -- 2.36.1

2 1

[PATCH 1/4] tapi32: Add lineGetCallInfoW stub.
by Roman Pišl 28 May '22

28 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53061 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 75bfe837f3d..2dbca2aba3e 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -296,6 +296,15 @@ DWORD WINAPI lineGetCallInfoA(HCALL hCall, LPLINECALLINFO lpCallInfo) return 0; } +/*********************************************************************** + * lineGetCallInfoW (TAPI32.@) + */ +DWORD WINAPI lineGetCallInfoW(HCALL hCall, LPLINECALLINFO lpCallInfo) +{ + FIXME("(%p, %p): stub.\n", hCall, lpCallInfo); + return 0; +} + /*********************************************************************** * lineGetCallStatus (TAPI32.@) */ diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 6c01a870479..757e387c8d2 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -39,6 +39,7 @@ @ stdcall lineGetAppPriorityA(str long ptr long ptr ptr) @ stdcall lineGetCallInfo(long ptr) lineGetCallInfoA @ stdcall lineGetCallInfoA(long ptr) +@ stdcall lineGetCallInfoW(long ptr) @ stdcall lineGetCallStatus(long ptr) @ stdcall lineGetConfRelatedCalls(long ptr) @ stdcall lineGetCountry(long long ptr) lineGetCountryA -- 2.30.2

1 3

[PATCH 0/1] MR145: kernel32: Unstub MoveFileWithProgress, add test.
by James McDonnell (＠ElementalWarrior) 28 May '22

28 May '22

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

3 2

[PATCH 0/1] MR144: wininet: Return INTERNET_RAS_INSTALLED flag from InternetGetConnectedStateExW().
by Paul Gofman (＠gofman) 27 May '22

27 May '22

Fixes Split/Second network connection (LAN game, Internet servers are down for the game). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/144

2 1

Re: [PATCH v3 0/7] MR141: d3d11: Initialize output pointers on failure - approved
by Alexandre Julliard (＠julliard) 27 May '22

27 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/141

1 0

Re: [PATCH v2 0/5] MR142: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 27 May '22

27 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/142

1 0

Re: [PATCH v2 0/5] MR137: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) 27 May '22

27 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/137

1 0

Re: [PATCH v2 0/1] MR136: kernelbase: Avoid relying on the exception handler to test that handle != NULL. - approved
by Alexandre Julliard (＠julliard) 27 May '22

27 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/136

1 0

[PATCH] win32u: Create a dummy bitmap for display device contexts.
by Zhiyi Zhang 27 May '22

27 May '22

On Windows 7 and older versions of Windows, calling GetCurrentObject(hdc, OBJ_BITMAP) for a display device context will return a valid handle. However, this handle will fail for GetObject(). On newer versions of Windows, GetCurrentObject(hdc, OBJ_BITMAP) for display device contexts returns a bitmap of virtual screen size and its size changes after display mode changes. This behavior is tested in the _check_display_dc() function in user32/tests/monitor.c. The screen shot function of WeChat depends on GetObject() to either return failure or a valid size for the bitmap from display device contexts. Since Wine currently report Windows 7 as default and to save memory, the Windows 7 behavior is implemented. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/bitmap.c | 1 - dlls/win32u/dc.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 18d1e8f6c28..d3074286ee6 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2789,7 +2789,6 @@ static void test_CreateBitmap(void) "0: %p, 1: %p, 4: %p, 5: %p, curObj1 %p, old1 %p\n", bm, bm1, bm4, bm5, curObj1, old1); ok(bm != bm2 && bm != bm3, "0: %p, 2: %p, 3: %p\n", bm, bm2, bm3); - todo_wine ok(bm != curObj2, "0: %p, curObj2 %p\n", bm, curObj2); ok(old2 == 0, "old2 %p\n", old2); diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index b684e198c05..95dd2651929 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -274,7 +274,13 @@ void free_dc_ptr( DC *dc ) GDI_dec_ref_count( dc->hPen ); GDI_dec_ref_count( dc->hBrush ); GDI_dec_ref_count( dc->hFont ); - if (dc->hBitmap) GDI_dec_ref_count( dc->hBitmap ); + if (dc->hBitmap) + { + if (dc->is_display) + NtGdiDeleteClientObj( dc->hBitmap ); + else + GDI_dec_ref_count( dc->hBitmap ); + } free_gdi_handle( dc->hSelf ); free_dc_state( dc ); } @@ -724,7 +730,10 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD if (!(dc = alloc_dc_ptr( NTGDI_OBJ_DC ))) return 0; hdc = dc->hSelf; - dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + if (is_display) + dc->hBitmap = NtGdiCreateClientObj( NTGDI_OBJ_SURF ); + else + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); TRACE("(device=%s, output=%s): returning %p\n", debugstr_us(device), debugstr_us(output), dc->hSelf ); -- 2.34.1

3 2

[PATCH] WWN ISS 419
by Cressida Silver 27 May '22

27 May '22

--- news/en/2022052702.xml | 13 ++ wwn/en/wn20220527_419.xml | 440 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 453 insertions(+) create mode 100644 news/en/2022052702.xml create mode 100644 wwn/en/wn20220527_419.xml diff --git a/news/en/2022052702.xml b/news/en/2022052702.xml new file mode 100644 index 00000000..b6c1ddd7 --- /dev/null +++ b/news/en/2022052702.xml @@ -0,0 +1,13 @@ +<news> + <date>May 27, 2022</date> + <title>World Wine News Issue 419</title> + <body> + <a href="{$root}/wwn/419">WWN Issue 419</a> was released today. + <p> + <ul> + <li><a href="{$root}/wwn/419#Wine 7.9" class="">Wine 7.9</a></li> + <li><a href="{$root}/wwn/419#A Bug's Life" class="">A Bug's Life</a></li> + </ul> + </p> + </body> +</news> diff --git a/wwn/en/wn20220527_419.xml b/wwn/en/wn20220527_419.xml new file mode 100644 index 00000000..f449208d --- /dev/null +++ b/wwn/en/wn20220527_419.xml @@ -0,0 +1,440 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn@winehq.org">Cressida Silver</author> + <issue num="419" date="5/27/2022"/> + <intro> + <p> + This is the 419th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. + Wine is an open-source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. + Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code. + </p> + </intro> + + <section title="Wine 7.9"> + <p> + <a href="https://www.winehq.org/wwn/408#Conversion%20to%20PE%20Files">PE</a> conversion marches onward — preliminary work started for the macOS driver. + </p> + + <p> + Bugs closed with this release are listed below. + </p> + + </section> + + <section title="A Bug's Life"> + <p> + <center> + <table border="2"> + <tr> + <td width="100" align="center"> + <b>Bug ID</b> + </td> + <td width="100" align="center"> + <b>Open Date</b> + </td> + <td width="100" align="center"> + <b>Days Open</b> + </td> + <td width="100" align="center"> + <b>Weeks Open</b> + </td> + <td width="100" align="center"> + <b>Months Open</b> + </td> + <td width="100" align="center"> + <b>Years Open</b> + </td> + <td width="850" align="center"> + <b>Bug Summary</b> + </td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=14841">14841</a> + </td> + <td align="center">8/11/08</td> + <td align="center">5,030</td> + <td align="center">719</td> + <td align="center">165</td> + <td align="center">14</td> + <td>ntdll:file tests are flaky</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=19183">19183</a> + </td> + <td align="center">7/4/09</td> + <td align="center">4,703</td> + <td align="center">672</td> + <td align="center">154</td> + <td align="center">13</td> + <td>"make test" still fails on d3d9/tests/visual.c</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=28220">28220</a> + </td> + <td align="center">8/29/11</td> + <td align="center">3,917</td> + <td align="center">560</td> + <td align="center">128</td> + <td align="center">11</td> + <td>kernel32/process.ok: test fails when redirected</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=28508">28508</a> + </td> + <td align="center">9/27/11</td> + <td align="center">3,888</td> + <td align="center">555</td> + <td align="center">127</td> + <td align="center">11</td> + <td>user32:monitor tests fail occasionally</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=34782">34782</a> + </td> + <td align="center">10/22/13</td> + <td align="center">3,132</td> + <td align="center">447</td> + <td align="center">102</td> + <td align="center">9</td> + <td>crypt32/chain tests crash with gcc-4.8.1 (win64)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=39346">39346</a> + </td> + <td align="center">9/27/15</td> + <td align="center">2,427</td> + <td align="center">347</td> + <td align="center">79</td> + <td align="center">7</td> + <td>Lego Rock Raiders crashes on startup (d3drm_device_init doesn't handle device version 3 case)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=45959">45959</a> + </td> + <td align="center">10/8/18</td> + <td align="center">1,320</td> + <td align="center">189</td> + <td align="center">43</td> + <td align="center">4</td> + <td>Editpad Lite 7 GUI not rendered correctly</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=45960">45960</a> + </td> + <td align="center">10/9/18</td> + <td align="center">1,319</td> + <td align="center">188</td> + <td align="center">43</td> + <td align="center">4</td> + <td>Editpad Lite 7 displays empty boxes instead of text in some menus</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=49285">49285</a> + </td> + <td align="center">5/28/20</td> + <td align="center">722</td> + <td align="center">103</td> + <td align="center">23</td> + <td align="center">2</td> + <td>PNotesPortable crashes inside WritePrivateProfileStructW</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=50462">50462</a> + </td> + <td align="center">1/6/21</td> + <td align="center">499</td> + <td align="center">71</td> + <td align="center">16</td> + <td align="center">1</td> + <td>Ulead Photo Explorer 8.5 crashes on startup (needs {4a2286e0-7bef-11ce-9bd9-0000e202599c} CLSID_CMpegAudioCodec)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51104">51104</a> + </td> + <td align="center">5/7/21</td> + <td align="center">378</td> + <td align="center">54</td> + <td align="center">12</td> + <td align="center">1</td> + <td>mf:mf crashes on Windows + AMD/NVidia</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51283">51283</a> + </td> + <td align="center">6/17/21</td> + <td align="center">337</td> + <td align="center">48</td> + <td align="center">11</td> + <td align="center">1</td> + <td>d3d8:device breaks evr:evr on w7u-2qxl</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51297">51297</a> + </td> + <td align="center">6/20/21</td> + <td align="center">334</td> + <td align="center">48</td> + <td align="center">11</td> + <td align="center">1</td> + <td>d3d8:visual & d3d9:visual, test_sample_mask() fails on Nvidia (cw-gtx560)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51298">51298</a> + </td> + <td align="center">6/20/21</td> + <td align="center">334</td> + <td align="center">48</td> + <td align="center">11</td> + <td align="center">1</td> + <td>d3d8:visual: lighting_test() fails on Windows 10 >= 2004</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51376">51376</a> + </td> + <td align="center">7/1/21</td> + <td align="center">323</td> + <td align="center">46</td> + <td align="center">10</td> + <td align="center">1</td> + <td>Wine causes PC to lock or crash wine when loading more than 1 VST addon into WaveLab 6</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51612">51612</a> + </td> + <td align="center">8/15/21</td> + <td align="center">278</td> + <td align="center">40</td> + <td align="center">9</td> + <td align="center">1</td> + <td>Stellaris launcher (Paradox) does not launch</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51680">51680</a> + </td> + <td align="center">8/25/21</td> + <td align="center">268</td> + <td align="center">38</td> + <td align="center">8</td> + <td align="center">1</td> + <td>nsi:nsi test_ip_neighbour() fails on unreachable link local entry</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51783">51783</a> + </td> + <td align="center">9/23/21</td> + <td align="center">239</td> + <td align="center">34</td> + <td align="center">7</td> + <td align="center">1</td> + <td>The ieframe:webbrowser output is too big in Wine</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=51827">51827</a> + </td> + <td align="center">10/1/21</td> + <td align="center">231</td> + <td align="center">33</td> + <td align="center">7</td> + <td align="center">1</td> + <td>d3dx10_34:d3dx10 crashes on all versions of Windows</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52686">52686</a> + </td> + <td align="center">3/17/22</td> + <td align="center">64</td> + <td align="center">9</td> + <td align="center">2</td> + <td align="center">0</td> + <td>DateAdd not implemented</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52751">52751</a> + </td> + <td align="center">3/30/22</td> + <td align="center">51</td> + <td align="center">7</td> + <td align="center">1</td> + <td align="center">0</td> + <td>`winetricks nocrashdialog` no longer works properly with Wine 7.5(but works with 7.4)</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52761">52761</a> + </td> + <td align="center">4/1/22</td> + <td align="center">49</td> + <td align="center">7</td> + <td align="center">1</td> + <td align="center">0</td> + <td>mscoree:mscoree test fails without a display or console</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52821">52821</a> + </td> + <td align="center">4/15/22</td> + <td align="center">35</td> + <td align="center">5</td> + <td align="center">1</td> + <td align="center">0</td> + <td>Cxbx Reloaded needs unimplemented function msvcp140_atomic_wait.dll.__std_atomic_wait_direct</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52848">52848</a> + </td> + <td align="center">4/21/22</td> + <td align="center">29</td> + <td align="center">4</td> + <td align="center">0</td> + <td align="center">0</td> + <td>Mavis Beacon Teaches Typing 15: Typed characters not spaced correctly</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52874">52874</a> + </td> + <td align="center">4/23/22</td> + <td align="center">27</td> + <td align="center">4</td> + <td align="center">0</td> + <td align="center">0</td> + <td>win32u change prevents chromium from starting</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52892">52892</a> + </td> + <td align="center">4/26/22</td> + <td align="center">24</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td>The 64-bit ntdll:thread fails on w7pro64 and w864</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52908">52908</a> + </td> + <td align="center">4/26/22</td> + <td align="center">24</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td>mf:mf - The 64-bit test_wma_decoder() fails on 64-bit Debian 11 + Intel</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52914">52914</a> + </td> + <td align="center">4/26/22</td> + <td align="center">24</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td>mf:mf - The 64-bit test_h264_decoder() fails on 64-bit Debian 11 + Intel GPU</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52937">52937</a> + </td> + <td align="center">4/29/22</td> + <td align="center">21</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td>msvcr110:msvcr110 fails on Windows with the UTF-8 codepage</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52961">52961</a> + </td> + <td align="center">5/6/22</td> + <td align="center">14</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>crypt32:str - test_CertGetNameString() fails on Windows 7</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52969">52969</a> + </td> + <td align="center">5/6/22</td> + <td align="center">14</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>mshtml:script fails on up-to-date Windows 8.1 machines</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52970">52970</a> + </td> + <td align="center">5/6/22</td> + <td align="center">14</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>kernelbase:process breaks lz32:lzexpand_main on Windows 1809+</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=52975">52975</a> + </td> + <td align="center">5/8/22</td> + <td align="center">12</td> + <td align="center">2</td> + <td align="center">0</td> + <td align="center">0</td> + <td>VTFEdit fails to start: err:module:LdrInitializeThunk "MSVCP80.dll" failed to initialize, aborting</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53004">53004</a> + </td> + <td align="center">5/14/22</td> + <td align="center">6</td> + <td align="center">1</td> + <td align="center">0</td> + <td align="center">0</td> + <td>63ce060 causes a white border line in winecfg</td> + </tr> + <tr> + <td align="center"> + <a href ="https://bugs.winehq.org/show_bug.cgi?id=53015">53015</a> + </td> + <td align="center">5/17/22</td> + <td align="center">3</td> + <td align="center">0</td> + <td align="center">0</td> + <td align="center">0</td> + <td>winscp bookmark adding error</td> + </tr> + </table> + </center> + </p> + </section> +</kc> -- 2.25.1

1 0

[PATCH v2 0/2] MR138: d3drm: IDirect3DRMTexture3 Get/SetDecalTransparency
by Alistair Leslie-Hughes (＠alesliehughes) 27 May '22

27 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v2: d3drm: IDirect3DRMTexture3 Get/SetDecalSize https://gitlab.winehq.org/wine/wine/-/merge_requests/138

3 4

[PATCH 0/2] MR143: d3drm: Implement more IDirect3DRMTexture3 methods.
by Zebediah Figura (＠zfigura) 27 May '22

27 May '22

This supersedes merge request 138. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/143

2 2

[PATCH v2 0/2] MR130: user32: Progress toward PE conversion of raw input APIs.
by Zebediah Figura (＠zfigura) 27 May '22

27 May '22

-- v2: d3drm: Implement IDirect3DRMTexture3::{Get,Set}DecalSize(). d3drm: Implement IDirect3DRMTexture3::{Get,Set}DecalTransparency(). https://gitlab.winehq.org/wine/wine/-/merge_requests/130

2 2

[PATCH v2 0/7] MR141: d3d11: Initialize output pointers on failure
by Nikolay Sivov (＠nsivov) 27 May '22

27 May '22

Similar changes were done before for views, that fixed actual issue when object couldn't and shouldn't have been created, but pointer was still used afterwards. These are the same kind of changes for shader objects. -- v2: d3d11: Always initialize out shader pointer in CreateComputeShader(). d3d11: Always initialize out shader pointer in CreateDomainShader(). d3d11: Always initialize out shader pointer in CreateHullShader(). d3d11: Always initialize out shader pointer in CreatePixelShader(). d3d11: Always initialize out shader pointer in CreateGeometryShaderWithStreamOutput(). d3d11: Always initialize out shader pointer in CreateGeometryShader(). d3d11: Always initialize out shader pointer in CreateVertexShader(). https://gitlab.winehq.org/wine/wine/-/merge_requests/141

4 11

[PATCH 1/4] mshtml: Handle empty strings in heap_strndupWtoU.
by Gabriel Ivăncescu 27 May '22

27 May '22

The HTTP response header status text can be empty, so process_response_status_text would erroneously return E_OUTOFMEMORY. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mshtml_private.h | 6 +++--- dlls/wininet/tests/http.c | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ad1fca0..0a7c3a2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1392,11 +1392,11 @@ static inline char *heap_strndupWtoU(LPCWSTR str, unsigned len) char *ret = NULL; DWORD size; - if(str && len) { - size = WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL); + if(str) { + size = len ? WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL) : 0; ret = heap_alloc(size + 1); if(ret) { - WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); + if(len) WideCharToMultiByte(CP_UTF8, 0, str, len, ret, size, NULL, NULL); ret[size] = '\0'; } } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ec576ae..bc1b829 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4526,6 +4526,13 @@ static const http_status_test_t http_status_tests[] = { 200, "" }, + { + "HTTP/1.1 200 \r\n" + "Content-Length: 1\r\n" + "\r\nx", + 200, + "" + }, { "HTTP/1.1 410 \r\n" "Content-Length: 1\r\n" -- 2.34.1

3 8

[PATCH 0/5] MR142: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 27 May '22

27 May '22

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

3 6

[PATCH v2 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated
by Paul Gofman (＠gofman) 27 May '22

27 May '22

Inspired by the discussion for MR 127 (https://www.winehq.org/pipermail/wine-devel/2022-May/217832.html) and is aimed to replace the second patch (ws2_32: Use allocated IO status block in select().) in that MR. When the thread calls server's terminate_thread for itself queuing the system APC though SIGUSR1 might race with the thread exit, there seems no easy and reliable way to be sure that signal is processed before the thread's stack and TEB are freed. Thus I am making the system APCs to be queued to the thread to be processed by server_select() after (terminate_thread) server call. When terminate_thread is called for the other thread the system APC will always be delivered through some other thread. Thread stack and TEB are not freed when the thread is killed externally, so completing the async from another thread should probably be fine. -- v2: ntdll: Cancel asyncs when thread is terminated. ws2_32/tests: Add tests for terminated thread asyncs completion. https://gitlab.winehq.org/wine/wine/-/merge_requests/135

2 3

Re: [PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by Hans Leidekker 27 May '22

27 May '22

On Fri, 2022-05-27 at 16:43 +0800, Zhao Yi wrote: > These profiles belong to a specific printer driver and are required for > data conversion during printing. However, these profiles are not available in > the default wine prefix of the Linux system, resulting in the failure of my > test program. Here's a test using the standard RGB color profile which shows our mapping is wrong. I think this is sufficient to show the general problem and we can assume that the CMYK case should be fixed accordingly.

1 0

[PATCH 0/7] MR141: d3d11: Initialize output pointers on failure
by Nikolay Sivov (＠nsivov) 27 May '22

27 May '22

Similar changes were done before for views, that fixed actual issue when object couldn't and shouldn't have been created, but pointer was still used afterwards. These are the same kind of changes for shader objects. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/141

3 12

[PATCH v2 0/4] MR140: qasf: More ASF reader filter implementation.
by Rémi Bernon (＠rbernon) 27 May '22

27 May '22

-- v2: qasf: Implement ASF Reader filter pin DecideBufferSize. qasf: Implement ASF Reader filter pin_query_accept. winegstreamer: Implement IWMOutputMediaProps_SetMediaType. qasf: Implement ASF Reader filter pin_get_media_type. https://gitlab.winehq.org/wine/wine/-/merge_requests/140

2 4

[PATCH v3 3/3] d2d1: Add some tests for ID2D1Bitmap1::Map()/::Unmap().
by Dmitry Timoshkov 27 May '22

27 May '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/tests/d2d1.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d5adb0c749c..e34d1070637 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11388,6 +11388,78 @@ static void test_image_bounds(BOOL d3d11) release_test_context(&ctx); } +static void test_bitmap_map(BOOL d3d11) +{ + struct d2d1_test_context ctx; + D2D1_SIZE_U size; + IDXGISurface *surface; + ID2D1Bitmap1 *bitmap; + D2D1_MAPPED_RECT mapped_rect; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + set_size_u(&size, 4, 4); + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + surface = create_surface(ctx.device, DXGI_FORMAT_B8G8R8A8_UNORM); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + todo_wine + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + ID2D1Bitmap1_Release(bitmap); + + IDXGISurface_Release(surface); + + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -11464,6 +11536,7 @@ START_TEST(d2d1) queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); + queue_test(test_bitmap_map); run_queued_tests(); } -- 2.36.1

2 1

[PATCH v3 2/3] d2d1: Implement ID2D1Bitmap1::Unmap().
by Dmitry Timoshkov 27 May '22

27 May '22

v3: Don't Unmap on Release. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/bitmap.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index a75a9be62be..9d9d980b4c9 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -285,9 +285,23 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OP static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11Device *device; + ID3D11DeviceContext *context; - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + if (!bitmap->staging_resource) + return D2DERR_WRONG_STATE; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_Unmap(context, bitmap->staging_resource, 0); + bitmap->staging_resource = NULL; + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return S_OK; } static const struct ID2D1Bitmap1Vtbl d2d_bitmap_vtbl = -- 2.36.1

2 1

[PATCH v2 2/3] d2d1: Implement ID2D1Bitmap1::Unmap().
by Dmitry Timoshkov 27 May '22

27 May '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/bitmap.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index b48c0bf2384..91594ad58a0 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -66,6 +66,8 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface) if (!refcount) { + if (bitmap->staging_resource) + ID2D1Bitmap1_Unmap(iface); if (bitmap->srv) ID3D11ShaderResourceView_Release(bitmap->srv); if (bitmap->rtv) @@ -281,9 +283,23 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OP static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11Device *device; + ID3D11DeviceContext *context; - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + if (!bitmap->staging_resource) + return D2DERR_WRONG_STATE; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_Unmap(context, bitmap->staging_resource, 0); + bitmap->staging_resource = NULL; + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return S_OK; } static const struct ID2D1Bitmap1Vtbl d2d_bitmap_vtbl = -- 2.36.1

2 2

[PATCH v2 1/3] d2d1: Implement ID2D1Bitmap1::Map().
by Dmitry Timoshkov 27 May '22

27 May '22

v2: Support only D2D1_MAP_OPTIONS_READ and always use staging resource. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/bitmap.c | 49 ++++++++++++++++++++++++++++++++++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 971e3c7ff6b..b48c0bf2384 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -229,9 +229,54 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_GetSurface(ID2D1Bitmap1 *iface, IDXG static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OPTIONS options, D2D1_MAPPED_RECT *mapped_rect) { - FIXME("iface %p, options %#x, mapped_rect %p stub!\n", iface, options, mapped_rect); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + ID3D11Device *device; + ID3D11DeviceContext *context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Texture2D *staging_texture; + D3D11_MAPPED_SUBRESOURCE mapped_subresource; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, options %#x, mapped_rect %p.\n", iface, options, mapped_rect); + + if (options != D2D1_MAP_OPTIONS_READ) + { + FIXME("Unhandled map options %#x.\n", options); + return E_INVALIDARG; + } + + if (!(bitmap->options & D2D1_BITMAP_OPTIONS_CPU_READ)) + return E_INVALIDARG; + + if (bitmap->staging_resource) + return D2DERR_WRONG_STATE; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11Texture2D_GetDesc((ID3D11Texture2D *)bitmap->resource, &texture_desc); + + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &staging_texture); + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)staging_texture, bitmap->resource); + if (SUCCEEDED(hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)staging_texture, 0, + D3D11_MAP_READ, 0, &mapped_subresource))) + { + mapped_rect->pitch = mapped_subresource.RowPitch; + mapped_rect->bits = mapped_subresource.pData; + bitmap->staging_resource = (ID3D11Resource *)staging_texture; + } + else + { + WARN("Failed to map resource, hr %#lx.\n", hr); + ID3D11Texture2D_Release(staging_texture); + } + + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 8edfa030ee1..b886ac52dd9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -395,6 +395,7 @@ struct d2d_bitmap ID3D11RenderTargetView *rtv; IDXGISurface *surface; ID3D11Resource *resource; + ID3D11Resource *staging_resource; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format; float dpi_x; -- 2.36.1

2 2

[PATCH v2 resend] crypt32: CryptAcquireCertificatePrivateKey() should reset last error code on success.
by Dmitry Timoshkov 27 May '22

27 May '22

One of Chrome crypto plugins depends on this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 1 + dlls/crypt32/tests/cert.c | 45 ++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index ad39b7d18c7..b57cc685212 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1006,6 +1006,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, CryptMemFree(info); if (cert_in_store) CertFreeCertificateContext(cert_in_store); + if (ret) SetLastError(0); return ret; } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 0f8684a5483..ea25826f4ed 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -4305,45 +4305,42 @@ static void testAcquireCertPrivateKey(void) CERT_KEY_CONTEXT keyContext; /* Don't cache provider */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, NULL, NULL); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); /* Use the key prov info's caching (there shouldn't be any) */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); - if (ret) - { - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); - } + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); /* Cache it (and check that it's cached) */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_CACHE_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); /* Remove the cached provider */ CryptReleaseContext(keyContext.hCryptProv, 0); @@ -4354,17 +4351,17 @@ static void testAcquireCertPrivateKey(void) CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); /* Now use the key prov info's caching */ + SetLastError(0xdeadbeef); ret = CryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", - GetLastError()); + ok(ret, "CryptAcquireCertificatePrivateKey failed: %08lx\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got %08lx\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); CryptDestroyKey(key); -- 2.36.1

2 1

[PATCH 0/4] MR140: qasf: More ASF reader filter implementation.
by Rémi Bernon (＠rbernon) 27 May '22

27 May '22

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

3 8

[PATCH 0/4] MR139: winegstreamer: Implement video plane alignment for the H264 decoder.
by Rémi Bernon (＠rbernon) 27 May '22

27 May '22

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

3 7

[PATCH 0/2] MR138: d3drm: IDirect3DRMTexture3 Get/SetDecalTransparency
by Alistair Leslie-Hughes (＠alesliehughes) 27 May '22

27 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/138

3 3

[PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by Zhao Yi 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/tests/profile.c | 118 +++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..77165877275 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -62,6 +62,7 @@ static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); +static BOOL (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ if (!p##func) return FALSE; @@ -97,6 +98,7 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( UninstallColorProfileW ) pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" ); + GETFUNCPTR( TranslateBitmapBits ) return TRUE; } @@ -123,6 +125,16 @@ L"\\color\\srgb color space profile.icm"; static const WCHAR profile2W[] = L"\\spool\\drivers\\color\\srgb color space profile.icm"; +static const char binfile1[] = +"\\w32x86\\3\\SS0IIN03.BIN"; +static const char binfile1_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IIN03.BIN"; + +static const char binfile2[] = +"\\w32x86\\3\\SS0IO15.BIN"; +static const char binfile2_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IO15.BIN"; + static BOOL have_color_profile; static const unsigned char rgbheader[] = @@ -1359,6 +1371,110 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp } } +static void test_TranslateBitmapBits(void) +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intents = INTENT_PERCEPTUAL; + + #define DESTBUFSIZE 4 + HANDLE binfile_handle; + UINT uret; + char binfilefile1[MAX_PATH], binfilefile1_ex[MAX_PATH], binfilefile2[MAX_PATH], binfilefile2_ex[MAX_PATH]; + char *standbinfile1 = NULL; + char *standbinfile2 = NULL; + BYTE srcbits[] = {0,0,0xff}; + BMFORMAT input = BM_BGRTRIPLETS; + DWORD width = 1; + DWORD height = 1; + DWORD inputstride = 3; + PVOID destbits = HeapAlloc( GetProcessHeap(), 0, DESTBUFSIZE); + BMFORMAT output = BM_KYMCQUADS; + DWORD outputstride = 4; + PBMCALLBACKFN callback = NULL; + ULONG data = 0; + BYTE expect_destbits[]={0xff, 0xb6, 0, 0}; + BOOL bret = FALSE; + + uret = GetSystemDirectoryA( binfilefile1, sizeof(binfilefile1) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile1[0] && lstrlenA(binfilefile1) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile1)); + lstrcpyA(binfilefile1_ex, binfilefile1); + + uret = GetSystemDirectoryA( binfilefile2, sizeof(binfilefile2) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile2[0] && lstrlenA(binfilefile2) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile2)); + lstrcpyA(binfilefile2_ex, binfilefile2); + + lstrcatA( binfilefile1, binfile1 ); + binfile_handle = CreateFileA( binfilefile1, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile1_ex, binfile1_ex ); + binfile_handle = CreateFileA( binfilefile1_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1_ex; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2, binfile2 ); + binfile_handle = CreateFileA( binfilefile2, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2_ex, binfile2_ex ); + binfile_handle = CreateFileA( binfilefile2_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2_ex; + CloseHandle( binfile_handle ); + } + + if (standbinfile1 && standbinfile2) + { + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile1; + profile.cbDataSize = strlen(standbinfile1); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile2; + profile.cbDataSize = strlen(standbinfile2); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, &intents, 1, 3, 0 ); + ok( transform != NULL, "got %lu\n", GetLastError() ); + + ZeroMemory(destbits,DESTBUFSIZE); + bret = pTranslateBitmapBits(transform,srcbits,input,width,height,inputstride,destbits,output,outputstride,callback,data); + ok(bret && memcmp(expect_destbits, destbits, sizeof(expect_destbits)) == 0, "get err destbits data\n"); + HeapFree( GetProcessHeap(), 0, destbits ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); + } +} + START_TEST(profile) { UINT len; @@ -1470,6 +1586,8 @@ START_TEST(profile) test_AssociateColorProfileWithDeviceA( testprofile ); test_CreateMultiProfileTransform( standardprofile, testprofile ); + test_TranslateBitmapBits( ); + if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); FreeLibrary( hmscms ); -- 2.20.1

3 2

[PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by zhaoyi_uos 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/tests/profile.c | 118 +++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..3d24f5aa62a 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -62,6 +62,7 @@ static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); +static BOOL (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ if (!p##func) return FALSE; @@ -95,6 +96,7 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( SetStandardColorSpaceProfileW ) GETFUNCPTR( UninstallColorProfileA ) GETFUNCPTR( UninstallColorProfileW ) + GETFUNCPTR( TranslateBitmapBits ) pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" ); @@ -123,6 +125,16 @@ L"\\color\\srgb color space profile.icm"; static const WCHAR profile2W[] = L"\\spool\\drivers\\color\\srgb color space profile.icm"; +static const char binfile1[] = +"\\w32x86\\3\\SS0IIN03.BIN"; +static const char binfile1_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IIN03.BIN"; + +static const char binfile2[] = +"\\w32x86\\3\\SS0IO15.BIN"; +static const char binfile2_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IO15.BIN"; + static BOOL have_color_profile; static const unsigned char rgbheader[] = @@ -1359,6 +1371,111 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp } } +static void test_TranslateBitmapBits() +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intents = INTENT_PERCEPTUAL; + + #define DESTBUFSIZE 4 + HANDLE binfile_handle; + UINT uret; + char binfilefile1[MAX_PATH], binfilefile1_ex[MAX_PATH], binfilefile2[MAX_PATH], binfilefile2_ex[MAX_PATH]; + WCHAR binfilefile1W[MAX_PATH]; + char *standbinfile1 = NULL; + char *standbinfile2 = NULL; + BYTE srcbits[] = {0,0,0xff}; + BMFORMAT input = BM_BGRTRIPLETS; + DWORD width = 1; + DWORD height = 1; + DWORD inputstride = 3; + PVOID destbits = HeapAlloc( GetProcessHeap(), 0, DESTBUFSIZE); + BMFORMAT output = BM_KYMCQUADS; + DWORD outputstride = 4; + PBMCALLBACKFN callback = NULL; + ULONG data = 0; + BYTE expect_destbits[]={0xff, 0xb6, 0, 0}; + BOOL bret = FALSE; + + uret = GetSystemDirectoryA( binfilefile1, sizeof(binfilefile1) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile1[0] && lstrlenA(binfilefile1) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile1)); + lstrcpyA(binfilefile1_ex, binfilefile1); + + uret = GetSystemDirectoryA( binfilefile2, sizeof(binfilefile2) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile2[0] && lstrlenA(binfilefile2) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile2)); + lstrcpyA(binfilefile2_ex, binfilefile2); + + lstrcatA( binfilefile1, binfile1 ); + binfile_handle = CreateFileA( binfilefile1, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile1_ex, binfile1_ex ); + binfile_handle = CreateFileA( binfilefile1_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1_ex; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2, binfile2 ); + binfile_handle = CreateFileA( binfilefile2, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2_ex, binfile2_ex ); + binfile_handle = CreateFileA( binfilefile2_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2_ex; + CloseHandle( binfile_handle ); + } + + if (standbinfile1 && standbinfile2) + { + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile1; + profile.cbDataSize = strlen(standbinfile1); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile2; + profile.cbDataSize = strlen(standbinfile2); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, &intents, 1, 3, 0 ); + ok( transform != NULL, "got %lu\n", GetLastError() ); + + ZeroMemory(destbits,DESTBUFSIZE); + bret = pTranslateBitmapBits(transform,srcbits,input,width,height,inputstride,destbits,output,outputstride,callback,data); + ok(bret && memcmp(expect_destbits, destbits, sizeof(expect_destbits)) == 0, "get err destbits data\n"); + HeapFree( GetProcessHeap(), 0, destbits ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); + } +} + START_TEST(profile) { UINT len; @@ -1469,6 +1586,7 @@ START_TEST(profile) test_AssociateColorProfileWithDeviceA( testprofile ); test_CreateMultiProfileTransform( standardprofile, testprofile ); + test_TranslateBitmapBits( ); if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); -- 2.20.1

2 1

[PATCH 2/2]mscms: make the correct value for bmformat.
by zhaoyi_uos 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/transform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..21f58e73134 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format ) switch (format) { - case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; - case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; + case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break; case BM_GRAY: ret = TYPE_GRAY_8; break; - case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; - case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; - case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; + case BM_xRGBQUADS: ret = TYPE_ABGR_8; break; + case BM_xBGRQUADS: ret = TYPE_ARGB_8; break; + case BM_KYMCQUADS: ret = TYPE_CMYK_8; break; default: if (!quietfixme) { -- 2.20.1

2 1

[PATCH 1/3] d2d1/tests: Test effect property if register effect multiple times with different xml.
by Ziqing Hui 27 May '22

27 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d5adb0c749c..29d3780a6e7 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -37,7 +37,7 @@ DEFINE_GUID(GUID_TestPixelShader, 0x53015748,0xfc13,0x4168,0xbd,0x13,0x0f,0xcf, static const WCHAR *effect_xml_a = L"<?xml version='1.0'?> \ <Effect> \ - <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='DisplayName' type='string' value='TestEffectA'/> \ <Property name='Author' type='string' value='The Wine Project'/> \ <Property name='Category' type='string' value='Test'/> \ <Property name='Description' type='string' value='Test effect.'/> \ @@ -56,7 +56,7 @@ L"<?xml version='1.0'?> \ static const WCHAR *effect_xml_b = L"<?xml version='1.0'?> \ <Effect> \ - <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='DisplayName' type='string' value='TestEffectB'/> \ <Property name='Author' type='string' value='The Wine Project'/> \ <Property name='Category' type='string' value='Test'/> \ <Property name='Description' type='string' value='Test effect.'/> \ @@ -72,7 +72,7 @@ L"<?xml version='1.0'?> \ static const WCHAR *effect_xml_c = L"<?xml version='1.0'?> \ <Effect> \ - <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='DisplayName' type='string' value='TestEffectC'/> \ <Property name='Author' type='string' value='The Wine Project'/> \ <Property name='Category' type='string' value='Test'/> \ <Property name='Description' type='string' value='Test effect.'/> \ @@ -10488,8 +10488,11 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, static void test_effect_register(BOOL d3d11) { + ID2D1DeviceContext *device_context; struct d2d1_test_context ctx; ID2D1Factory1 *factory; + WCHAR display_name[64]; + ID2D1Effect *effect; unsigned int i; HRESULT hr; @@ -10529,6 +10532,7 @@ static void test_effect_register(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; + device_context = ctx.context; factory = ctx.factory1; if (!factory) { @@ -10564,9 +10568,31 @@ static void test_effect_register(BOOL d3d11) hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, effect_xml_a, NULL, 0, effect_impl_create); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)display_name, sizeof(display_name)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(display_name, L"TestEffectA"), "Got unexpected display name %s.\n", debugstr_w(display_name)); + ID2D1Effect_Release(effect); + } + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, effect_xml_b, NULL, 0, effect_impl_create); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, + D2D1_PROPERTY_TYPE_STRING, (BYTE *)display_name, sizeof(display_name)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(display_name, L"TestEffectA"), "Got unexpected display name %s.\n", debugstr_w(display_name)); + ID2D1Effect_Release(effect); + } + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); -- 2.25.1

2 5

[PATCH 2/2]mscms: make the correct value for bmformat.
by Zhao Yi 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/transform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..21f58e73134 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format ) switch (format) { - case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; - case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; + case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break; case BM_GRAY: ret = TYPE_GRAY_8; break; - case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; - case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; - case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; + case BM_xRGBQUADS: ret = TYPE_ABGR_8; break; + case BM_xBGRQUADS: ret = TYPE_ARGB_8; break; + case BM_KYMCQUADS: ret = TYPE_CMYK_8; break; default: if (!quietfixme) { -- 2.20.1

2 1

[PATCH 1/6] secur32: Simplify get_session_peer_certificate unixlib interface.
by Nikolay Sivov 27 May '22

27 May '22

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> --- 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; }; -- 2.35.1

1 5

[PATCH 0/5] MR137: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 27 May '22

27 May '22

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

2 5

[PATCH 0/1] MR136: kernelbase: Avoid relying on the exception handler to test that handle != NULL.
by Huw Davies (＠huw) 27 May '22

27 May '22

Fixes a regression in SlingPlayer 2 caused by commit a76518c186ac0893ea460cd3b061096f1b05c8cc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52127 Signed-off-by: Huw Davies <huw(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/136

2 1

Fwd: [Mingw-w64-public] [PATCH] Add directory defined by BIN_TO_DLLDIR to dlldirs
by LIU Hao 27 May '22

27 May '22

Hello wine folks. As mingw-w64 imports WIDL from wine, I am forwarding this message here to ask for your comments and opinions. There are more details on GitHub: * https://github.com/msys2/MINGW-packages/issues/11520 * https://github.com/msys2/MINGW-packages/pull/11547

1 0

[PATCH 2/2]mscms: make the correct value for bmformat.
by Zhao Yi 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/transform.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..21f58e73134 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format ) switch (format) { - case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; - case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; + case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; + case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break; case BM_GRAY: ret = TYPE_GRAY_8; break; - case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; - case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; - case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; + case BM_xRGBQUADS: ret = TYPE_ABGR_8; break; + case BM_xBGRQUADS: ret = TYPE_ARGB_8; break; + case BM_KYMCQUADS: ret = TYPE_CMYK_8; break; default: if (!quietfixme) { -- 2.20.1

2 1

[PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by Zhao Yi 27 May '22

27 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> --- dlls/mscms/tests/profile.c | 118 +++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..3d24f5aa62a 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -62,6 +62,7 @@ static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); +static BOOL (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \ if (!p##func) return FALSE; @@ -95,6 +96,7 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( SetStandardColorSpaceProfileW ) GETFUNCPTR( UninstallColorProfileA ) GETFUNCPTR( UninstallColorProfileW ) + GETFUNCPTR( TranslateBitmapBits ) pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" ); @@ -123,6 +125,16 @@ L"\\color\\srgb color space profile.icm"; static const WCHAR profile2W[] = L"\\spool\\drivers\\color\\srgb color space profile.icm"; +static const char binfile1[] = +"\\w32x86\\3\\SS0IIN03.BIN"; +static const char binfile1_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IIN03.BIN"; + +static const char binfile2[] = +"\\w32x86\\3\\SS0IO15.BIN"; +static const char binfile2_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IO15.BIN"; + static BOOL have_color_profile; static const unsigned char rgbheader[] = @@ -1359,6 +1371,111 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp } } +static void test_TranslateBitmapBits() +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intents = INTENT_PERCEPTUAL; + + #define DESTBUFSIZE 4 + HANDLE binfile_handle; + UINT uret; + char binfilefile1[MAX_PATH], binfilefile1_ex[MAX_PATH], binfilefile2[MAX_PATH], binfilefile2_ex[MAX_PATH]; + WCHAR binfilefile1W[MAX_PATH]; + char *standbinfile1 = NULL; + char *standbinfile2 = NULL; + BYTE srcbits[] = {0,0,0xff}; + BMFORMAT input = BM_BGRTRIPLETS; + DWORD width = 1; + DWORD height = 1; + DWORD inputstride = 3; + PVOID destbits = HeapAlloc( GetProcessHeap(), 0, DESTBUFSIZE); + BMFORMAT output = BM_KYMCQUADS; + DWORD outputstride = 4; + PBMCALLBACKFN callback = NULL; + ULONG data = 0; + BYTE expect_destbits[]={0xff, 0xb6, 0, 0}; + BOOL bret = FALSE; + + uret = GetSystemDirectoryA( binfilefile1, sizeof(binfilefile1) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile1[0] && lstrlenA(binfilefile1) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile1)); + lstrcpyA(binfilefile1_ex, binfilefile1); + + uret = GetSystemDirectoryA( binfilefile2, sizeof(binfilefile2) ); + ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); + ok(binfilefile2[0] && lstrlenA(binfilefile2) < MAX_PATH, + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile2)); + lstrcpyA(binfilefile2_ex, binfilefile2); + + lstrcatA( binfilefile1, binfile1 ); + binfile_handle = CreateFileA( binfilefile1, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile1_ex, binfile1_ex ); + binfile_handle = CreateFileA( binfilefile1_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile1 = binfilefile1_ex; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2, binfile2 ); + binfile_handle = CreateFileA( binfilefile2, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2; + CloseHandle( binfile_handle ); + } + + lstrcatA( binfilefile2_ex, binfile2_ex ); + binfile_handle = CreateFileA( binfilefile2_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + + if (handle != INVALID_HANDLE_VALUE) + { + standbinfile2 = binfilefile2_ex; + CloseHandle( binfile_handle ); + } + + if (standbinfile1 && standbinfile2) + { + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile1; + profile.cbDataSize = strlen(standbinfile1); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standbinfile2; + profile.cbDataSize = strlen(standbinfile2); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, &intents, 1, 3, 0 ); + ok( transform != NULL, "got %lu\n", GetLastError() ); + + ZeroMemory(destbits,DESTBUFSIZE); + bret = pTranslateBitmapBits(transform,srcbits,input,width,height,inputstride,destbits,output,outputstride,callback,data); + ok(bret && memcmp(expect_destbits, destbits, sizeof(expect_destbits)) == 0, "get err destbits data\n"); + HeapFree( GetProcessHeap(), 0, destbits ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); + } +} + START_TEST(profile) { UINT len; @@ -1469,6 +1586,7 @@ START_TEST(profile) test_AssociateColorProfileWithDeviceA( testprofile ); test_CreateMultiProfileTransform( standardprofile, testprofile ); + test_TranslateBitmapBits( ); if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); -- 2.20.1

2 1

[PATCH v4 0/2] MR76: ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+.
by Brendan Shanks (＠bshanks) 26 May '22

26 May '22

- signal_alloc_thread() and signal_free_thread() mostly match signal_i386.c, but with the difference that first thread’s FS needs to be allocated in signal_init_process(). signal_alloc_thread() is called too early before the Wow TEB is allocated. - The LDT code is copied from signal_i386.c. Would it be worthwhile to move that into a common file? -- v4: ntdll: Set up 32-bit segments to support Wow64 on macOS 10.15+. ntdll: Store Wow64 FS selector in thread_data. https://gitlab.winehq.org/wine/wine/-/merge_requests/76

3 3

Re: [PATCH v2 0/1] MR133: wow64: Ensure SECURITY_DESCRIPTOR fields are always initialized. - approved
by Alexandre Julliard (＠julliard) 26 May '22

26 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/133

1 0

[PATCH 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated
by Paul Gofman (＠gofman) 26 May '22

26 May '22

Inspired by the discussion for MR 127 (https://www.winehq.org/pipermail/wine-devel/2022-May/217832.html) and is aimed to replace the second patch (ws2_32: Use allocated IO status block in select().) in that MR. When the thread calls server's terminate_thread for itself queuing the system APC though SIGUSR1 might race with the thread exit, there seems no easy and reliable way to be sure that signal is processed before the thread's stack and TEB are freed. Thus I am making the system APCs to be queued to the thread to be processed by server_select() after (terminate_thread) server call. When terminate_thread is called for the other thread the system APC will always be delivered through some other thread. Thread stack and TEB are not freed when the thread is killed externally, so completing the async from another thread should probably be fine. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/135

2 2

[PATCH v4 1/3] winepulse: Try to obtain shorter device names if it exceeds 62 chars.
by Gabriel Ivăncescu 26 May '22

26 May '22

If the device desc is longer than the limit, we try to obtain product name or alsa name (if product name does not fit in the limit), as otherwise there is no point to do it anyway. Then the profile desc is appended if it doesn't cause us to exceed the limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53010 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v4: Forgot to change commit message... dlls/winepulse.drv/pulse.c | 92 +++++++++++++++++++++++++++++++++----- 1 file changed, 80 insertions(+), 12 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1254509..0e504b6 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -426,6 +426,81 @@ static UINT pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } +#define MAX_DEVICE_NAME_LEN 62 + +static WCHAR *get_device_name(const char *desc, pa_proplist *proplist) +{ + /* + Some broken apps (e.g. Split/Second with fmodex) can't handle names that + are too long and crash even on native. If the device desc is too long, + we'll attempt to incrementally build it to try to stay under the limit. + ( + 1 is to check against truncated buffer after ntdll_umbstowcs ) + */ + WCHAR buf[MAX_DEVICE_NAME_LEN + 1]; + + /* For monitors of sinks; this does not seem to be localized in PA either */ + static const WCHAR monitor_of[] = {'M','o','n','i','t','o','r',' ','o','f',' '}; + + size_t len = strlen(desc); + WCHAR *name, *tmp; + + if (!(name = malloc((len + 1) * sizeof(WCHAR)))) + return NULL; + if (!(len = ntdll_umbstowcs(desc, len, name, len))) { + free(name); + return NULL; + } + + if (len > MAX_DEVICE_NAME_LEN && proplist) { + const char *prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_CLASS); + unsigned prop_len, rem = ARRAY_SIZE(buf); + BOOL monitor = FALSE; + + if (prop && !strcmp(prop, "monitor")) { + rem -= ARRAY_SIZE(monitor_of); + monitor = TRUE; + } + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PRODUCT_NAME); + if (!prop || !prop[0] || + !(prop_len = ntdll_umbstowcs(prop, strlen(prop), buf, rem)) || prop_len == rem) { + prop = pa_proplist_gets(proplist, "alsa.card_name"); + if (!prop || !prop[0] || + !(prop_len = ntdll_umbstowcs(prop, strlen(prop), buf, rem)) || prop_len == rem) + prop = NULL; + } + + if (prop) { + /* We know we have a name that fits within the limit now */ + WCHAR *p = name; + + if (monitor) { + memcpy(p, monitor_of, sizeof(monitor_of)); + p += ARRAY_SIZE(monitor_of); + } + len = ntdll_umbstowcs(prop, strlen(prop), p, rem); + rem -= len; + p += len; + + if (rem > 2) { + rem--; /* space */ + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION); + if (prop && prop[0] && (len = ntdll_umbstowcs(prop, strlen(prop), p + 1, rem)) && len != rem) { + *p++ = ' '; + p += len; + } + } + len = p - name; + } + } + name[len] = '\0'; + + if ((tmp = realloc(name, (len + 1) * sizeof(WCHAR)))) + name = tmp; + return name; +} + static void fill_device_info(PhysDevice *dev, pa_proplist *p) { const char *buffer; @@ -452,27 +527,18 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p) } static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, - UINT channel_mask, const char *pulse_name, const char *name) + UINT channel_mask, const char *pulse_name, const char *desc) { - size_t len = strlen(pulse_name), name_len = strlen(name); + size_t len = strlen(pulse_name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); - WCHAR *wname; if (!dev) return; - if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + if (!(dev->name = get_device_name(desc, proplist))) { free(dev); return; } - - if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || - !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { - free(wname); - free(dev); - return; - } - dev->name[name_len] = 0; dev->form = form; dev->index = index; dev->channel_mask = channel_mask; @@ -480,6 +546,8 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index memcpy(dev->pulse_name, pulse_name, len + 1); list_add_tail(list, &dev->entry); + + TRACE("%s\n", debugstr_w(dev->name)); } static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) -- 2.34.1

2 5

[PATCH v2 5/6] d3dx10_43: Add D3DX10CreateAsyncTextureInfoProcessor implementation.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 61 ++++++++++++++++++++++++++++++++++++-- dlls/d3dx10_43/dxhelpers.h | 2 ++ dlls/d3dx10_43/texture.c | 27 ++++++++++------- 3 files changed, 77 insertions(+), 13 deletions(-)

1 0

[PATCH 5/5] wineoss: Handle MIDI running status.
by Akihiro Sagawa 26 May '22

26 May '22

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/wineoss.drv/ossmidi.c | 70 ++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 11 deletions(-)

2 1

[PATCH 4/5] wineoss: Fix missing break statement.
by Akihiro Sagawa 26 May '22

26 May '22

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/wineoss.drv/ossmidi.c | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH 3/5] winealsa: Handle MIDI running status.
by Akihiro Sagawa 26 May '22

26 May '22

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winealsa.drv/alsamidi.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)

2 1

[PATCH 2/5] winealsa: Use the symbolic name for MIDI_CTL_ALL_SOUNDS_OFF.
by Akihiro Sagawa 26 May '22

26 May '22

MIDI_CTL_ALL_SOUNDS_OFF is channel dependent. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winealsa.drv/alsamidi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

2 1

[PATCH 1/5] midimap: Handle MIDI running status.
by Akihiro Sagawa 26 May '22

26 May '22

Wine's midiOutShortMsg() can't handle the MIDI message if the status byte is omitted. Omitting status byte is valid and called "running status". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53003 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/midimap/midimap.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)

2 1

[PATCH] [RFC] winecoreaudio: Handle MIDI running status.
by Akihiro Sagawa 26 May '22

26 May '22

Not compile tested. Andrew, could you try this patch on Mac? --- dlls/winecoreaudio.drv/coremidi.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)

2 1

[PATCH v3 1/3] winepulse: Try to obtain shorter device names if it exceeds 62 chars.
by Gabriel Ivăncescu 26 May '22

26 May '22

If the device desc is longer than the limit, we try to obtain product name or alsa name (whichever is shorter) but only if both fit within the limit, as otherwise there is no point to do it anyway (and avoids another allocation, simplifying the code). Then the profile desc is appended if it doesn't cause us to exceed the limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53010 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winepulse.drv/pulse.c | 92 +++++++++++++++++++++++++++++++++----- 1 file changed, 80 insertions(+), 12 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1254509..0e504b6 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -426,6 +426,81 @@ static UINT pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } +#define MAX_DEVICE_NAME_LEN 62 + +static WCHAR *get_device_name(const char *desc, pa_proplist *proplist) +{ + /* + Some broken apps (e.g. Split/Second with fmodex) can't handle names that + are too long and crash even on native. If the device desc is too long, + we'll attempt to incrementally build it to try to stay under the limit. + ( + 1 is to check against truncated buffer after ntdll_umbstowcs ) + */ + WCHAR buf[MAX_DEVICE_NAME_LEN + 1]; + + /* For monitors of sinks; this does not seem to be localized in PA either */ + static const WCHAR monitor_of[] = {'M','o','n','i','t','o','r',' ','o','f',' '}; + + size_t len = strlen(desc); + WCHAR *name, *tmp; + + if (!(name = malloc((len + 1) * sizeof(WCHAR)))) + return NULL; + if (!(len = ntdll_umbstowcs(desc, len, name, len))) { + free(name); + return NULL; + } + + if (len > MAX_DEVICE_NAME_LEN && proplist) { + const char *prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_CLASS); + unsigned prop_len, rem = ARRAY_SIZE(buf); + BOOL monitor = FALSE; + + if (prop && !strcmp(prop, "monitor")) { + rem -= ARRAY_SIZE(monitor_of); + monitor = TRUE; + } + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PRODUCT_NAME); + if (!prop || !prop[0] || + !(prop_len = ntdll_umbstowcs(prop, strlen(prop), buf, rem)) || prop_len == rem) { + prop = pa_proplist_gets(proplist, "alsa.card_name"); + if (!prop || !prop[0] || + !(prop_len = ntdll_umbstowcs(prop, strlen(prop), buf, rem)) || prop_len == rem) + prop = NULL; + } + + if (prop) { + /* We know we have a name that fits within the limit now */ + WCHAR *p = name; + + if (monitor) { + memcpy(p, monitor_of, sizeof(monitor_of)); + p += ARRAY_SIZE(monitor_of); + } + len = ntdll_umbstowcs(prop, strlen(prop), p, rem); + rem -= len; + p += len; + + if (rem > 2) { + rem--; /* space */ + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION); + if (prop && prop[0] && (len = ntdll_umbstowcs(prop, strlen(prop), p + 1, rem)) && len != rem) { + *p++ = ' '; + p += len; + } + } + len = p - name; + } + } + name[len] = '\0'; + + if ((tmp = realloc(name, (len + 1) * sizeof(WCHAR)))) + name = tmp; + return name; +} + static void fill_device_info(PhysDevice *dev, pa_proplist *p) { const char *buffer; @@ -452,27 +527,18 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p) } static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, - UINT channel_mask, const char *pulse_name, const char *name) + UINT channel_mask, const char *pulse_name, const char *desc) { - size_t len = strlen(pulse_name), name_len = strlen(name); + size_t len = strlen(pulse_name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); - WCHAR *wname; if (!dev) return; - if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + if (!(dev->name = get_device_name(desc, proplist))) { free(dev); return; } - - if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || - !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { - free(wname); - free(dev); - return; - } - dev->name[name_len] = 0; dev->form = form; dev->index = index; dev->channel_mask = channel_mask; @@ -480,6 +546,8 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index memcpy(dev->pulse_name, pulse_name, len + 1); list_add_tail(list, &dev->entry); + + TRACE("%s\n", debugstr_w(dev->name)); } static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) -- 2.34.1

1 2

[PATCH 5/5] d3dx10_43: Add D3DX10CreateAsyncTextureInfoProcessor implementation.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 61 ++++++++++++++++++++++++++++++++++++-- dlls/d3dx10_43/dxhelpers.h | 2 ++ dlls/d3dx10_43/texture.c | 27 ++++++++++------- 3 files changed, 77 insertions(+), 13 deletions(-)

1 0

[PATCH 4/5] d3dx10_43: Add D3DX10CreateAsyncTextureInfoProcessor stub.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 6 ++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10.h | 2 +- include/d3dx10async.h | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-)

1 0

[PATCH 3/5] d3dx10_43: Share code for resource data loading.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 93 ++++++++++++++++++++++++++++---------- dlls/d3dx10_43/compiler.c | 34 ++------------ dlls/d3dx10_43/dxhelpers.h | 4 ++ dlls/d3dx10_43/texture.c | 70 ++++------------------------ 4 files changed, 89 insertions(+), 112 deletions(-)

1 0

[PATCH 2/5] d3dx10_43: Share code for file data loading.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 39 +++++++++++++++--------- dlls/d3dx10_43/dxhelpers.h | 19 ++++++++++++ dlls/d3dx10_43/texture.c | 62 +++++--------------------------------- 3 files changed, 51 insertions(+), 69 deletions(-) create mode 100644 dlls/d3dx10_43/dxhelpers.h

1 0

[PATCH 1/5] d3dx10_43: Try loading the resource as bitmap in D3DX10CreateAsyncResourceLoader.
by Piotr Caban 26 May '22

26 May '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/async.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tools] winetest/tests: Add CORS page for testing CORS and XDomainRequest.
by Gabriel Ivăncescu 26 May '22

26 May '22

"text/plain" content type is important since native has too many restrictions on XDomainRequest and doesn't support anything else. The fact the file is a html page also enables detection testing instead of it reading the header only. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- winetest/tests/.htaccess | 7 +++++++ winetest/tests/cors.html | 1 + 2 files changed, 8 insertions(+) create mode 100644 winetest/tests/cors.html diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess index 73bab30..18c8b24 100644 --- a/winetest/tests/.htaccess +++ b/winetest/tests/.htaccess @@ -24,3 +24,10 @@ Header set Pragma "no-cache" Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" </ifModule> </FilesMatch> + +<Files cors.html> +<ifModule mod_headers.c> +Header set Access-Control-Allow-Origin "*" +Header set Content-Type "text/plain" +</ifModule> +</Files> diff --git a/winetest/tests/cors.html b/winetest/tests/cors.html new file mode 100644 index 0000000..3a73f89 --- /dev/null +++ b/winetest/tests/cors.html @@ -0,0 +1 @@ +<html><body>test</body></html> -- 2.34.1

1 0

[PATCH v2 1/2] winepulse: Try to obtain shorter device names if it exceeds 62 chars.
by Gabriel Ivăncescu 26 May '22

26 May '22

If the device desc is longer than the limit, we try to obtain product name or alsa name (whichever is shorter) but only if both fit within the limit, as otherwise there is no point to do it anyway (and avoids another allocation, simplifying the code). Then the profile desc is appended if it doesn't cause us to exceed the limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53010 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- I've done some testing with this by hacking the checks. Sometimes, the desc is even shorter than the device name (e.g. for "Built-In Analog Stereo" case), so it's always the first attempt. Note that we have to check the length *after* conversion to WCHAR since it can change. We can't rely on the source string's length (also we can't assume UTF8 if host CP is something else, which ntdll_umbstowcs takes care of). dlls/winepulse.drv/pulse.c | 94 +++++++++++++++++++++++++++++++++----- 1 file changed, 82 insertions(+), 12 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1254509..47860fa 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -426,6 +426,83 @@ static UINT pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } +static WCHAR *get_device_name(const char *desc, pa_proplist *proplist) +{ + /* + Some broken apps (e.g. Split/Second with fmodex) can't handle names that + are too long and crash even on native. If the device desc is too long, + we'll attempt to incrementally build it to try to stay under the limit. + ( + 1 is to check against full buffer after ntdll_umbstowcs ) + */ + WCHAR buf[62 + 1]; + + /* For monitors of sinks; this does not seem to be localized in PA either */ + static const WCHAR monitor_of[] = {'M','o','n','i','t','o','r',' ','o','f',' '}; + + size_t len = strlen(desc); + WCHAR *name, *tmp; + + if (!(name = malloc((len + 1) * sizeof(WCHAR)))) + return NULL; + if (!(len = ntdll_umbstowcs(desc, len, name, len))) { + free(name); + return NULL; + } + + if (len >= ARRAY_SIZE(buf) && proplist) { + const char *prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_CLASS); + const char *product_name, *alsa_name; + unsigned product_len, alsa_len; + unsigned rem = ARRAY_SIZE(buf); + BOOL monitor = FALSE; + + if (prop && !strcmp(prop, "monitor")) { + rem -= ARRAY_SIZE(monitor_of); + monitor = TRUE; + } + + product_name = pa_proplist_gets(proplist, PA_PROP_DEVICE_PRODUCT_NAME); + if (!product_name || !product_name[0] || + !(product_len = ntdll_umbstowcs(product_name, strlen(product_name), buf, rem)) || product_len == rem) + product_name = NULL; + + alsa_name = pa_proplist_gets(proplist, "alsa.card_name"); + if (!alsa_name || !alsa_name[0] || + !(alsa_len = ntdll_umbstowcs(alsa_name, strlen(alsa_name), buf, rem)) || alsa_len == rem) + alsa_name = NULL; + + prop = !product_name || (alsa_name && alsa_len < product_len) ? alsa_name : product_name; + if (prop) { + /* We know we have a name that fits within the limit now */ + WCHAR *p = name; + + if (monitor) { + memcpy(p, monitor_of, sizeof(monitor_of)); + p += ARRAY_SIZE(monitor_of); + } + len = ntdll_umbstowcs(prop, strlen(prop), p, rem); + rem -= len; + p += len; + + if (rem > 2) { + rem--; /* space */ + + prop = pa_proplist_gets(proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION); + if (prop && prop[0] && (len = ntdll_umbstowcs(prop, strlen(prop), p + 1, rem)) && len != rem) { + *p++ = ' '; + p += len; + } + } + len = p - name; + } + } + name[len] = '\0'; + + if ((tmp = realloc(name, (len + 1) * sizeof(WCHAR)))) + name = tmp; + return name; +} + static void fill_device_info(PhysDevice *dev, pa_proplist *p) { const char *buffer; @@ -452,27 +529,18 @@ static void fill_device_info(PhysDevice *dev, pa_proplist *p) } static void pulse_add_device(struct list *list, pa_proplist *proplist, int index, EndpointFormFactor form, - UINT channel_mask, const char *pulse_name, const char *name) + UINT channel_mask, const char *pulse_name, const char *desc) { - size_t len = strlen(pulse_name), name_len = strlen(name); + size_t len = strlen(pulse_name); PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); - WCHAR *wname; if (!dev) return; - if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + if (!(dev->name = get_device_name(desc, proplist))) { free(dev); return; } - - if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || - !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { - free(wname); - free(dev); - return; - } - dev->name[name_len] = 0; dev->form = form; dev->index = index; dev->channel_mask = channel_mask; @@ -480,6 +548,8 @@ static void pulse_add_device(struct list *list, pa_proplist *proplist, int index memcpy(dev->pulse_name, pulse_name, len + 1); list_add_tail(list, &dev->entry); + + TRACE("%s\n", debugstr_w(dev->name)); } static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) -- 2.34.1

1 1

[PATCH] secur32: Remove unused field from struct schan_transport.
by Nikolay Sivov 26 May '22

26 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 2 -- dlls/secur32/secur32_priv.h | 1 - 2 files changed, 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index bbbac37c6bb..6ab5507becf 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -826,8 +826,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( else ctx->header_size = HEADER_SIZE_TLS; - ctx->transport.ctx = ctx; - if (pszTargetName && *pszTargetName) { UINT len = WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, NULL, 0, NULL, NULL ); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 64edc0581d6..be375618266 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -102,7 +102,6 @@ struct schan_buffers struct schan_transport { - struct schan_context *ctx; schan_session session; struct schan_buffers in; struct schan_buffers out; -- 2.35.1

1 0

[PATCH 0/6] MR130: user32: Progress toward PE conversion of raw input APIs.
by Zebediah Figura (＠zfigura) 26 May '22

26 May '22

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

4 8

[PATCH 2/2]mscms: make the correct value for bmformat.
by Zhao Yi 26 May '22

26 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> ---  dlls/mscms/transform.c | 10 +++++-----  1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 0d48e217d66..21f58e73134 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -39,12 +39,12 @@ static DWORD from_bmformat( BMFORMAT format )        switch (format)      { -    case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; -    case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; +    case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; +    case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break;      case BM_GRAY:        ret = TYPE_GRAY_8; break; -    case BM_xRGBQUADS:   ret = TYPE_ARGB_8; break; -    case BM_xBGRQUADS:   ret = TYPE_ABGR_8; break; -    case BM_KYMCQUADS:   ret = TYPE_KYMC_8; break; +    case BM_xRGBQUADS:   ret = TYPE_ABGR_8; break; +    case BM_xBGRQUADS:   ret = TYPE_ARGB_8; break; +    case BM_KYMCQUADS:   ret = TYPE_CMYK_8; break;      default:          if (!quietfixme)          { --  2.20.1

2 1

[PATCH 1/2]mscms/test: test whether the value of bmformat is correct.
by Zhao Yi 26 May '22

26 May '22

Signed-off-by: Zhao Yi <zhaoyi(a)uniontech.com> ---  dlls/mscms/tests/profile.c | 118 +++++++++++++++++++++++++++++++++++++  1 file changed, 118 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..3d24f5aa62a 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -62,6 +62,7 @@ static BOOL     (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL);  static BOOL     (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL);    static BOOL     (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD); +static BOOL     (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG);    #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( hmscms, #func ); \      if (!p##func) return FALSE; @@ -95,6 +96,7 @@ static BOOL init_function_ptrs( void )      GETFUNCPTR( SetStandardColorSpaceProfileW )      GETFUNCPTR( UninstallColorProfileA )      GETFUNCPTR( UninstallColorProfileW ) +    GETFUNCPTR( TranslateBitmapBits )        pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" );   @@ -123,6 +125,16 @@ L"\\color\\srgb color space profile.icm";  static const WCHAR profile2W[] =  L"\\spool\\drivers\\color\\srgb color space profile.icm";   +static const char binfile1[] = +"\\w32x86\\3\\SS0IIN03.BIN"; +static const char binfile1_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IIN03.BIN"; + +static const char binfile2[] = +"\\w32x86\\3\\SS0IO15.BIN"; +static const char binfile2_ex[] = +"\\spool\\drivers\\w32x86\\3\\SS0IO15.BIN"; +  static BOOL have_color_profile;    static const unsigned char rgbheader[] = @@ -1359,6 +1371,111 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp      }  }   +static void test_TranslateBitmapBits() +{ +    PROFILE profile; +    HPROFILE handle[2]; +    HTRANSFORM transform; +    DWORD intents = INTENT_PERCEPTUAL; + +    #define DESTBUFSIZE 4 +    HANDLE binfile_handle; +    UINT uret; +    char binfilefile1[MAX_PATH], binfilefile1_ex[MAX_PATH], binfilefile2[MAX_PATH], binfilefile2_ex[MAX_PATH]; +    WCHAR binfilefile1W[MAX_PATH]; +    char *standbinfile1 = NULL; +    char *standbinfile2 = NULL; +    BYTE srcbits[] = {0,0,0xff}; +    BMFORMAT input = BM_BGRTRIPLETS; +    DWORD width = 1; +    DWORD height = 1; +    DWORD inputstride = 3; +    PVOID destbits = HeapAlloc( GetProcessHeap(), 0, DESTBUFSIZE); +    BMFORMAT output = BM_KYMCQUADS; +    DWORD outputstride = 4; +    PBMCALLBACKFN callback = NULL; +    ULONG data = 0; +    BYTE expect_destbits[]={0xff, 0xb6, 0, 0}; +    BOOL bret = FALSE; + +    uret = GetSystemDirectoryA( binfilefile1, sizeof(binfilefile1) ); +    ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); +    ok(binfilefile1[0] && lstrlenA(binfilefile1) < MAX_PATH, +        "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile1)); +    lstrcpyA(binfilefile1_ex, binfilefile1); + +    uret = GetSystemDirectoryA( binfilefile2, sizeof(binfilefile2) ); +    ok( uret > 0, "GetSystemDirectoryA() returns %d, LastError = %lu\n", uret, GetLastError()); +    ok(binfilefile2[0] && lstrlenA(binfilefile2) < MAX_PATH, +        "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(binfilefile2)); +    lstrcpyA(binfilefile2_ex, binfilefile2); + +    lstrcatA( binfilefile1, binfile1 ); +    binfile_handle = CreateFileA( binfilefile1, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + +    if (handle != INVALID_HANDLE_VALUE) +    { +        standbinfile1 = binfilefile1; +        CloseHandle( binfile_handle ); +    } + +    lstrcatA( binfilefile1_ex, binfile1_ex ); +    binfile_handle = CreateFileA( binfilefile1_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + +    if (handle != INVALID_HANDLE_VALUE) +    { +        standbinfile1 = binfilefile1_ex; +        CloseHandle( binfile_handle ); +    } + +    lstrcatA( binfilefile2, binfile2 ); +    binfile_handle = CreateFileA( binfilefile2, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + +    if (handle != INVALID_HANDLE_VALUE) +    { +        standbinfile2 = binfilefile2; +        CloseHandle( binfile_handle ); +    } + +    lstrcatA( binfilefile2_ex, binfile2_ex ); +    binfile_handle = CreateFileA( binfilefile2_ex, 0 , 0, NULL, OPEN_EXISTING, 0, NULL ); + +    if (handle != INVALID_HANDLE_VALUE) +    { +        standbinfile2 = binfilefile2_ex; +        CloseHandle( binfile_handle ); +    } +    +    if (standbinfile1 && standbinfile2) +    { +        profile.dwType       = PROFILE_FILENAME; +        profile.pProfileData = standbinfile1; +        profile.cbDataSize   = strlen(standbinfile1); + +        handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); +        ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + +        profile.dwType       = PROFILE_FILENAME; +        profile.pProfileData = standbinfile2; +        profile.cbDataSize   = strlen(standbinfile2); + +        handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); +        ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + +        transform = pCreateMultiProfileTransform( handle, 2, &intents, 1, 3, 0 ); +        ok( transform != NULL, "got %lu\n", GetLastError() ); + +        ZeroMemory(destbits,DESTBUFSIZE); +        bret = pTranslateBitmapBits(transform,srcbits,input,width,height,inputstride,destbits,output,outputstride,callback,data); +        ok(bret && memcmp(expect_destbits, destbits, sizeof(expect_destbits)) == 0, "get err destbits data\n"); +        HeapFree( GetProcessHeap(), 0, destbits ); + +        pDeleteColorTransform( transform ); +        pCloseColorProfile( handle[0] ); +        pCloseColorProfile( handle[1] ); +    } +} +  START_TEST(profile)  {      UINT len; @@ -1469,6 +1586,7 @@ START_TEST(profile)        test_AssociateColorProfileWithDeviceA( testprofile );      test_CreateMultiProfileTransform( standardprofile, testprofile ); +    test_TranslateBitmapBits( );        if (testprofile) DeleteFileA( testprofile );      FreeLibrary( huser32 ); -- 2.20.1

2 1

[PATCH v2 3/3] d2d1: Add some tests for ID2D1Bitmap1::Map()/::Unmap().
by Dmitry Timoshkov 26 May '22

26 May '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/tests/d2d1.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d5adb0c749c..e34d1070637 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11388,6 +11388,78 @@ static void test_image_bounds(BOOL d3d11) release_test_context(&ctx); } +static void test_bitmap_map(BOOL d3d11) +{ + struct d2d1_test_context ctx; + D2D1_SIZE_U size; + IDXGISurface *surface; + ID2D1Bitmap1 *bitmap; + D2D1_MAPPED_RECT mapped_rect; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + set_size_u(&size, 4, 4); + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmap(ctx.context, size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Bitmap1_Unmap(bitmap); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); + + ID2D1Bitmap1_Release(bitmap); + + surface = create_surface(ctx.device, DXGI_FORMAT_B8G8R8A8_UNORM); + + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ; + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(ctx.context, surface, &bitmap_desc, &bitmap); + todo_wine + ok(hr == E_INVALIDARG , "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + ID2D1Bitmap1_Release(bitmap); + + IDXGISurface_Release(surface); + + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -11464,6 +11536,7 @@ START_TEST(d2d1) queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); queue_test(test_image_bounds); + queue_test(test_bitmap_map); run_queued_tests(); } -- 2.36.1

1 0

[PATCH 0/1] MR133: wow64: Ensure SECURITY_DESCRIPTOR fields are always initialized.
by Brendan Shanks (＠bshanks) 26 May '22

26 May '22

Fixes exceptions seen in CEF and some advapi32 security tests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/133

2 1

[PATCH 0/5] MR129: winemac: PE conversion preparation
by Jacek Caban (＠jacek) 26 May '22

26 May '22

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

4 8

[PATCH 0/5] MR131: wined3d: Introduce wined3d_device_check_format_support().
by Chip Davis (＠cdavis5e) 26 May '22

26 May '22

Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/131

3 7

[PATCH v5 0/3] MR115: ntdll: Fake success for ThreadPowerThrottlingState
by Alistair Leslie-Hughes (＠alesliehughes) 26 May '22

26 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v5: ntdll: Fake success for ThreadPowerThrottlingState. include: Add THREAD_POWER_THROTTLING_STATE type. winex11.drv: Define ControlMask when not available. https://gitlab.winehq.org/wine/wine/-/merge_requests/115

4 6

[PATCH v5 0/8] MR61: winegstreamer: Dynamic transform stream format change support.
by Rémi Bernon (＠rbernon) 25 May '22

25 May '22

Compared to last attempt, I moved the format pointer to a dedicated `wg_transform_read_data` parameter instead of a property of the sample. Most of the transforms use `NULL` there as they don't expect or support format change. H264 decoder passes a transform format member where it tracks the current stream format. -- v5: winegstreamer: Expose output media type attributes from the stream format. winegstreamer: Support wg_transform output format change events. winegstreamer: Track caps changes and keep them with the output buffers. winegstreamer: Only filter video caps attributes when format uses 0. winegstreamer: Avoid leaking buffer list in wg_transform_read_data. winegstreamer: Return early if output buffer is too small. winegstreamer: Set wg_transform output sample size on gst_buffer_map failure. winegstreamer: Append a videoconvert element to wg_transform video output. https://gitlab.winehq.org/wine/wine/-/merge_requests/61

4 12

[PATCH v2 0/5] MR125: qasf: Beginnings of an ASF reader implementation.
by Zebediah Figura (＠zfigura) 25 May '22

25 May '22

This supersedes merge request 116. -- v2: qasf: Implement ASF Reader filter stream stubs. qasf: Create and open a WMReader in the ASF Reader filter. qasf: Rename variables and functions. qasf: Constify filter_ops. qasf/tests: Add more ASF Reader filter tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/125

4 9

Re: [PATCH v2 0/5] MR129: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 25 May '22

25 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/129

1 0

Re: [PATCH v2 0/6] MR128: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) 25 May '22

25 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/128

1 0

Re: [PATCH v2 0/1] MR124: win32u: Fix typo in NtUserGetIconInfo. - approved
by Alexandre Julliard (＠julliard) 25 May '22

25 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/124

1 0

[v2 PATCH 1/4] kernel32/tests: Run process information tests over defined test data.
by Nikolay Sivov 25 May '22

25 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c1312bd8916..4a6451a23fe 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3773,7 +3773,7 @@ static void test_process_info(HANDLE hproc) return; } - for (i = 0; i < MaxProcessInfoClass; i++) + for (i = 0; i < ARRAY_SIZE(info_size); i++) { ret_len = 0; status = pNtQueryInformationProcess(hproc, i, buf, info_size[i], &ret_len); -- 2.35.1

2 4

[PATCH v4 0/8] MR61: winegstreamer: Dynamic transform stream format change support.
by Rémi Bernon (＠rbernon) 25 May '22

25 May '22

Compared to last attempt, I moved the format pointer to a dedicated `wg_transform_read_data` parameter instead of a property of the sample. Most of the transforms use `NULL` there as they don't expect or support format change. H264 decoder passes a transform format member where it tracks the current stream format. -- v4: winegstreamer: Expose output media type attributes from the stream format. winegstreamer: Support wg_transform output format change events. winegstreamer: Track caps changes and keep them with the output buffers. winegstreamer: Only filter video caps attributes when format uses 0. winegstreamer: Avoid leaking buffer list in wg_transform_read_data. winegstreamer: Return early if output buffer is too small. winegstreamer: Set wg_transform output sample size on gst_buffer_map failure. winegstreamer: Append a videoconvert element to wg_transform video output. https://gitlab.winehq.org/wine/wine/-/merge_requests/61

4 13

[PATCH v2 1/4] mshtml: Implement timeout for XMLHttpRequest.
by Gabriel Ivăncescu 25 May '22

25 May '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 2 + dlls/mshtml/tests/xmlhttprequest.c | 36 +++++++++ dlls/mshtml/xmlhttprequest.c | 116 +++++++++++++++++++++++++++++ 4 files changed, 155 insertions(+) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 930ab3b..5574272 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -265,6 +265,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLWindow6) \ XIID(IHTMLWindow7) \ XIID(IHTMLXMLHttpRequest) \ + XIID(IHTMLXMLHttpRequest2) \ XIID(IHTMLXMLHttpRequestFactory) \ XIID(IOmHistory) \ XIID(IOmNavigator) \ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 5f10447..8503523 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -397,6 +397,8 @@ sync_test("xhr_props", function() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); + test_exposed("ontimeout", true); + test_exposed("timeout", true); }); sync_test("stylesheet_props", function() { diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 868035d..6aef9f5 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -1007,6 +1007,41 @@ static void test_xhr_post(IHTMLDocument2 *doc) xhr = NULL; } +static void test_timeout(IHTMLDocument2 *doc) +{ + IHTMLXMLHttpRequest2 *xhr2; + LONG timeout; + HRESULT hres; + + create_xmlhttprequest(doc); + if(!xhr) + return; + + hres = IHTMLXMLHttpRequest_QueryInterface(xhr, &IID_IHTMLXMLHttpRequest2, (void**)&xhr2); + ok(hres == S_OK, "QueryInterface(IHTMLXMLHttpRequest2) failed: %08lx\n", hres); + + hres = IHTMLXMLHttpRequest2_get_timeout(xhr2, NULL); + ok(hres == E_POINTER, "get_timeout returned %08lx\n", hres); + hres = IHTMLXMLHttpRequest2_get_timeout(xhr2, &timeout); + ok(hres == S_OK, "get_timeout returned %08lx\n", hres); + ok(timeout == 0, "timeout = %ld\n", timeout); + + /* Some Windows versions only allow setting timeout after open() */ + xhr_open(L"http://test.winehq.org/tests/post.php", L"POST", TRUE); + IHTMLXMLHttpRequest_Release(xhr); + xhr = NULL; + + hres = IHTMLXMLHttpRequest2_put_timeout(xhr2, -1); + ok(hres == E_INVALIDARG || broken(hres == E_FAIL), "put_timeout returned %08lx\n", hres); + hres = IHTMLXMLHttpRequest2_put_timeout(xhr2, 1337); + ok(hres == S_OK, "put_timeout returned %08lx\n", hres); + hres = IHTMLXMLHttpRequest2_get_timeout(xhr2, &timeout); + ok(hres == S_OK, "get_timeout returned %08lx\n", hres); + ok(timeout == 1337, "timeout = %ld\n", timeout); + + IHTMLXMLHttpRequest2_Release(xhr2); +} + static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) { BSTR url; @@ -1071,6 +1106,7 @@ START_TEST(xmlhttprequest) test_async_xhr(doc, large_page_url, NULL); test_async_xhr_abort(doc, large_page_url); test_xhr_post(doc); + test_timeout(doc); IHTMLDocument2_Release(doc); } SysFreeString(content_type); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 1721959..066b94b 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -105,6 +105,7 @@ typedef struct { struct HTMLXMLHttpRequest { EventTarget event_target; IHTMLXMLHttpRequest IHTMLXMLHttpRequest_iface; + IHTMLXMLHttpRequest2 IHTMLXMLHttpRequest2_iface; IProvideClassInfo2 IProvideClassInfo2_iface; LONG ref; nsIXMLHttpRequest *nsxhr; @@ -236,6 +237,8 @@ static HRESULT WINAPI HTMLXMLHttpRequest_QueryInterface(IHTMLXMLHttpRequest *ifa *ppv = &This->IHTMLXMLHttpRequest_iface; }else if(IsEqualGUID(&IID_IHTMLXMLHttpRequest, riid)) { *ppv = &This->IHTMLXMLHttpRequest_iface; + }else if(IsEqualGUID(&IID_IHTMLXMLHttpRequest2, riid)) { + *ppv = &This->IHTMLXMLHttpRequest2_iface; }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { *ppv = &This->IProvideClassInfo2_iface; }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { @@ -726,6 +729,117 @@ static const IHTMLXMLHttpRequestVtbl HTMLXMLHttpRequestVtbl = { HTMLXMLHttpRequest_setRequestHeader }; +static inline HTMLXMLHttpRequest *impl_from_IHTMLXMLHttpRequest2(IHTMLXMLHttpRequest2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IHTMLXMLHttpRequest2_iface); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_QueryInterface(IHTMLXMLHttpRequest2 *iface, REFIID riid, void **ppv) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IHTMLXMLHttpRequest_QueryInterface(&This->IHTMLXMLHttpRequest_iface, riid, ppv); +} + +static ULONG WINAPI HTMLXMLHttpRequest2_AddRef(IHTMLXMLHttpRequest2 *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IHTMLXMLHttpRequest_AddRef(&This->IHTMLXMLHttpRequest_iface); +} + +static ULONG WINAPI HTMLXMLHttpRequest2_Release(IHTMLXMLHttpRequest2 *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IHTMLXMLHttpRequest_Release(&This->IHTMLXMLHttpRequest_iface); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_GetTypeInfoCount(IHTMLXMLHttpRequest2 *iface, UINT *pctinfo) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_GetTypeInfoCount(&This->event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_GetTypeInfo(IHTMLXMLHttpRequest2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_GetTypeInfo(&This->event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_GetIDsOfNames(IHTMLXMLHttpRequest2 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_GetIDsOfNames(&This->event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_Invoke(IHTMLXMLHttpRequest2 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_Invoke(&This->event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_put_timeout(IHTMLXMLHttpRequest2 *iface, LONG v) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + + TRACE("(%p)->(%ld)\n", This, v); + + if(v < 0) + return E_INVALIDARG; + return map_nsresult(nsIXMLHttpRequest_SetTimeout(This->nsxhr, v)); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_get_timeout(IHTMLXMLHttpRequest2 *iface, LONG *p) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + nsresult nsres; + UINT32 timeout; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + nsres = nsIXMLHttpRequest_GetTimeout(This->nsxhr, &timeout); + *p = timeout; + return map_nsresult(nsres); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_put_ontimeout(IHTMLXMLHttpRequest2 *iface, VARIANT v) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_get_ontimeout(IHTMLXMLHttpRequest2 *iface, VARIANT *p) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + + FIXME("(%p)->(%p)\n", This, p); + + return E_NOTIMPL; +} + +static const IHTMLXMLHttpRequest2Vtbl HTMLXMLHttpRequest2Vtbl = { + HTMLXMLHttpRequest2_QueryInterface, + HTMLXMLHttpRequest2_AddRef, + HTMLXMLHttpRequest2_Release, + HTMLXMLHttpRequest2_GetTypeInfoCount, + HTMLXMLHttpRequest2_GetTypeInfo, + HTMLXMLHttpRequest2_GetIDsOfNames, + HTMLXMLHttpRequest2_Invoke, + HTMLXMLHttpRequest2_put_timeout, + HTMLXMLHttpRequest2_get_timeout, + HTMLXMLHttpRequest2_put_ontimeout, + HTMLXMLHttpRequest2_get_ontimeout +}; + static inline HTMLXMLHttpRequest *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) { return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IProvideClassInfo2_iface); @@ -895,6 +1009,7 @@ static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { }; static const tid_t HTMLXMLHttpRequest_iface_tids[] = { + IHTMLXMLHttpRequest2_tid, 0 }; static dispex_static_data_t HTMLXMLHttpRequest_dispex = { @@ -1013,6 +1128,7 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->nsxhr = nsxhr; ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; + ret->IHTMLXMLHttpRequest2_iface.lpVtbl = &HTMLXMLHttpRequest2Vtbl; ret->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; EventTarget_Init(&ret->event_target, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, &HTMLXMLHttpRequest_dispex, This->window->doc->document_mode); -- 2.34.1

3 9

[PATCH v2 1/3] user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure.
by Zebediah Figura 25 May '22

25 May '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index a014066f988..961efecd075 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -177,7 +177,6 @@ void rawinput_update_device_list(void) SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; struct device *device; HIDD_ATTRIBUTES attr; - HIDP_CAPS caps; GUID hid_guid; HDEVINFO set; DWORD idx; @@ -201,6 +200,8 @@ void rawinput_update_device_list(void) for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) { + const struct hid_preparsed_data *preparsed; + if (!(device = add_device(set, &iface))) continue; @@ -215,12 +216,10 @@ void rawinput_update_device_list(void) if (!HidD_GetPreparsedData(device->file, &device->data)) WARN("Failed to get preparsed data.\n"); + preparsed = (struct hid_preparsed_data *)device->data; - if (!HidP_GetCaps(device->data, &caps)) - WARN("Failed to get caps.\n"); - - device->info.hid.usUsagePage = caps.UsagePage; - device->info.hid.usUsage = caps.Usage; + device->info.hid.usUsagePage = preparsed->usage_page; + device->info.hid.usUsage = preparsed->usage; } SetupDiDestroyDeviceInfoList(set); -- 2.35.1

2 5

[PATCH v2 1/4] mshtml: Implement HTMLStorage_getItem().
by Hans Leidekker 25 May '22

25 May '22

v2: Store filename. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 276 ++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlwindow.c | 4 +- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 274 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 95f7ae5cd16..8f154291e36 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "shlobj.h" #include "wine/debug.h" @@ -35,6 +36,7 @@ typedef struct { DispatchEx dispex; IHTMLStorage IHTMLStorage_iface; LONG ref; + WCHAR *filename; } HTMLStorage; static inline HTMLStorage *impl_from_IHTMLStorage(IHTMLStorage *iface) @@ -83,6 +85,7 @@ static ULONG WINAPI HTMLStorage_Release(IHTMLStorage *iface) if(!ref) { release_dispex(&This->dispex); + heap_free(This->filename); heap_free(This); } @@ -121,6 +124,144 @@ static HRESULT WINAPI HTMLStorage_Invoke(IHTMLStorage *iface, DISPID dispIdMembe pDispParams, pVarResult, pExcepInfo, puArgErr); } +static BOOL create_path(const WCHAR *path) +{ + BOOL ret = TRUE; + WCHAR *new_path; + int len; + + new_path = heap_alloc((wcslen(path) + 1) * sizeof(WCHAR)); + if(!new_path) + return FALSE; + wcscpy(new_path, path); + + while((len = wcslen(new_path)) && new_path[len - 1] == '\\') + new_path[len - 1] = 0; + + while(!CreateDirectoryW(new_path, NULL)) { + WCHAR *slash; + DWORD error = GetLastError(); + if(error == ERROR_ALREADY_EXISTS) break; + if(error != ERROR_PATH_NOT_FOUND) { + ret = FALSE; + break; + } + slash = wcsrchr(new_path, '\\'); + if(!slash) { + ret = FALSE; + break; + } + len = slash - new_path; + new_path[len] = 0; + if(!create_path(new_path)) { + ret = FALSE; + break; + } + new_path[len] = '\\'; + } + heap_free(new_path); + return ret; +} + +static WCHAR *build_mutexname(const WCHAR *filename) +{ + WCHAR *ret, *ptr; + ret = heap_strdupW(filename); + if(!ret) + return NULL; + for(ptr = ret; *ptr; ptr++) + if(*ptr == '\\') *ptr = '_'; + return ret; +} + +struct storage { + IXMLDOMDocument *doc; + HANDLE mutex; +}; + +static void close_storage(struct storage *storage) +{ + if(storage->doc) + IXMLDOMDocument_Release(storage->doc); + ReleaseMutex(storage->mutex); + CloseHandle(storage->mutex); + heap_free(storage); +} + +static HRESULT open_storage(const WCHAR *filename, struct storage **ret) +{ + struct storage *storage; + HRESULT hres = E_OUTOFMEMORY; + VARIANT var; + VARIANT_BOOL success; + WCHAR *mutexname, *ptr, *path = NULL; + + storage = heap_alloc_zero(sizeof(*storage)); + if(!storage) + return E_OUTOFMEMORY; + + mutexname = build_mutexname(filename); + if(!mutexname) + goto done; + + storage->mutex = CreateMutexW(NULL, FALSE, mutexname); + heap_free(mutexname); + if(!storage->mutex) { + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + WaitForSingleObject(storage->mutex, INFINITE); + + path = heap_strdupW(filename); + if(!path) + goto done; + + *(ptr = wcsrchr(path, '\\')) = 0; + if(!create_path(path)) + goto done; + + if(GetFileAttributesW(filename) == INVALID_FILE_ATTRIBUTES) { + DWORD count; + HANDLE file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + if(file == INVALID_HANDLE_VALUE) { + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + if(!WriteFile(file, "<root/>", sizeof("<root/>") - 1, &count, NULL)) { + CloseHandle(file); + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + CloseHandle(file); + } + + hres = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&storage->doc); + if(hres != S_OK) + goto done; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(filename); + if(!V_BSTR(&var)) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMDocument_load(storage->doc, var, &success); + if(hres == S_FALSE || success == VARIANT_FALSE) + hres = E_FAIL; + + SysFreeString(V_BSTR(&var)); + +done: + if(hres != S_OK) + close_storage(storage); + else + *ret = storage; + + heap_free(path); + return hres; +} + static HRESULT WINAPI HTMLStorage_get_length(IHTMLStorage *iface, LONG *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); @@ -142,14 +283,93 @@ static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) return E_NOTIMPL; } -static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *p) +static BSTR build_query(const WCHAR *key) +{ + static const WCHAR fmt[] = L"item[@name='%s']"; + const WCHAR *str = key ? key : L""; + UINT len = ARRAY_SIZE(fmt) + wcslen(str); + BSTR ret = SysAllocStringLen(NULL, len); + + if(ret) swprintf(ret, len, fmt, str); + return ret; +} + +static HRESULT get_root_node(IXMLDOMDocument *doc, IXMLDOMNode **root) +{ + HRESULT hres; + BSTR str; + + str = SysAllocString(L"root"); + if(!str) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_selectSingleNode(doc, str, root); + SysFreeString(str); + return hres; +} + +static HRESULT get_item(const WCHAR *filename, BSTR key, VARIANT *value) +{ + struct storage *storage; + BSTR query = NULL; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + HRESULT hres; + + hres = open_storage(filename, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = IXMLDOMElement_getAttribute(elem, (BSTR)L"value", value); + }else { + V_VT(value) = VT_NULL; + hres = S_OK; + } + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + close_storage(storage); + return hres; +} + +static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *value) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), p); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), value); - V_VT(p) = VT_NULL; - return S_OK; + if(!value) + return E_POINTER; + + if(!This->filename) { + FIXME("session storage not supported\n"); + V_VT(value) = VT_NULL; + return S_OK; + } + + return get_item(This->filename, bstrKey, value); } static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) @@ -201,7 +421,48 @@ static dispex_static_data_t HTMLStorage_dispex = { HTMLStorage_iface_tids }; -HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) +static WCHAR *build_filename(IUri *uri) +{ + static const WCHAR store[] = L"\\Microsoft\\Internet Explorer\\DOMStore\\"; + WCHAR path[MAX_PATH], *ret; + BSTR hostname; + HRESULT hres; + int len; + + hres = IUri_GetHost(uri, &hostname); + if(hres != S_OK) + return NULL; + + if(!SHGetSpecialFolderPathW(NULL, path, CSIDL_LOCAL_APPDATA, TRUE)) { + ERR("Can't get folder path %lu\n", GetLastError()); + SysFreeString(hostname); + return NULL; + } + + len = wcslen(path); + if(len + ARRAY_SIZE(store) > ARRAY_SIZE(path)) { + ERR("Path too long\n"); + SysFreeString(hostname); + return NULL; + } + memcpy(path + len, store, sizeof(store)); + + len += ARRAY_SIZE(store); + ret = heap_alloc((len + wcslen(hostname) + ARRAY_SIZE(L".xml")) * sizeof(WCHAR)); + if(!ret) { + SysFreeString(hostname); + return NULL; + } + + wcscpy(ret, path); + wcscat(ret, hostname); + wcscat(ret, L".xml"); + + SysFreeString(hostname); + return ret; +} + +HRESULT create_html_storage(compat_mode_t compat_mode, IUri *uri, IHTMLStorage **p) { HTMLStorage *storage; @@ -209,6 +470,11 @@ HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) if(!storage) return E_OUTOFMEMORY; + if(uri && !(storage->filename = build_filename(uri))) { + heap_free(storage); + return E_OUTOFMEMORY; + } + storage->IHTMLStorage_iface.lpVtbl = &HTMLStorageVtbl; storage->ref = 1; init_dispatch(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex, compat_mode); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 235e29a3070..ef5d80ff512 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2143,7 +2143,7 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS HRESULT hres; hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - &This->inner_window->session_storage); + NULL, &This->inner_window->session_storage); if(FAILED(hres)) return hres; } @@ -2163,7 +2163,7 @@ static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLSto HRESULT hres; hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - &This->inner_window->local_storage); + This->inner_window->base.outer_window->uri, &This->inner_window->local_storage); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 930ab3bbe19..4ad5d3dbe9a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -941,7 +941,7 @@ HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**) DE HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; void detach_dom_implementation(IHTMLDOMImplementation*) DECLSPEC_HIDDEN; -HRESULT create_html_storage(compat_mode_t,IHTMLStorage**) DECLSPEC_HIDDEN; +HRESULT create_html_storage(compat_mode_t,IUri*,IHTMLStorage**) DECLSPEC_HIDDEN; void HTMLDocument_Persist_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_OleCmd_Init(HTMLDocument*) DECLSPEC_HIDDEN; -- 2.30.2

2 1

[PATCH 1/6] include: Add IDOMProgressEvent interface and dispinterface.
by Gabriel Ivăncescu 25 May '22

25 May '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/mshtmdid.h | 12 +++++++++ include/mshtml.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 31e7570..f56fc4d 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -141,6 +141,12 @@ #define DISPID_DOMSTORAGEEVENT (DISPID_DOMMESSAGEEVENT+25) #define DISPID_DOMBEFOREUNLOADEVENT (DISPID_DOMSTORAGEEVENT+25) #define DISPID_DOMDRAGEVENT (DISPID_DOMBEFOREUNLOADEVENT+25) +#define DISPID_DOMMSPOINTEREVENT (DISPID_DOMDRAGEVENT+25) +#define DISPID_DOMMSGESTUREEVENT (DISPID_DOMMSPOINTEREVENT+25) +#define DISPID_DOMMSTRANSITIONEVENT (DISPID_DOMMSGESTUREEVENT+25) +#define DISPID_DOMMSANIMATIONEVENT (DISPID_DOMMSTRANSITIONEVENT+25) +#define DISPID_DOMMSMANIPULATIONEVENT (DISPID_DOMMSANIMATIONEVENT+25) +#define DISPID_DOMPROGRESSEVENT (DISPID_DOMMSMANIPULATIONEVENT+25) #define DISPID_DOMIMPLEMENTATION DISPID_NORMAL_FIRST #define DISPID_DOCUMENTCOMPATIBLEINFO DISPID_NORMAL_FIRST @@ -4704,6 +4710,12 @@ #define DISPID_IDOMMESSAGEEVENT_SOURCE DISPID_DOMMESSAGEEVENT+3 #define DISPID_IDOMMESSAGEEVENT_INITMESSAGEEVENT DISPID_DOMMESSAGEEVENT+4 +/* IDOMProgressEvent */ +#define DISPID_IDOMPROGRESSEVENT_LENGTHCOMPUTABLE DISPID_DOMPROGRESSEVENT+1 +#define DISPID_IDOMPROGRESSEVENT_LOADED DISPID_DOMPROGRESSEVENT+2 +#define DISPID_IDOMPROGRESSEVENT_TOTAL DISPID_DOMPROGRESSEVENT+3 +#define DISPID_IDOMPROGRESSEVENT_INITPROGRESSEVENT DISPID_DOMPROGRESSEVENT+4 + /* IHTMLControlElement */ #define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX #define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0) diff --git a/include/mshtml.idl b/include/mshtml.idl index 162a969..afeb442 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28495,6 +28495,68 @@ methods: [in] IHTMLWindow2 *source); } +/***************************************************************************** + * IDOMProgressEvent interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051071e-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDOMProgressEvent : IDispatch +{ + [propget, id(DISPID_IDOMPROGRESSEVENT_LENGTHCOMPUTABLE)] + HRESULT lengthComputable([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMPROGRESSEVENT_LOADED)] + HRESULT loaded([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IDOMPROGRESSEVENT_TOTAL)] + HRESULT total([out, retval] ULONGLONG *p); + + [id(DISPID_IDOMPROGRESSEVENT_INITPROGRESSEVENT)] + HRESULT initProgressEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] VARIANT_BOOL lengthComputableArg, + [in] ULONGLONG loadedArg, + [in] ULONGLONG totalArg); +}; + +/***************************************************************************** + * DispDOMProgressEvent dispinterface + */ +[ + hidden, + uuid(30590091-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispDOMProgressEvent +{ +properties: +methods: + WINE_IDOMEVENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IDOMPROGRESSEVENT_LENGTHCOMPUTABLE)] + VARIANT_BOOL lengthComputable(); + + [propget, id(DISPID_IDOMPROGRESSEVENT_LOADED)] + ULONGLONG loaded(); + + [propget, id(DISPID_IDOMPROGRESSEVENT_TOTAL)] + ULONGLONG total(); + + [id(DISPID_IDOMPROGRESSEVENT_INITPROGRESSEVENT)] + void initProgressEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] VARIANT_BOOL lengthComputableArg, + [in] ULONGLONG loadedArg, + [in] ULONGLONG totalArg); +}; + /***************************************************************************** * IHTMLNamespaceCollection interface */ -- 2.34.1

3 16

[PATCH 0/2] MR127: ws2_32: Make wait in select alertable
by Paul Gofman (＠gofman) 25 May '22

25 May '22

Fixes V Rising hang on exit. During exit the main thread wants to terminate the other thread by queuing APC which APC is supposed to raise an exception and abort the thread. That is basically how Unity / Mono aborts threads. The thread being terminated is calling select() in a loop and the wait in select() is currently not alertable (while they should be, as the test suggests). But with the first patch the things may get more interesting. ws2_32.select() passes on stack io status block to NtDeviceIoControlFile(), then it is killed from APC while waiting for event to be signaled by ioctl async processing. Then, wineserver wants to complete the async. The async owner thread is already terminated and it delivers SIGUSR1 to process the system APC to the main thread. When the APC is processed from USR1 handler it segfaults trying to put the IO status to iosb pointing to already deallocated thread stack. This is segfault on signal stack and as such is unrecoverable. The process is left hanging. Thus the second patch. In the ideal case we'd probably want to avoid crashing or handle segfault in system APC processing somehow, but I don't yet see a feasible way to do it. In theory the same may happen without ws2_32 if the app does the same, but I don't know that anything hits that case while ws2_32 queues those on stack iosbs, so avoiding that may probably avoid the practical issues. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/127

7 12

[PATCH 0/5] MR125: qasf: Beginnings of an ASF reader implementation.
by Zebediah Figura (＠zfigura) 25 May '22

25 May '22

This supersedes merge request 116. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/125

4 8

[PATCH] server: clear area when file size is not full page.
by chen 25 May '22

25 May '22

2 1

[PATCH 2/2] scrrun: Add MoveFolder implementation.
by Robert Wilhelm 25 May '22

25 May '22

This implements folder rename which is sufficient for installer used in the bug report. No wildcard handling yet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52128 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 16 ++++++++--- dlls/scrrun/tests/filesystem.c | 51 ++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 35b43e2f124..6d534bc4413 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3764,12 +3764,20 @@ static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR source, BSTR de return MoveFileW(source, destination) ? S_OK : create_error(GetLastError()); } -static HRESULT WINAPI filesys_MoveFolder(IFileSystem3 *iface,BSTR Source, - BSTR Destination) +static HRESULT WINAPI filesys_MoveFolder(IFileSystem3 *iface, BSTR source, BSTR destination) { - FIXME("%p %s %s\n", iface, debugstr_w(Source), debugstr_w(Destination)); + DWORD attrs; - return E_NOTIMPL; + TRACE("%p %s %s\n", iface, debugstr_w(source), debugstr_w(destination)); + + if(!source || !destination) + return E_INVALIDARG; + + attrs = GetFileAttributesW(source); + if((attrs == INVALID_FILE_ATTRIBUTES) || !(attrs & FILE_ATTRIBUTE_DIRECTORY)) + return CTL_E_PATHNOTFOUND; + + return MoveFileW(source, destination) ? S_OK : create_error(GetLastError()); } static inline HRESULT copy_file(const WCHAR *source, DWORD source_len, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 1ba0e81a2d1..aa0927ff4b7 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2600,6 +2600,56 @@ static void test_MoveFile(void) SysFreeString(str); } +static void test_MoveFolder(void) +{ + BSTR src, dst; + WCHAR buffW1[MAX_PATH],buffW2[MAX_PATH]; + HANDLE file; + HRESULT hr; + + get_temp_path(L"foo", buffW1); + get_temp_path(L"bar", buffW2); + + ok(CreateDirectoryW(buffW1, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(buffW1)); + src = SysAllocString(buffW1); + dst = SysAllocString(buffW2); + hr = IFileSystem3_MoveFolder(fs3, src, dst); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + SysFreeString(src); + SysFreeString(dst); + + ok(CreateDirectoryW(buffW1, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(buffW1)); + src = SysAllocString(buffW1); + dst = SysAllocString(buffW2); + hr = IFileSystem3_MoveFolder(fs3, src, dst); /* dst already exists */ + ok(hr == CTL_E_FILEALREADYEXISTS, "Unexpected hr %#lx.\n", hr); + SysFreeString(src); + SysFreeString(dst); + + ok(RemoveDirectoryW(buffW1), "can't remove %s directory\n", wine_dbgstr_w(buffW1)); + ok(RemoveDirectoryW(buffW2), "can't remove %s directory\n", wine_dbgstr_w(buffW2)); + + src = SysAllocString(buffW1); + dst = SysAllocString(buffW2); + hr = IFileSystem3_MoveFolder(fs3, src, dst); /* src nonexistant */ + ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr); + SysFreeString(src); + SysFreeString(dst); + + file = CreateFileW(buffW1, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + CloseHandle(file); + + src = SysAllocString(buffW1); + dst = SysAllocString(buffW2); + hr = IFileSystem3_MoveFolder(fs3, src, dst); + ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr); + SysFreeString(src); + SysFreeString(dst); + DeleteFileW(buffW1); +} + static void test_DoOpenPipeStream(void) { static const char testdata[] = "test"; @@ -2733,6 +2783,7 @@ START_TEST(filesystem) test_GetExtensionName(); test_GetSpecialFolder(); test_MoveFile(); + test_MoveFolder(); test_DoOpenPipeStream(); IFileSystem3_Release(fs3); -- 2.36.1

1 0

[PATCH v2 4/4] mshtml/tests: Add HTMLStorage tests.
by Hans Leidekker 25 May '22

25 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/tests/misc.c | 190 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 1702a24c804..410d24884ee 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "mshtml.h" #include "initguid.h" #include "optary.h" @@ -106,11 +107,200 @@ static void test_HTMLLoadOptions(void) IHtmlLoadOptions_Release(loadopts); } +static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) +{ + BSTR url; + IBindCtx *bc; + IMoniker *url_mon; + IPersistMoniker *persist_mon; + IHTMLDocument2 *doc; + HRESULT hres; + + hres = CreateBindCtx(0, &bc); + ok(hres == S_OK, "CreateBindCtx failed: 0x%08lx\n", hres); + + url = SysAllocString(start_url); + hres = CreateURLMoniker(NULL, url, &url_mon); + ok(hres == S_OK, "CreateURLMoniker failed: 0x%08lx\n", hres); + + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, + CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, + (void**)&doc); + ok(hres == S_OK, "CoCreateInstance failed: 0x%08lx\n", hres); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker, + (void**)&persist_mon); + ok(hres == S_OK, "IHTMLDocument2_QueryInterface failed: 0x%08lx\n", hres); + + hres = IPersistMoniker_Load(persist_mon, FALSE, url_mon, bc, + STGM_SHARE_EXCLUSIVE | STGM_READWRITE); + ok(hres == S_OK, "IPersistMoniker_Load failed: 0x%08lx\n", hres); + + IPersistMoniker_Release(persist_mon); + IMoniker_Release(url_mon); + IBindCtx_Release(bc); + SysFreeString(url); + return doc; +} + +static HRESULT get_localstorage(IHTMLDocument2 *doc, IHTMLStorage **storage) +{ + IHTMLWindow2 *window; + IHTMLWindow6 *window6; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); + ok(window != NULL, "window == NULL\n"); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow6, (void**)&window6); + IHTMLWindow2_Release(window); + if(FAILED(hres)) { + win_skip("IHTMLWindow6 not supported\n"); + return hres; + } + + hres = IHTMLWindow6_get_localStorage(window6, storage); + ok(hres == S_OK, "get_localStorage failed: %08lx\n", hres); + ok(*storage != NULL, "*storage == NULL\n"); + + IHTMLWindow6_Release(window6); + return hres; +} + +static void test_HTMLStorage(void) +{ + IHTMLDocument2 *doc, *doc2; + IHTMLStorage *storage, *storage2; + VARIANT var; + BSTR key, value; + HRESULT hres; + + doc = create_doc_from_url(L"http://www.codeweavers.com/"); + doc2 = create_doc_from_url(L"http://www.codeweavers.com/"); + + hres = get_localstorage(doc, &storage); + ok(hres == S_OK, "got %08lx\n", hres); + + hres = get_localstorage(doc2, &storage2); + ok(hres == S_OK, "got %08lx\n", hres); + + key = SysAllocString(L""); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + key = SysAllocString(L"undefined"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + value = SysAllocString(L"null"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"null"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + SysFreeString(value); + + key = SysAllocString(L"winetest"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + /* retrieve value from different storage instance */ + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"winetest"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + SysFreeString(value); + + /* item doesn't exist */ + key = SysAllocString(L"nosuch"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + + hres = IHTMLStorage_getItem(storage, NULL, NULL); + ok(hres == E_POINTER, "getItem returned: %08lx\n", hres); + + hres = IHTMLStorage_getItem(storage, key, NULL); + ok(hres == E_POINTER, "getItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, NULL, &var); + ok(hres == S_OK, "getItem returned: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + hres = IHTMLStorage_setItem(storage, NULL, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + key = SysAllocString(L"winetest2"); + hres = IHTMLStorage_setItem(storage, key, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_setItem(storage, NULL, key); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + + hres = IHTMLStorage_removeItem(storage, NULL); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + /* Unicode characters */ + key = SysAllocString(L"winetest"); + value = SysAllocString(L"\x20ac"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + key = SysAllocString(L"\x20ac"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + IHTMLStorage_Release(storage); + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc); + IHTMLDocument2_Release(doc2); +} + START_TEST(misc) { CoInitialize(NULL); test_HTMLLoadOptions(); + test_HTMLStorage(); CoUninitialize(); } -- 2.30.2

1 0

[PATCH v2 3/4] mshtml: Implement HTMLStorage_removeItem().
by Hans Leidekker 25 May '22

25 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 51 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 107ae7ad720..b68cd11ae64 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -484,11 +484,58 @@ static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BST return set_item(This->filename, bstrKey, bstrValue); } +static HRESULT remove_item(const WCHAR *filename, BSTR key) +{ + struct storage *storage; + IXMLDOMNode *root = NULL, *node = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_storage(filename, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_removeChild(root, node, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_storage(storage, filename); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + close_storage(storage); + return hres; +} + static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrKey)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(bstrKey)); + + if(!This->filename) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + return remove_item(This->filename, bstrKey); } static HRESULT WINAPI HTMLStorage_clear(IHTMLStorage *iface) -- 2.30.2

1 0

[PATCH v2 2/4] mshtml: Implement HTMLStorage_setItem().
by Hans Leidekker 25 May '22

25 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 109 +++++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 8f154291e36..107ae7ad720 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -372,11 +372,116 @@ static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VAR return get_item(This->filename, bstrKey, value); } +static HRESULT set_attribute(IXMLDOMElement *elem, const WCHAR *name, BSTR value) +{ + BSTR str; + VARIANT var; + HRESULT hres; + + str = SysAllocString(name); + if(!str) + return E_OUTOFMEMORY; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = value; + + hres = IXMLDOMElement_setAttribute(elem, str, var); + + SysFreeString(str); + return hres; +} + +static HRESULT save_storage(struct storage *storage, const WCHAR *filename) +{ + VARIANT var; + HRESULT hres; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(filename); + if(!V_BSTR(&var)) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_save(storage->doc, var); + SysFreeString(V_BSTR(&var)); + return hres; +} + +static HRESULT set_item(const WCHAR *filename, BSTR key, BSTR value) +{ + struct storage *storage; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_storage(filename, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + }else { + BSTR str = SysAllocString(L"item"); + hres = IXMLDOMDocument_createElement(storage->doc, str, &elem); + SysFreeString(str); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"name", key); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + + hres = IXMLDOMNode_appendChild(root, (IXMLDOMNode*)elem, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_storage(storage, filename); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + close_storage(storage); + return hres; +} + static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); - return E_NOTIMPL; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); + + if(!This->filename) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + return set_item(This->filename, bstrKey, bstrValue); } static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) -- 2.30.2

1 0

[PATCH 0/1] MR110: ntdll: Generalize check for IMAGE_FILE_MACHINE_AMD64 to other 64-bit archs in loader_exec.
by Jinoh Kang (＠iamahuman) 25 May '22

25 May '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/110

3 3

[PATCH] secur32: Add support for SCH_CREDENTIALS.
by Hans Leidekker 25 May '22

25 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 104 +++++++++++++++++++++++++--------- dlls/secur32/tests/schannel.c | 11 +++- include/schannel.h | 49 ++++++++++++++++ 3 files changed, 137 insertions(+), 27 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index c7d62c47758..bbbac37c6bb 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -31,6 +31,7 @@ #include "winnls.h" #include "lmcons.h" #include "sspi.h" +#define SCHANNEL_USE_BLACKLISTS #include "schannel.h" #include "wine/unixlib.h" @@ -333,46 +334,74 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryCredentialsAttributesW( return ret; } -static SECURITY_STATUS get_cert(const SCHANNEL_CRED *cred, CERT_CONTEXT const **cert) +static SECURITY_STATUS get_cert(const void *credentials, CERT_CONTEXT const **cert) { SECURITY_STATUS status; - DWORD i; - - TRACE("dwVersion = %lu\n", cred->dwVersion); - TRACE("cCreds = %lu\n", cred->cCreds); - TRACE("paCred = %p\n", cred->paCred); - TRACE("hRootStore = %p\n", cred->hRootStore); - TRACE("cMappers = %lu\n", cred->cMappers); - TRACE("cSupportedAlgs = %lu:\n", cred->cSupportedAlgs); - for (i = 0; i < cred->cSupportedAlgs; i++) TRACE("%08x\n", cred->palgSupportedAlgs[i]); - TRACE("grbitEnabledProtocols = %08lx\n", cred->grbitEnabledProtocols); - TRACE("dwMinimumCipherStrength = %lu\n", cred->dwMinimumCipherStrength); - TRACE("dwMaximumCipherStrength = %lu\n", cred->dwMaximumCipherStrength); - TRACE("dwSessionLifespan = %lu\n", cred->dwSessionLifespan); - TRACE("dwFlags = %08lx\n", cred->dwFlags); - TRACE("dwCredFormat = %lu\n", cred->dwCredFormat); + const SCHANNEL_CRED *cred_old; + const SCH_CREDENTIALS *cred = credentials; + PCCERT_CONTEXT *cert_list; + DWORD i, cert_count; switch (cred->dwVersion) { case SCH_CRED_V3: case SCHANNEL_CRED_VERSION: + cred_old = credentials; + TRACE("dwVersion = %lu\n", cred_old->dwVersion); + TRACE("cCreds = %lu\n", cred_old->cCreds); + TRACE("paCred = %p\n", cred_old->paCred); + TRACE("hRootStore = %p\n", cred_old->hRootStore); + TRACE("cMappers = %lu\n", cred_old->cMappers); + TRACE("cSupportedAlgs = %lu:\n", cred_old->cSupportedAlgs); + for (i = 0; i < cred_old->cSupportedAlgs; i++) TRACE("%08x\n", cred_old->palgSupportedAlgs[i]); + TRACE("grbitEnabledProtocols = %08lx\n", cred_old->grbitEnabledProtocols); + TRACE("dwMinimumCipherStrength = %lu\n", cred_old->dwMinimumCipherStrength); + TRACE("dwMaximumCipherStrength = %lu\n", cred_old->dwMaximumCipherStrength); + TRACE("dwSessionLifespan = %lu\n", cred_old->dwSessionLifespan); + TRACE("dwFlags = %08lx\n", cred_old->dwFlags); + TRACE("dwCredFormat = %lu\n", cred_old->dwCredFormat); + cert_list = cred_old->paCred; + cert_count = cred_old->cCreds; break; + + case SCH_CREDENTIALS_VERSION: + TRACE("dwVersion = %lu\n", cred->dwVersion); + TRACE("dwCredFormat = %lu\n", cred->dwCredFormat); + TRACE("cCreds = %lu\n", cred->cCreds); + TRACE("paCred = %p\n", cred->paCred); + TRACE("hRootStore = %p\n", cred->hRootStore); + TRACE("cMappers = %lu\n", cred->cMappers); + TRACE("dwSessionLifespan = %lu\n", cred->dwSessionLifespan); + TRACE("dwFlags = %08lx\n", cred->dwFlags); + TRACE("cTlsParameters = %lu:\n", cred->cTlsParameters); + for (i = 0; i < cred->cTlsParameters; i++) + { + TRACE(" cAlpnIds %lu\n", cred->pTlsParameters[i].cAlpnIds); + TRACE(" grbitDisabledProtocols %08lx\n", cred->pTlsParameters[i].grbitDisabledProtocols); + TRACE(" cDisabledCrypto %lu\n", cred->pTlsParameters[i].cDisabledCrypto); + TRACE(" dwFlags %08lx\n", cred->pTlsParameters[i].dwFlags); + } + cert_list = cred->paCred; + cert_count = cred->cCreds; + break; + default: + FIXME("unhandled version %lu\n", cred->dwVersion); return SEC_E_INTERNAL_ERROR; } - if (!cred->cCreds) status = SEC_E_NO_CREDENTIALS; - else if (cred->cCreds > 1) status = SEC_E_UNKNOWN_CREDENTIALS; + if (!cert_count) status = SEC_E_NO_CREDENTIALS; + else if (cert_count > 1) status = SEC_E_UNKNOWN_CREDENTIALS; else { DWORD spec; HCRYPTPROV prov; BOOL free; - if (CryptAcquireCertificatePrivateKey(cred->paCred[0], CRYPT_ACQUIRE_CACHE_FLAG, NULL, &prov, &spec, &free)) + if (CryptAcquireCertificatePrivateKey(cert_list[0], CRYPT_ACQUIRE_CACHE_FLAG, NULL, &prov, &spec, &free)) { if (free) CryptReleaseContext(prov, 0); - *cert = cred->paCred[0]; + *cert = cert_list[0]; status = SEC_E_OK; } else status = SEC_E_UNKNOWN_CREDENTIALS; @@ -381,6 +410,28 @@ static SECURITY_STATUS get_cert(const SCHANNEL_CRED *cred, CERT_CONTEXT const ** return status; } +static DWORD get_enabled_protocols(const void *credentials) +{ + const SCHANNEL_CRED *cred_old; + const SCH_CREDENTIALS *cred = credentials; + + switch (cred->dwVersion) + { + case SCH_CRED_V3: + case SCHANNEL_CRED_VERSION: + cred_old = credentials; + return cred_old->grbitEnabledProtocols; + + case SCH_CREDENTIALS_VERSION: + if (cred->cTlsParameters) FIXME("handle TLS parameters\n"); + return 0; + + default: + FIXME("unhandled version %lu\n", cred->dwVersion); + return 0; + } +} + static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) { CERT_KEY_CONTEXT keyctx; @@ -486,11 +537,11 @@ static BYTE *get_key_blob(const CERT_CONTEXT *ctx, DWORD *size) return ret; } -static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schanCred, +static SECURITY_STATUS schan_AcquireClientCredentials(const void *schanCred, PCredHandle phCredential, PTimeStamp ptsExpiry) { struct schan_credentials *creds; - unsigned enabled_protocols; + DWORD enabled_protocols, cred_enabled_protocols; ULONG_PTR handle; SECURITY_STATUS status = SEC_E_OK; const CERT_CONTEXT *cert = NULL; @@ -509,15 +560,16 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (status != SEC_E_OK && status != SEC_E_NO_CREDENTIALS) return status; - if ((schanCred->grbitEnabledProtocols & tls_protocols) && - (schanCred->grbitEnabledProtocols & dtls_protocols)) return SEC_E_ALGORITHM_MISMATCH; + cred_enabled_protocols = get_enabled_protocols(schanCred); + if ((cred_enabled_protocols & tls_protocols) && + (cred_enabled_protocols & dtls_protocols)) return SEC_E_ALGORITHM_MISMATCH; status = SEC_E_OK; } read_config(); - if(schanCred && schanCred->grbitEnabledProtocols) - enabled_protocols = schanCred->grbitEnabledProtocols & config_enabled_protocols; + if(schanCred && cred_enabled_protocols) + enabled_protocols = cred_enabled_protocols & config_enabled_protocols; else enabled_protocols = config_enabled_protocols & ~config_default_disabled_protocols; if(!enabled_protocols) { diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 1cf751a3198..2bf0336f3f5 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -25,6 +25,7 @@ #include <stdio.h> #define SECURITY_WIN32 #include <security.h> +#define SCHANNEL_USE_BLACKLISTS #include <schannel.h> #include "wine/test.h" @@ -272,6 +273,7 @@ static void testAcquireSecurityContext(void) SecPkgCredentials_NamesA names; TimeStamp exp; SCHANNEL_CRED schanCred; + SCH_CREDENTIALS schCred; PCCERT_CONTEXT certs[2]; HCRYPTPROV csp; WCHAR ms_def_prov_w[MAX_PATH]; @@ -279,7 +281,6 @@ static void testAcquireSecurityContext(void) HCRYPTKEY key; CRYPT_KEY_PROV_INFO keyProvInfo; - if (SUCCEEDED(EnumerateSecurityPackagesA(&i, &package_info))) { while(i--) @@ -545,6 +546,14 @@ static void testAcquireSecurityContext(void) CryptDestroyKey(key); } + memset(&schCred, 0, sizeof(schCred)); + schCred.dwVersion = SCH_CREDENTIALS_VERSION; + st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + NULL, &schCred, NULL, NULL, &cred, NULL); + ok(st == SEC_E_OK || broken(st == SEC_E_UNKNOWN_CREDENTIALS) /* <= win10v1570 */, + "AcquireCredentialsHandleA failed: %08lx\n", st); + FreeCredentialsHandle(&cred); + CryptReleaseContext(csp, 0); CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET); diff --git a/include/schannel.h b/include/schannel.h index b60fdf7ad47..556ec1882c9 100644 --- a/include/schannel.h +++ b/include/schannel.h @@ -80,6 +80,7 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SCH_CRED_VERSION 2 #define SCH_CRED_V3 3 #define SCHANNEL_CRED_VERSION 4 +#define SCH_CREDENTIALS_VERSION 5 #define SCHANNEL_RENEGOTIATE 0 #define SCHANNEL_SHUTDOWN 1 @@ -216,6 +217,54 @@ typedef struct _SCHANNEL_CRED DWORD dwCredFormat; } SCHANNEL_CRED, *PSCHANNEL_CRED; +#ifdef SCHANNEL_USE_BLACKLISTS + +typedef enum _eTlsAlgorithmUsage +{ + TlsParametersCngAlgUsageKeyExchange, + TlsParametersCngAlgUsageSignature, + TlsParametersCngAlgUsageCipher, + TlsParametersCngAlgUsageDigest, + TlsParametersCngAlgUsageCertSig, +} eTlsAlgorithmUsage; + +typedef struct _CRYPTO_SETTINGS +{ + eTlsAlgorithmUsage eAlgorithmUsage; + UNICODE_STRING strCngAlgId; + DWORD cChainingModes; + PUNICODE_STRING rgstrChainingModes; + DWORD dwMinBitLength; + DWORD dwMaxBitLength; +} CRYPTO_SETTINGS, *PCRYPTO_SETTINGS; + +typedef struct _TLS_PARAMETERS +{ + DWORD cAlpnIds; + PUNICODE_STRING rgstrAlpnIds; + DWORD grbitDisabledProtocols; + DWORD cDisabledCrypto; + PCRYPTO_SETTINGS pDisabledCrypto; + DWORD dwFlags; +} TLS_PARAMETERS, *PTLS_PARAMETERS; + +typedef struct _SCH_CREDENTIALS +{ + DWORD dwVersion; + DWORD dwCredFormat; + DWORD cCreds; + PCCERT_CONTEXT *paCred; + HCERTSTORE hRootStore; + DWORD cMappers; + struct _HMAPPER **aphMappers; + DWORD dwSessionLifespan; + DWORD dwFlags; + DWORD cTlsParameters; + PTLS_PARAMETERS pTlsParameters; +} SCH_CREDENTIALS, *PSCH_CREDENTIALS; + +#endif + typedef struct _SecPkgCred_SupportedAlgs { DWORD cSupportedAlgs; -- 2.30.2

1 0

[PATCH 2/2] light.msstyles: Add Menu parts.
by Zhiyi Zhang 25 May '22

25 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53034 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 8 + .../blue_menu_popup_check_16px.bmp | Bin 0 -> 4234 bytes .../blue_menu_popup_check_16px.svg | 9 + .../blue_menu_popup_check_18px.bmp | Bin 0 -> 5322 bytes .../blue_menu_popup_check_18px.svg | 9 + .../blue_menu_popup_separator.bmp | Bin 0 -> 162 bytes .../blue_menu_popup_separator.svg | 5 + .../blue_menu_popup_submenu.bmp | Bin 0 -> 786 bytes .../blue_menu_popup_submenu.svg | 9 + .../light.msstyles/blue_menu_system_close.bmp | Bin 0 -> 1018 bytes .../light.msstyles/blue_menu_system_close.svg | 5 + .../blue_menu_system_maximize.bmp | Bin 0 -> 1018 bytes .../blue_menu_system_maximize.svg | 5 + .../blue_menu_system_minimize.bmp | Bin 0 -> 1018 bytes .../blue_menu_system_minimize.svg | 5 + .../blue_menu_system_restore.bmp | Bin 0 -> 1018 bytes .../blue_menu_system_restore.svg | 15 ++ dlls/light.msstyles/light.rc | 154 ++++++++++++++++++ 18 files changed, 224 insertions(+) create mode 100644 dlls/light.msstyles/blue_menu_popup_check_16px.bmp create mode 100644 dlls/light.msstyles/blue_menu_popup_check_16px.svg create mode 100644 dlls/light.msstyles/blue_menu_popup_check_18px.bmp create mode 100644 dlls/light.msstyles/blue_menu_popup_check_18px.svg create mode 100644 dlls/light.msstyles/blue_menu_popup_separator.bmp create mode 100644 dlls/light.msstyles/blue_menu_popup_separator.svg create mode 100644 dlls/light.msstyles/blue_menu_popup_submenu.bmp create mode 100644 dlls/light.msstyles/blue_menu_popup_submenu.svg create mode 100644 dlls/light.msstyles/blue_menu_system_close.bmp create mode 100644 dlls/light.msstyles/blue_menu_system_close.svg create mode 100644 dlls/light.msstyles/blue_menu_system_maximize.bmp create mode 100644 dlls/light.msstyles/blue_menu_system_maximize.svg create mode 100644 dlls/light.msstyles/blue_menu_system_minimize.bmp create mode 100644 dlls/light.msstyles/blue_menu_system_minimize.svg create mode 100644 dlls/light.msstyles/blue_menu_system_restore.bmp create mode 100644 dlls/light.msstyles/blue_menu_system_restore.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 8ac2fcea0e6..a79a29d9c94 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -26,6 +26,14 @@ SVG_SRCS = \ blue_groupbox.svg \ blue_header.svg \ blue_header_item.svg \ + blue_menu_popup_check_16px.svg \ + blue_menu_popup_check_18px.svg \ + blue_menu_popup_separator.svg \ + blue_menu_popup_submenu.svg \ + blue_menu_system_close.svg \ + blue_menu_system_maximize.svg \ + blue_menu_system_minimize.svg \ + blue_menu_system_restore.svg \ blue_progress_chunk_horizontal.svg \ blue_progress_chunk_vertical.svg \ blue_progress_track_horizontal.svg \ diff --git a/dlls/light.msstyles/blue_menu_popup_check_16px.bmp b/dlls/light.msstyles/blue_menu_popup_check_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..555db6f6ae039f0fc7c7d0fc7c951b328f2b6589 GIT binary patch literal 4234 zcmeHKzfaph6n4}~WvS@Wi6uithf18SGIju#N-bfil#M@ty#qq(z)(?%f-0f-Or=KI zqa;q2Y-txJ0umz|6AKbU(<s<Z;QF1(Rkn%GhZ!hRth~JY@qO>!d*_$CEaWzyY5uc` z?@tikor7ewto8`nAK*IlFipGu@KLt#_QS`}v_j{x0_LGZ>h*fAR;&H2R;yhuybW1Y zi3|7*U|EcOme~MzDTepY9x(6YY=HYKiI4e~g#Sl@|ND;oj)Z?F|5fsb_@w)Y`7e?j zNcT^~HS~kOGd!PMl;0m=W32Bl0|SdJdZy9#sP1?sgzEbPs>jw{&{L0+ZQ#2Q77|nM zx>Wxf#75hWIg`VBH@U(V=45_&)Hn#ODR^PMA6-}Uhp~qJ4s#jD2z*pyZJsMR-y#=L zp6Dazhlzabi@-;<LyaZRB=PyfzVN+`@`8P@F!ODs4S!$Ab`TrazV-vLSi0*A_Jxnd z;m70uPX-uc8T?)sE0xN-G+x=Zy#+o$uX~U;x3K~ID(Aw+8uT9I9Dck~u>sC9@K-o{ zHaNaqE>EI=1UbcAHpvEXpjLnI_yra=rZ9d2IY#@r7$2oerP2g2{?#)$5AHPN3_i3Q zjmFd9oN606n1ziFq}6OTpQ!SJIK(y&z5{KK@-v8yYlEMMTp|`T4wEzv{tA3pPr{Ao z?<WI{X&IbD#lfzgs{V0yYz@z_Uf(3Qs{cMEtDM`X`Wo~e<lHR~rTTX%SqA<JcMQM& z+4t9z=pVt>>4l|dld{>TMiqA#)Ia`04xgSyreNa)a?ExNY5lX(+ypD<Z`8k2Ak*NV z;oi_@#h0n--`h22VWWflO^fZkNLByXi+R{^kPmy5pCV?NMsD-4afvfMb^RlT71z|) JW$QeoxxYVJ&^-VE literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_popup_check_16px.svg b/dlls/light.msstyles/blue_menu_popup_check_16px.svg new file mode 100644 index 00000000000..b3eb3487299 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_popup_check_16px.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:16-32" width="16" height="64" version="1.1" viewBox="0 0 4.2333 16.933" xmlns="http://www.w3.org/2000/svg"> + <g stroke-width=".26458"> + <path d="m1.5394 2.8867-0.75766-0.82928-0.25256 0.27644 1.0102 1.1057 2.1648-2.3694-0.25256-0.27644z" fill="#3096fa"/> + <path d="m1.5394 7.12-0.75766-0.82928-0.25256 0.27644 1.0102 1.1057 2.1648-2.3694-0.25256-0.27644z" fill="#aeaeae"/> + <path d="m3.3073 10.583a1.1906 1.1906 0 0 1-1.1906 1.1906 1.1906 1.1906 0 0 1-1.1906-1.1906 1.1906 1.1906 0 0 1 1.1906-1.1906 1.1906 1.1906 0 0 1 1.1906 1.1906z" fill="#3096fa" stroke="#3096fa"/> + <path d="m3.4396 14.817a1.3229 1.3229 0 0 1-1.3229 1.3229 1.3229 1.3229 0 0 1-1.3229-1.3229 1.3229 1.3229 0 0 1 1.3229-1.3229 1.3229 1.3229 0 0 1 1.3229 1.3229z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_menu_popup_check_18px.bmp b/dlls/light.msstyles/blue_menu_popup_check_18px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0bb15fadc28aa36cff1e825711dcc36f4e9bbb60 GIT binary patch literal 5322 zcmeHL&ubGw6yBg<4?;oo)JqQ1OQAE1J$h(+QLHIN$gO`s?;c9QLlF_w7NKM(6)d@j zY?4z>Ml19b6?*Kgr(Oy@^oQwYlXm<j*@4}3Co?g6+a+J#%=_`}n>WkkZRRtL`&RdQ zkMCE&J>V&jveMQq$l1V-Vd&zP)%yq?pMUb=WyokWylv!_IO!_jy6!@`T&@FWz$x&h zR4P5w#f9yNc?0k`R4SF%VPDm_TCHZ{;=?+Vyx{*W9HSW5Re4A~;?5PZ;dP!$f0Z=k zIakF?J$QBv^7$(LRTBHLq~j5Lp^6Xd@$9@)al!UB?5i6Gd3^`p?*O~tSk%QO_M`&; zvI3nvdG0&*51&!bcK}8k9Yz<1xrfilCgLst9)UwIT8w@$;qsj64DNrELvq4ql9$iy zpOGA7d{j1cIR&+dt|!XDg^!j;)U`jZf1W3oS{}##rRBjs>Ucb6FZvEq*BSdLo(Ua~ zu=}~`kFi|ceI%PE9MY$k7uJ}ktuC;SLMQEsOe*ldE5JEV;kS6lr0*J(3x3--f<B=M z`FN18%7(aA!2zx{$UWc$c}=PO<MfDKM%=aRO^U_hIOhAn5p3zWm^dB$LE(ND^^taP zO+bGL9ANxF>Ica}p)dwt@tPF5z%dCN0}a^kMvOyFP@@^}h~B<ltJUrd86I)Rn&-gd z0p+;7BhH!$D6+s6kkhzo&EQx;ZtGgd#38A`2o>PmN})I0>1@-X-jDlli5_7i=v|s^ zhy2xf*k)u^aI_g+gWLm7S~)V*dDvoP8FAO>NxScA{L`ax%=f{0beX5={=8N5HnUyy zyf_c>w@+|2^JD^Chrj{fvW?C|UYH%@#q5pq(94lY@EijT?o5qz9{St%40z7a7uWgL s!;#KI?A;u=ytYHjae2#Hm`LnF7F<`r$mb!}w$gIwy2*VLpI!z20Ddyiy8r+H literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_popup_check_18px.svg b/dlls/light.msstyles/blue_menu_popup_check_18px.svg new file mode 100644 index 00000000000..228cac7bab0 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_popup_check_18px.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:18-32" width="18" height="72" version="1.1" viewBox="0 0 4.7625 19.05" xmlns="http://www.w3.org/2000/svg"> + <g stroke-width=".26458"> + <path d="m1.804 3.1513-0.75766-0.82928-0.25256 0.27644 1.0102 1.1057 2.1648-2.3694-0.25256-0.27644z" fill="#3096fa"/> + <path d="m1.804 7.9137-0.75766-0.82928-0.25256 0.27644 1.0102 1.1057 2.1648-2.3694-0.25256-0.27644z" fill="#aeaeae"/> + <path d="m3.5718 11.906a1.1906 1.1906 0 0 1-1.1906 1.1906 1.1906 1.1906 0 0 1-1.1906-1.1906 1.1906 1.1906 0 0 1 1.1906-1.1906 1.1906 1.1906 0 0 1 1.1906 1.1906z" fill="#3096fa" stroke="#3096fa"/> + <path d="m3.7041 16.668a1.3229 1.3229 0 0 1-1.3229 1.3229 1.3229 1.3229 0 0 1-1.3229-1.3229 1.3229 1.3229 0 0 1 1.3229-1.3229 1.3229 1.3229 0 0 1 1.3229 1.3229z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_menu_popup_separator.bmp b/dlls/light.msstyles/blue_menu_popup_separator.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ff904c3ede0619a00ac6428d29866c512e896893 GIT binary patch literal 162 zcmZ?rUBmzZT|lY^h#7&H4NNOAFav1`AjSm$85kf4B=z6PJ*XH{4So?8EYkmhVBNZP IK$8&w0Qj8_&Hw-a literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_popup_separator.svg b/dlls/light.msstyles/blue_menu_popup_separator.svg new file mode 100644 index 00000000000..60da6ac4964 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_popup_separator.svg @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:1-32" width="1" height="6" version="1.1" viewBox="0 0 .26458 1.5875" xmlns="http://www.w3.org/2000/svg"> + <path d="m0 0.79373h0.26458v0.26458h-0.26458z" fill="#aeaeae" stroke-width=".99999"/> + <path d="m0 1.0583h0.26458v0.26458h-0.26458z" fill="#fff" stroke-width=".99999"/> +</svg> diff --git a/dlls/light.msstyles/blue_menu_popup_submenu.bmp b/dlls/light.msstyles/blue_menu_popup_submenu.bmp new file mode 100644 index 0000000000000000000000000000000000000000..72066bd5c751bdad0389c409cb37ae54f3fc1d4b GIT binary patch literal 786 zcmZ?r6=G%pgDxOh1H_y_ECj@i3<?Y&sSYL}fdT$AFhCGU=D(ABP%(xQ0s<@q<OxZy zTeoh(+O=!t@u^$2YLy&N-TqCRHYrj=9nd}tpn2DDnFX{@0w}+0<Hn6D*whe`2k8Oo zpN&gDHZv&^`!&sA!S^YKc*F4fOk+8qy8YiL>){PUV%2?{re^^(4`&$upK2=cYpTJn XA5)F6h9Mz&P<Q~%pN&gDq3{9#2_jh3 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_popup_submenu.svg b/dlls/light.msstyles/blue_menu_popup_submenu.svg new file mode 100644 index 00000000000..826203b0398 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_popup_submenu.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:9-32" width="9" height="18" version="1.1" viewBox="0 0 2.3812 4.7625" xmlns="http://www.w3.org/2000/svg"> + <g stroke-width=".99996"> + <path d="m1.7209 1.3148-0.91789-0.91898 0.13113-0.13129 0.91789 0.91898z" fill="#3096fa"/> + <path d="m1.8427 1.1977-0.91789 0.91898-0.13113-0.13129 0.91789-0.91898z" fill="#3096fa"/> + <path d="m1.7209 3.6962-0.91789-0.91905 0.13113-0.1313 0.91789 0.91905z" fill="#aeaeae"/> + <path d="m1.8427 3.5789-0.91789 0.91905-0.13113-0.1313 0.91789-0.91905z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_menu_system_close.bmp b/dlls/light.msstyles/blue_menu_system_close.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fd74d533cce4cc5b14d0567765518b83a5a4188c GIT binary patch literal 1018 zcmdUsF%E)25JlH$XJKOp1!tkLveAQJVrxO|Nz5j@+j9sKIF1dxQAk#lWUP!6-p>4) zAF`Xt_xGiF#Fg^`YuLiVWJX4(VNMxEXUy}HUYG9<=V+)ZS1Q-MDTHu?W9$$u{kSK! zb1tP{lS|Rmh4;QCXQHQJt=%xMpph(k>KV1xi!agM0iXJ9<30W;%YI(=Ht4s#(NCd< g5+n*}A%jmLd#a!r^6cK2YrP3x?H#^(8^8Ts^fH8EHUIzs literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_system_close.svg b/dlls/light.msstyles/blue_menu_system_close.svg new file mode 100644 index 00000000000..0bf10043a03 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_system_close.svg @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="20" version="1.1" viewBox="0 0 2.9104 5.2917" xmlns="http://www.w3.org/2000/svg"> + <path d="m2.1166 0.95364-0.18653-0.15989-0.73951 0.63386-0.73951-0.63386-0.18653 0.15989 0.73951 0.63386-0.73951 0.63386 0.18653 0.15989 0.73951-0.63386 0.73951 0.63386 0.18653-0.15989-0.73951-0.63386z"/> + <path d="m2.1166 3.5995-0.18653-0.15989-0.73951 0.63386-0.73951-0.63386-0.18653 0.15989 0.73951 0.63386-0.73951 0.63386 0.18653 0.15989 0.73951-0.63386 0.73951 0.63386 0.18653-0.15989-0.73951-0.63386z" fill="#aeaeae"/> +</svg> diff --git a/dlls/light.msstyles/blue_menu_system_maximize.bmp b/dlls/light.msstyles/blue_menu_system_maximize.bmp new file mode 100644 index 0000000000000000000000000000000000000000..866154c99af25bb7a4624371c6f80a6a800a74a6 GIT binary patch literal 1018 zcmZ?r{l&}x23<h128g+VSOka}859^mQUy?XAQK7vXJCLJkl24G_n=}VNuro6M5)59 zXx+MX|M6jDo%qy&<glql76Y+iW+01W6QibDnEB{5HaDQFf$@>m4iYvfyzyaVXW~<b k5^qRmBI^gSVP+tUV-usMTA2ChG&VP&tAX*6)l!`e0Ann<_W%F@ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_system_maximize.svg b/dlls/light.msstyles/blue_menu_system_maximize.svg new file mode 100644 index 00000000000..22975e1eec0 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_system_maximize.svg @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="20" version="1.1" viewBox="0 0 2.9104 5.2917" xmlns="http://www.w3.org/2000/svg"> + <rect x=".52915" y=".79375" width="1.5875" height="1.3229" fill="none" stroke="#000" stroke-width=".52917"/> + <rect x=".52915" y="3.4396" width="1.5875" height="1.3229" fill="none" stroke="#aeaeae" stroke-width=".52917"/> +</svg> diff --git a/dlls/light.msstyles/blue_menu_system_minimize.bmp b/dlls/light.msstyles/blue_menu_system_minimize.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1255e9323e26225b7f9445024b8069ce93b529ac GIT binary patch literal 1018 zcmZ?r{l&}x23<h128g+VSOka}859^mQUy?XAQK7vXJCLJkl24G_n=}VNuro6M5)59 oXx+MX|M6jDo%qy&<dD^lvS}Uypzy|rksW|f-DtcahZKoy0A&727XSbN literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_system_minimize.svg b/dlls/light.msstyles/blue_menu_system_minimize.svg new file mode 100644 index 00000000000..38c7a446c50 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_system_minimize.svg @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="20" version="1.1" viewBox="0 0 2.9104 5.2917" xmlns="http://www.w3.org/2000/svg"> + <path d="m0.26457 1.8521h2.1167v0.52917h-2.1167z" stroke-width=".26458"/> + <path d="m0.26457 4.4979h2.1167v0.52917h-2.1167z" fill="#aeaeae" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_menu_system_restore.bmp b/dlls/light.msstyles/blue_menu_system_restore.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e40c4404f370d5fc8f29209e2138cc50b1733999 GIT binary patch literal 1018 zcmcJMF%H5&3<Qm!qvZj-B@Gn~FF~T^1w7^+NORc0NY=_1U6Uw|&%5i1lq}cx-oDq% zpHHu&*U4*VXAA58_x+fzZuYxF>&xZ#Naob>FqImIT5G+kYNN`9wwA@yUG(U9Xn9sX zo_07em^BBFp7ZR?Xk<rxWo$6Vcdx2?Rh29MTVle|UG(U9Xn9sXo_07em^BBFp7ZR? LXk<rxWvtF0hLOGh literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_system_restore.svg b/dlls/light.msstyles/blue_menu_system_restore.svg new file mode 100644 index 00000000000..f5f63511ede --- /dev/null +++ b/dlls/light.msstyles/blue_menu_system_restore.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="20" version="1.1" viewBox="0 0 2.9104 5.2917" xmlns="http://www.w3.org/2000/svg"> + <rect x=".52915" y="1.0583" width="1.0583" height="1.0583" fill="none" stroke="#000" stroke-width=".52917"/> + <path d="m0.79374 0.26458h1.5875v0.26458h-1.5875z" stroke-width=".26458"/> + <path d="m0.79374 2.9104h1.5875v0.26458h-1.5875z" fill="#aeaeae" stroke-width=".26458"/> + <g stroke-width=".26458"> + <path d="m2.1167 0.52917h0.26458v1.3229h-0.26458z"/> + <path d="m2.1167 3.175h0.26458v1.3229h-0.26458z" fill="#aeaeae"/> + <path d="m1.8521 1.5875h0.26458v0.26458h-0.26458z"/> + <path d="m1.8521 4.2334h0.26458v0.26458h-0.26458z" fill="#aeaeae"/> + <path d="m0.79374 0.52917h0.26458v0.26458h-0.26458z"/> + <path d="m0.79374 3.175h0.26458v0.26458h-0.26458z" fill="#aeaeae"/> + </g> + <rect x=".52915" y="3.7042" width="1.0583" height="1.0583" fill="none" stroke="#aeaeae" stroke-width=".52917"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 5073ad935b4..980854ae2d3 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -402,6 +402,135 @@ BLUE_INI TEXTFILE "[Menu]\r\n" "BgType = None\r\n" +"[Menu.BarBackground]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" + +"[Menu.BarItem]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 0 0 0\r\n" + +"[Menu.BarItem(Hot)]\r\n" +"FillColor = 48 150 250\r\n" +"TextColor = 255 255 255\r\n" + +"[Menu.BarItem(Pushed)]\r\n" +"FillColor = 48 150 250\r\n" +"TextColor = 255 255 255\r\n" + +"[Menu.BarItem(Disabled)]\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 166 166 166\r\n" + +"[Menu.BarItem(DisabledHot)]\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 166 166 166\r\n" + +"[Menu.BarItem(DisabledPushed)]\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 166 166 166\r\n" + +"[Menu.PopupBackground]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" + +"[Menu.PopupBorders]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[Menu.PopupCheck]\r\n" +"BgType = ImageFile\r\n" +"ImageFile1 = blue_menu_popup_check_16px.bmp\r\n" +"ImageFile2 = blue_menu_popup_check_18px.bmp\r\n" +"ContentMargins = 3, 3, 3, 3\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" +"ImageCount = 4\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 120\r\n" + +"[Menu.PopupCheckBackground]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" + +"[Menu.PopupGutter]\r\n" +"BgType = None\r\n" + +"[Menu.PopupItem]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 0 0 0\r\n" + +"[Menu.PopupItem(Hot)]\r\n" +"FillColor = 48 150 250\r\n" +"TextColor = 255 255 255\r\n" + +"[Menu.PopupItem(Disabled)]\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 166 166 166\r\n" + +"[Menu.PopupItem(DisabledHot)]\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 166 166 166\r\n" + +"[Menu.PopupSeparator]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_menu_popup_separator.bmp\r\n" +"MinSize = 1, 4\r\n" +"SizingMargins = 0, 0, 3, 1\r\n" +"SizingType = Stretch\r\n" + +"[Menu.PopupSubmenu]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_menu_popup_submenu.bmp\r\n" +"ImageCount = 2\r\n" +"SizingMargins = 2, 7, 3, 3\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + +"[Menu.SystemClose]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_menu_system_close.bmp\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + +"[Menu.SystemMaximize]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_menu_system_maximize.bmp\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + +"[Menu.SystemMinimize]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_menu_system_minimize.bmp\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + +"[Menu.SystemRestore]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_menu_system_restore.bmp\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + "\r\n; Progress\r\n" "[Progress]\r\n" "ProgressChunkSize = 1\r\n" @@ -1279,6 +1408,31 @@ BLUE_HEADER_BMP BITMAP "blue_header.bmp" /* @makedep: blue_header_item.bmp */ BLUE_HEADER_ITEM_BMP BITMAP "blue_header_item.bmp" +/* Menu */ +/* @makedep: blue_menu_popup_check_16px.bmp */ +BLUE_MENU_POPUP_CHECK_16PX_BMP BITMAP "blue_menu_popup_check_16px.bmp" + +/* @makedep: blue_menu_popup_check_18px.bmp */ +BLUE_MENU_POPUP_CHECK_18PX_BMP BITMAP "blue_menu_popup_check_18px.bmp" + +/* @makedep: blue_menu_popup_separator.bmp */ +BLUE_MENU_POPUP_SEPARATOR_BMP BITMAP "blue_menu_popup_separator.bmp" + +/* @makedep: blue_menu_popup_submenu.bmp */ +BLUE_MENU_POPUP_SUBMENU_BMP BITMAP "blue_menu_popup_submenu.bmp" + +/* @makedep: blue_menu_system_close.bmp */ +BLUE_MENU_SYSTEM_CLOSE_BMP BITMAP "blue_menu_system_close.bmp" + +/* @makedep: blue_menu_system_maximize.bmp */ +BLUE_MENU_SYSTEM_MAXIMIZE_BMP BITMAP "blue_menu_system_maximize.bmp" + +/* @makedep: blue_menu_system_minimize.bmp */ +BLUE_MENU_SYSTEM_MINIMIZE_BMP BITMAP "blue_menu_system_minimize.bmp" + +/* @makedep: blue_menu_system_restore.bmp */ +BLUE_MENU_SYSTEM_RESTORE_BMP BITMAP "blue_menu_system_restore.bmp" + /* Progress */ /* @makedep: blue_progress_chunk_horizontal.bmp */ BLUE_PROGRESS_CHUNK_HORIZONTAL_BMP BITMAP "blue_progress_chunk_horizontal.bmp" -- 2.34.1

1 0

[PATCH 1/2] uxtheme: Support parsing menu class.
by Zhiyi Zhang 25 May '22

25 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index afeda659a36..07fafbe0bde 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -485,6 +485,59 @@ static const MSSTYLES_CLASS_MAP classListview[] = { {0, 0, L""} }; +static const MSSTYLES_CLASS_MAP classMenu[] = { + {MENU_MENUITEM_TMSCHEMA, 0, L"MENUITEM"}, + {MENU_MENUDROPDOWN_TMSCHEMA, 0, L"MENUDROPDOWN"}, + {MENU_MENUBARITEM_TMSCHEMA, 0, L"MENUBARITEM"}, + {MENU_MENUBARDROPDOWN_TMSCHEMA, 0, L"MENUBARDROPDOWN"}, + {MENU_CHEVRON_TMSCHEMA, 0, L"CHEVRON"}, + {MENU_SEPARATOR_TMSCHEMA, 0, L"SEPARATOR"}, + {MENU_BARBACKGROUND, 0, L"BARBACKGROUND"}, + {MENU_BARBACKGROUND, MB_ACTIVE, L"ACTIVE"}, + {MENU_BARBACKGROUND, MB_INACTIVE, L"INACTIVE"}, + {MENU_BARITEM, 0, L"BARITEM"}, + {MENU_BARITEM, MBI_NORMAL, L"NORMAL"}, + {MENU_BARITEM, MBI_HOT, L"HOT"}, + {MENU_BARITEM, MBI_PUSHED, L"PUSHED"}, + {MENU_BARITEM, MBI_DISABLED, L"DISABLED"}, + {MENU_BARITEM, MBI_DISABLEDHOT, L"DISABLEDHOT"}, + {MENU_BARITEM, MBI_DISABLEDPUSHED, L"DISABLEDPUSHED"}, + {MENU_POPUPBACKGROUND, 0, L"POPUPBACKGROUND"}, + {MENU_POPUPBORDERS, 0, L"POPUPBORDERS"}, + {MENU_POPUPCHECK, 0, L"POPUPCHECK"}, + {MENU_POPUPCHECK, MC_CHECKMARKNORMAL, L"CHECKMARKNORMAL"}, + {MENU_POPUPCHECK, MC_CHECKMARKDISABLED, L"CHECKMARKDISABLED"}, + {MENU_POPUPCHECK, MC_BULLETNORMAL, L"BULLETNORMAL"}, + {MENU_POPUPCHECK, MC_BULLETDISABLED, L"BULLETDISABLED"}, + {MENU_POPUPCHECKBACKGROUND, 0, L"POPUPCHECKBACKGROUND"}, + {MENU_POPUPCHECKBACKGROUND, MCB_DISABLED, L"DISABLED"}, + {MENU_POPUPCHECKBACKGROUND, MCB_NORMAL, L"NORMAL"}, + {MENU_POPUPCHECKBACKGROUND, MCB_BITMAP, L"BITMAP"}, + {MENU_POPUPGUTTER, 0, L"POPUPGUTTER"}, + {MENU_POPUPITEM, 0, L"POPUPITEM"}, + {MENU_POPUPITEM, MPI_NORMAL, L"NORMAL"}, + {MENU_POPUPITEM, MPI_HOT, L"HOT"}, + {MENU_POPUPITEM, MPI_DISABLED, L"DISABLED"}, + {MENU_POPUPITEM, MPI_DISABLEDHOT, L"DISABLEDHOT"}, + {MENU_POPUPSEPARATOR, 0, L"POPUPSEPARATOR"}, + {MENU_POPUPSUBMENU, 0, L"POPUPSUBMENU"}, + {MENU_POPUPSUBMENU, MSM_NORMAL, L"NORMAL"}, + {MENU_POPUPSUBMENU, MSM_DISABLED, L"DISABLED"}, + {MENU_SYSTEMCLOSE, 0, L"SYSTEMCLOSE"}, + {MENU_SYSTEMCLOSE, MSYSC_NORMAL, L"NORMAL"}, + {MENU_SYSTEMCLOSE, MSYSC_DISABLED, L"DISABLED"}, + {MENU_SYSTEMMAXIMIZE, 0, L"SYSTEMMAXIMIZE"}, + {MENU_SYSTEMMAXIMIZE, MSYSMX_NORMAL, L"NORMAL"}, + {MENU_SYSTEMMAXIMIZE, MSYSMX_DISABLED, L"DISABLED"}, + {MENU_SYSTEMMINIMIZE, 0, L"SYSTEMMINIMIZE"}, + {MENU_SYSTEMMINIMIZE, MSYSMN_NORMAL, L"NORMAL"}, + {MENU_SYSTEMMINIMIZE, MSYSMN_DISABLED, L"DISABLED"}, + {MENU_SYSTEMRESTORE, 0, L"SYSTEMRESTORE"}, + {MENU_SYSTEMRESTORE, MSYSR_NORMAL, L"NORMAL"}, + {MENU_SYSTEMRESTORE, MSYSR_DISABLED, L"DISABLED"}, + {0, 0, L""} +}; + static const MSSTYLES_CLASS_MAP classMenuband[] = { {MDP_NEWAPPBUTTON, 0, L"NEWAPPBUTTON"}, {MDP_NEWAPPBUTTON, MDS_NORMAL, L"NORMAL"}, @@ -1020,6 +1073,7 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classExplorerbar, L"EXPLORERBAR"}, {classHeader, L"HEADER"}, {classListview, L"LISTVIEW"}, + {classMenu, L"MENU"}, {classMenuband, L"MENUBAND"}, {classPage, L"PAGE"}, {classProgress, L"PROGRESS"}, -- 2.34.1

1 0

[PATCH v4 0/3] MR115: winex11.drv: Define ControlMask when not available
by Alistair Leslie-Hughes (＠alesliehughes) 25 May '22

25 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v4: ntdll: Fake success for ThreadPowerThrottlingState include: Add THREAD_POWER_THROTTLING_STATE type winex11.drv: Define ControlMask when not available https://gitlab.winehq.org/wine/wine/-/merge_requests/115

3 4

[PATCH] widl: Remove set but unused variable.
by Rémi Bernon 25 May '22

25 May '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/write_msft.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index abeb37f34a4..457b20df259 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1056,7 +1056,7 @@ static int encode_var( var, type, type->name ? type->name : "NULL"); if (is_array(type) && !type_array_is_decl_as_ptr(type)) { - int num_dims, elements = 1, arrayoffset; + int num_dims, arrayoffset; type_t *atype; int *arraydata; @@ -1083,7 +1083,6 @@ static int encode_var( arraydata[0] = type_array_get_dim(atype); arraydata[1] = 0; arraydata += 2; - elements *= type_array_get_dim(atype); } typeoffset = ctl2_alloc_segment(typelib, MSFT_SEG_TYPEDESC, 8, 0); -- 2.35.1

1 0

[PATCH v2 0/5] MR116: qasf: Better implementation of ASF reader filter.
by Rémi Bernon (＠rbernon) 25 May '22

25 May '22

-- v2: qasf: Implement ASF Reader filter stream stubs. qasf: Create and open a WMReader in the ASF Reader filter. qasf: Rename variables and functions. qasf: Constify filter_ops. qasf/tests: Add more ASF Reader filter tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/116

3 11

[PATCH 0/6] MR128: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 25 May '22

25 May '22

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

2 6

[v3 PATCH 1/6] d2d1/tests: Add device context field to test context.
by Nikolay Sivov 25 May '22

25 May '22

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0a8245d6805..d256fcb2cc2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -111,6 +111,7 @@ struct d2d1_test_context IDXGISwapChain *swapchain; IDXGISurface *surface; ID2D1RenderTarget *rt; + ID2D1DeviceContext *context; }; struct resource_readback @@ -1029,6 +1030,7 @@ static void release_test_context_(unsigned int line, struct d2d1_test_context *c ID2D1Factory *factory; ULONG ref; + ID2D1DeviceContext_Release(ctx->context); ID2D1RenderTarget_GetFactory(ctx->rt, &factory); ID2D1RenderTarget_Release(ctx->rt); ref = ID2D1Factory_Release(factory); @@ -1075,6 +1077,9 @@ static BOOL init_test_context_(unsigned int line, struct d2d1_test_context *ctx, } ok_(__FILE__, line)(!!ctx->rt, "Failed to create render target.\n"); + hr = ID2D1RenderTarget_QueryInterface(ctx->rt, &IID_ID2D1DeviceContext, (void **)&ctx->context); + ok_(__FILE__, line)(hr == S_OK, "Failed to get device context, hr %#lx.\n", hr); + return TRUE; } @@ -2036,13 +2041,10 @@ static void test_bitmap_brush(BOOL d3d11) ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Got unexpected hr %#lx.\n", hr); if (hr == S_OK) { - ID2D1DeviceContext *context; + ID2D1DeviceContext *context = ctx.context; D2D1_POINT_2F offset; D2D1_RECT_F src_rect; - hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID2D1RenderTarget_BeginDraw(rt); set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); ID2D1RenderTarget_Clear(rt, &color); @@ -2111,7 +2113,6 @@ static void test_bitmap_brush(BOOL d3d11) ok(match, "Surface does not match.\n"); ID2D1RenderTarget_SetTransform(rt, &tmp_matrix); - ID2D1DeviceContext_Release(context); ID2D1Image_Release(image); } @@ -2393,8 +2394,7 @@ static void test_image_brush(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&device_context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + device_context = ctx.context; set_size_u(&size, 4, 4); bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; @@ -2466,7 +2466,6 @@ static void test_image_brush(BOOL d3d11) refcount = ID2D1Bitmap_Release(bitmap); ok(!refcount, "Bitmap has %lu references left.\n", refcount); - ID2D1DeviceContext_Release(device_context); release_test_context(&ctx); } @@ -9768,13 +9767,11 @@ static void test_unit_mode(BOOL d3d11) struct d2d1_test_context ctx; ID2D1DeviceContext *context; D2D1_UNIT_MODE unit_mode; - HRESULT hr; if (!init_test_context(&ctx, d3d11)) return; - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + context = ctx.context; unit_mode = ID2D1DeviceContext_GetUnitMode(context); ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Got unexpected unit mode %#x.\n", unit_mode); @@ -9791,7 +9788,6 @@ static void test_unit_mode(BOOL d3d11) unit_mode = ID2D1DeviceContext_GetUnitMode(context); ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); - ID2D1DeviceContext_Release(context); release_test_context(&ctx); } @@ -10211,8 +10207,7 @@ static void test_effect(BOOL d3d11) if (factory_version < 3) win_skip("ID2D1Factory%u is not supported.\n", factory_version + 1); - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + context = ctx.context; for (i = 0; i < ARRAY_SIZE(effect_tests); ++i) { @@ -10356,7 +10351,6 @@ static void test_effect(BOOL d3d11) winetest_pop_context(); } - ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory); release_test_context(&ctx); } @@ -10674,8 +10668,7 @@ static void test_effect_2d_affine(BOOL d3d11) return; } - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + context = ctx.context; hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D12DAffineTransform, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -10739,7 +10732,6 @@ static void test_effect_2d_affine(BOOL d3d11) } ID2D1Effect_Release(effect); - ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory); release_test_context(&ctx); } @@ -10786,8 +10778,7 @@ static void test_effect_crop(BOOL d3d11) return; } - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + context = ctx.context; hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Crop, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -10828,7 +10819,6 @@ static void test_effect_crop(BOOL d3d11) } ID2D1Effect_Release(effect); - ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory); release_test_context(&ctx); } @@ -10860,8 +10850,7 @@ static void test_effect_grayscale(BOOL d3d11) return; } - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + context = ctx.context; hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Grayscale, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -10906,7 +10895,6 @@ static void test_effect_grayscale(BOOL d3d11) } ID2D1Effect_Release(effect); - ID2D1DeviceContext_Release(context); ID2D1Factory3_Release(factory); release_test_context(&ctx); } @@ -11269,8 +11257,7 @@ static void test_image_bounds(BOOL d3d11) return; } - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + context = ctx.context; for (i = 0; i < ARRAY_SIZE(bitmap_bounds_tests); ++i) { @@ -11315,7 +11302,6 @@ static void test_image_bounds(BOOL d3d11) winetest_pop_context(); } - ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory); release_test_context(&ctx); } -- 2.35.1

1 5

[PATCH 0/1] MR124: win32u: Fix typo in NtUserGetIconInfo.
by Brendan Shanks (＠bshanks) 25 May '22

25 May '22

Fixes Plants vs Zombies: GOTY, Geometry Dash, and likely other apps/games. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/124

3 2

[PATCH v2 1/3] d2d1/tests: Add device context field to test context.
by Ziqing Hui 25 May '22

25 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0a8245d6805..c81c967e55e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -111,6 +111,7 @@ struct d2d1_test_context IDXGISwapChain *swapchain; IDXGISurface *surface; ID2D1RenderTarget *rt; + ID2D1DeviceContext *context; }; struct resource_readback @@ -1029,6 +1030,7 @@ static void release_test_context_(unsigned int line, struct d2d1_test_context *c ID2D1Factory *factory; ULONG ref; + ID2D1DeviceContext_Release(ctx->context); ID2D1RenderTarget_GetFactory(ctx->rt, &factory); ID2D1RenderTarget_Release(ctx->rt); ref = ID2D1Factory_Release(factory); @@ -1075,6 +1077,9 @@ static BOOL init_test_context_(unsigned int line, struct d2d1_test_context *ctx, } ok_(__FILE__, line)(!!ctx->rt, "Failed to create render target.\n"); + hr = ID2D1RenderTarget_QueryInterface(ctx->rt, &IID_ID2D1DeviceContext, (void **)&ctx->context); + ok_(__FILE__, line)(hr == S_OK, "Failed to get device context, hr %#lx.\n", hr); + return TRUE; } @@ -2036,13 +2041,10 @@ static void test_bitmap_brush(BOOL d3d11) ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Got unexpected hr %#lx.\n", hr); if (hr == S_OK) { - ID2D1DeviceContext *context; + ID2D1DeviceContext *context = ctx.context; D2D1_POINT_2F offset; D2D1_RECT_F src_rect; - hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID2D1RenderTarget_BeginDraw(rt); set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); ID2D1RenderTarget_Clear(rt, &color); @@ -2111,7 +2113,6 @@ static void test_bitmap_brush(BOOL d3d11) ok(match, "Surface does not match.\n"); ID2D1RenderTarget_SetTransform(rt, &tmp_matrix); - ID2D1DeviceContext_Release(context); ID2D1Image_Release(image); } @@ -2393,8 +2394,7 @@ static void test_image_brush(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&device_context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + device_context = ctx.context; set_size_u(&size, 4, 4); bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; @@ -2466,7 +2466,6 @@ static void test_image_brush(BOOL d3d11) refcount = ID2D1Bitmap_Release(bitmap); ok(!refcount, "Bitmap has %lu references left.\n", refcount); - ID2D1DeviceContext_Release(device_context); release_test_context(&ctx); } @@ -9773,8 +9772,7 @@ static void test_unit_mode(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + context = ctx.context; unit_mode = ID2D1DeviceContext_GetUnitMode(context); ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Got unexpected unit mode %#x.\n", unit_mode); @@ -9791,7 +9789,6 @@ static void test_unit_mode(BOOL d3d11) unit_mode = ID2D1DeviceContext_GetUnitMode(context); ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); - ID2D1DeviceContext_Release(context); release_test_context(&ctx); } @@ -10211,8 +10208,7 @@ static void test_effect(BOOL d3d11) if (factory_version < 3) win_skip("ID2D1Factory%u is not supported.\n", factory_version + 1); - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + context = ctx.context; for (i = 0; i < ARRAY_SIZE(effect_tests); ++i) { @@ -10356,7 +10352,6 @@ static void test_effect(BOOL d3d11) winetest_pop_context(); } - ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory); release_test_context(&ctx); } @@ -10674,8 +10669,7 @@ static void test_effect_2d_affine(BOOL d3d11) return; } - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + context = ctx.context; hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D12DAffineTransform, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -10739,7 +10733,6 @@ static void test_effect_2d_affine(BOOL d3d11) } ID2D1Effect_Release(effect); - ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory); release_test_context(&ctx); } @@ -10786,8 +10779,7 @@ static void test_effect_crop(BOOL d3d11) return; } - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + context = ctx.context; hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Crop, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -10828,7 +10820,6 @@ static void test_effect_crop(BOOL d3d11) } ID2D1Effect_Release(effect); - ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory); release_test_context(&ctx); } @@ -10860,8 +10851,7 @@ static void test_effect_grayscale(BOOL d3d11) return; } - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + context = ctx.context; hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Grayscale, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -10906,7 +10896,6 @@ static void test_effect_grayscale(BOOL d3d11) } ID2D1Effect_Release(effect); - ID2D1DeviceContext_Release(context); ID2D1Factory3_Release(factory); release_test_context(&ctx); } @@ -11269,8 +11258,7 @@ static void test_image_bounds(BOOL d3d11) return; } - hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + context = ctx.context; for (i = 0; i < ARRAY_SIZE(bitmap_bounds_tests); ++i) { @@ -11315,7 +11303,6 @@ static void test_image_bounds(BOOL d3d11) winetest_pop_context(); } - ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory); release_test_context(&ctx); } -- 2.25.1

2 3

[PATCH] d2d1: Implement ID2D1EffectContext_IsShaderLoaded().
by Ziqing Hui 25 May '22

25 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/effect.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index b87ae6bb77d..22a0761070e 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -195,6 +195,9 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", iface, debugstr_guid(shader_id), buffer, buffer_size); + if (ID2D1EffectContext_IsShaderLoaded(iface, shader_id)) + return S_OK; + if (FAILED(hr = ID3D11Device1_CreateVertexShader(effect_context->device_context->d3d_device, buffer, buffer_size, NULL, &vertex_shader))) { @@ -231,7 +234,16 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1Effec static BOOL STDMETHODCALLTYPE d2d_effect_context_IsShaderLoaded(ID2D1EffectContext *iface, REFGUID shader_id) { - FIXME("iface %p, shader_id %s stub!\n", iface, debugstr_guid(shader_id)); + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + unsigned int i; + + TRACE("iface %p, shader_id %s.\n", iface, debugstr_guid(shader_id)); + + for (i = 0; i < effect_context->shader_count; ++i) + { + if (IsEqualGUID(shader_id, effect_context->shaders[i].id)) + return TRUE; + } return FALSE; } -- 2.25.1

1 0

[PATCH v3 0/7] MR61: winegstreamer: Dynamic transform stream format change support.
by Rémi Bernon (＠rbernon) 24 May '22

24 May '22

Compared to last attempt, I moved the format pointer to a dedicated `wg_transform_read_data` parameter instead of a property of the sample. Most of the transforms use `NULL` there as they don't expect or support format change. H264 decoder passes a transform format member where it tracks the current stream format. -- v3: winegstreamer: Expose output media type attributes from the stream format. winegstreamer: Support wg_transform output format change events. winegstreamer: Avoid leaking buffer list in wg_transform_read_data. winegstreamer: Track caps changes and keep them with the output buffers. winegstreamer: Only filter video caps attributes when format explicitely uses 0. winegstreamer: Set wg_transform output sample size on gst_buffer_map failure. winegstreamer: Append a videoconvert element to wg_transform video output. https://gitlab.winehq.org/wine/wine/-/merge_requests/61

4 15

[PATCH 0/5] MR116: qasf: Better implementation of ASF reader filter.
by Rémi Bernon (＠rbernon) 24 May '22

24 May '22

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

4 14

[PATCH v2 0/5] MR101: wined3d: Various patches.
by Matteo Bruni (＠Mystral) 24 May '22

24 May '22

Next 5 patches in my queue, mostly fixing issues with older GPUs / drivers. -- v2: wined3d: Add some state table consistency checking to context_invalidate_state(). wined3d: Assert that the CS queue size is a power of two. wined3d: Allow blits with fixups in the FFP blitter without a shader backend. d3d9/tests: Fix typo. wined3d: Don't touch GL sRGB decode state when not supported. https://gitlab.winehq.org/wine/wine/-/merge_requests/101

4 10

[PATCH v2 0/1] MR122: winevulkan: Update to VK spec version 1.3.215.
by Georg Lehmann (＠DadSchoorse) 24 May '22

24 May '22

-- v2: winevulkan: Update to VK spec version 1.3.215. https://gitlab.winehq.org/wine/wine/-/merge_requests/122

4 3

[PATCH v7 0/10] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) 24 May '22

24 May '22

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v7: wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

4 21

Re: [PATCH v2 0/5] MR83: MPEG audio decoder seeking and quality control - approved
by Alexandre Julliard (＠julliard) 24 May '22

24 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/83

1 0

Re: [PATCH v2 0/7] MR104: Revamp type management (on input) - approved
by Alexandre Julliard (＠julliard) 24 May '22

24 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/104

1 0

Re: [PATCH v2 0/2] MR121: gdi32: A couple of EMF DC fixes. - approved
by Alexandre Julliard (＠julliard) 24 May '22

24 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/121

1 0

Re: [PATCH v2 0/6] MR118: windows.media.speech: IAsyncAction implementation. - approved
by Alexandre Julliard (＠julliard) 24 May '22

24 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/118

1 0

Re: [PATCH v2 0/6] MR120: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) 24 May '22

24 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/120

1 0

Re: [PATCH v2 0/6] MR119: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 24 May '22

24 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/119

1 0

[PATCH v2 0/4] MR109: wined3d: Add a memory_colour_fill path for clearing the entire level to zero.
by Stefan Dösinger (＠stefan) 24 May '22

24 May '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> -- v2: d3d9/tests: Extend color_fill_test. wined3d: Store clear colors in subresources (v3). wined3d: Prepare sysmem LOCATION_CLEARED handling for non-zero colors (v2). wined3d: Add a memory_colour_fill path for clearing the entire level to zero. https://gitlab.winehq.org/wine/wine/-/merge_requests/109

4 8

[PATCH 0/5] MR83: MPEG audio decoder seeking and quality control
by Anton Baskanov (＠baskanov) 24 May '22

24 May '22

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

3 6

[tools v2 1/3] testbot/web: Add support for adding and removing roles.
by Francois Gouget 24 May '22

24 May '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I don't forsee a need to add / remove roles but it is useful to at least be able to see which ones exist. In that it's similar to the Branches pages and fills a hole in the website administration interface. These pages are also little more than a 's/Branch/Role/g' of the Branches pages and should not require much maintenance. --- v1 failed to apply because the context had a bit from a patch in my worktree adding a copy of the "Special Jobs" page (I guess that patch should not be part of my "configuration tweaks for my copy of the TestBot" patches). --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 ++ testbot/web/admin/RoleDetails.pl | 42 +++++++++++++++++++++++++ testbot/web/admin/RolesList.pl | 30 ++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 testbot/web/admin/RoleDetails.pl create mode 100644 testbot/web/admin/RolesList.pl diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index c42a4f2b4..40f519737 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -559,6 +559,8 @@ EOF "'>Special Jobs</a></p></li>\n"; print " <li><p><a href='", MakeSecureURL("/admin/UsersList.pl"), "'>Users</a></p></li>\n"; + print " <li><p><a href='", MakeSecureURL("/admin/RolesList.pl"), + "'>Roles</a></p></li>\n"; print " <li class='divider'> </li>\n"; print " <li><p><a href='", MakeSecureURL("/admin/VMsList.pl"), "'>VMs</a></p></li>\n"; diff --git a/testbot/web/admin/RoleDetails.pl b/testbot/web/admin/RoleDetails.pl new file mode 100644 index 000000000..3f6d02eb8 --- /dev/null +++ b/testbot/web/admin/RoleDetails.pl @@ -0,0 +1,42 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Role details page +# +# Copyright 2010 VMware, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package RoleDetailsPage; + +use ObjectModel::CGI::ItemPage; +our @ISA = qw(ObjectModel::CGI::ItemPage); + +use WineTestBot::Roles; + + +sub _initialize($$$) +{ + my ($self, $Request, $RequiredRole) = @_; + + $self->SUPER::_initialize($Request, $RequiredRole, CreateRoles()); +} + + +package main; + +my $Request = shift; +my $Page = RoleDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/RolesList.pl b/testbot/web/admin/RolesList.pl new file mode 100644 index 000000000..3fb765b0a --- /dev/null +++ b/testbot/web/admin/RolesList.pl @@ -0,0 +1,30 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Role list page +# +# Copyright 2009 Ge van Geldorp +# 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; + +package main; + +use ObjectModel::CGI::CollectionPage; +use WineTestBot::Roles; + +my $Request = shift; +my $Page = ObjectModel::CGI::CollectionPage->new($Request, "admin", CreateRoles()); +$Page->GeneratePage(); -- 2.30.2

1 2

[PATCH 1/2] mmdevapi: Truncate strings from PropertyStore's GetValue to 62 chars.
by Gabriel Ivăncescu 24 May '22

24 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53010 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Not sure if this is the best solution, but... dlls/mmdevapi/devenum.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index ed1daa8..f5799be 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1378,6 +1378,8 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *pv) { MMDevPropStore *This = impl_from_IPropertyStore(iface); + HRESULT hres; + TRACE("(%p)->(\"%s,%lu\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv); if (!key || !pv) @@ -1397,7 +1399,16 @@ static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTY return S_OK; } - return MMDevice_GetPropValue(&This->parent->devguid, This->parent->flow, key, pv); + hres = MMDevice_GetPropValue(&This->parent->devguid, This->parent->flow, key, pv); + if (FAILED(hres)) + return hres; + + /* Some broken apps and libs (e.g. Split/Second with fmodex) + can't deal with strings longer than 62 characters + NUL. */ + if (pv->vt == VT_LPWSTR && wcslen(pv->pwszVal) > 62) + pv->pwszVal[62] = '\0'; + + return hres; } static HRESULT WINAPI MMDevPropStore_SetValue(IPropertyStore *iface, REFPROPERTYKEY key, REFPROPVARIANT pv) -- 2.34.1

2 7

[PATCH v6 0/10] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) 24 May '22

24 May '22

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v6: wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

2 10

[PATCH] conhost: Set correct face name when the specified font is not available
by Hugh McMaster 24 May '22

24 May '22

conhost.exe currently copies the user-specified face name from the LOGFONT structure. This results in an invalid face name when the specified font is not available. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 582badf43b5..5e8c3e15a4f 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -678,6 +678,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) struct font_info *font_info = &console->active->font; HFONT font, old_font; TEXTMETRICW tm; + WCHAR face_name[LF_FACESIZE]; CPINFO cpinfo; HDC dc; @@ -703,6 +704,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) old_font = SelectObject( dc, font ); GetTextMetricsW( dc, &tm ); + font_info->face_len = GetTextFaceW( dc, ARRAY_SIZE(face_name), face_name ) - 1; SelectObject( dc, old_font ); ReleaseDC( console->win, dc ); @@ -712,9 +714,8 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->weight = tm.tmWeight; free( font_info->face_name ); - font_info->face_len = wcslen( logfont->lfFaceName ); font_info->face_name = malloc( font_info->face_len * sizeof(WCHAR) ); - memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len * sizeof(WCHAR) ); + memcpy( font_info->face_name, face_name, font_info->face_len * sizeof(WCHAR) ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize == 2) -- 2.36.1

2 1

[PATCH v2 1/5] mshtml: Implement HTMLStorage_getItem().
by Hans Leidekker 24 May '22

24 May '22

v2: Fix test failure. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 245 ++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlwindow.c | 4 +- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 243 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 95f7ae5cd16..fe1d6a21b88 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "shlobj.h" #include "wine/debug.h" @@ -35,6 +36,7 @@ typedef struct { DispatchEx dispex; IHTMLStorage IHTMLStorage_iface; LONG ref; + HTMLInnerWindow *window; } HTMLStorage; static inline HTMLStorage *impl_from_IHTMLStorage(IHTMLStorage *iface) @@ -121,6 +123,151 @@ static HRESULT WINAPI HTMLStorage_Invoke(IHTMLStorage *iface, DISPID dispIdMembe pDispParams, pVarResult, pExcepInfo, puArgErr); } +static BOOL create_path(const WCHAR *path) +{ + BOOL ret = TRUE; + WCHAR *new_path; + int len; + + new_path = malloc((wcslen(path) + 1) * sizeof(WCHAR)); + if(!new_path) + return FALSE; + wcscpy(new_path, path); + + while((len = wcslen(new_path)) && new_path[len - 1] == '\\') + new_path[len - 1] = 0; + + while(!CreateDirectoryW(new_path, NULL)) { + WCHAR *slash; + DWORD error = GetLastError(); + if(error == ERROR_ALREADY_EXISTS) break; + if(error != ERROR_PATH_NOT_FOUND) { + ret = FALSE; + break; + } + slash = wcsrchr(new_path, '\\'); + if(!slash) { + ret = FALSE; + break; + } + len = slash - new_path; + new_path[len] = 0; + if(!create_path(new_path)) { + ret = FALSE; + break; + } + new_path[len] = '\\'; + } + free(new_path); + return ret; +} + +static WCHAR *build_filename(const WCHAR *hostname) +{ + static const WCHAR store[] = L"\\Microsoft\\Internet Explorer\\DOMStore\\"; + WCHAR path[MAX_PATH], *ret; + int len; + + if(!SHGetSpecialFolderPathW(NULL, path, CSIDL_LOCAL_APPDATA, TRUE)) { + ERR("Can't get folder path %lu\n", GetLastError()); + return NULL; + } + + len = wcslen(path); + if(len + ARRAY_SIZE(store) > ARRAY_SIZE(path)) { + ERR("Path too long\n"); + return NULL; + } + memcpy(path + len, store, sizeof(store)); + + len += ARRAY_SIZE(store); + ret = malloc((len + wcslen(hostname) + ARRAY_SIZE(L".xml")) * sizeof(WCHAR)); + if(!ret) + return NULL; + + wcscpy(ret, path); + wcscat(ret, hostname); + wcscat(ret, L".xml"); + return ret; +} + +struct storage { + WCHAR *filename; + IXMLDOMDocument *doc; +}; + +static void close_storage(struct storage *storage) +{ + free(storage->filename); + if(storage->doc) + IXMLDOMDocument_Release(storage->doc); + free(storage); +} + +static HRESULT open_storage(const WCHAR *hostname, struct storage **ret) +{ + struct storage *storage; + HRESULT hres = E_OUTOFMEMORY; + VARIANT var; + VARIANT_BOOL success; + WCHAR *ptr; + + storage = calloc(1, sizeof(*storage)); + if(!storage) + return E_OUTOFMEMORY; + + storage->filename = build_filename(hostname); + if(!storage->filename) + goto done; + + *(ptr = wcsrchr(storage->filename, '\\')) = 0; + if(!create_path(storage->filename)) { + hres = E_FAIL; + goto done; + } + *ptr = '\\'; + + if(GetFileAttributesW(storage->filename) == INVALID_FILE_ATTRIBUTES) { + DWORD count; + HANDLE file = CreateFileW(storage->filename, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + if(file == INVALID_HANDLE_VALUE) { + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + if(!WriteFile(file, "<root/>", sizeof("<root/>") - 1, &count, NULL)) { + CloseHandle(file); + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + CloseHandle(file); + } + + hres = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&storage->doc); + if(hres != S_OK) + goto done; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(storage->filename); + if(!V_BSTR(&var)) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMDocument_load(storage->doc, var, &success); + if(hres == S_FALSE || success == VARIANT_FALSE) + hres = E_FAIL; + + SysFreeString(V_BSTR(&var)); + +done: + if(hres != S_OK) + close_storage(storage); + else + *ret = storage; + + return hres; +} + static HRESULT WINAPI HTMLStorage_get_length(IHTMLStorage *iface, LONG *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); @@ -142,14 +289,101 @@ static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) return E_NOTIMPL; } -static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *p) +static BSTR build_query(const WCHAR *key) +{ + static const WCHAR fmt[] = L"item[@name='%s']"; + const WCHAR *str = key ? key : L""; + UINT len = ARRAY_SIZE(fmt) + wcslen(str); + BSTR ret = SysAllocStringLen(NULL, len); + + if(ret) swprintf(ret, len, fmt, str); + return ret; +} + +static HRESULT get_root_node(IXMLDOMDocument *doc, IXMLDOMNode **root) +{ + HRESULT hres; + BSTR str; + + str = SysAllocString(L"root"); + if(!str) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_selectSingleNode(doc, str, root); + SysFreeString(str); + return hres; +} + +static HRESULT get_item(BSTR hostname, BSTR key, VARIANT *value) +{ + struct storage *storage; + BSTR query = NULL; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + HRESULT hres; + + hres = open_storage(hostname, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = IXMLDOMElement_getAttribute(elem, (BSTR)L"value", value); + }else { + V_VT(value) = VT_NULL; + hres = S_OK; + } + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + close_storage(storage); + return hres; +} + +static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *value) { HTMLStorage *This = impl_from_IHTMLStorage(iface); + BSTR hostname; + HRESULT hres; - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), p); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), value); - V_VT(p) = VT_NULL; - return S_OK; + if(!value) + return E_POINTER; + + if(!This->window) { + FIXME("session storage not supported\n"); + V_VT(value) = VT_NULL; + return S_OK; + } + + hres = IUri_GetHost(This->window->base.outer_window->uri, &hostname); + if(hres != S_OK) + return hres; + + hres = get_item(hostname, bstrKey, value); + SysFreeString(hostname); + return hres; } static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) @@ -201,7 +435,7 @@ static dispex_static_data_t HTMLStorage_dispex = { HTMLStorage_iface_tids }; -HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) +HRESULT create_html_storage(compat_mode_t compat_mode, HTMLInnerWindow *window, IHTMLStorage **p) { HTMLStorage *storage; @@ -211,6 +445,7 @@ HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) storage->IHTMLStorage_iface.lpVtbl = &HTMLStorageVtbl; storage->ref = 1; + storage->window = window; init_dispatch(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex, compat_mode); *p = &storage->IHTMLStorage_iface; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ecd530db7e2..57388ae64a2 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2143,7 +2143,7 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS HRESULT hres; hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - &This->inner_window->session_storage); + NULL, &This->inner_window->session_storage); if(FAILED(hres)) return hres; } @@ -2163,7 +2163,7 @@ static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLSto HRESULT hres; hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - &This->inner_window->local_storage); + This->inner_window, &This->inner_window->local_storage); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a94f1be1969..0fed06b8aae 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -941,7 +941,7 @@ HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**) DE HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; void detach_dom_implementation(IHTMLDOMImplementation*) DECLSPEC_HIDDEN; -HRESULT create_html_storage(compat_mode_t,IHTMLStorage**) DECLSPEC_HIDDEN; +HRESULT create_html_storage(compat_mode_t,HTMLInnerWindow*,IHTMLStorage**) DECLSPEC_HIDDEN; void HTMLDocument_Persist_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_OleCmd_Init(HTMLDocument*) DECLSPEC_HIDDEN; -- 2.30.2

2 1

[PATCH 1/2] dwmapi: Fill some values of DWM_TIMING_INFO from DwmGetCompositionTimingInfo().
by Jactry Zeng 24 May '22

24 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53035 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53038 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/dwmapi/dwmapi_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6bb086a87d1..1ae15c9de72 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -228,6 +228,11 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) memset(info, 0, info->cbSize); info->cbSize = sizeof(DWM_TIMING_INFO); + info->rateRefresh.uiDenominator = 1; + info->rateRefresh.uiNumerator = 64; + info->rateCompose.uiDenominator = 1; + info->rateCompose.uiNumerator = 64; + info->qpcRefreshPeriod = 156250; return S_OK; } -- 2.35.1

2 2

[PATCH v5 0/10] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) 24 May '22

24 May '22

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v5: wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

4 13

[PATCH 0/2] MR123: Fix interaction between RtlWow64SetThreadContext and NtSetThreadContext
by Jinoh Kang (＠iamahuman) 24 May '22

24 May '22

If a Wow64 process is in emulation mode (e.g. CS points to 32-bit compat segment on x86-64), the Wow64 register context is synonymous to the native register context. The client should indicate this condition by omitting the Wow64 context when issuing a select request. Then, the wineserver automatically redirects Wow64 context writes to the native context. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/123

2 2

[PATCH 0/5] MR101: wined3d: Various patches.
by Matteo Bruni (＠Mystral) 24 May '22

24 May '22

Next 5 patches in my queue, mostly fixing issues with older GPUs / drivers. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/101

5 8

[PATCH 1/2] vbscript: Handle null arguments in MonthName().
by Nikolay Sivov 24 May '22

24 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 3 +++ dlls/vbscript/tests/api.vbs | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 80348a5288f..876a41a14b2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2897,6 +2897,9 @@ static HRESULT Global_MonthName(BuiltinDisp *This, VARIANT *args, unsigned args_ assert(args_cnt == 1 || args_cnt == 2); + if(V_VT(args) == VT_NULL || (args_cnt == 2 && V_VT(args+1) == VT_NULL)) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + hres = to_int(args, &month); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 617589053c6..758013c93ef 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2148,4 +2148,21 @@ call testWeekday(DateSerial(2000, 1, 1), vbFriday, 2) call testWeekday(DateSerial(2000, 1, 1), vbSaturday, 1) call testWeekdayError() +sub testMonthNameError() + on error resume next + call Err.clear() + call MonthName(null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call MonthName(1, null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call MonthName(null, null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call MonthName("a", null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub +call testMonthNameError() + Call reportSuccess() -- 2.35.1

2 3

[PATCH 0/2] MR121: gdi32: A couple of EMF DC fixes.
by Huw Davies (＠huw) 24 May '22

24 May '22

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

3 3

[PATCH 0/6] MR118: windows.media.speech: IAsyncAction implementation.
by Bernhard Kölbl (＠besentv) 24 May '22

24 May '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/118

3 9

[PATCH 0/1] MR122: winevulkan: Update to VK spec version 1.3.215.
by Georg Lehmann (＠DadSchoorse) 24 May '22

24 May '22

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

2 1

[PATCH v3 0/3] MR115: winex11.drv: Define ControlMask when not available
by Alistair Leslie-Hughes (＠alesliehughes) 24 May '22

24 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v3: ntdll: Fake success for ThreadPowerThrottlingState include: Add THREAD_POWER_THROTTLING_STATE type winex11.drv: Define ControlMask when not available https://gitlab.winehq.org/wine/wine/-/merge_requests/115

3 4

[PATCH 3/3] crypt32/tests: Add more OCSP revocation tests.
by Hans Leidekker 24 May '22

24 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/tests/cert.c | 552 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 552 insertions(+) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 3cdb5e5ceea..0f8684a5483 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3537,6 +3537,520 @@ static const BYTE rootSignedCRL[] = { 0xd5,0xbc,0xb0,0xd5,0xa5,0x9c,0x1b,0x72,0xc3,0x0f,0xa3,0xe3,0x3c,0xf0,0xc3, 0x91,0xe8,0x93,0x4f,0xd4,0x2f }; +static const BYTE ocsp_cert[] = { + 0x30, 0x82, 0x06, 0xcd, 0x30, 0x82, 0x05, 0xb5, 0xa0, 0x03, 0x02, 0x01, + 0x02, 0x02, 0x10, 0x08, 0x49, 0x8f, 0x6d, 0xd9, 0xef, 0xfb, 0x40, 0x55, + 0x1e, 0xac, 0x54, 0x54, 0x87, 0xc1, 0xb1, 0x30, 0x0d, 0x06, 0x09, 0x2a, + 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x4f, + 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, + 0x53, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x0c, + 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x20, 0x49, 0x6e, 0x63, + 0x31, 0x29, 0x30, 0x27, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x20, 0x44, + 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x20, 0x54, 0x4c, 0x53, 0x20, + 0x52, 0x53, 0x41, 0x20, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x20, 0x32, + 0x30, 0x32, 0x30, 0x20, 0x43, 0x41, 0x31, 0x30, 0x1e, 0x17, 0x0d, 0x32, + 0x31, 0x30, 0x34, 0x32, 0x38, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, + 0x17, 0x0d, 0x32, 0x32, 0x30, 0x35, 0x32, 0x39, 0x32, 0x33, 0x35, 0x39, + 0x35, 0x39, 0x5a, 0x30, 0x6b, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, + 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, + 0x55, 0x04, 0x08, 0x13, 0x0a, 0x57, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, + 0x74, 0x6f, 0x6e, 0x31, 0x11, 0x30, 0x0f, 0x06, 0x03, 0x55, 0x04, 0x07, + 0x13, 0x08, 0x42, 0x65, 0x6c, 0x6c, 0x65, 0x76, 0x75, 0x65, 0x31, 0x14, + 0x30, 0x12, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x0b, 0x56, 0x61, 0x6c, + 0x76, 0x65, 0x20, 0x43, 0x6f, 0x72, 0x70, 0x2e, 0x31, 0x1e, 0x30, 0x1c, + 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x15, 0x2a, 0x2e, 0x63, 0x6d, 0x2e, + 0x73, 0x74, 0x65, 0x61, 0x6d, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x65, 0x64, + 0x2e, 0x63, 0x6f, 0x6d, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, + 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, + 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, + 0x00, 0xcd, 0x98, 0x0c, 0x13, 0xb2, 0xb9, 0xf2, 0xa5, 0xc6, 0x52, 0xad, + 0xf9, 0x4d, 0xcf, 0x1e, 0x2b, 0x74, 0x05, 0xd1, 0x2e, 0x95, 0xc3, 0x9d, + 0x9b, 0x03, 0x2a, 0xc6, 0x65, 0x1e, 0xda, 0x5d, 0x57, 0x3c, 0x61, 0xa1, + 0x3d, 0xa3, 0xe7, 0x0c, 0xdd, 0xb1, 0x6b, 0x30, 0x97, 0x99, 0xc7, 0x77, + 0xab, 0xc2, 0xb0, 0x0a, 0x5b, 0x1c, 0x86, 0x55, 0x42, 0x25, 0xa8, 0x4e, + 0xe2, 0x61, 0xfe, 0x88, 0x10, 0x25, 0xf5, 0x8e, 0x9c, 0x0f, 0xc7, 0xa5, + 0xef, 0x9d, 0xd5, 0xf0, 0x2a, 0xf2, 0x31, 0x59, 0x59, 0xfc, 0xe0, 0x1f, + 0x8f, 0xb4, 0xa1, 0x06, 0x32, 0x04, 0x37, 0x3d, 0x9d, 0xad, 0xc1, 0xe0, + 0x00, 0x3d, 0x8d, 0x60, 0x4c, 0x9e, 0x6a, 0x1f, 0xd2, 0xf6, 0xf8, 0x86, + 0x0b, 0x11, 0x7b, 0xfd, 0x75, 0xae, 0x20, 0x9b, 0xca, 0x52, 0x5f, 0x4e, + 0xad, 0x2e, 0xa2, 0xce, 0xed, 0x35, 0x08, 0x23, 0xa8, 0x6e, 0x61, 0x7e, + 0x18, 0x1a, 0x6a, 0xd9, 0xe0, 0x3b, 0x52, 0x64, 0xe9, 0x2c, 0x81, 0x8f, + 0xbc, 0x4b, 0x48, 0xd1, 0x7a, 0x3e, 0x02, 0x9c, 0xad, 0x87, 0x73, 0xae, + 0xaa, 0xea, 0x32, 0xfb, 0x07, 0x4e, 0xcb, 0xe9, 0xac, 0xac, 0x50, 0x0f, + 0x49, 0xb7, 0x23, 0x3b, 0x1f, 0xb2, 0x24, 0x46, 0x78, 0x32, 0x11, 0x9e, + 0xa2, 0xeb, 0xd8, 0x8b, 0x7e, 0x56, 0x92, 0xaa, 0x29, 0xbd, 0x55, 0xc8, + 0x3e, 0x69, 0xe2, 0x56, 0xf4, 0x24, 0x58, 0x7b, 0xf8, 0xb0, 0xbb, 0x72, + 0xb7, 0x38, 0x34, 0xe3, 0x0f, 0x30, 0xf4, 0xfd, 0x44, 0xf1, 0x53, 0x0f, + 0xc5, 0x31, 0xd6, 0xad, 0x45, 0xbf, 0x57, 0x2c, 0x4c, 0xe5, 0x1a, 0xc0, + 0x08, 0x25, 0x88, 0x2f, 0xca, 0x07, 0x2e, 0x35, 0x31, 0xa7, 0x40, 0x3a, + 0x71, 0x1d, 0xba, 0x09, 0xf8, 0x76, 0x6c, 0x69, 0xb2, 0x89, 0xd7, 0xbe, + 0xca, 0x9d, 0xf5, 0xd4, 0x7d, 0x02, 0x03, 0x01, 0x00, 0x01, 0xa3, 0x82, + 0x03, 0x87, 0x30, 0x82, 0x03, 0x83, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, + 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, + 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, + 0x76, 0xb9, 0xf4, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, + 0x04, 0x14, 0x22, 0x68, 0x57, 0xb9, 0xc0, 0x1f, 0xce, 0xa6, 0xbf, 0xb6, + 0x55, 0xcb, 0x2a, 0x1b, 0xe6, 0xe0, 0x76, 0x94, 0x07, 0x06, 0x30, 0x35, + 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x2e, 0x30, 0x2c, 0x82, 0x15, 0x2a, + 0x2e, 0x63, 0x6d, 0x2e, 0x73, 0x74, 0x65, 0x61, 0x6d, 0x70, 0x6f, 0x77, + 0x65, 0x72, 0x65, 0x64, 0x2e, 0x63, 0x6f, 0x6d, 0x82, 0x13, 0x63, 0x6d, + 0x2e, 0x73, 0x74, 0x65, 0x61, 0x6d, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x65, + 0x64, 0x2e, 0x63, 0x6f, 0x6d, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, + 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x05, 0xa0, 0x30, 0x1d, 0x06, + 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b, 0x06, + 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, + 0x05, 0x07, 0x03, 0x02, 0x30, 0x81, 0x8b, 0x06, 0x03, 0x55, 0x1d, 0x1f, + 0x04, 0x81, 0x83, 0x30, 0x81, 0x80, 0x30, 0x3e, 0xa0, 0x3c, 0xa0, 0x3a, + 0x86, 0x38, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x6c, + 0x33, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x54, + 0x4c, 0x53, 0x52, 0x53, 0x41, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x32, + 0x30, 0x32, 0x30, 0x43, 0x41, 0x31, 0x2e, 0x63, 0x72, 0x6c, 0x30, 0x3e, + 0xa0, 0x3c, 0xa0, 0x3a, 0x86, 0x38, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, + 0x2f, 0x63, 0x72, 0x6c, 0x34, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, + 0x72, 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x44, 0x69, 0x67, 0x69, 0x43, + 0x65, 0x72, 0x74, 0x54, 0x4c, 0x53, 0x52, 0x53, 0x41, 0x53, 0x48, 0x41, + 0x32, 0x35, 0x36, 0x32, 0x30, 0x32, 0x30, 0x43, 0x41, 0x31, 0x2e, 0x63, + 0x72, 0x6c, 0x30, 0x3e, 0x06, 0x03, 0x55, 0x1d, 0x20, 0x04, 0x37, 0x30, + 0x35, 0x30, 0x33, 0x06, 0x06, 0x67, 0x81, 0x0c, 0x01, 0x02, 0x02, 0x30, + 0x29, 0x30, 0x27, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x02, + 0x01, 0x16, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, + 0x77, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x43, 0x50, 0x53, 0x30, 0x7d, 0x06, 0x08, 0x2b, 0x06, + 0x01, 0x05, 0x05, 0x07, 0x01, 0x01, 0x04, 0x71, 0x30, 0x6f, 0x30, 0x24, + 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x01, 0x86, 0x18, + 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6f, 0x63, 0x73, 0x70, 0x2e, + 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, 0x63, 0x6f, 0x6d, + 0x30, 0x47, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x02, + 0x86, 0x3b, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x61, 0x63, + 0x65, 0x72, 0x74, 0x73, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, 0x72, + 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, + 0x72, 0x74, 0x54, 0x4c, 0x53, 0x52, 0x53, 0x41, 0x53, 0x48, 0x41, 0x32, + 0x35, 0x36, 0x32, 0x30, 0x32, 0x30, 0x43, 0x41, 0x31, 0x2e, 0x63, 0x72, + 0x74, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, + 0x02, 0x30, 0x00, 0x30, 0x82, 0x01, 0x7e, 0x06, 0x0a, 0x2b, 0x06, 0x01, + 0x04, 0x01, 0xd6, 0x79, 0x02, 0x04, 0x02, 0x04, 0x82, 0x01, 0x6e, 0x04, + 0x82, 0x01, 0x6a, 0x01, 0x68, 0x00, 0x76, 0x00, 0x29, 0x79, 0xbe, 0xf0, + 0x9e, 0x39, 0x39, 0x21, 0xf0, 0x56, 0x73, 0x9f, 0x63, 0xa5, 0x77, 0xe5, + 0xbe, 0x57, 0x7d, 0x9c, 0x60, 0x0a, 0xf8, 0xf9, 0x4d, 0x5d, 0x26, 0x5c, + 0x25, 0x5d, 0xc7, 0x84, 0x00, 0x00, 0x01, 0x79, 0x19, 0x43, 0x10, 0x65, + 0x00, 0x00, 0x04, 0x03, 0x00, 0x47, 0x30, 0x45, 0x02, 0x21, 0x00, 0x93, + 0x5f, 0x66, 0xe4, 0xfe, 0x76, 0x25, 0xe6, 0x07, 0x74, 0xa1, 0x8b, 0x7f, + 0x37, 0xad, 0xb1, 0x40, 0x8f, 0x20, 0x66, 0x71, 0x57, 0x14, 0x2c, 0x2e, + 0x28, 0xe0, 0xb2, 0x95, 0xd5, 0x19, 0xd0, 0x02, 0x20, 0x32, 0xd1, 0xa8, + 0x59, 0xfd, 0x69, 0x24, 0x8a, 0x27, 0x7e, 0x56, 0x06, 0xce, 0x6d, 0xeb, + 0xa1, 0xc6, 0x2a, 0xce, 0x4b, 0x37, 0xb1, 0x25, 0xca, 0x6d, 0xd3, 0x43, + 0xf3, 0xdb, 0xb8, 0xa5, 0x5e, 0x00, 0x76, 0x00, 0x22, 0x45, 0x45, 0x07, + 0x59, 0x55, 0x24, 0x56, 0x96, 0x3f, 0xa1, 0x2f, 0xf1, 0xf7, 0x6d, 0x86, + 0xe0, 0x23, 0x26, 0x63, 0xad, 0xc0, 0x4b, 0x7f, 0x5d, 0xc6, 0x83, 0x5c, + 0x6e, 0xe2, 0x0f, 0x02, 0x00, 0x00, 0x01, 0x79, 0x19, 0x43, 0x10, 0xa4, + 0x00, 0x00, 0x04, 0x03, 0x00, 0x47, 0x30, 0x45, 0x02, 0x20, 0x3a, 0x73, + 0x53, 0xfb, 0xbb, 0x42, 0xdf, 0x2e, 0xa2, 0xc0, 0xc5, 0x29, 0x57, 0xda, + 0xb9, 0x0b, 0x76, 0x58, 0xb6, 0xeb, 0xd3, 0x4d, 0x10, 0x95, 0x1b, 0x58, + 0x3e, 0x58, 0x86, 0xea, 0xec, 0xe5, 0x02, 0x21, 0x00, 0xeb, 0xb2, 0xfe, + 0x83, 0x74, 0xdf, 0xb5, 0xfd, 0x8f, 0x74, 0x82, 0xd3, 0x8f, 0x6b, 0xce, + 0x63, 0x8b, 0x93, 0x94, 0x08, 0x7b, 0x1c, 0x6b, 0x48, 0xae, 0x59, 0xa1, + 0x7e, 0xec, 0x59, 0xdf, 0x56, 0x00, 0x76, 0x00, 0x51, 0xa3, 0xb0, 0xf5, + 0xfd, 0x01, 0x79, 0x9c, 0x56, 0x6d, 0xb8, 0x37, 0x78, 0x8f, 0x0c, 0xa4, + 0x7a, 0xcc, 0x1b, 0x27, 0xcb, 0xf7, 0x9e, 0x88, 0x42, 0x9a, 0x0d, 0xfe, + 0xd4, 0x8b, 0x05, 0xe5, 0x00, 0x00, 0x01, 0x79, 0x19, 0x43, 0x10, 0xea, + 0x00, 0x00, 0x04, 0x03, 0x00, 0x47, 0x30, 0x45, 0x02, 0x20, 0x68, 0x89, + 0x8b, 0xab, 0x98, 0xd3, 0x4f, 0x41, 0x4f, 0x7d, 0x1c, 0x52, 0xbe, 0x1b, + 0xf1, 0xbe, 0xb3, 0x68, 0x49, 0x5a, 0x91, 0x93, 0xdc, 0xac, 0xba, 0x6e, + 0x58, 0x8d, 0xcd, 0x3c, 0x5a, 0x26, 0x02, 0x21, 0x00, 0x85, 0x09, 0xf7, + 0x21, 0x4a, 0x66, 0x45, 0x77, 0xfe, 0xd5, 0x77, 0x25, 0xd5, 0xc5, 0x1a, + 0xb3, 0x33, 0xd8, 0x86, 0x52, 0xcc, 0xe1, 0x26, 0x21, 0x03, 0xcf, 0x1b, + 0x34, 0x24, 0xab, 0xc0, 0x1f, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, + 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, + 0x00, 0xbd, 0x22, 0x40, 0xf1, 0x6d, 0xe7, 0x68, 0x89, 0x82, 0x53, 0xcd, + 0x64, 0xed, 0x21, 0x17, 0x90, 0x3a, 0xd0, 0xa3, 0x21, 0x42, 0x40, 0x60, + 0xf2, 0x2c, 0xf7, 0x40, 0xef, 0xc3, 0xf0, 0x22, 0x24, 0xc2, 0x51, 0x17, + 0x9d, 0x4b, 0x10, 0x9f, 0x86, 0x1a, 0x05, 0x4c, 0x6a, 0xe0, 0x13, 0xbb, + 0x29, 0xad, 0xf7, 0x18, 0x5f, 0x76, 0x01, 0x10, 0x8b, 0x1c, 0x29, 0x79, + 0x23, 0x94, 0x58, 0x1a, 0xa6, 0xf8, 0xac, 0x9b, 0x2e, 0xe0, 0x70, 0x1d, + 0x06, 0x1a, 0xe9, 0x5d, 0x24, 0x9f, 0x03, 0xff, 0x40, 0xe5, 0xc1, 0xb0, + 0xb9, 0xa7, 0x7e, 0x19, 0x3d, 0x0c, 0x99, 0x89, 0x81, 0xe4, 0x53, 0x9b, + 0xbd, 0x66, 0x1b, 0xba, 0x2e, 0xcd, 0xff, 0x24, 0x16, 0xd2, 0x89, 0xc9, + 0x75, 0xdd, 0xc9, 0x78, 0x25, 0x1e, 0x11, 0x43, 0x25, 0x06, 0x15, 0xe5, + 0xe3, 0x6b, 0xf9, 0x33, 0xee, 0x06, 0x16, 0x92, 0x8e, 0xe1, 0x8a, 0x93, + 0x41, 0x15, 0x8b, 0xf1, 0x06, 0xf7, 0x52, 0x07, 0x25, 0xb8, 0x6a, 0xae, + 0x46, 0x70, 0xa6, 0x81, 0x74, 0x70, 0x3c, 0x50, 0x42, 0x85, 0x65, 0x41, + 0xdb, 0x25, 0xb3, 0x4f, 0xce, 0x25, 0xb5, 0x2b, 0x62, 0xb7, 0x2b, 0xbf, + 0x66, 0xc4, 0xb4, 0x8a, 0x10, 0xb0, 0x50, 0x8e, 0x84, 0xf8, 0xe5, 0x28, + 0x86, 0xda, 0x7d, 0xe6, 0x65, 0xbf, 0xb1, 0xd5, 0x7d, 0x09, 0x28, 0x61, + 0xa3, 0x14, 0x89, 0x23, 0x35, 0x6e, 0x9c, 0x70, 0x06, 0x8b, 0xcb, 0x84, + 0xe8, 0x70, 0x8d, 0xb9, 0xfb, 0x74, 0xcf, 0x77, 0x63, 0x00, 0x5d, 0x8c, + 0xbb, 0x62, 0x4a, 0x2b, 0xc2, 0x8b, 0x2c, 0xd9, 0x9a, 0xa8, 0x83, 0x6f, + 0x06, 0x2a, 0x2a, 0x30, 0x4c, 0x39, 0xb4, 0xf8, 0x7d, 0x8c, 0x5e, 0xa7, + 0xcb, 0xce, 0x64, 0xe0, 0x27, 0xfa, 0x24, 0x42, 0xdd, 0xd1, 0x1d, 0xf8, + 0xa9, 0xd7, 0xc4, 0x0c, 0x92 +}; + +static const BYTE ocsp_cert_issuer[] = { + 0x30, 0x82, 0x04, 0xbe, 0x30, 0x82, 0x03, 0xa6, 0xa0, 0x03, 0x02, 0x01, + 0x02, 0x02, 0x10, 0x06, 0xd8, 0xd9, 0x04, 0xd5, 0x58, 0x43, 0x46, 0xf6, + 0x8a, 0x2f, 0xa7, 0x54, 0x22, 0x7e, 0xc4, 0x30, 0x0d, 0x06, 0x09, 0x2a, + 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x61, + 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, + 0x53, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x0c, + 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x20, 0x49, 0x6e, 0x63, + 0x31, 0x19, 0x30, 0x17, 0x06, 0x03, 0x55, 0x04, 0x0b, 0x13, 0x10, 0x77, + 0x77, 0x77, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, + 0x63, 0x6f, 0x6d, 0x31, 0x20, 0x30, 0x1e, 0x06, 0x03, 0x55, 0x04, 0x03, + 0x13, 0x17, 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x20, 0x47, + 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x20, 0x52, 0x6f, 0x6f, 0x74, 0x20, 0x43, + 0x41, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x31, 0x30, 0x34, 0x31, 0x34, 0x30, + 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x17, 0x0d, 0x33, 0x31, 0x30, 0x34, + 0x31, 0x33, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x4f, 0x31, + 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, + 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x0c, 0x44, + 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x20, 0x49, 0x6e, 0x63, 0x31, + 0x29, 0x30, 0x27, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x20, 0x44, 0x69, + 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x20, 0x54, 0x4c, 0x53, 0x20, 0x52, + 0x53, 0x41, 0x20, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x20, 0x32, 0x30, + 0x32, 0x30, 0x20, 0x43, 0x41, 0x31, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, + 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, + 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, + 0x01, 0x01, 0x00, 0xc1, 0x4b, 0xb3, 0x65, 0x47, 0x70, 0xbc, 0xdd, 0x4f, + 0x58, 0xdb, 0xec, 0x9c, 0xed, 0xc3, 0x66, 0xe5, 0x1f, 0x31, 0x13, 0x54, + 0xad, 0x4a, 0x66, 0x46, 0x1f, 0x2c, 0x0a, 0xec, 0x64, 0x07, 0xe5, 0x2e, + 0xdc, 0xdc, 0xb9, 0x0a, 0x20, 0xed, 0xdf, 0xe3, 0xc4, 0xd0, 0x9e, 0x9a, + 0xa9, 0x7a, 0x1d, 0x82, 0x88, 0xe5, 0x11, 0x56, 0xdb, 0x1e, 0x9f, 0x58, + 0xc2, 0x51, 0xe7, 0x2c, 0x34, 0x0d, 0x2e, 0xd2, 0x92, 0xe1, 0x56, 0xcb, + 0xf1, 0x79, 0x5f, 0xb3, 0xbb, 0x87, 0xca, 0x25, 0x03, 0x7b, 0x9a, 0x52, + 0x41, 0x66, 0x10, 0x60, 0x4f, 0x57, 0x13, 0x49, 0xf0, 0xe8, 0x37, 0x67, + 0x83, 0xdf, 0xe7, 0xd3, 0x4b, 0x67, 0x4c, 0x22, 0x51, 0xa6, 0xdf, 0x0e, + 0x99, 0x10, 0xed, 0x57, 0x51, 0x74, 0x26, 0xe2, 0x7d, 0xc7, 0xca, 0x62, + 0x2e, 0x13, 0x1b, 0x7f, 0x23, 0x88, 0x25, 0x53, 0x6f, 0xc1, 0x34, 0x58, + 0x00, 0x8b, 0x84, 0xff, 0xf8, 0xbe, 0xa7, 0x58, 0x49, 0x22, 0x7b, 0x96, + 0xad, 0xa2, 0x88, 0x9b, 0x15, 0xbc, 0xa0, 0x7c, 0xdf, 0xe9, 0x51, 0xa8, + 0xd5, 0xb0, 0xed, 0x37, 0xe2, 0x36, 0xb4, 0x82, 0x4b, 0x62, 0xb5, 0x49, + 0x9a, 0xec, 0xc7, 0x67, 0xd6, 0xe3, 0x3e, 0xf5, 0xe3, 0xd6, 0x12, 0x5e, + 0x44, 0xf1, 0xbf, 0x71, 0x42, 0x7d, 0x58, 0x84, 0x03, 0x80, 0xb1, 0x81, + 0x01, 0xfa, 0xf9, 0xca, 0x32, 0xbb, 0xb4, 0x8e, 0x27, 0x87, 0x27, 0xc5, + 0x2b, 0x74, 0xd4, 0xa8, 0xd6, 0x97, 0xde, 0xc3, 0x64, 0xf9, 0xca, 0xce, + 0x53, 0xa2, 0x56, 0xbc, 0x78, 0x17, 0x8e, 0x49, 0x03, 0x29, 0xae, 0xfb, + 0x49, 0x4f, 0xa4, 0x15, 0xb9, 0xce, 0xf2, 0x5c, 0x19, 0x57, 0x6d, 0x6b, + 0x79, 0xa7, 0x2b, 0xa2, 0x27, 0x20, 0x13, 0xb5, 0xd0, 0x3d, 0x40, 0xd3, + 0x21, 0x30, 0x07, 0x93, 0xea, 0x99, 0xf5, 0x02, 0x03, 0x01, 0x00, 0x01, + 0xa3, 0x82, 0x01, 0x82, 0x30, 0x82, 0x01, 0x7e, 0x30, 0x12, 0x06, 0x03, + 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, + 0xff, 0x02, 0x01, 0x00, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, + 0x16, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, + 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x30, + 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, + 0x03, 0xde, 0x50, 0x35, 0x56, 0xd1, 0x4c, 0xbb, 0x66, 0xf0, 0xa3, 0xe2, + 0x1b, 0x1b, 0xc3, 0x97, 0xb2, 0x3d, 0xd1, 0x55, 0x30, 0x0e, 0x06, 0x03, + 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x01, 0x86, + 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, + 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, + 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02, 0x30, 0x76, 0x06, 0x08, 0x2b, + 0x06, 0x01, 0x05, 0x05, 0x07, 0x01, 0x01, 0x04, 0x6a, 0x30, 0x68, 0x30, + 0x24, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x01, 0x86, + 0x18, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6f, 0x63, 0x73, 0x70, + 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, 0x63, 0x6f, + 0x6d, 0x30, 0x40, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, + 0x02, 0x86, 0x34, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x61, + 0x63, 0x65, 0x72, 0x74, 0x73, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, + 0x72, 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x44, 0x69, 0x67, 0x69, 0x43, + 0x65, 0x72, 0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x6f, 0x6f, + 0x74, 0x43, 0x41, 0x2e, 0x63, 0x72, 0x74, 0x30, 0x42, 0x06, 0x03, 0x55, + 0x1d, 0x1f, 0x04, 0x3b, 0x30, 0x39, 0x30, 0x37, 0xa0, 0x35, 0xa0, 0x33, + 0x86, 0x31, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x6c, + 0x33, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x47, + 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x6f, 0x6f, 0x74, 0x43, 0x41, 0x2e, + 0x63, 0x72, 0x6c, 0x30, 0x3d, 0x06, 0x03, 0x55, 0x1d, 0x20, 0x04, 0x36, + 0x30, 0x34, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x86, 0xfd, + 0x6c, 0x02, 0x01, 0x30, 0x07, 0x06, 0x05, 0x67, 0x81, 0x0c, 0x01, 0x01, + 0x30, 0x08, 0x06, 0x06, 0x67, 0x81, 0x0c, 0x01, 0x02, 0x01, 0x30, 0x08, + 0x06, 0x06, 0x67, 0x81, 0x0c, 0x01, 0x02, 0x02, 0x30, 0x08, 0x06, 0x06, + 0x67, 0x81, 0x0c, 0x01, 0x02, 0x03, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, + 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, + 0x01, 0x00, 0x80, 0x32, 0xce, 0x5e, 0x0b, 0xdd, 0x6e, 0x5a, 0x0d, 0x0a, + 0xaf, 0xe1, 0xd6, 0x84, 0xcb, 0xc0, 0x8e, 0xfa, 0x85, 0x70, 0xed, 0xda, + 0x5d, 0xb3, 0x0c, 0xf7, 0x2b, 0x75, 0x40, 0xfe, 0x85, 0x0a, 0xfa, 0xf3, + 0x31, 0x78, 0xb7, 0x70, 0x4b, 0x1a, 0x89, 0x58, 0xba, 0x80, 0xbd, 0xf3, + 0x6b, 0x1d, 0xe9, 0x7e, 0xcf, 0x0b, 0xba, 0x58, 0x9c, 0x59, 0xd4, 0x90, + 0xd3, 0xfd, 0x6c, 0xfd, 0xd0, 0x98, 0x6d, 0xb7, 0x71, 0x82, 0x5b, 0xcf, + 0x6d, 0x0b, 0x5a, 0x09, 0xd0, 0x7b, 0xde, 0xc4, 0x43, 0xd8, 0x2a, 0xa4, + 0xde, 0x9e, 0x41, 0x26, 0x5f, 0xbb, 0x8f, 0x99, 0xcb, 0xdd, 0xae, 0xe1, + 0xa8, 0x6f, 0x9f, 0x87, 0xfe, 0x74, 0xb7, 0x1f, 0x1b, 0x20, 0xab, 0xb1, + 0x4f, 0xc6, 0xf5, 0x67, 0x5d, 0x5d, 0x9b, 0x3c, 0xe9, 0xff, 0x69, 0xf7, + 0x61, 0x6c, 0xd6, 0xd9, 0xf3, 0xfd, 0x36, 0xc6, 0xab, 0x03, 0x88, 0x76, + 0xd2, 0x4b, 0x2e, 0x75, 0x86, 0xe3, 0xfc, 0xd8, 0x55, 0x7d, 0x26, 0xc2, + 0x11, 0x77, 0xdf, 0x3e, 0x02, 0xb6, 0x7c, 0xf3, 0xab, 0x7b, 0x7a, 0x86, + 0x36, 0x6f, 0xb8, 0xf7, 0xd8, 0x93, 0x71, 0xcf, 0x86, 0xdf, 0x73, 0x30, + 0xfa, 0x7b, 0xab, 0xed, 0x2a, 0x59, 0xc8, 0x42, 0x84, 0x3b, 0x11, 0x17, + 0x1a, 0x52, 0xf3, 0xc9, 0x0e, 0x14, 0x7d, 0xa2, 0x5b, 0x72, 0x67, 0xba, + 0x71, 0xed, 0x57, 0x47, 0x66, 0xc5, 0xb8, 0x02, 0x4a, 0x65, 0x34, 0x5e, + 0x8b, 0xd0, 0x2a, 0x3c, 0x20, 0x9c, 0x51, 0x99, 0x4c, 0xe7, 0x52, 0x9e, + 0xf7, 0x6b, 0x11, 0x2b, 0x0d, 0x92, 0x7e, 0x1d, 0xe8, 0x8a, 0xeb, 0x36, + 0x16, 0x43, 0x87, 0xea, 0x2a, 0x63, 0xbf, 0x75, 0x3f, 0xeb, 0xde, 0xc4, + 0x03, 0xbb, 0x0a, 0x3c, 0xf7, 0x30, 0xef, 0xeb, 0xaf, 0x4c, 0xfc, 0x8b, + 0x36, 0x10, 0x73, 0x3e, 0xf3, 0xa4 +}; + +static const BYTE ocsp_cert_revoked[] = { + 0x30, 0x82, 0x06, 0x86, 0x30, 0x82, 0x05, 0x6e, 0xa0, 0x03, 0x02, 0x01, + 0x02, 0x02, 0x10, 0x0d, 0x2e, 0x67, 0xa2, 0x98, 0x85, 0x3b, 0x9a, 0x54, + 0x52, 0xe3, 0xa2, 0x85, 0xa4, 0x57, 0x2f, 0x30, 0x0d, 0x06, 0x09, 0x2a, + 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x59, + 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, + 0x53, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x0c, + 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x20, 0x49, 0x6e, 0x63, + 0x31, 0x33, 0x30, 0x31, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x2a, 0x52, + 0x61, 0x70, 0x69, 0x64, 0x53, 0x53, 0x4c, 0x20, 0x54, 0x4c, 0x53, 0x20, + 0x44, 0x56, 0x20, 0x52, 0x53, 0x41, 0x20, 0x4d, 0x69, 0x78, 0x65, 0x64, + 0x20, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x20, 0x32, 0x30, 0x32, 0x30, + 0x20, 0x43, 0x41, 0x2d, 0x31, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x31, 0x31, + 0x30, 0x32, 0x37, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x17, 0x0d, + 0x32, 0x32, 0x31, 0x30, 0x32, 0x37, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, + 0x5a, 0x30, 0x1d, 0x31, 0x1b, 0x30, 0x19, 0x06, 0x03, 0x55, 0x04, 0x03, + 0x13, 0x12, 0x72, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x64, 0x2e, 0x62, 0x61, + 0x64, 0x73, 0x73, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x30, 0x82, 0x01, 0x22, + 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, + 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, + 0x02, 0x82, 0x01, 0x01, 0x00, 0xb0, 0x76, 0x2d, 0x55, 0x66, 0xdc, 0x72, + 0x8a, 0xa0, 0x9e, 0x85, 0x92, 0x38, 0x7f, 0x5b, 0xe1, 0x93, 0x8d, 0xad, + 0x06, 0xc8, 0xad, 0xe9, 0x89, 0xb4, 0xef, 0x1e, 0x77, 0x5b, 0x33, 0x45, + 0x16, 0x60, 0x7d, 0x33, 0x38, 0x68, 0x04, 0xd7, 0xc9, 0x83, 0x42, 0x83, + 0xd9, 0x30, 0x4b, 0x54, 0x49, 0x14, 0xca, 0xed, 0xbe, 0x0c, 0x76, 0xba, + 0x5f, 0xa6, 0x5c, 0x33, 0x78, 0x3f, 0x39, 0xf2, 0x49, 0xa8, 0x88, 0x32, + 0xee, 0x53, 0x21, 0x14, 0xd3, 0xaa, 0x5c, 0x58, 0x3c, 0x39, 0xcc, 0xf7, + 0x80, 0xb1, 0x27, 0x1f, 0x54, 0x79, 0x7b, 0x6c, 0x8b, 0xff, 0x41, 0xaa, + 0x39, 0x24, 0x95, 0x5f, 0x71, 0xbc, 0x49, 0xbf, 0x39, 0x3b, 0xa5, 0xd5, + 0xe1, 0xa5, 0xde, 0x1d, 0x40, 0x81, 0x25, 0xdc, 0x8a, 0x47, 0x82, 0xfe, + 0xcd, 0x7c, 0x4b, 0x2c, 0x04, 0xbb, 0xd3, 0x27, 0x56, 0x51, 0xa0, 0x61, + 0xf2, 0xd2, 0xcb, 0x55, 0x08, 0x25, 0x2a, 0x85, 0xdb, 0x2c, 0x06, 0x8d, + 0x0d, 0x61, 0xc2, 0x5b, 0x3e, 0x9b, 0x46, 0xdc, 0x58, 0xff, 0x13, 0x27, + 0xbe, 0x0a, 0x44, 0x1e, 0x68, 0xfe, 0xe1, 0xf6, 0xb7, 0xde, 0x9f, 0x8e, + 0x6c, 0xc4, 0xb5, 0x19, 0xfa, 0xd7, 0xd3, 0x4f, 0x55, 0xa8, 0x61, 0x79, + 0xdb, 0x61, 0x2f, 0x6a, 0x9c, 0x2c, 0xf1, 0xc4, 0x81, 0xbb, 0x9e, 0xd2, + 0x02, 0x05, 0xba, 0x9c, 0x14, 0xa0, 0xf9, 0xf3, 0x54, 0x79, 0x7d, 0x69, + 0xd9, 0xba, 0x66, 0x1c, 0x87, 0x95, 0x41, 0x50, 0x0e, 0xf9, 0x5e, 0xe1, + 0xb7, 0xbd, 0xf5, 0x31, 0x24, 0xc5, 0x21, 0x21, 0x03, 0x8a, 0xcf, 0x6d, + 0x78, 0x58, 0xde, 0xd9, 0x30, 0x7d, 0x03, 0x42, 0x52, 0xd6, 0xb0, 0x1b, + 0xb9, 0xc9, 0x54, 0x1b, 0x5a, 0xe8, 0xc8, 0x53, 0xf0, 0xac, 0x2b, 0x82, + 0x10, 0x27, 0xa6, 0xa9, 0x70, 0x25, 0xae, 0xf8, 0xa7, 0x02, 0x03, 0x01, + 0x00, 0x01, 0xa3, 0x82, 0x03, 0x84, 0x30, 0x82, 0x03, 0x80, 0x30, 0x1f, + 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xa4, + 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, + 0xad, 0x23, 0x58, 0xdc, 0xf5, 0x31, 0x7f, 0x30, 0x1d, 0x06, 0x03, 0x55, + 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0xb0, 0xc8, 0xce, 0x20, 0xb2, 0x78, + 0xcc, 0x1d, 0x23, 0xef, 0xf0, 0xfe, 0xd6, 0x0e, 0x29, 0x4b, 0xac, 0x15, + 0x72, 0x3c, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x16, 0x30, + 0x14, 0x82, 0x12, 0x72, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x64, 0x2e, 0x62, + 0x61, 0x64, 0x73, 0x73, 0x6c, 0x2e, 0x63, 0x6f, 0x6d, 0x30, 0x0e, 0x06, + 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x05, + 0xa0, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, + 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, + 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02, 0x30, 0x81, 0x9b, 0x06, + 0x03, 0x55, 0x1d, 0x1f, 0x04, 0x81, 0x93, 0x30, 0x81, 0x90, 0x30, 0x46, + 0xa0, 0x44, 0xa0, 0x42, 0x86, 0x40, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, + 0x2f, 0x63, 0x72, 0x6c, 0x33, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, + 0x72, 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x52, 0x61, 0x70, 0x69, 0x64, + 0x53, 0x53, 0x4c, 0x54, 0x4c, 0x53, 0x44, 0x56, 0x52, 0x53, 0x41, 0x4d, + 0x69, 0x78, 0x65, 0x64, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x32, 0x30, + 0x32, 0x30, 0x43, 0x41, 0x2d, 0x31, 0x2e, 0x63, 0x72, 0x6c, 0x30, 0x46, + 0xa0, 0x44, 0xa0, 0x42, 0x86, 0x40, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, + 0x2f, 0x63, 0x72, 0x6c, 0x34, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, + 0x72, 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x52, 0x61, 0x70, 0x69, 0x64, + 0x53, 0x53, 0x4c, 0x54, 0x4c, 0x53, 0x44, 0x56, 0x52, 0x53, 0x41, 0x4d, + 0x69, 0x78, 0x65, 0x64, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x32, 0x30, + 0x32, 0x30, 0x43, 0x41, 0x2d, 0x31, 0x2e, 0x63, 0x72, 0x6c, 0x30, 0x3e, + 0x06, 0x03, 0x55, 0x1d, 0x20, 0x04, 0x37, 0x30, 0x35, 0x30, 0x33, 0x06, + 0x06, 0x67, 0x81, 0x0c, 0x01, 0x02, 0x01, 0x30, 0x29, 0x30, 0x27, 0x06, + 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x02, 0x01, 0x16, 0x1b, 0x68, + 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x64, 0x69, + 0x67, 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x43, + 0x50, 0x53, 0x30, 0x81, 0x85, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, + 0x07, 0x01, 0x01, 0x04, 0x79, 0x30, 0x77, 0x30, 0x24, 0x06, 0x08, 0x2b, + 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x01, 0x86, 0x18, 0x68, 0x74, 0x74, + 0x70, 0x3a, 0x2f, 0x2f, 0x6f, 0x63, 0x73, 0x70, 0x2e, 0x64, 0x69, 0x67, + 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x30, 0x4f, 0x06, + 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x02, 0x86, 0x43, 0x68, + 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x61, 0x63, 0x65, 0x72, 0x74, + 0x73, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x52, 0x61, 0x70, 0x69, 0x64, 0x53, 0x53, 0x4c, 0x54, + 0x4c, 0x53, 0x44, 0x56, 0x52, 0x53, 0x41, 0x4d, 0x69, 0x78, 0x65, 0x64, + 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x32, 0x30, 0x32, 0x30, 0x43, 0x41, + 0x2d, 0x31, 0x2e, 0x63, 0x72, 0x74, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d, + 0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x82, 0x01, 0x7d, 0x06, 0x0a, 0x2b, + 0x06, 0x01, 0x04, 0x01, 0xd6, 0x79, 0x02, 0x04, 0x02, 0x04, 0x82, 0x01, + 0x6d, 0x04, 0x82, 0x01, 0x69, 0x01, 0x67, 0x00, 0x76, 0x00, 0x29, 0x79, + 0xbe, 0xf0, 0x9e, 0x39, 0x39, 0x21, 0xf0, 0x56, 0x73, 0x9f, 0x63, 0xa5, + 0x77, 0xe5, 0xbe, 0x57, 0x7d, 0x9c, 0x60, 0x0a, 0xf8, 0xf9, 0x4d, 0x5d, + 0x26, 0x5c, 0x25, 0x5d, 0xc7, 0x84, 0x00, 0x00, 0x01, 0x7c, 0xc3, 0xa4, + 0xf7, 0x37, 0x00, 0x00, 0x04, 0x03, 0x00, 0x47, 0x30, 0x45, 0x02, 0x20, + 0x77, 0xb0, 0x79, 0x18, 0xf3, 0xde, 0x34, 0x70, 0xfa, 0xf2, 0x1b, 0xc2, + 0x32, 0x39, 0xc8, 0xc8, 0x95, 0xb0, 0xc8, 0x7a, 0x8f, 0x62, 0x23, 0x58, + 0xdd, 0xad, 0xf9, 0x1b, 0xbe, 0x84, 0x95, 0xed, 0x02, 0x21, 0x00, 0xdd, + 0x25, 0x68, 0x47, 0xa3, 0x84, 0x5f, 0x95, 0xb1, 0xea, 0xe7, 0xbc, 0x0a, + 0x09, 0x92, 0xf9, 0x5a, 0x56, 0x72, 0x31, 0xec, 0x07, 0xd6, 0xc6, 0x97, + 0x4d, 0x4c, 0x7b, 0x90, 0x75, 0x64, 0xae, 0x00, 0x76, 0x00, 0x51, 0xa3, + 0xb0, 0xf5, 0xfd, 0x01, 0x79, 0x9c, 0x56, 0x6d, 0xb8, 0x37, 0x78, 0x8f, + 0x0c, 0xa4, 0x7a, 0xcc, 0x1b, 0x27, 0xcb, 0xf7, 0x9e, 0x88, 0x42, 0x9a, + 0x0d, 0xfe, 0xd4, 0x8b, 0x05, 0xe5, 0x00, 0x00, 0x01, 0x7c, 0xc3, 0xa4, + 0xf7, 0x64, 0x00, 0x00, 0x04, 0x03, 0x00, 0x47, 0x30, 0x45, 0x02, 0x20, + 0x4c, 0x22, 0xff, 0x65, 0x39, 0x6b, 0x7e, 0x7b, 0x15, 0x21, 0x79, 0x44, + 0xc2, 0xeb, 0xb8, 0x4c, 0x2a, 0xc9, 0xa5, 0xc7, 0xac, 0xce, 0x5f, 0x6a, + 0x5d, 0xe8, 0xb7, 0x24, 0xc5, 0x76, 0xec, 0x19, 0x02, 0x21, 0x00, 0x94, + 0x5e, 0x02, 0xee, 0x14, 0x60, 0x80, 0x96, 0xbc, 0x0e, 0x39, 0x16, 0x01, + 0xa8, 0x37, 0x9f, 0x15, 0xb9, 0xb9, 0xba, 0x0f, 0xa2, 0x0c, 0x5a, 0x17, + 0x90, 0xa5, 0xe1, 0x33, 0x36, 0x45, 0xf2, 0x00, 0x75, 0x00, 0x41, 0xc8, + 0xca, 0xb1, 0xdf, 0x22, 0x46, 0x4a, 0x10, 0xc6, 0xa1, 0x3a, 0x09, 0x42, + 0x87, 0x5e, 0x4e, 0x31, 0x8b, 0x1b, 0x03, 0xeb, 0xeb, 0x4b, 0xc7, 0x68, + 0xf0, 0x90, 0x62, 0x96, 0x06, 0xf6, 0x00, 0x00, 0x01, 0x7c, 0xc3, 0xa4, + 0xf6, 0xdf, 0x00, 0x00, 0x04, 0x03, 0x00, 0x46, 0x30, 0x44, 0x02, 0x20, + 0x68, 0x8a, 0x5f, 0x50, 0xb7, 0x76, 0xda, 0x7e, 0x34, 0x32, 0xa5, 0x77, + 0x02, 0xa6, 0xfa, 0xa7, 0x87, 0xbb, 0xdb, 0x41, 0x5c, 0x80, 0x40, 0x2c, + 0x05, 0xe5, 0x09, 0xdd, 0x3f, 0xcc, 0x6d, 0x9f, 0x02, 0x20, 0x7b, 0x1d, + 0x64, 0x48, 0x61, 0x19, 0x75, 0xb6, 0x37, 0xd1, 0x3c, 0x1e, 0x38, 0x78, + 0x86, 0x7a, 0xf2, 0x79, 0x14, 0x08, 0x42, 0xe8, 0xdd, 0x0f, 0xff, 0x38, + 0x3a, 0x3c, 0x36, 0xd9, 0xbf, 0xd9, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, + 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, + 0x01, 0x00, 0xd5, 0x8c, 0xbd, 0xbe, 0xe4, 0xdc, 0x94, 0xa4, 0xb7, 0xf3, + 0x49, 0xaf, 0xc4, 0x99, 0x26, 0xda, 0x27, 0x68, 0xda, 0xe8, 0xb8, 0xc1, + 0xba, 0xc6, 0x30, 0xb6, 0x16, 0xaa, 0x50, 0xfe, 0xf4, 0x77, 0x07, 0xeb, + 0x99, 0xf2, 0xda, 0xdd, 0x77, 0x1d, 0x19, 0x82, 0xf7, 0x24, 0x2a, 0x3b, + 0xa0, 0x63, 0xe0, 0xdb, 0x09, 0xbe, 0x10, 0x7f, 0xc5, 0x1f, 0x81, 0xba, + 0xaf, 0x9e, 0x49, 0xce, 0x32, 0x30, 0x49, 0x17, 0x8f, 0x74, 0xc6, 0xd6, + 0xcd, 0x6a, 0xd8, 0x3b, 0x47, 0x7b, 0xf0, 0xe0, 0x0c, 0xbb, 0xc0, 0x8e, + 0x3a, 0x1d, 0xa3, 0x7f, 0x92, 0xac, 0x7e, 0x8d, 0xdc, 0xa4, 0xb5, 0x30, + 0x2a, 0x57, 0x13, 0x23, 0xa7, 0xee, 0x25, 0xc6, 0x37, 0xed, 0x48, 0xb2, + 0x4a, 0xd0, 0x01, 0xfc, 0x85, 0xe5, 0xc1, 0xe2, 0xe0, 0xdc, 0x8c, 0x61, + 0x74, 0xaa, 0xaf, 0x68, 0x28, 0x26, 0x45, 0x94, 0xa3, 0xb1, 0x4c, 0xc9, + 0x5c, 0xc7, 0x92, 0xa2, 0x6c, 0x4a, 0x80, 0x6f, 0xdd, 0x48, 0xfa, 0x4f, + 0x04, 0xb2, 0x4a, 0x73, 0x17, 0xf2, 0xf9, 0x1e, 0x8e, 0x5c, 0xe9, 0x23, + 0xec, 0x53, 0xff, 0x3e, 0xc7, 0x8a, 0xb6, 0x18, 0x89, 0xbc, 0x77, 0x45, + 0x67, 0x4b, 0x9a, 0x73, 0x75, 0x6b, 0x57, 0xc8, 0xc0, 0x6a, 0xcb, 0x84, + 0x1d, 0xf4, 0xed, 0xef, 0x70, 0x16, 0x77, 0x8e, 0xf3, 0x1a, 0x8e, 0xbb, + 0x95, 0xf3, 0xeb, 0xf8, 0x5a, 0xe4, 0xa9, 0xb1, 0xdf, 0x1d, 0x36, 0xab, + 0x0a, 0xdd, 0x91, 0xaf, 0x2d, 0x71, 0x3c, 0xab, 0x97, 0x18, 0x03, 0xdc, + 0x5c, 0x1a, 0xa9, 0xb1, 0xdb, 0xb6, 0x48, 0x40, 0xc7, 0x19, 0xa7, 0x81, + 0x14, 0x0b, 0x0d, 0xce, 0x38, 0x6f, 0xda, 0xcf, 0xce, 0x0f, 0x64, 0x13, + 0x28, 0xf3, 0x4d, 0x67, 0x1b, 0x2c, 0xd1, 0x16, 0x54, 0x19, 0x6f, 0xaa, + 0x08, 0x54, 0xa3, 0x4d, 0x67, 0x64 +}; + +static const BYTE ocsp_cert_revoked_issuer[] = { + 0x30, 0x82, 0x05, 0x51, 0x30, 0x82, 0x04, 0x39, 0xa0, 0x03, 0x02, 0x01, + 0x02, 0x02, 0x10, 0x07, 0x98, 0x36, 0x03, 0xad, 0xe3, 0x99, 0x08, 0x21, + 0x9c, 0xa0, 0x0c, 0x27, 0xbc, 0x8a, 0x6c, 0x30, 0x0d, 0x06, 0x09, 0x2a, + 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x61, + 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, + 0x53, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x0c, + 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x20, 0x49, 0x6e, 0x63, + 0x31, 0x19, 0x30, 0x17, 0x06, 0x03, 0x55, 0x04, 0x0b, 0x13, 0x10, 0x77, + 0x77, 0x77, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, + 0x63, 0x6f, 0x6d, 0x31, 0x20, 0x30, 0x1e, 0x06, 0x03, 0x55, 0x04, 0x03, + 0x13, 0x17, 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x20, 0x47, + 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x20, 0x52, 0x6f, 0x6f, 0x74, 0x20, 0x43, + 0x41, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x30, 0x30, 0x37, 0x31, 0x36, 0x31, + 0x32, 0x32, 0x35, 0x32, 0x37, 0x5a, 0x17, 0x0d, 0x32, 0x33, 0x30, 0x35, + 0x33, 0x31, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x59, 0x31, + 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, + 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x0c, 0x44, + 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, 0x20, 0x49, 0x6e, 0x63, 0x31, + 0x33, 0x30, 0x31, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x2a, 0x52, 0x61, + 0x70, 0x69, 0x64, 0x53, 0x53, 0x4c, 0x20, 0x54, 0x4c, 0x53, 0x20, 0x44, + 0x56, 0x20, 0x52, 0x53, 0x41, 0x20, 0x4d, 0x69, 0x78, 0x65, 0x64, 0x20, + 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x20, 0x32, 0x30, 0x32, 0x30, 0x20, + 0x43, 0x41, 0x2d, 0x31, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, + 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, + 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, + 0x00, 0xda, 0x6e, 0x43, 0x55, 0x55, 0x99, 0x7b, 0xd9, 0x95, 0xa2, 0x66, + 0xc4, 0x65, 0x58, 0xa2, 0xd0, 0x0c, 0x17, 0x3a, 0x00, 0xa6, 0x88, 0x5b, + 0x24, 0x07, 0x8d, 0xa7, 0x33, 0x7e, 0xe3, 0xd2, 0xdb, 0x82, 0x4a, 0xcc, + 0x2e, 0xfd, 0xad, 0x6e, 0x52, 0x08, 0xf0, 0x7e, 0x37, 0xbc, 0xde, 0xd4, + 0x16, 0xe9, 0xb1, 0x57, 0xb9, 0x49, 0x74, 0xfc, 0x0b, 0x3f, 0x6d, 0xaa, + 0x6b, 0x4b, 0x15, 0xf5, 0xcc, 0x02, 0xaf, 0xa4, 0x19, 0xa0, 0x61, 0x28, + 0x6d, 0xd6, 0xbe, 0xe2, 0x9b, 0x9f, 0x1b, 0x46, 0x92, 0x7c, 0x74, 0x02, + 0x42, 0x1b, 0xa5, 0x6a, 0xa2, 0xa9, 0x3d, 0xc6, 0x18, 0x38, 0xf8, 0xd3, + 0xc2, 0x0a, 0x89, 0x03, 0xce, 0x00, 0x15, 0x88, 0xfc, 0x97, 0xf2, 0x1e, + 0x43, 0xc9, 0xf4, 0xd5, 0x5c, 0x82, 0xba, 0xb3, 0x08, 0x1c, 0x0e, 0x3b, + 0xf2, 0xdb, 0x36, 0x1b, 0xa1, 0x86, 0xb4, 0x4c, 0x74, 0xb9, 0xc9, 0xc4, + 0x7d, 0x5d, 0x90, 0x1d, 0x42, 0xfa, 0xe0, 0x40, 0xb6, 0xca, 0x1e, 0xf2, + 0x6d, 0xba, 0x28, 0xe6, 0xff, 0x27, 0x15, 0x65, 0x78, 0x97, 0x1f, 0xf1, + 0x71, 0xfc, 0x68, 0xc6, 0x41, 0x53, 0x56, 0x70, 0x08, 0x46, 0x01, 0xeb, + 0x1f, 0x6b, 0xd4, 0x74, 0xe8, 0x95, 0xf6, 0xc9, 0x4e, 0x8b, 0x1d, 0xf3, + 0xe4, 0xa3, 0xec, 0xda, 0xb2, 0xb6, 0x6d, 0xb6, 0x9c, 0x87, 0xc4, 0xa1, + 0xe4, 0x64, 0xa4, 0x82, 0x9d, 0x87, 0x46, 0x84, 0xbf, 0x9b, 0x2d, 0x2d, + 0x0a, 0xad, 0x6f, 0x8f, 0x22, 0xc9, 0x78, 0xfd, 0x1a, 0x37, 0x03, 0xdd, + 0xde, 0xb9, 0x39, 0x3b, 0xc2, 0xe2, 0x7d, 0xf2, 0xde, 0xbf, 0xd8, 0xfe, + 0x50, 0xa6, 0x68, 0xd2, 0xdb, 0x74, 0x56, 0xf4, 0xcb, 0x91, 0xd1, 0xa6, + 0x48, 0xde, 0x21, 0xd6, 0x65, 0x58, 0xe8, 0x39, 0xc6, 0x7c, 0xec, 0x29, + 0xd4, 0x2e, 0x52, 0x2b, 0x43, 0x02, 0x03, 0x01, 0x00, 0x01, 0xa3, 0x82, + 0x02, 0x0b, 0x30, 0x82, 0x02, 0x07, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, + 0x0e, 0x04, 0x16, 0x04, 0x14, 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, + 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, 0xdc, 0xf5, 0x31, + 0x7f, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, + 0x80, 0x14, 0x03, 0xde, 0x50, 0x35, 0x56, 0xd1, 0x4c, 0xbb, 0x66, 0xf0, + 0xa3, 0xe2, 0x1b, 0x1b, 0xc3, 0x97, 0xb2, 0x3d, 0xd1, 0x55, 0x30, 0x0e, + 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, + 0x01, 0x86, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, + 0x14, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, + 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02, 0x30, 0x12, 0x06, + 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, + 0x01, 0xff, 0x02, 0x01, 0x00, 0x30, 0x34, 0x06, 0x08, 0x2b, 0x06, 0x01, + 0x05, 0x05, 0x07, 0x01, 0x01, 0x04, 0x28, 0x30, 0x26, 0x30, 0x24, 0x06, + 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x01, 0x86, 0x18, 0x68, + 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6f, 0x63, 0x73, 0x70, 0x2e, 0x64, + 0x69, 0x67, 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x30, + 0x7b, 0x06, 0x03, 0x55, 0x1d, 0x1f, 0x04, 0x74, 0x30, 0x72, 0x30, 0x37, + 0xa0, 0x35, 0xa0, 0x33, 0x86, 0x31, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, + 0x2f, 0x63, 0x72, 0x6c, 0x33, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, + 0x72, 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x44, 0x69, 0x67, 0x69, 0x43, + 0x65, 0x72, 0x74, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x6f, 0x6f, + 0x74, 0x43, 0x41, 0x2e, 0x63, 0x72, 0x6c, 0x30, 0x37, 0xa0, 0x35, 0xa0, + 0x33, 0x86, 0x31, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x72, + 0x6c, 0x34, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x44, 0x69, 0x67, 0x69, 0x43, 0x65, 0x72, 0x74, + 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x52, 0x6f, 0x6f, 0x74, 0x43, 0x41, + 0x2e, 0x63, 0x72, 0x6c, 0x30, 0x81, 0xce, 0x06, 0x03, 0x55, 0x1d, 0x20, + 0x04, 0x81, 0xc6, 0x30, 0x81, 0xc3, 0x30, 0x81, 0xc0, 0x06, 0x04, 0x55, + 0x1d, 0x20, 0x00, 0x30, 0x81, 0xb7, 0x30, 0x28, 0x06, 0x08, 0x2b, 0x06, + 0x01, 0x05, 0x05, 0x07, 0x02, 0x01, 0x16, 0x1c, 0x68, 0x74, 0x74, 0x70, + 0x73, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x64, 0x69, 0x67, 0x69, + 0x63, 0x65, 0x72, 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x43, 0x50, 0x53, + 0x30, 0x81, 0x8a, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x02, + 0x02, 0x30, 0x7e, 0x0c, 0x7c, 0x41, 0x6e, 0x79, 0x20, 0x75, 0x73, 0x65, + 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x43, 0x65, 0x72, + 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x20, 0x63, 0x6f, 0x6e, + 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x65, 0x73, 0x20, 0x61, 0x63, 0x63, + 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x52, 0x65, 0x6c, 0x79, 0x69, 0x6e, 0x67, 0x20, 0x50, + 0x61, 0x72, 0x74, 0x79, 0x20, 0x41, 0x67, 0x72, 0x65, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x64, 0x20, 0x61, + 0x74, 0x20, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x77, 0x77, + 0x77, 0x2e, 0x64, 0x69, 0x67, 0x69, 0x63, 0x65, 0x72, 0x74, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x72, 0x70, 0x61, 0x2d, 0x75, 0x61, 0x30, 0x0d, 0x06, + 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, + 0x03, 0x82, 0x01, 0x01, 0x00, 0x22, 0xe3, 0xdc, 0x6d, 0x48, 0xeb, 0x8e, + 0xca, 0x00, 0x72, 0x73, 0x2e, 0x74, 0xaa, 0xe0, 0x93, 0x84, 0x6e, 0x39, + 0xc4, 0x87, 0x54, 0x02, 0xc4, 0x02, 0x69, 0x71, 0x55, 0x45, 0xaf, 0x5a, + 0xb0, 0xf6, 0x81, 0xfe, 0x32, 0xc8, 0x35, 0x72, 0x4b, 0xde, 0xa5, 0x7d, + 0x27, 0x41, 0xa1, 0xd9, 0xb6, 0x4c, 0xd2, 0x4e, 0x32, 0x38, 0xc7, 0x80, + 0x31, 0x9e, 0x7b, 0xb2, 0x63, 0xfa, 0x26, 0x47, 0x09, 0x8a, 0x18, 0x4e, + 0x16, 0x57, 0xd0, 0x6b, 0x5f, 0x1a, 0x96, 0x37, 0x7e, 0xc4, 0xd7, 0x3a, + 0x6f, 0xe1, 0x97, 0xea, 0x81, 0x5c, 0x08, 0x71, 0xab, 0xfa, 0x0b, 0x04, + 0xc8, 0xf3, 0x3c, 0xaa, 0xf9, 0x4a, 0x1b, 0x17, 0x39, 0x4f, 0x97, 0x87, + 0x57, 0x35, 0x7a, 0x8e, 0x98, 0xe9, 0xcb, 0x39, 0x7a, 0x54, 0x42, 0xa9, + 0x6b, 0x11, 0xfa, 0x81, 0xd1, 0x95, 0xa5, 0x05, 0x60, 0x8e, 0x43, 0x91, + 0xf7, 0x26, 0x3d, 0x5c, 0x05, 0x25, 0x16, 0x7c, 0xe5, 0x38, 0x2a, 0x6a, + 0xb2, 0x6e, 0xeb, 0xd9, 0x95, 0x0a, 0xa4, 0x37, 0xeb, 0x85, 0x49, 0xd5, + 0xcd, 0x7d, 0xa7, 0x48, 0xcd, 0x79, 0x5d, 0x28, 0xf8, 0xf2, 0xb5, 0x41, + 0x04, 0x09, 0xc6, 0x25, 0x69, 0x0b, 0x3e, 0x28, 0xe5, 0x00, 0x27, 0x77, + 0xb1, 0x61, 0x4c, 0x55, 0x48, 0x8a, 0x47, 0x3d, 0x42, 0xe4, 0xf6, 0x72, + 0x7a, 0x5d, 0xa5, 0xec, 0x9f, 0xd6, 0xe1, 0xdf, 0x7d, 0x28, 0x52, 0xd2, + 0x62, 0x0a, 0x32, 0xe4, 0x60, 0xe6, 0x01, 0x1a, 0x70, 0x2d, 0xcf, 0xff, + 0x7d, 0x77, 0xe4, 0xaf, 0x8d, 0x27, 0x31, 0x8f, 0x22, 0x6c, 0x29, 0xb1, + 0x0a, 0xc8, 0xd7, 0x41, 0x37, 0xb4, 0x7c, 0x96, 0xed, 0xae, 0xb2, 0xcb, + 0xc9, 0x64, 0x25, 0x93, 0xd5, 0x43, 0x57, 0x6f, 0x7a, 0x10, 0x8f, 0xe4, + 0x40, 0xe2, 0x4d, 0x2d, 0x51, 0x24, 0x27, 0x9e, 0x0f +}; + static void testVerifyRevocation(void) { BOOL ret; @@ -3643,6 +4157,44 @@ static void testVerifyRevocation(void) CertCloseStore(revPara.hCrlStore, 0); CertFreeCertificateContext(certs[1]); CertFreeCertificateContext(certs[0]); + + /* OCSP */ + certs[0] = CertCreateCertificateContext(X509_ASN_ENCODING, ocsp_cert, sizeof(ocsp_cert)); + memset(&revPara, 0, sizeof(revPara)); + revPara.cbSize = sizeof(revPara); + memset(&status, 0x55, sizeof(status)); + status.cbSize = sizeof(status); + SetLastError(0xdeadbeef); + ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[0], + 0, &revPara, &status); + ok(!ret, "success\n"); + ok(GetLastError() == CRYPT_E_REVOCATION_OFFLINE, "got %08lx\n", GetLastError()); + + revPara.pIssuerCert = CertCreateCertificateContext(X509_ASN_ENCODING, ocsp_cert_issuer, + sizeof(ocsp_cert_issuer)); + ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[0], + 0, &revPara, &status); + ok(ret, "got %08lx\n", GetLastError()); + ok(!status.dwError, "got %08lx\n", status.dwError); + ok(!status.dwIndex, "got %ld\n", status.dwIndex); + CertFreeCertificateContext(revPara.pIssuerCert); + CertFreeCertificateContext(certs[0]); + + certs[0] = CertCreateCertificateContext(X509_ASN_ENCODING, ocsp_cert_revoked, sizeof(ocsp_cert_revoked)); + revPara.pIssuerCert = CertCreateCertificateContext(X509_ASN_ENCODING, ocsp_cert_revoked_issuer, + sizeof(ocsp_cert_revoked_issuer)); + memset(&status, 0x55, sizeof(status)); + status.cbSize = sizeof(status); + SetLastError(0xdeadbeef); + ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[0], + 0, &revPara, &status); + ok(!ret, "success\n"); + ok(GetLastError() == CRYPT_E_REVOKED, "got %08lx\n", GetLastError()); + ok(status.dwError == CRYPT_E_REVOKED, "got %08lx\n", status.dwError); + ok(!status.dwIndex, "got %ld\n", status.dwIndex); + ok(!status.dwReason, "got %lu\n", status.dwReason); + CertFreeCertificateContext(revPara.pIssuerCert); + CertFreeCertificateContext(certs[0]); } static BYTE privKey[] = { -- 2.30.2

1 0

[PATCH 2/3] cryptnet: Give precedence to OID_AUTHORITY_INFO_ACCESS in verify_cert_revocation().
by Hans Leidekker 24 May '22

24 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/cryptnet/cryptnet_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 6654ef77c8c..e8c17407a9b 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -2139,17 +2139,13 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, if (find_cached_revocation_status(&cert->pCertInfo->SerialNumber, pTime, pRevStatus)) return pRevStatus->dwError; - if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, - cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) + if ((ext = CertFindExtension(szOID_AUTHORITY_INFO_ACCESS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) { - error = verify_cert_revocation_from_dist_points_ext(&ext->Value, cert, - pTime, dwFlags, pRevPara, pRevStatus); + error = verify_cert_revocation_from_aia_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus); } - else if ((ext = CertFindExtension(szOID_AUTHORITY_INFO_ACCESS, - cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) + else if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) { - error = verify_cert_revocation_from_aia_ext(&ext->Value, cert, pTime, - dwFlags, pRevPara, pRevStatus); + error = verify_cert_revocation_from_dist_points_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus); } else { -- 2.30.2

1 0

[PATCH 1/3] crypt32: Add support for decoding OCSP_BASIC_REVOKED_INFO structures.
by Hans Leidekker 24 May '22

24 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/decode.c | 113 ++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/encode.c | 4 +- 2 files changed, 110 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 762d1b54661..60f9868ed67 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6351,6 +6351,112 @@ static BOOL CRYPT_AsnDecodeOCSPNextUpdate(const BYTE *pbEncoded, return ret; } +static BOOL CRYPT_AsnDecodeCertStatus(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret = TRUE; + BYTE tag = pbEncoded[0] & ~3, status = pbEncoded[0] & 3; + DWORD bytesNeeded = FIELD_OFFSET(OCSP_BASIC_RESPONSE_ENTRY, ThisUpdate) - + FIELD_OFFSET(OCSP_BASIC_RESPONSE_ENTRY, dwCertStatus); + + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + + switch (status) + { + case 0: + if (tag != ASN_CONTEXT) + { + WARN("Unexpected tag %02x\n", tag); + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + if (cbEncoded < 2 || pbEncoded[1]) + { + SetLastError(CRYPT_E_ASN1_CORRUPT); + return FALSE; + } + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + return FALSE; + } + if (pvStructInfo) + { + *(DWORD *)pvStructInfo = 0; + *(OCSP_BASIC_REVOKED_INFO **)((char *)pvStructInfo + + FIELD_OFFSET(OCSP_BASIC_RESPONSE_ENTRY, u.pRevokedInfo) + - FIELD_OFFSET(OCSP_BASIC_RESPONSE_ENTRY, dwCertStatus)) = NULL; + } + *pcbStructInfo = bytesNeeded; + *pcbDecoded = 2; + break; + + case 1: + { + DWORD dataLen; + + if (tag != (ASN_CONTEXT | ASN_CONSTRUCTOR)) + { + WARN("Unexpected tag %02x\n", tag); + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) + { + BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); + DWORD bytesDecoded, size; + FILETIME date; + + if (dataLen) + { + size = sizeof(date); + ret = CRYPT_AsnDecodeGeneralizedTime(pbEncoded + 1 + lenBytes, cbEncoded - 1 - lenBytes, + dwFlags, &date, &size, &bytesDecoded); + if (ret) + { + OCSP_BASIC_REVOKED_INFO *info; + + bytesNeeded += sizeof(*info); + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + return FALSE; + } + if (pvStructInfo) + { + *(DWORD *)pvStructInfo = 1; + info = *(OCSP_BASIC_REVOKED_INFO **)((char *)pvStructInfo + + FIELD_OFFSET(OCSP_BASIC_RESPONSE_ENTRY, u.pRevokedInfo) + - FIELD_OFFSET(OCSP_BASIC_RESPONSE_ENTRY, dwCertStatus)); + info->RevocationDate = date; + } + *pcbStructInfo = bytesNeeded; + *pcbDecoded = 1 + lenBytes + bytesDecoded; + } + } + } + break; + } + default: + FIXME("Unhandled status %u\n", status); + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + + return ret; +} + static BOOL CRYPT_AsnDecodeOCSPBasicResponseEntry(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { @@ -6367,10 +6473,9 @@ static BOOL CRYPT_AsnDecodeOCSPBasicResponseEntry(const BYTE *pbEncoded, DWORD c { ASN_INTEGER, offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.SerialNumber), CRYPT_AsnDecodeIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), FALSE, TRUE, offsetof(OCSP_BASIC_RESPONSE_ENTRY, CertId.SerialNumber.pbData), 0 }, - { ASN_CONTEXT, offsetof(OCSP_BASIC_RESPONSE_ENTRY, dwCertStatus), - CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, - 0, 0 }, - /* FIXME: pRevokedInfo */ + { 0, offsetof(OCSP_BASIC_RESPONSE_ENTRY, dwCertStatus), + CRYPT_AsnDecodeCertStatus, sizeof(DWORD), FALSE, TRUE, + offsetof(OCSP_BASIC_RESPONSE_ENTRY, u.pRevokedInfo), 0 }, { ASN_GENERALTIME, offsetof(OCSP_BASIC_RESPONSE_ENTRY, ThisUpdate), CRYPT_AsnDecodeGeneralizedTime, sizeof(FILETIME), FALSE, FALSE, 0, 0 }, diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index b65ffde3a84..c611bb63936 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8824,9 +8824,8 @@ static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) size = 0; ret = CryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response_revoked, sizeof(ocsp_basic_response_revoked), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine ok(ret, "got %08lx\n", GetLastError()); + ok(ret, "got %08lx\n", GetLastError()); - if (ret) { ok(!info->dwVersion, "got %lu\n", info->dwVersion); ok(info->dwResponderIdChoice == 2, "got %lu\n", info->dwResponderIdChoice); ok(info->ByKeyResponderId.cbData == sizeof(resp_id), "got %lu\n", info->ByKeyResponderId.cbData); @@ -8864,7 +8863,6 @@ static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) ok(!info->cExtension, "got %lu\n", info->cExtension); ok(info->rgExtension == NULL, "got %p\n", info->rgExtension); - } LocalFree(info); } -- 2.30.2

1 0

[PATCH 0/6] MR120: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 24 May '22

24 May '22

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

2 6

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

24 May '22

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

3 7

[PATCH] d2d1/tests: Add tests for effect context.
by Ziqing Hui 24 May '22

24 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- Note: create_factory() becomes get_factory() because the factory which registers effects needs to be the same one with device context. So we get factory from render target here, instead of creating a new one. dlls/d2d1/tests/d2d1.c | 131 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0a8245d6805..83f3d12cd4b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -31,6 +31,8 @@ #include "wine/heap.h" DEFINE_GUID(CLSID_TestEffect, 0xb9ee12e9,0x32d9,0xe659,0xac,0x61,0x2d,0x7c,0xea,0x69,0x28,0x78); +DEFINE_GUID(GUID_TestVertexShader, 0x5bcdcfae,0x1e92,0x4dc1,0x94,0xfa,0x3b,0x01,0xca,0x54,0x59,0x20); +DEFINE_GUID(GUID_TestPixelShader, 0x53015748,0xfc13,0x4168,0xbd,0x13,0x0f,0xcf,0x15,0x29,0x7f,0x01); static const WCHAR *effect_xml_a = L"<?xml version='1.0'?> \ @@ -86,6 +88,39 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const DWORD test_vs[] = +{ +#if 0 + void main(float4 pos : Position, out float4 output : SV_Position) + { + output = pos; + } +#endif + 0x43425844, 0xa84b398b, 0xc4047d32, 0xc19c67bb, 0x4644285e, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x69736f50, 0x6e6f6974, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, +}; + +static const DWORD test_ps[] = +{ +#if 0 + float4 main() : SV_Target + { + return float4(0.1, 0.2, 0.3, 0.4); + } +#endif + 0x43425844, 0xf34300ae, 0x22fc6d56, 0x5cca66fa, 0x86ae3266, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3dcccccd, + 0x3e4ccccd, 0x3e99999a, 0x3ecccccd, 0x0100003e, +}; + static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *properties, ID2D1Device **device); static void (WINAPI *pD2D1SinCos)(float angle, float *s, float *c); @@ -10134,9 +10169,10 @@ static void test_mt_factory(BOOL d3d11) ID2D1Factory_Release(factory); } -static void *create_factory(const GUID *iid, UINT32 *factory_version) +static IUnknown *get_factory(ID2D1RenderTarget *rt, const GUID *iid, UINT32 *factory_version) { IUnknown *factory, *tmp; + ID2D1Factory *factory0; unsigned int i; static const GUID *const factory_iid[] = @@ -10147,8 +10183,12 @@ static void *create_factory(const GUID *iid, UINT32 *factory_version) &IID_ID2D1Factory3, }; - if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, iid, NULL, (void **)&factory))) + ID2D1RenderTarget_GetFactory(rt, &factory0); + if (FAILED(ID2D1Factory_QueryInterface(factory0, iid, (void **)&factory))) + { + ID2D1Factory_Release(factory0); return NULL; + } if (factory_version) { @@ -10161,6 +10201,7 @@ static void *create_factory(const GUID *iid, UINT32 *factory_version) *factory_version = i - 1; } + ID2D1Factory_Release(factory0); return factory; } @@ -10202,7 +10243,7 @@ static void test_effect(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; - if (!(factory = create_factory(&IID_ID2D1Factory1, &factory_version))) + if (!(factory = (ID2D1Factory1 *)get_factory(ctx.rt, &IID_ID2D1Factory1, &factory_version))) { win_skip("ID2D1Factory1 is not supported.\n"); release_test_context(&ctx); @@ -10531,7 +10572,7 @@ static void test_effect_register(BOOL d3d11) if (!init_test_context(&ctx, d3d11)) return; - if (!(factory = create_factory(&IID_ID2D1Factory1, NULL))) + if (!(factory = (ID2D1Factory1 *)get_factory(ctx.rt, &IID_ID2D1Factory1, NULL))) { win_skip("ID2D1Factory1 is not supported.\n"); release_test_context(&ctx); @@ -10596,6 +10637,87 @@ static void test_effect_register(BOOL d3d11) release_test_context(&ctx); } +static void test_effect_context(BOOL d3d11) +{ + ID2D1DeviceContext *device_context; + ID2D1EffectContext *effect_context; + D2D1_PROPERTY_BINDING binding; + struct d2d1_test_context ctx; + ID2D1Effect *effect = NULL; + ID2D1Factory1 *factory; + BOOL loaded; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + if (!(factory = (ID2D1Factory1 *)get_factory(ctx.rt, &IID_ID2D1Factory1, NULL))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&device_context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + binding.propertyName = L"Context"; + binding.setFunction = NULL; + binding.getFunction = effect_impl_get_context; + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_b, &binding, 1, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + hr = ID2D1Effect_GetValueByName(effect, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + + /* Test shader loading */ + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestVertexShader); + todo_wine ok(!loaded, "Shader is loaded.\n"); + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); + todo_wine ok(!loaded, "Shader is loaded.\n"); + + hr = ID2D1EffectContext_LoadVertexShader(effect_context, + &GUID_TestVertexShader, (const BYTE *)test_ps, sizeof(test_ps)); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_LoadVertexShader(effect_context, + &GUID_TestVertexShader, (const BYTE *)test_vs, sizeof(test_vs)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestVertexShader); + todo_wine ok(loaded, "Shader is not loaded.\n"); + + hr = ID2D1EffectContext_LoadVertexShader(effect_context, + &GUID_TestVertexShader, (const BYTE *)test_ps, sizeof(test_ps)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_LoadVertexShader(effect_context, + &GUID_TestVertexShader, (const BYTE *)test_vs, sizeof(test_vs)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1EffectContext_LoadPixelShader(effect_context, + &GUID_TestPixelShader, (const BYTE *)test_vs, sizeof(test_vs)); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1EffectContext_LoadPixelShader(effect_context, + &GUID_TestPixelShader, (const BYTE *)test_ps, sizeof(test_ps)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); + todo_wine ok(loaded, "Shader is not loaded.\n"); + +done: + if (effect) + ID2D1Effect_Release(effect); + ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + ID2D1DeviceContext_Release(device_context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + static void test_effect_2d_affine(BOOL d3d11) { D2D1_MATRIX_3X2_F rotate, scale, skew; @@ -11389,6 +11511,7 @@ START_TEST(d2d1) queue_test(test_geometry_group); queue_test(test_mt_factory); queue_test(test_effect_register); + queue_test(test_effect_context); queue_test(test_effect); queue_test(test_effect_2d_affine); queue_test(test_effect_crop); -- 2.25.1

2 1

[PATCH v2 0/6] MR61: winegstreamer: Dynamic transform stream format change support.
by Rémi Bernon (＠rbernon) 24 May '22

24 May '22

Compared to last attempt, I moved the format pointer to a dedicated `wg_transform_read_data` parameter instead of a property of the sample. Most of the transforms use `NULL` there as they don't expect or support format change. H264 decoder passes a transform format member where it tracks the current stream format. -- v2: winegstreamer: Expose output media type attributes from the stream format. winegstreamer: Support wg_transform output format change events. winegstreamer: Track caps changes and keep them with the output buffers. winegstreamer: Only filter video caps attributes when format explicitely uses 0. winegstreamer: Set wg_transform output sample size on gst_buffer_map failure. winegstreamer: Append a videoconvert element to wg_transform video output. https://gitlab.winehq.org/wine/wine/-/merge_requests/61

3 17

[PATCH 1/3] wined3d: Correctly handle 3D textures in wined3d_view_{load, invalidate}_location().
by Zebediah Figura 23 May '22

23 May '22

The sub-resource index should not be offset by the layer index, which represents a depth offset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53027 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/view.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f2dea8f0f9a..dbd385219f0 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -315,7 +315,7 @@ static void create_buffer_view(struct wined3d_gl_view *view, struct wined3d_cont static void wined3d_view_invalidate_location(struct wined3d_resource *resource, const struct wined3d_view_desc *desc, DWORD location) { - unsigned int i, sub_resource_idx, layer_count; + unsigned int i, sub_resource_idx; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -325,17 +325,21 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource, } texture = texture_from_resource(resource); + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + wined3d_texture_invalidate_location(texture, desc->u.texture.level_idx, location); + return; + } sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; - layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + for (i = 0; i < desc->u.texture.layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } static void wined3d_view_load_location(struct wined3d_resource *resource, const struct wined3d_view_desc *desc, struct wined3d_context *context, DWORD location) { - unsigned int i, sub_resource_idx, layer_count; + unsigned int i, sub_resource_idx; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -345,9 +349,14 @@ static void wined3d_view_load_location(struct wined3d_resource *resource, } texture = texture_from_resource(resource); + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + wined3d_texture_load_location(texture, desc->u.texture.level_idx, context, location); + return; + } + sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; - layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + for (i = 0; i < desc->u.texture.layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_load_location(texture, sub_resource_idx, context, location); } -- 2.35.1

2 3

Re: [PATCH v2 0/5] MR113: include: Fix malloc attributes, and a few related warnings. - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/113

1 0

Re: [PATCH v2 0/6] MR114: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/114

1 0

Re: [PATCH v3 0/2] MR106: Avoid mpg123 functions with suffix - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/106

1 0

Re: [PATCH v3 0/6] MR117: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/117

1 0

Re: [PATCH v2 0/1] MR108: wmphoto: Zero user buffer before calling jxrlib Copy. - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/108

1 0

Re: [PATCH v2 0/1] MR107: mscoree/tests: Use wait_child_process for csc process. - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/107

1 0

[PATCH v3 resend] d2d1/tests: Add tests for effect register.
by Ziqing Hui 23 May '22

23 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- This patch is resend to see the its result on test bot. dlls/d2d1/tests/d2d1.c | 301 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 301 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 663fc150df8..0a8245d6805 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -21,6 +21,7 @@ #include <math.h> #include <float.h> #include "d2d1_3.h" +#include "d2d1effectauthor.h" #include "d3d11.h" #include "wincrypt.h" #include "wine/test.h" @@ -29,6 +30,62 @@ #include "wincodec.h" #include "wine/heap.h" +DEFINE_GUID(CLSID_TestEffect, 0xb9ee12e9,0x32d9,0xe659,0xac,0x61,0x2d,0x7c,0xea,0x69,0x28,0x78); + +static const WCHAR *effect_xml_a = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='string' value='The Wine Project'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs> \ + <Input name='Source'/> \ + </Inputs> \ + <Property name='Integer' type='uint32'> \ + <Property name='DisplayName' type='string' value='Integer'/> \ + <Property name='Min' type='uint32' value='0'/> \ + <Property name='Max' type='uint32' value='100'/> \ + <Property name='Default' type='uint32' value='10'/> \ + </Property> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_b = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='string' value='The Wine Project'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs> \ + <Input name='Source'/> \ + </Inputs> \ + <Property name='Context' type='iunknown'> \ + <Property name='DisplayName' type='string' value='Context'/> \ + </Property> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_c = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='string' value='The Wine Project'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs> \ + <Input name='Source'/> \ + </Inputs> \ + <Property name='Context' type='iunknown'> \ + <Property name='DisplayName' type='string' value='Context'/> \ + </Property> \ + <Property name='Integer' type='uint32'> \ + <Property name='DisplayName' type='string' value='Integer'/> \ + </Property> \ + </Effect> \ +"; + static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *properties, ID2D1Device **device); static void (WINAPI *pD2D1SinCos)(float angle, float *s, float *c); @@ -118,6 +175,14 @@ struct expected_geometry_figure const struct geometry_segment *segments; }; +struct effect_impl +{ + ID2D1EffectImpl ID2D1EffectImpl_iface; + LONG refcount; + UINT integer; + ID2D1EffectContext *effect_context; +}; + static void queue_d3d1x_test(void (*test)(BOOL d3d11), BOOL d3d11) { if (mt_test_count >= mt_tests_size) @@ -10296,6 +10361,241 @@ static void test_effect(BOOL d3d11) release_test_context(&ctx); } +static inline struct effect_impl *impl_from_ID2D1EffectImpl(ID2D1EffectImpl *iface) +{ + return CONTAINING_RECORD(iface, struct effect_impl, ID2D1EffectImpl_iface); +} + +static HRESULT STDMETHODCALLTYPE effect_impl_QueryInterface(ID2D1EffectImpl *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_ID2D1EffectImpl) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1EffectImpl_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE effect_impl_AddRef(ID2D1EffectImpl *iface) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl(iface); + ULONG refcount = InterlockedIncrement(&effect_impl->refcount); + return refcount; +} + +static ULONG STDMETHODCALLTYPE effect_impl_Release(ID2D1EffectImpl *iface) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl(iface); + ULONG refcount = InterlockedDecrement(&effect_impl->refcount); + + if (!refcount) + { + if (effect_impl->effect_context) + ID2D1EffectContext_Release(effect_impl->effect_context); + heap_free(effect_impl); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_Initialize(ID2D1EffectImpl *iface, + ID2D1EffectContext *context,ID2D1TransformGraph *graph) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl(iface); + ID2D1EffectContext_AddRef(effect_impl->effect_context = context); + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_PrepareForRender(ID2D1EffectImpl *iface, D2D1_CHANGE_TYPE type) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_SetGraph(ID2D1EffectImpl *iface, ID2D1TransformGraph *graph) +{ + return E_NOTIMPL; +} + +static const ID2D1EffectImplVtbl effect_impl_vtbl = +{ + effect_impl_QueryInterface, + effect_impl_AddRef, + effect_impl_Release, + effect_impl_Initialize, + effect_impl_PrepareForRender, + effect_impl_SetGraph, +}; + +static HRESULT STDMETHODCALLTYPE effect_impl_create(IUnknown **effect_impl) +{ + struct effect_impl *object; + + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID2D1EffectImpl_iface.lpVtbl = &effect_impl_vtbl; + object->refcount = 1; + object->integer = 0; + object->effect_context = NULL; + + *effect_impl = (IUnknown *)&object->ID2D1EffectImpl_iface; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_set_integer(IUnknown *iface, const BYTE *data, UINT32 data_size) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); + + if (!data || data_size != sizeof(effect_impl->integer)) + return E_INVALIDARG; + + effect_impl->integer = *((UINT *)data); + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_get_integer(const IUnknown *iface, + BYTE *data, UINT32 data_size, UINT32 *actual_size) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); + + if (!data || data_size != sizeof(effect_impl->integer)) + return E_INVALIDARG; + + *((UINT *)data) = effect_impl->integer; + if (actual_size) + *actual_size = sizeof(effect_impl->integer); + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, + BYTE *data, UINT32 data_size, UINT32 *actual_size) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); + + if (!data || data_size != sizeof(effect_impl->effect_context)) + return E_INVALIDARG; + + *((ID2D1EffectContext **)data) = effect_impl->effect_context; + if (actual_size) + *actual_size = sizeof(effect_impl->effect_context); + + return S_OK; +} + +static void test_effect_register(BOOL d3d11) +{ + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + unsigned int i; + HRESULT hr; + + const D2D1_PROPERTY_BINDING binding[] = + { + {L"Integer", effect_impl_set_integer, effect_impl_get_integer}, + {L"Context", NULL, effect_impl_get_context}, + {L"Integer", NULL, effect_impl_get_integer}, + {L"Integer", effect_impl_set_integer, NULL}, + {L"Integer", NULL, NULL}, + {L"DeadBeef", effect_impl_set_integer, effect_impl_get_integer}, + }; + + const struct binding_test + { + const D2D1_PROPERTY_BINDING *binding; + UINT32 binding_count; + const WCHAR *effect_xml; + HRESULT hr; + } + binding_tests[] = + { + {NULL, 0, effect_xml_a, S_OK}, + {NULL, 0, effect_xml_b, S_OK}, + {binding, 1, effect_xml_a, S_OK}, + {binding, 1, effect_xml_b, D2DERR_INVALID_PROPERTY}, + {binding + 1, 1, effect_xml_b, S_OK}, + {binding + 2, 1, effect_xml_a, S_OK}, + {binding + 3, 1, effect_xml_a, S_OK}, + {binding + 4, 1, effect_xml_a, S_OK}, + {binding + 5, 1, effect_xml_a, D2DERR_INVALID_PROPERTY}, + {binding, 2, effect_xml_a, D2DERR_INVALID_PROPERTY}, + {binding, 2, effect_xml_b, D2DERR_INVALID_PROPERTY}, + {binding, 2, effect_xml_c, S_OK}, + }; + + if (!init_test_context(&ctx, d3d11)) + return; + + if (!(factory = create_factory(&IID_ID2D1Factory1, NULL))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + /* Register effect once */ + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_a, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + + /* Register effect multiple times */ + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_a, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_a, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + + /* Register effect multiple times with different xml */ + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_a, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_b, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Register effect with property binding */ + for (i = 0; i < ARRAY_SIZE(binding_tests); ++i) + { + const struct binding_test *test = &binding_tests[i]; + winetest_push_context("Test %u", i); + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + test->effect_xml, test->binding, test->binding_count, effect_impl_create); + todo_wine_if(test->hr != S_OK) + ok(hr == test->hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, test->hr); + ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + + winetest_pop_context(); + } + + /* Unregister builtin effect */ + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_D2D1Composite); + todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + static void test_effect_2d_affine(BOOL d3d11) { D2D1_MATRIX_3X2_F rotate, scale, skew; @@ -11088,6 +11388,7 @@ START_TEST(d2d1) queue_d3d10_test(test_colour_space); queue_test(test_geometry_group); queue_test(test_mt_factory); + queue_test(test_effect_register); queue_test(test_effect); queue_test(test_effect_2d_affine); queue_test(test_effect_crop); -- 2.25.1

3 2

[PATCH 0/5] MR109: wined3d: Add a memory_colour_fill path for clearing the entire level to zero.
by Stefan Dösinger (＠stefan) 23 May '22

23 May '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/109

4 12

[PATCH v2] dxgi: Implement adapter video memory budget change notification.
by Zhiyi Zhang 23 May '22

23 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51665 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 235995. Simplify thread creation. dlls/dxgi/adapter.c | 13 +++- dlls/dxgi/tests/dxgi.c | 4 -- dlls/wined3d/directx.c | 139 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 + include/wine/wined3d.h | 3 + 5 files changed, 154 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 20c017eba08..b178376341b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -333,15 +333,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetVideoMemoryReservation(IWineDXG static HRESULT STDMETHODCALLTYPE dxgi_adapter_RegisterVideoMemoryBudgetChangeNotificationEvent( IWineDXGIAdapter *iface, HANDLE event, DWORD *cookie) { - FIXME("iface %p, event %p, cookie %p stub!\n", iface, event, cookie); + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); - return E_NOTIMPL; + TRACE("iface %p, event %p, cookie %p.\n", iface, event, cookie); + + if (!event || !cookie) + return DXGI_ERROR_INVALID_CALL; + + return wined3d_adapter_register_budget_change_notification(adapter->wined3d_adapter, event, cookie); } static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification( IWineDXGIAdapter *iface, DWORD cookie) { - FIXME("iface %p, cookie %#lx stub!\n", iface, cookie); + TRACE("iface %p, cookie %#lx.\n", iface, cookie); + + wined3d_adapter_unregister_budget_change_notification(cookie); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 04bba29e8e5..33e9ead31ad 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7539,16 +7539,13 @@ static void test_video_memory_budget_notification(void) goto done; hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, NULL, &cookie); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); event = CreateEventW(NULL, FALSE, FALSE, NULL); hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, event, NULL); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, event, &cookie); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &memory_info); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -7560,7 +7557,6 @@ static void test_video_memory_budget_notification(void) if (memory_info.Budget) { ret = WaitForSingleObject(event, 1000); - todo_wine ok(ret == WAIT_OBJECT_0, "Expected event fired.\n"); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8c58a346add..fb588b88098 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -23,6 +23,7 @@ #include "wined3d_private.h" #include "winternl.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -38,6 +39,19 @@ enum wined3d_driver_model DRIVER_MODEL_NT6X }; +struct wined3d_adapter_budget_change_notification +{ + const struct wined3d_adapter *adapter; + HANDLE event; + DWORD cookie; + UINT64 last_local_budget; + UINT64 last_non_local_budget; + struct list entry; +}; + +static struct list adapter_budget_change_notifications = LIST_INIT( adapter_budget_change_notifications ); +static HANDLE notification_thread, notification_thread_stop_event; + /* The d3d device ID */ static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; @@ -1046,6 +1060,131 @@ HRESULT CDECL wined3d_adapter_get_video_memory_info(const struct wined3d_adapter return WINED3D_OK; } +static DWORD CALLBACK notification_thread_func(void *stop_event) +{ + struct wined3d_adapter_budget_change_notification *notification; + struct wined3d_video_memory_info info; + HRESULT hr; + + while (TRUE) + { + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(notification, &adapter_budget_change_notifications, + struct wined3d_adapter_budget_change_notification, entry) + { + hr = wined3d_adapter_get_video_memory_info(notification->adapter, 0, + WINED3D_MEMORY_SEGMENT_GROUP_LOCAL, &info); + if (SUCCEEDED(hr) && info.budget != notification->last_local_budget) + { + notification->last_local_budget = info.budget; + SetEvent(notification->event); + continue; + } + + hr = wined3d_adapter_get_video_memory_info(notification->adapter, 0, + WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL, &info); + if (SUCCEEDED(hr) && info.budget != notification->last_non_local_budget) + { + notification->last_non_local_budget = info.budget; + SetEvent(notification->event); + } + } + wined3d_mutex_unlock(); + + if (WaitForSingleObject(stop_event, 1000) == WAIT_OBJECT_0) + break; + } + + return TRUE; +} + +HRESULT CDECL wined3d_adapter_register_budget_change_notification(const struct wined3d_adapter *adapter, + HANDLE event, DWORD *cookie) +{ + static DWORD cookie_counter; + static BOOL wrapped; + struct wined3d_adapter_budget_change_notification *notification, *new_notification; + BOOL found = FALSE; + + new_notification = heap_alloc_zero(sizeof(*new_notification)); + if (!new_notification) + return E_OUTOFMEMORY; + + wined3d_mutex_lock(); + new_notification->adapter = adapter; + new_notification->event = event; + new_notification->cookie = cookie_counter++; + if (cookie_counter < new_notification->cookie) + wrapped = TRUE; + if (wrapped) + { + while (TRUE) + { + LIST_FOR_EACH_ENTRY(notification, &adapter_budget_change_notifications, + struct wined3d_adapter_budget_change_notification, entry) + { + if (notification->cookie == new_notification->cookie) + { + found = TRUE; + break; + } + } + + if (!found) + break; + + new_notification->cookie = cookie_counter++; + } + } + + *cookie = new_notification->cookie; + list_add_head(&adapter_budget_change_notifications, &new_notification->entry); + + if (!notification_thread) + { + notification_thread_stop_event = CreateEventW(0, FALSE, FALSE, NULL); + notification_thread = CreateThread(NULL, 0, notification_thread_func, + notification_thread_stop_event, 0, NULL); + } + wined3d_mutex_unlock(); + return WINED3D_OK; +} + +HRESULT CDECL wined3d_adapter_unregister_budget_change_notification(DWORD cookie) +{ + struct wined3d_adapter_budget_change_notification *notification; + HANDLE thread, thread_stop_event; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(notification, &adapter_budget_change_notifications, + struct wined3d_adapter_budget_change_notification, entry) + { + if (notification->cookie == cookie) + { + list_remove(&notification->entry); + heap_free(notification); + break; + } + } + + if (!list_empty(&adapter_budget_change_notifications)) + { + wined3d_mutex_unlock(); + return WINED3D_OK; + } + + thread = notification_thread; + thread_stop_event = notification_thread_stop_event; + notification_thread = NULL; + notification_thread_stop_event = NULL; + wined3d_mutex_unlock(); + SetEvent(thread_stop_event); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + CloseHandle(thread_stop_event); + return WINED3D_OK; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 845ca0fb170..63220e1222c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -22,6 +22,8 @@ @ cdecl wined3d_adapter_get_output(ptr long) @ cdecl wined3d_adapter_get_output_count(ptr) @ cdecl wined3d_adapter_get_video_memory_info(ptr long long ptr) +@ cdecl wined3d_adapter_register_budget_change_notification(ptr ptr ptr) +@ cdecl wined3d_adapter_unregister_budget_change_notification(long) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2b7a626f751..116aea82348 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2364,6 +2364,9 @@ unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapt HRESULT __cdecl wined3d_adapter_get_video_memory_info(const struct wined3d_adapter *adapter, unsigned int node_idx, enum wined3d_memory_segment_group group, struct wined3d_video_memory_info *info); +HRESULT __cdecl wined3d_adapter_register_budget_change_notification(const struct wined3d_adapter *adapter, + HANDLE event, DWORD *cookie); +HRESULT __cdecl wined3d_adapter_unregister_budget_change_notification(DWORD cookie); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, -- 2.34.1

3 2

[PATCH] d3drm/tests: Use test context for test ran in a loop.
by Nikolay Sivov 23 May '22

23 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3drm/tests/d3drm.c | 184 +++++++++++++++++++++------------------ 1 file changed, 100 insertions(+), 84 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 426aa1fd28d..72c71ebae09 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1657,80 +1657,84 @@ static void test_object(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + winetest_push_context("Test %u", i); + unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown); - ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr); ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, (void **)&unknown); - ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr); ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, NULL); - ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr); hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); - ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { ref2 = get_refcount((IUnknown *)d3drm1); if (tests[i].takes_d3drm_ref) - ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 > ref1, "Unexpected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); else - ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 == ref1, "Unexpected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); - ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3); + ok(ref3 == ref1, "Unexpected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3); ref4 = get_refcount((IUnknown *)d3drm3); - ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4); + ok(ref4 == ref1, "Unexpected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4); IUnknown_Release(unknown); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 == ref1, "Unexpected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); - ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3); + ok(ref3 == ref1, "Unexpected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3); ref4 = get_refcount((IUnknown *)d3drm3); - ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4); + ok(ref4 == ref1, "Unexpected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4); /* test Add/Destroy callbacks */ test_destroy_callback(i, tests[i].clsid, tests[i].iid); hr = IDirect3DRM2_CreateObject(d3drm2, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); - ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr); ref2 = get_refcount((IUnknown *)d3drm1); if (tests[i].takes_d3drm_ref) - ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 > ref1, "Unexpected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); else - ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 == ref1, "Unexpected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); - ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3); + ok(ref3 == ref1, "Unexpected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3); ref4 = get_refcount((IUnknown *)d3drm3); - ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4); + ok(ref4 == ref1, "Unexpected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4); IUnknown_Release(unknown); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 == ref1, "Unexpected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); - ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3); + ok(ref3 == ref1, "Unexpected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3); ref4 = get_refcount((IUnknown *)d3drm3); - ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4); + ok(ref4 == ref1, "Unexpected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4); hr = IDirect3DRM3_CreateObject(d3drm3, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); - ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr); ref2 = get_refcount((IUnknown *)d3drm1); if (tests[i].takes_d3drm_ref) - ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 > ref1, "Unexpected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); else - ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 == ref1, "Unexpected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); - ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3); + ok(ref3 == ref1, "Unexpected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3); ref4 = get_refcount((IUnknown *)d3drm3); - ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4); + ok(ref4 == ref1, "Unexpected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4); IUnknown_Release(unknown); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 == ref1, "Unexpected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); - ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3); + ok(ref3 == ref1, "Unexpected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3); ref4 = get_refcount((IUnknown *)d3drm3); - ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4); + ok(ref4 == ref1, "Unexpected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4); } + + winetest_pop_context(); } IDirect3DRM_Release(d3drm1); @@ -3501,7 +3505,7 @@ static void test_frame_mesh_materials(void) ULONG size; IDirect3DRMMaterial *material; IDirect3DRMTexture *texture; - int i; + unsigned int i; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr); @@ -3524,40 +3528,44 @@ static void test_frame_mesh_materials(void) unsigned vertex_count, face_count, vertex_per_face; DWORD face_data_size; + winetest_push_context("Group %u", i); + hr = IDirect3DRMMesh_GetGroup(mesh, i, &vertex_count, &face_count, &vertex_per_face, &face_data_size, NULL); - ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr); - ok(vertex_count == groups[i].vertex_count, "Group %d: Wrong vertex count %d, expected %d\n", i, vertex_count, groups[i].vertex_count); - ok(face_count == groups[i].face_count, "Group %d: Wrong face count %d; expected %d\n", i, face_count, groups[i].face_count); - ok(vertex_per_face == groups[i].vertex_per_face, "Group %d: Wrong vertex per face %d, expected %d\n", i, vertex_per_face, groups[i].vertex_per_face); - ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %ld, expected %d\n", i, face_data_size, groups[i].face_data_size); + ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr); + ok(vertex_count == groups[i].vertex_count, "Wrong vertex count %d, expected %d\n", vertex_count, groups[i].vertex_count); + ok(face_count == groups[i].face_count, "Wrong face count %d; expected %d\n", face_count, groups[i].face_count); + ok(vertex_per_face == groups[i].vertex_per_face, "Wrong vertex per face %d, expected %d\n", vertex_per_face, groups[i].vertex_per_face); + ok(face_data_size == groups[i].face_data_size, "Wrong face data size %ld, expected %d\n", face_data_size, groups[i].face_data_size); color = IDirect3DRMMesh_GetGroupColor(mesh, i); - ok(color == groups[i].color, "Group %d: Wrong color %lx, expected %lx.\n", i, color, groups[i].color); + ok(color == groups[i].color, "Wrong color %lx, expected %lx.\n", color, groups[i].color); hr = IDirect3DRMMesh_GetGroupMaterial(mesh, i, &material); - ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr); - ok(material != NULL, "Group %d: No material\n", i); + ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr); + ok(material != NULL, "No material.\n"); power = IDirect3DRMMaterial_GetPower(material); - ok(power == groups[i].power, "Group %d: Wrong power %f, expected %f\n", i, power, groups[i].power); + ok(power == groups[i].power, "Wrong power %f, expected %f\n", power, groups[i].power); hr = IDirect3DRMMaterial_GetSpecular(material, &red, &green, &blue); - ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr); - ok(red == groups[i].specular[0], "Group %d: Wrong specular red %f, expected %f\n", i, red, groups[i].specular[0]); - ok(green == groups[i].specular[1], "Group %d: Wrong specular green %f, pD3DRMexpected %f\n", i, green, groups[i].specular[1]); - ok(blue == groups[i].specular[2], "Group %d: Wrong specular blue %f, expected %f\n", i, blue, groups[i].specular[2]); + ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr); + ok(red == groups[i].specular[0], "Wrong specular red %f, expected %f\n", red, groups[i].specular[0]); + ok(green == groups[i].specular[1], "Wrong specular green %f, pD3DRMexpected %f\n", green, groups[i].specular[1]); + ok(blue == groups[i].specular[2], "Wrong specular blue %f, expected %f\n", blue, groups[i].specular[2]); hr = IDirect3DRMMaterial_GetEmissive(material, &red, &green, &blue); - ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr); - ok(red == groups[i].emissive[0], "Group %d: Wrong emissive red %f, expected %f\n", i, red, groups[i].emissive[0]); - ok(green == groups[i].emissive[1], "Group %d: Wrong emissive green %f, expected %f\n", i, green, groups[i].emissive[1]); - ok(blue == groups[i].emissive[2], "Group %d: Wrong emissive blue %f, expected %f\n", i, blue, groups[i].emissive[2]); + ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr); + ok(red == groups[i].emissive[0], "Wrong emissive red %f, expected %f\n", red, groups[i].emissive[0]); + ok(green == groups[i].emissive[1], "Wrong emissive green %f, expected %f\n", green, groups[i].emissive[1]); + ok(blue == groups[i].emissive[2], "Wrong emissive blue %f, expected %f\n", blue, groups[i].emissive[2]); hr = IDirect3DRMMesh_GetGroupTexture(mesh, i, &texture); - ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr); - ok(!texture, "Group %d: Unexpected texture\n", i); + ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr); + ok(!texture, "Unexpected texture\n"); if (material) IDirect3DRMMaterial_Release(material); if (texture) IDirect3DRMTexture_Release(texture); + + winetest_pop_context(); } IDirect3DRMMesh_Release(mesh); @@ -6371,105 +6379,109 @@ static void test_load_texture(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + winetest_push_context("Test %u", i); + filename = create_bitmap(tests[i].w, tests[i].h, tests[i].palettized); hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); - ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2); + ok(ref2 > ref1, "Expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", ref1, ref2); hr = IDirect3DRMTexture_InitFromFile(texture1, filename); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); /* InitFromFile() seems to AddRef() IDirect3DRM even if it fails. */ IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref1 == ref2, "Expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void **)&texture1); - ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr); hr = IDirect3DRMTexture_InitFromFile(texture1, NULL); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DRMTexture_InitFromFile(texture1, ""); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DRMTexture_InitFromFile(texture1, filename); - ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to initialise texture from file, hr %#lx.\n", hr); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); - ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2); + ok(ref2 > ref1, "Expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", ref1, ref2); hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture2_Release(texture2); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref1 == ref2, "Expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); - ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr); hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DRMTexture2_InitFromFile(texture2, ""); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); - ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to initialise texture from file, hr %#lx.\n", hr); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture2_Release(texture2); hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); - ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2); + ok(ref2 > ref1, "Expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", ref1, ref2); hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); /* Test whether querying a version 1 texture from version 3 causes a * change in the loading behavior. */ hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1); ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#lx.\n", hr); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); IDirect3DRMTexture3_Release(texture3); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref1 == ref2, "Expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, (void **)&texture3); - ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr); hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DRMTexture3_InitFromFile(texture3, ""); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); - ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to initialize texture from file, hr %#lx.\n", hr); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture3_Release(texture3); ret = DeleteFileA(filename); - ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename); + ok(ret, "Failed to delete bitmap \"%s\".\n", filename); HeapFree(GetProcessHeap(), 0, filename); + + winetest_pop_context(); } IDirect3DRM3_Release(d3drm3); @@ -7773,25 +7785,29 @@ static void test_animation(void) for (i = 0; i < count; i++) { - ok(keys[i].dwSize == sizeof(*keys), "%lu: unexpected dwSize value %lu.\n", i, keys[i].dwSize); + winetest_push_context("%lu", i); + + ok(keys[i].dwSize == sizeof(*keys), "Unexpected dwSize value %lu.\n", keys[i].dwSize); todo_wine { switch (keys[i].dwKeyType) { case D3DRMANIMATION_ROTATEKEY: - ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID); + ok((keys[i].dwID & 0xf0000000) == 0x40000000, "Unexpected id mask %#lx.\n", keys[i].dwID); break; case D3DRMANIMATION_POSITIONKEY: - ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID); + ok((keys[i].dwID & 0xf0000000) == 0x80000000, "Unexpected id mask %#lx.\n", keys[i].dwID); break; case D3DRMANIMATION_SCALEKEY: - ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID); + ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "Unexpected id mask %#lx.\n", keys[i].dwID); break; default: - ok(0, "%lu: unknown key type %ld.\n", i, keys[i].dwKeyType); + ok(0, "Unknown key type %ld.\n", keys[i].dwKeyType); } } + + winetest_pop_context(); } /* No keys in this range. */ -- 2.35.1

2 1

[PATCH v4 0/10] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) 23 May '22

23 May '22

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v4: wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

6 17

[PATCH] conhost: Split first font code path from font update code path
by Hugh McMaster 23 May '22

23 May '22

This change prevents calls to update_console_font() setting any defaults. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 120 ++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 63 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index c115e42a282..582badf43b5 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -736,6 +736,8 @@ struct font_chooser { struct console *console; int pass; + unsigned int font_height; + unsigned int font_width; BOOL done; }; @@ -791,93 +793,82 @@ static BOOL validate_font( struct console *console, const LOGFONTW *lf, int pass return TRUE; } -/* helper functions to get a decent font for the renderer */ -static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW *tm, - DWORD font_type, LPARAM lparam) +static int CALLBACK enum_first_font_proc( const LOGFONTW *lf, const TEXTMETRICW *tm, + DWORD font_type, LPARAM lparam ) { struct font_chooser *fc = (struct font_chooser *)lparam; + LOGFONTW mlf; + + if (font_type != TRUETYPE_FONTTYPE) return 1; + + TRACE( "%s\n", debugstr_logfont( lf, font_type )); + + if (!validate_font( fc->console, lf, fc->pass )) + return 1; TRACE( "%s\n", debugstr_textmetric( tm, font_type )); - if (validate_font_metric( fc->console, tm, font_type, fc->pass )) - { - LOGFONTW mlf = *lf; + if (!validate_font_metric( fc->console, tm, font_type, fc->pass )) + return 1; - /* Use the default sizes for the font (this is needed, especially for - * TrueType fonts, so that we get a decent size, not the max size) - */ - mlf.lfWidth = fc->console->active->font.width; - mlf.lfHeight = fc->console->active->font.height; - if (!mlf.lfHeight) - mlf.lfHeight = MulDiv( 16, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); + /* set default font size */ + mlf = *lf; + mlf.lfHeight = fc->font_height; + mlf.lfWidth = fc->font_width; - if (set_console_font( fc->console, &mlf )) - { - struct console_config config; + if (!set_console_font( fc->console, &mlf )) + return 1; - fc->done = 1; + fc->done = TRUE; - /* since we've modified the current config with new font information, - * set this information as the new default. - */ - load_config( fc->console->window->config_key, &config ); - config.cell_width = fc->console->active->font.width; - config.cell_height = fc->console->active->font.height; - config.font_pitch_family = fc->console->active->font.pitch_family; - memcpy( config.face_name, fc->console->active->font.face_name, - fc->console->active->font.face_len * sizeof(WCHAR) ); - config.face_name[fc->console->active->font.face_len] = 0; - - /* Force also its writing back to the registry so that we can get it - * the next time. - */ - save_config( fc->console->window->config_key, &config ); - return 0; - } - } - return 1; + return 0; } -static int WINAPI get_first_font_enum( const LOGFONTW *lf, const TEXTMETRICW *tm, - DWORD font_type, LPARAM lparam ) +static void set_first_font( struct console *console, struct console_config *config ) { - struct font_chooser *fc = (struct font_chooser *)lparam; + LOGFONTW lf; + struct font_chooser fc; - TRACE("%s\n", debugstr_logfont( lf, font_type )); + TRACE("Looking for a suitable console font\n"); - if (validate_font( fc->console, lf, fc->pass )) + memset( &lf, 0, sizeof(lf) ); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; + + fc.console = console; + fc.font_height = config->cell_height; + fc.font_width = config->cell_width; + fc.done = FALSE; + + for (fc.pass = 0; fc.pass <= 5; fc.pass++) { - EnumFontFamiliesW( fc->console->window->mem_dc, lf->lfFaceName, - get_first_font_sub_enum, lparam ); - return !fc->done; /* we just need the first matching one... */ + EnumFontFamiliesExW( console->window->mem_dc, &lf, enum_first_font_proc, (LPARAM)&fc, 0); + if (fc.done) break; } - return 1; -} + if (fc.pass > 5) + ERR("Unable to find a valid console font\n"); + + /* Save font configuration to the registry */ + config->cell_width = console->active->font.width; + config->cell_height = console->active->font.height; + config->font_pitch_family = console->active->font.pitch_family; + memcpy( config->face_name, console->active->font.face_name, + console->active->font.face_len * sizeof(WCHAR) ); + config->face_name[console->active->font.face_len] = 0; + + save_config( console->window->config_key, config ); +} -/* sets logfont as the new font for the console */ +/* Sets the font specified in the LOGFONT as the new console font */ void update_console_font( struct console *console, const WCHAR *face_name, size_t face_name_size, unsigned int height, unsigned int weight ) { - struct font_chooser fc; LOGFONTW lf; - if (face_name[0] && height && weight) - { - fill_logfont( &lf, face_name, face_name_size, height, weight ); - if (set_console_font( console, &lf )) return; - } + fill_logfont( &lf, face_name, face_name_size, height, weight ); - /* try to find an acceptable font */ - WARN( "Couldn't match the font from registry, trying to find one\n" ); - fc.console = console; - fc.done = FALSE; - for (fc.pass = 0; fc.pass <= 5; fc.pass++) - { - EnumFontFamiliesW( console->window->mem_dc, NULL, get_first_font_enum, (LPARAM)&fc ); - if (fc.done) return; - } - ERR( "Couldn't find a decent font\n" ); + set_console_font( console, &lf ); } /* get a cell from a relative coordinate in window (takes into account the scrolling) */ @@ -2440,6 +2431,9 @@ BOOL init_window( struct console *console ) 0, 0, 0, 0, wndclass.hInstance, console )) return FALSE; + if (!config.face_name[0]) + set_first_font( console, &config ); + apply_config( console, &config ); return TRUE; } -- 2.36.1

2 1

[PATCH] vbscript: Handle negative argument in Space().
by Nikolay Sivov 23 May '22

23 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 11 +++++++---- dlls/vbscript/tests/api.vbs | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 15c0bb0958e..80348a5288f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1586,14 +1586,17 @@ static HRESULT Global_Space(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, TRACE("%s\n", debugstr_variant(arg)); + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + hres = to_int(arg, &n); if(FAILED(hres)) return hres; - if(n < 0) { - FIXME("n = %d\n", n); - return E_NOTIMPL; - } + if(n < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); if(!res) return S_OK; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3b67e920c3d..617589053c6 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -747,6 +747,21 @@ Call ok(Space(4.5) = " ", "Space(4.5) = " & Space(4.5) & """") Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") Call ok(Space("1") = " ", "Space(""1"") = " & Space("1") & """") +Call ok(Space(Empty) = "", "Space(Empty) = " & Space(Empty) & """") + +sub testSpaceError() + on error resume next + call Err.clear() + call Space(-1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Space("-1") + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Space(Null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub +call testSpaceError() sub test_string(cnt, char, exp) call ok(String(cnt, char) = exp, "String(" & cnt & ", """ & char & """ = """ & _ -- 2.35.1

2 1

[PATCH] vbscript: Fix a typo in sizeof() (Coverity).
by Nikolay Sivov 23 May '22

23 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9a24657c848..15c0bb0958e 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2028,7 +2028,7 @@ static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *args, unsigned args_cn { /* vbUseSystemDayOfWeek */ GetLocaleInfoW(This->ctx->lcid, LOCALE_RETURN_NUMBER | LOCALE_IFIRSTDAYOFWEEK, (LPWSTR)&first_day, - sizeof(&first_day) / sizeof(WCHAR)); + sizeof(first_day) / sizeof(WCHAR)); first_day = (first_day + 1) % 7; } else if (first_day >= 1 && first_day <= 7) -- 2.35.1

2 1

[PATCH 1/3] include: Add some more process information classes constants.
by Nikolay Sivov 23 May '22

23 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 2 +- include/winternl.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c1312bd8916..4a6451a23fe 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3773,7 +3773,7 @@ static void test_process_info(HANDLE hproc) return; } - for (i = 0; i < MaxProcessInfoClass; i++) + for (i = 0; i < ARRAY_SIZE(info_size); i++) { ret_len = 0; status = pNtQueryInformationProcess(hproc, i, buf, info_size[i], &ret_len); diff --git a/include/winternl.h b/include/winternl.h index ca265cf074c..c992eaebf11 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1566,6 +1566,14 @@ typedef enum _PROCESSINFOCLASS { ProcessThreadStackAllocation = 41, ProcessWorkingSetWatchEx = 42, ProcessImageFileNameWin32 = 43, + ProcessImageFileMapping = 44, + ProcessAffinityUpdateMode = 45, + ProcessMemoryAllocationMode = 46, + ProcessGroupInformation = 47, + ProcessTokenVirtualizationEnabled = 48, + ProcessConsoleHostProcess = 49, + ProcessWindowInformation = 50, + ProcessHandleInformation = 51, MaxProcessInfoClass, #ifdef __WINESRC__ ProcessWineMakeProcessSystem = 1000, -- 2.35.1

2 4

[PATCH v2] msadpm: Stop decoding instead of crashing for invalid adpcm data.
by Moore, Brandon A. 23 May '22

23 May '22

2 1

[PATCH 0/1] MR112: Revert "dbghelp: Don't bother trying to initialize loader backend if we can't...
by Jinoh Kang (＠iamahuman) 23 May '22

23 May '22

Revert "dbghelp: Don't bother trying to initialize loader backend if we can't get debug base address from PEB." This reverts commit 3047385437c7ef36996d0418ac378677f3e9d67c. ntdll.so puts the base address of the main Unix executable, called the "debug base address," inside an unused field of PEB. When debugging a WoW64 target process, obtaining the debug base address fails. This is because the architecture of PE modules differs from that of Unix modules. Specifically, dbghelp attempts to fetch it from the WoW64 PEB although it actually resides in the native PEB. However, this shouldn't be a reason to give up initializing dbghelp entirely. We do not expect a "user-mode" debugger to be able to debug Unix-side modules in a WoW64 process anyway. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/112

3 6

[PATCH v2 0/2] MR106: Avoid mpg123 functions with suffix
by André Zwing (＠AndreRH) 23 May '22

23 May '22

Otherwise I get: ld: dlls/l3codeca.acm/mpegl3.o: in function `MPEG3_DriverProc': mpegl3.c:(.text+0x977): undefined reference to `mpg123_feedseek_64' and MPG123_NO_LARGENAME is also defined for the builtin mpg123. With this patch the headers behave the same. Not sure why I am the first to spot this, maybe others mostly use the host mpg123? -- v2: mp3dmod: Avoid mpg123 functions with suffix l3codeca.acm: Avoid mpg123 functions with suffix https://gitlab.winehq.org/wine/wine/-/merge_requests/106

2 2

[PATCH v2 0/3] MR115: winex11.drv: Define ControlMask when not available
by Alistair Leslie-Hughes (＠alesliehughes) 23 May '22

23 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v2: ntdll: Fake success for ThreadPowerThrottlingState include: Add THREAD_POWER_THROTTLING_STATE type winex11.drv: Define ControlMask when not available https://gitlab.winehq.org/wine/wine/-/merge_requests/115

4 5

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

23 May '22

Avoid using user32. -- v2: winemac: Directly use win32u for user functions in window.c. winemac: Directly use win32u for user functions in opengl.c. winemac: Directly use win32u for user functions in mouse.c. winemac: Directly use win32u in more places. winemac: Directly use win32u for user functions in clipboard.c. winemac: Directly use win32u for user functions in display.c. https://gitlab.winehq.org/wine/wine/-/merge_requests/117

3 8

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

23 May '22

Avoid using user32. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/117

2 6

[PATCH 0/3] MR115: winex11.drv: Define ControlMask when not available
by Alistair Leslie-Hughes (＠alesliehughes) 23 May '22

23 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/115

3 5

[PATCH 0/6] MR114: ntdll: More heap code cleanup.
by Rémi Bernon (＠rbernon) 23 May '22

23 May '22

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

2 6

[PATCH v2 5/5] mshtml/tests: Add HTMLStorage tests.
by Hans Leidekker 23 May '22

23 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/tests/misc.c | 190 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 1702a24c804..7526fa997d2 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "mshtml.h" #include "initguid.h" #include "optary.h" @@ -106,11 +107,200 @@ static void test_HTMLLoadOptions(void) IHtmlLoadOptions_Release(loadopts); } +static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) +{ + BSTR url; + IBindCtx *bc; + IMoniker *url_mon; + IPersistMoniker *persist_mon; + IHTMLDocument2 *doc; + HRESULT hres; + + hres = CreateBindCtx(0, &bc); + ok(hres == S_OK, "CreateBindCtx failed: 0x%08lx\n", hres); + + url = SysAllocString(start_url); + hres = CreateURLMoniker(NULL, url, &url_mon); + ok(hres == S_OK, "CreateURLMoniker failed: 0x%08lx\n", hres); + + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, + CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, + (void**)&doc); + ok(hres == S_OK, "CoCreateInstance failed: 0x%08lx\n", hres); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker, + (void**)&persist_mon); + ok(hres == S_OK, "IHTMLDocument2_QueryInterface failed: 0x%08lx\n", hres); + + hres = IPersistMoniker_Load(persist_mon, FALSE, url_mon, bc, + STGM_SHARE_EXCLUSIVE | STGM_READWRITE); + ok(hres == S_OK, "IPersistMoniker_Load failed: 0x%08lx\n", hres); + + IPersistMoniker_Release(persist_mon); + IMoniker_Release(url_mon); + IBindCtx_Release(bc); + SysFreeString(url); + return doc; +} + +static HRESULT get_localstorage(IHTMLDocument2 *doc, IHTMLStorage **storage) +{ + IHTMLWindow2 *window; + IHTMLWindow6 *window6; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); + ok(window != NULL, "window == NULL\n"); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow6, (void**)&window6); + IHTMLWindow2_Release(window); + if(FAILED(hres)) { + win_skip("IHTMLWindow6 not supported\n"); + return hres; + } + + hres = IHTMLWindow6_get_localStorage(window6, storage); + ok(hres == S_OK, "get_localStorage failed: %08lx\n", hres); + ok(*storage != NULL, "*storage == NULL\n"); + + IHTMLWindow6_Release(window6); + return hres; +} + +static void test_HTMLStorage(void) +{ + IHTMLDocument2 *doc, *doc2; + IHTMLStorage *storage, *storage2; + VARIANT var; + BSTR key, value; + HRESULT hres; + + doc = create_doc_from_url(L"http://www.codeweavers.com/"); + doc2 = create_doc_from_url(L"http://www.codeweavers.com/"); + + hres = get_localstorage(doc, &storage); + ok(hres == S_OK, "got: %08lx\n", hres); + + hres = get_localstorage(doc2, &storage2); + ok(hres == S_OK, "got: %08lx\n", hres); + + key = SysAllocString(L""); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + key = SysAllocString(L"undefined"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + value = SysAllocString(L"null"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"null"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + SysFreeString(value); + + key = SysAllocString(L"winetest"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + /* retrieve value from different storage instance */ + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"winetest"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + SysFreeString(value); + + /* item doesn't exist */ + key = SysAllocString(L"nosuch"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + + hres = IHTMLStorage_getItem(storage, NULL, NULL); + ok(hres == E_POINTER, "getItem returned: %08lx\n", hres); + + hres = IHTMLStorage_getItem(storage, key, NULL); + ok(hres == E_POINTER, "getItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, NULL, &var); + ok(hres == S_OK, "getItem returned: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + hres = IHTMLStorage_setItem(storage, NULL, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + key = SysAllocString(L"winetest2"); + hres = IHTMLStorage_setItem(storage, key, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_setItem(storage, NULL, key); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + + hres = IHTMLStorage_removeItem(storage, NULL); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + /* Unicode characters */ + key = SysAllocString(L"winetest"); + value = SysAllocString(L"\x20ac"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + key = SysAllocString(L"\x20ac"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + IHTMLStorage_Release(storage); + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc); + IHTMLDocument2_Release(doc2); +} + START_TEST(misc) { CoInitialize(NULL); test_HTMLLoadOptions(); + test_HTMLStorage(); CoUninitialize(); } -- 2.30.2

1 0

[PATCH v2 4/5] mshtml: Protect storage with a mutex.
by Hans Leidekker 23 May '22

23 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 502eb8c25ab..1793cfae184 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -191,9 +191,21 @@ static WCHAR *build_filename(const WCHAR *hostname) return ret; } +static WCHAR *build_mutexname(const WCHAR *filename) +{ + WCHAR *ret, *ptr; + ret = wcsdup(filename); + if(!ret) + return NULL; + for(ptr = ret; *ptr; ptr++) + if(*ptr == '\\') *ptr = '_'; + return ret; +} + struct storage { WCHAR *filename; IXMLDOMDocument *doc; + HANDLE mutex; }; static void close_storage(struct storage *storage) @@ -201,6 +213,8 @@ static void close_storage(struct storage *storage) free(storage->filename); if(storage->doc) IXMLDOMDocument_Release(storage->doc); + ReleaseMutex(storage->mutex); + CloseHandle(storage->mutex); free(storage); } @@ -210,7 +224,7 @@ static HRESULT open_storage(const WCHAR *hostname, struct storage **ret) HRESULT hres = E_OUTOFMEMORY; VARIANT var; VARIANT_BOOL success; - WCHAR *ptr; + WCHAR *mutexname, *ptr; storage = calloc(1, sizeof(*storage)); if(!storage) @@ -220,6 +234,18 @@ static HRESULT open_storage(const WCHAR *hostname, struct storage **ret) if(!storage->filename) goto done; + mutexname = build_mutexname(storage->filename); + if(!mutexname) + goto done; + + storage->mutex = CreateMutexW(NULL, FALSE, mutexname); + free(mutexname); + if(!storage->mutex) { + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + WaitForSingleObject(storage->mutex, INFINITE); + *(ptr = wcsrchr(storage->filename, '\\')) = 0; if(!create_path(storage->filename)) { hres = E_FAIL; -- 2.30.2

1 0

[PATCH v2 3/5] mshtml: Implement HTMLStorage_removeItem().
by Hans Leidekker 23 May '22

23 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 59 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index b01247db56b..502eb8c25ab 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -506,11 +506,66 @@ static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BST return hres; } +static HRESULT remove_item(BSTR hostname, BSTR key) +{ + struct storage *storage; + IXMLDOMNode *root = NULL, *node = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_storage(hostname, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_removeChild(root, node, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_storage(storage); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + close_storage(storage); + return hres; +} + static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrKey)); - return E_NOTIMPL; + BSTR hostname; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(bstrKey)); + + if(!This->window) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + hres = IUri_GetHost(This->window->base.outer_window->uri, &hostname); + if(hres != S_OK) + return hres; + + hres = remove_item(hostname, bstrKey); + SysFreeString(hostname); + return hres; } static HRESULT WINAPI HTMLStorage_clear(IHTMLStorage *iface) -- 2.30.2

1 0

[PATCH v2 2/5] mshtml: Implement HTMLStorage_setItem().
by Hans Leidekker 23 May '22

23 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 117 +++++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index fe1d6a21b88..b01247db56b 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -386,11 +386,124 @@ static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VAR return hres; } +static HRESULT set_attribute(IXMLDOMElement *elem, const WCHAR *name, BSTR value) +{ + BSTR str; + VARIANT var; + HRESULT hres; + + str = SysAllocString(name); + if(!str) + return E_OUTOFMEMORY; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = value; + + hres = IXMLDOMElement_setAttribute(elem, str, var); + + SysFreeString(str); + return hres; +} + +static HRESULT save_storage(struct storage *storage) +{ + VARIANT var; + HRESULT hres; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(storage->filename); + if(!V_BSTR(&var)) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_save(storage->doc, var); + SysFreeString(V_BSTR(&var)); + return hres; +} + +static HRESULT set_item(BSTR hostname, BSTR key, BSTR value) +{ + struct storage *storage; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_storage(hostname, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + }else { + BSTR str = SysAllocString(L"item"); + hres = IXMLDOMDocument_createElement(storage->doc, str, &elem); + SysFreeString(str); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"name", key); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + + hres = IXMLDOMNode_appendChild(root, (IXMLDOMNode*)elem, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_storage(storage); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + close_storage(storage); + return hres; +} + static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); - return E_NOTIMPL; + BSTR hostname; + HRESULT hres; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); + + if(!This->window) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + hres = IUri_GetHost(This->window->base.outer_window->uri, &hostname); + if(hres != S_OK) + return hres; + + hres = set_item(hostname, bstrKey, bstrValue); + SysFreeString(hostname); + return hres; } static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) -- 2.30.2

1 0

[PATCH 0/5] MR113: include: Fix malloc attributes, and a few related warnings.
by Rémi Bernon (＠rbernon) 23 May '22

23 May '22

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

2 5

[PATCH] evr/sample: Use proper locking method for SetAllocator().
by Nikolay Sivov 22 May '22

22 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/sample.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 3521e6c4d51..f03292704b5 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -1446,8 +1446,7 @@ static HRESULT WINAPI tracked_video_sample_SetAllocator(IMFTrackedSample *iface, TRACE("%p, %p, %p.\n", iface, sample_allocator, state); - IMFSample_LockStore(sample->sample); - + EnterCriticalSection(&sample->cs); if (sample->tracked_result) hr = MF_E_NOTACCEPTING; else @@ -1464,8 +1463,7 @@ static HRESULT WINAPI tracked_video_sample_SetAllocator(IMFTrackedSample *iface, } } } - - IMFSample_UnlockStore(sample->sample); + LeaveCriticalSection(&sample->cs); return hr; } -- 2.35.1

1 0

[PATCH 0/1] MR111: winedbg: Allow debugging a 32bit target from a 64bit winedbg in --gdb mode.
by Jinoh Kang (＠iamahuman) 22 May '22

22 May '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/111

2 1

Re: [PATCH v2 0/0] MR4: wined3d: Don't transition GENERAL layouts for blits. - closed
by Stefan Dösinger (＠stefan) 22 May '22

22 May '22

This merge request was closed by Stefan Dösinger. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4

1 0

Re: [PATCH v2 0/0] MR4: wined3d: Don't transition GENERAL layouts for blits.
by Stefan Dösinger (＠stefan) 22 May '22

22 May '22

I'll close this merge request for now and recreate it later once I figured out what breaks World of Tanks. Preferably I'll also include patches to keep resources that are used both as render target and as shader resource view in a compressed state. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4#note_1091

1 0

[PATCH 0/1] MR108: wmphoto: Zero user buffer before calling jxrlib Copy.
by Esme (＠madewokherd) 21 May '22

21 May '22

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51788 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/108

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel