- wine-devel - winehq.org

[PATCH 1/2] hid: Implement HidD_GetPhysicalDescriptor.
by Rémi Bernon 30 Mar '22

30 Mar '22

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> The game INVERSUS Deluxe calls upon this function and crashes without it. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 37dfdbce307..67c4473129d 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -9,7 +9,7 @@ @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor @ stdcall HidD_GetNumInputBuffers(long ptr) -@ stub HidD_GetPhysicalDescriptor +@ stdcall HidD_GetPhysicalDescriptor(long ptr long) @ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) @ stdcall HidD_GetSerialNumberString(long ptr long) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 3b2e5a9fe4e..af024b456b4 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -121,6 +121,12 @@ BOOLEAN WINAPI HidD_SetNumInputBuffers( HANDLE file, ULONG num_buffer ) return sync_ioctl( file, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &num_buffer, sizeof(num_buffer), NULL, 0 ); } +BOOLEAN WINAPI HidD_GetPhysicalDescriptor( HANDLE file, void *buffer, ULONG buffer_len ) +{ + TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); + return sync_ioctl( file, IOCTL_GET_PHYSICAL_DESCRIPTOR, NULL, 0, buffer, buffer_len ); +} + BOOLEAN WINAPI HidD_GetProductString( HANDLE file, void *buffer, ULONG buffer_len ) { TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 22f64e687e7..72470079a79 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -41,6 +41,7 @@ BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULO BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers); +BOOLEAN WINAPI HidD_GetPhysicalDescriptor(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); -- 2.35.1

2 2

[tools 1/3] testbot/web: Document the Fcntl usage.
by Francois Gouget 30 Mar '22

30 Mar '22

Use Fcntl qw(O_RDONLY) for simple cases. This is better than adding a comment which may get out-of-date if more constants are needed. But still use a comment to avoid too much duplication in more complex cases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 2 +- testbot/lib/WineTestBot/Utils.pm | 2 +- testbot/web/GetFile.pl | 2 +- testbot/web/GetTaskFile.pl | 2 +- testbot/web/Screenshot.pl | 2 +- testbot/web/Submit.pl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index db9d82d30..7880b8e80 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -37,7 +37,7 @@ sub BEGIN } use Errno qw(EAGAIN); -use Fcntl; +use Fcntl; # For O_XXX and FD_XXX use MIME::Parser; use POSIX ":sys_wait_h"; use Socket; diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 27b222fd2..5315c75d4 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,7 +33,7 @@ our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString BuildTag SanitizeTag LocaleName NotifyAdministrator BatchQuote ShQuote ShArgv2Cmd); -use Fcntl; +use Fcntl qw(O_CREAT O_EXCL O_WRONLY); use WineTestBot::Config; diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index a8699497b..59602bf19 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -21,7 +21,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; -use Fcntl; # For O_XXX +use Fcntl qw(O_RDONLY); use WineTestBot::Jobs; diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl index 41111197d..0b7f167d2 100644 --- a/testbot/web/GetTaskFile.pl +++ b/testbot/web/GetTaskFile.pl @@ -22,7 +22,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; -use Fcntl; # for O_READONLY +use Fcntl qw(O_RDONLY); use WineTestBot::Config; diff --git a/testbot/web/Screenshot.pl b/testbot/web/Screenshot.pl index a8a3d88ed..685c4a45c 100644 --- a/testbot/web/Screenshot.pl +++ b/testbot/web/Screenshot.pl @@ -22,7 +22,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; use CGI::Cookie; -use Fcntl; +use Fcntl qw(O_RDONLY); use WineTestBot::Config; use WineTestBot::CGI::Sessions; use WineTestBot::Engine::Notify; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 472622dd5..e2173d898 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -26,7 +26,7 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use CGI qw(:standard); -use Fcntl; # For O_XXX +use Fcntl qw(O_RDONLY); use IO::Handle; use POSIX qw(:fcntl_h); # For SEEK_XXX use File::Basename; -- 2.30.2

1 2

[tools] testbot/web: Add an Apache module import for the Munin redirects.
by Francois Gouget 30 Mar '22

30 Mar '22

Fortunately it is only needed in the error case. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Munin.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl index c2464d055..513c6901b 100644 --- a/testbot/web/Munin.pl +++ b/testbot/web/Munin.pl @@ -19,6 +19,7 @@ use strict; +use Apache2::Const -compile => qw(REDIRECT); use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::VMs; -- 2.30.2

1 0

[tools] testbot/cgi: Improve the title for multi-word collection / item class names.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This will make the titles nicer for the future FailureBlacklist pages. --- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 4 +++- testbot/lib/ObjectModel/CGI/ItemPage.pm | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index d59310be5..ddbbd663e 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -137,7 +137,9 @@ sub GetTitle($) { my ($self) = @_; - return ucfirst($self->{Collection}->GetCollectionName()); + my $Title = ucfirst($self->{Collection}->GetCollectionName()); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return $Title; } sub GenerateTitle($) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 66fcab755..567a489fc 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -94,8 +94,11 @@ sub GetTitle($) { my ($self) = @_; - return $self->GetParam("Key") ? $self->GetParam("Key") : - "Add " . $self->{Collection}->GetItemName(); + return $self->GetParam("Key") if ($self->GetParam("Key")); + + my $Title = $self->{Collection}->GetItemName(); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return "Add $Title"; } sub GenerateFormStart($) -- 2.30.2

1 0

[tools] testbot/web: The VMsList page deals with VMs so rename the $Item parameter.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/VMsList.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 283c54263..0ed0b0d0b 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -54,16 +54,16 @@ sub SortKeys($$$) sub OnItemAction($$$$) { - my ($self, $CollectionBlock, $Item, $Action) = @_; + my ($self, $CollectionBlock, $VM, $Action) = @_; if ($Action eq "Delete") { - $Item->Role("deleted"); - (my $ErrProperty, $self->{ErrMessage}) = $Item->Save(); + $VM->Role("deleted"); + (my $ErrProperty, $self->{ErrMessage}) = $VM->Save(); return !defined $self->{ErrMessage}; } - return $self->SUPER::OnItemAction($CollectionBlock, $Item, $Action); + return $self->SUPER::OnItemAction($CollectionBlock, $VM, $Action); } -- 2.30.2

1 0

[tools] testbot/web: The UsersList page deals with users so rename the $Item parameter.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/UsersList.pl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 3621702a4..019bc6328 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -58,12 +58,12 @@ sub DisplayProperty($$$) sub GenerateDataCell($$$$$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $CollectionBlock, $User, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") { - my $Status = $Item->Status; + my $Status = $User->Status; my ($Class, $Label); if ($Status eq "disabled") { @@ -73,19 +73,19 @@ sub GenerateDataCell($$$$$) { ($Class, $Label) = ('userdeleted', 'deleted'); } - elsif ($Item->WaitingForApproval()) + elsif ($User->WaitingForApproval()) { ($Class, $Label) = ('userrequest', 'request'); } - elsif (!$Item->Activated()) + elsif (!$User->Activated()) { ($Class, $Label) = ('userapproved', 'approved'); } - elsif ($Item->HasRole("admin")) + elsif ($User->HasRole("admin")) { ($Class, $Label) = ('useradmin', 'admin'); } - elsif ($Item->HasRole("wine-devel")) + elsif ($User->HasRole("wine-devel")) { ($Class, $Label) = ('userdevel', 'wine-devel'); } @@ -93,12 +93,12 @@ sub GenerateDataCell($$$$$) { ($Class, $Label) = ('usernone', 'none'); } - print "<td><a href='/admin/UserDetails.pl?Key=", uri_escape($Item->GetKey()), + print "<td><a href='/admin/UserDetails.pl?Key=", uri_escape($User->GetKey()), "'><span class='$Class'>$Label</span></a></td>"; } else { - $self->SUPER::GenerateDataCell($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($CollectionBlock, $User, $PropertyDescriptor, $DetailsPage); } } @@ -112,20 +112,20 @@ sub GetItemActions($$) sub OnItemAction($$$$) { - my ($self, $CollectionBlock, $Item, $Action) = @_; + my ($self, $CollectionBlock, $User, $Action) = @_; if ($Action eq "Delete") { - $Item->Status('deleted'); - (my $ErrProperty, $self->{ErrMessage}) = $Item->Save(); + $User->Status('deleted'); + (my $ErrProperty, $self->{ErrMessage}) = $User->Save(); return 0 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting the web sessions - DeleteSessions($Item); + DeleteSessions($User); return 1; } - return $self->SUPER::OnItemAction($CollectionBlock, $Item, $Action); + return $self->SUPER::OnItemAction($CollectionBlock, $User, $Action); } -- 2.30.2

1 0

[tools] testbot/web: The main page deals with jobs so rename the $Item parameter.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 1f362fc32..94421536d 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -91,27 +91,27 @@ sub GenerateHeaderCell($$$) sub GetDisplayValue($$$) { - my ($self, $Item, $PropertyDescriptor) = @_; + my ($self, $Job, $PropertyDescriptor) = @_; if ($PropertyDescriptor->GetName() eq "User" && - defined($Item->Patch) && - $Item->User->GetKey() eq GetBatchUser()->GetKey() && - defined($Item->Patch->FromName)) + defined($Job->Patch) && + $Job->User->GetKey() eq GetBatchUser()->GetKey() && + defined($Job->Patch->FromName)) { - return $Item->Patch->FromName; + return $Job->Patch->FromName; } - return $self->SUPER::GetDisplayValue($Item, $PropertyDescriptor); + return $self->SUPER::GetDisplayValue($Job, $PropertyDescriptor); } sub GenerateDataCell($$$$) { - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $Job, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") { - my $EscapedKey = uri_escape($Item->GetKey()); + my $EscapedKey = uri_escape($Job->GetKey()); print "<td id='job$EscapedKey'><a href='/JobDetails.pl?Key=$EscapedKey'>"; my %HTMLChunks = ("queued" => "<span class='queued'>queued</span>", @@ -122,11 +122,11 @@ sub GenerateDataCell($$$$) "boterror" => "<span class='boterror'>TestBot error</span>", "canceled" => "<span class='canceled'>canceled</span>", ); - my $Status = $Item->Status; + my $Status = $Job->Status; my $HTMLStatus = $HTMLChunks{$Status} || $Status; if ($Status eq "completed" || $Status eq "running" || $Status eq "boterror" || $Status eq "canceled") { - my $JobInfo = $self->{JobsInfo}->{$Item->Id}; + my $JobInfo = $self->{JobsInfo}->{$Job->Id}; my $FailuresPrefix; if ($Status eq "completed") @@ -170,15 +170,15 @@ sub GenerateDataCell($$$$) } elsif ($PropertyName eq "Ended") { - if (defined $Item->Ended) + if (defined $Job->Ended) { - my $Duration = $Item->Ended - $Item->Submitted; - my $TagId = "E". $Item->Id; + my $Duration = $Job->Ended - $Job->Submitted; + my $TagId = "E". $Job->Id; print "<td><a id='$TagId' class='title' title='", - strftime("%Y-%m-%d %H:%M:%S", localtime($Item->Ended)), + strftime("%Y-%m-%d %H:%M:%S", localtime($Job->Ended)), "'>", DurationToString($Duration), "</a>\n"; print "<script type='text/javascript'></script>\n"; print "</td>\n"; } @@ -189,7 +189,7 @@ sub GenerateDataCell($$$$) } else { - $self->SUPER::GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($Job, $PropertyDescriptor, $DetailsPage); } } -- 2.30.2

1 0

[tools] testbot/web: The Activity page does not need URI::Escape.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index cbe3f8721..1771e7ca3 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -25,7 +25,6 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use POSIX qw(strftime); -use URI::Escape; use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; -- 2.30.2

1 0

[tools] testbot/cgi: Automatically use https for the Wine Wiki.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Presumably at some point it was an http-only site but nowadays it's available over https just like all the others. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 58102d397..a54b0e206 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -423,7 +423,7 @@ ${ProjectName} Test Bot <div id='tabs'> <ul> <li><a href='//www.winehq.org/'>WineHQ</a></li> - <li><a href='http://wiki.winehq.org'>Wiki</a></li> + <li><a href='//wiki.winehq.org'>Wiki</a></li> <li><a href='//appdb.winehq.org/'>AppDB</a></li> <li><a href='//bugs.winehq.org/'>Bugzilla</a></li> <li class='s'><a href='//${WebHostName}/'>TestBot</a></li> -- 2.30.2

1 0

[tools] testbot/cgi: Use SameSite=Lax on our session cookies.
by Francois Gouget 30 Mar '22

30 Mar '22

So far we were not specifying SameSite which means it defaulted to None in older browsers which potentially allowed some cross-site attacks. Newer browser would now default to Lax so explicitly use that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- My understanding of SameSite=Strict is that one would not be logged in after following a link found in one of the TestBot's emails. That does not seem very practical so SameSite=Lax seems like a better choice. It implies that the TestBot should not allow sensitive changes through the Get method... On the one hand I don't think the TestBot makes a distinction between Get and Post. But on the other hand I don't think one can do anything sensitive with the TestBot (at least for non-admin users). This latter part probably requires some more investigation independently from this patch. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index a54b0e206..4837b9f54 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -137,6 +137,7 @@ sub UnsetCookies($) -Expires => "Sun, 25 Jul 1997 05:00:00 GMT", -Domain => $ENV{"HTTP_HOST"}, -Path => "/", + -SameSite => "Lax", -Secure => $UseSSL); $Request->err_headers_out->add("Set-Cookie", $Cookie); } @@ -147,6 +148,7 @@ sub UnsetCookies($) -Expires => "Sun, 25 Jul 1997 05:00:00 GMT", -Domain => $ENV{"HTTP_HOST"}, -Path => "/", + -SameSite => "Lax", -Secure => !1); $Request->err_headers_out->add("Set-Cookie", $Cookie); } @@ -178,6 +180,7 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionId", -Value => $Session->Id, -Expires => $Expire, + -SameSite => "Lax", -Secure => $UseSSL, -HttpOnly => 1); $Request->err_headers_out->add("Set-Cookie", $Cookie); @@ -199,6 +202,7 @@ sub SetCookies($) $Cookie = CGI::Cookie->new(-Name => "SessionActive", -Value => $SessionPermanent, -Expires => $Expire, + -SameSite => "Lax", -Secure => !1, -HttpOnly => 1); $Request->err_headers_out->add("Set-Cookie", $Cookie); -- 2.30.2

1 0

[tools] testbot/web: Document why ErrField is not set when failing to delete an item.
by Francois Gouget 30 Mar '22

30 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/UsersList.pl | 3 ++- testbot/web/admin/VMsList.pl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 019bc6328..ae514e901 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -117,7 +117,8 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $User->Status('deleted'); - (my $ErrProperty, $self->{ErrMessage}) = $User->Save(); + # Setting $self->{ErrField} is only useful on form pages + (my $_ErrProperty, $self->{ErrMessage}) = $User->Save(); return 0 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting the web sessions diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 0ed0b0d0b..18952253f 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -59,7 +59,8 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $VM->Role("deleted"); - (my $ErrProperty, $self->{ErrMessage}) = $VM->Save(); + # Setting $self->{ErrField} is only useful on form pages + (my $_ErrProperty, $self->{ErrMessage}) = $VM->Save(); return !defined $self->{ErrMessage}; } -- 2.30.2

1 0

[PATCH 1/4] riched20: draw OLE object in richedit with OleDraw
by Dongwan Kim 30 Mar '22

30 Mar '22

When OLE object provides IViewObject::Draw, Richedit can draw it even though the OLE object does not support CF_BITMAP nor CF_ENHMETAFILE. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/riched20/richole.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 03572511ff7..1a62f0b9f36 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5653,6 +5653,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) STGMEDIUM stgm; DIBSECTION dibsect; ENHMETAHEADER emh; + int pixs; assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); @@ -5691,8 +5692,13 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) fmt.tymed = TYMED_ENHMF; if (IDataObject_GetData(ido, &fmt, &stgm) != S_OK) { - FIXME("unsupported format\n"); - pSize->cx = pSize->cy = 0; + if( IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, pSize) != S_OK){ + FIXME("unsupported format\n"); + pSize->cx = pSize->cy = 0; + } + pixs = GetDeviceCaps(c->hDC, LOGPIXELSX); + pSize->cx = MulDiv(pSize->cx, pixs , 2540); + pSize->cy = MulDiv(pSize->cy, pixs , 2540); IDataObject_Release(ido); return; } @@ -5735,6 +5741,8 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) BOOL has_size; HBITMAP old_bm; RECT rc; + HRESULT hr; + int pixs; assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); @@ -5755,7 +5763,17 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) fmt.tymed = TYMED_ENHMF; if (IDataObject_GetData(ido, &fmt, &stgm) != S_OK) { - FIXME("Couldn't get storage medium\n"); + IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, &sz); + pixs = GetDeviceCaps(c->hDC, LOGPIXELSX); + rc.left = x; + rc.top = y - MulDiv(sz.cy, pixs, 2540); + rc.right = x + MulDiv(sz.cx, pixs, 2540); + rc.bottom = y ; + hr = OleDraw(run->reobj->obj.poleobj, DVASPECT_CONTENT, c->hDC, &rc); + if (FAILED(hr)) + { + FIXME("Couldn't draw ole object\n"); + } IDataObject_Release(ido); return; } -- 2.30.2

3 8

[PATCH 1/5] windows.media.speech: Add IVector<Inspectable*>.
by Bernhard Kölbl 30 Mar '22

30 Mar '22

And use it in recognizer. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/private.h | 6 + dlls/windows.media.speech/recognizer.c | 21 +- dlls/windows.media.speech/vector.c | 279 +++++++++++++++++++++++++ 3 files changed, 305 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3c8371ccdbe..348c060c1c6 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -61,6 +61,11 @@ extern IActivationFactory *synthesizer_factory; +struct vector_iids +{ + const GUID *vector; +}; + HRESULT typed_event_handlers_append( struct list *list, ITypedEventHandler_IInspectable_IInspectable *handler, EventRegistrationToken *token ); HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken *token ); HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); @@ -68,6 +73,7 @@ HRESULT typed_event_handlers_clear( struct list* list ); HRESULT vector_hstring_create( IVector_HSTRING **out ); HRESULT vector_hstring_create_copy( IIterable_HSTRING *iterable, IVector_HSTRING **out ); +HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ); #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index da219d6bd0a..5f88331c703 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -233,6 +233,7 @@ struct recognizer LONG ref; ISpeechContinuousRecognitionSession *session; + IVector_ISpeechRecognitionConstraint *constraints; }; /* @@ -296,6 +297,7 @@ static ULONG WINAPI recognizer_Release( ISpeechRecognizer *iface ) if (!ref) { ISpeechContinuousRecognitionSession_Release(impl->session); + IVector_ISpeechRecognitionConstraint_Release(impl->constraints); free(impl); } @@ -637,13 +639,22 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface { struct recognizer *impl; struct session *session; + struct vector_iids constraints_iids = + { + .vector = &IID_IVector_ISpeechRecognitionConstraint, + }; + HRESULT hr; TRACE("iface %p, language %p, speechrecognizer %p.\n", iface, language, speechrecognizer); *speechrecognizer = NULL; if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; - if (!(session = calloc(1, sizeof(*session)))) return E_OUTOFMEMORY; + if (!(session = calloc(1, sizeof(*session)))) + { + hr = E_OUTOFMEMORY; + goto error; + } if (language) FIXME("language parameter unused. Stub!\n"); @@ -658,11 +669,19 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface impl->ISpeechRecognizer2_iface.lpVtbl = &speech_recognizer2_vtbl; impl->session = &session->ISpeechContinuousRecognitionSession_iface; impl->ref = 1; + if (FAILED(hr = vector_inspectable_create(&constraints_iids, (IVector_IInspectable**)&impl->constraints))) + goto error; TRACE("created SpeechRecognizer %p.\n", impl); *speechrecognizer = &impl->ISpeechRecognizer_iface; return S_OK; + +error: + if (session) free(session); + if (impl) free(impl); + + return hr; } static const struct ISpeechRecognizerFactoryVtbl speech_recognizer_factory_vtbl = diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index fcb7f483e03..e3a802fc020 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -771,3 +771,282 @@ error: IVector_HSTRING_Release(*out); return hr; } + +/* + * + * IVector<Inspectable*> + * + */ + +struct vector_inspectable +{ + IVector_IInspectable IVector_IInspectable_iface; + struct vector_iids iids; + LONG ref; + + UINT32 size; + UINT32 capacity; + IInspectable **elements; +}; + +static inline struct vector_inspectable *impl_from_IVector_IInspectable( IVector_IInspectable *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_inspectable, IVector_IInspectable_iface); +} + +static HRESULT WINAPI vector_inspectable_QueryInterface( IVector_IInspectable *iface, REFIID iid, void **out ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, impl->iids.vector)) + { + IInspectable_AddRef((*out = &impl->IVector_IInspectable_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_inspectable_AddRef( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_inspectable_Release( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + + if (!ref) + { + IVector_IInspectable_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_inspectable_GetIids( IVector_IInspectable *iface, ULONG *iid_count, IID **iids ) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetRuntimeClassName( IVector_IInspectable *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetTrustLevel( IVector_IInspectable *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetAt( IVector_IInspectable *iface, UINT32 index, IInspectable **value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + IInspectable_AddRef((*value = impl->elements[index])); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_get_Size( IVector_IInspectable *iface, UINT32 *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + TRACE("iface %p, value %p.\n", iface, value); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_GetView( IVector_IInspectable *iface, IVectorView_IInspectable **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_IndexOf( IVector_IInspectable *iface, + IInspectable *element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_SetAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release(impl->elements[index]); + IInspectable_AddRef((impl->elements[index] = value)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_InsertAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + IInspectable **tmp = impl->elements; + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + IInspectable_AddRef((impl->elements[index] = value)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_RemoveAt( IVector_IInspectable *iface, UINT32 index ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_Append( IVector_IInspectable *iface, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_IInspectable_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_inspectable_RemoveAtEnd( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) IInspectable_Release(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_Clear( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_IInspectable_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_GetMany( IVector_IInspectable *iface, UINT32 start_index, + UINT32 items_size, IInspectable **items, UINT *count ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", + iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + IInspectable_AddRef((items[i - start_index] = impl->elements[i])); + } + *count = i - start_index; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_ReplaceAll( IVector_IInspectable *iface, UINT32 count, IInspectable **items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_IInspectable_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_IInspectable_Append(iface, items[i]); + return hr; +} + +static const struct IVector_IInspectableVtbl vector_inspectable_vtbl = +{ + /* IUnknown methods */ + vector_inspectable_QueryInterface, + vector_inspectable_AddRef, + vector_inspectable_Release, + /* IInspectable methods */ + vector_inspectable_GetIids, + vector_inspectable_GetRuntimeClassName, + vector_inspectable_GetTrustLevel, + /* IVector<IInspectable*> methods */ + vector_inspectable_GetAt, + vector_inspectable_get_Size, + vector_inspectable_GetView, + vector_inspectable_IndexOf, + vector_inspectable_SetAt, + vector_inspectable_InsertAt, + vector_inspectable_RemoveAt, + vector_inspectable_Append, + vector_inspectable_RemoveAtEnd, + vector_inspectable_Clear, + vector_inspectable_GetMany, + vector_inspectable_ReplaceAll +}; + +HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ) +{ + struct vector_inspectable *impl; + + TRACE("iid %s, out %p.\n", debugstr_guid(iids->vector), out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_IInspectable_iface.lpVtbl = &vector_inspectable_vtbl; + impl->iids = *iids; + impl->ref = 1; + + *out = &impl->IVector_IInspectable_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

2 8

[PATCH] testbot/TestLauncher: Create processes with DETACHED_PROCESS flag.
by Rémi Bernon 30 Mar '22

30 Mar '22

So that it doesn't automatically create a console window when there is not one already. Fixing a Wine regression from f034084d49b354811096524d472ae5172ac1cebf. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm not completely sure what DETACHED_PROCESS implies, and hopefully this won't cause more trouble, but forcing the flag like in https://testbot.winehq.org/JobDetails.pl?Key=111584 seems to fix the regression. testbot/src/TestLauncher/TestLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 41fb904..17da4da 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -236,7 +236,7 @@ DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pi * whether there are missing dependencies as it could modify the test * results... */ - if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) + if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE|DETACHED_PROCESS, NULL, NULL, &StartupInfo, &ProcessInformation)) { *Pid = 0; if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) -- 2.35.1

2 1

[PATCH] wined3d: Add GPU information for NVIDIA Tesla T4.
by Henri Verbeet 30 Mar '22

30 Mar '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 4464bf3ecc2..5f3e3538950 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1310,6 +1310,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"Tesla T4", CARD_NVIDIA_TESLA_T4}, {"RTX 2080 Ti", CARD_NVIDIA_GEFORCE_RTX2080TI}, /* GeForce 2000 - highend */ {"RTX 2080", CARD_NVIDIA_GEFORCE_RTX2080}, /* GeForce 2000 - highend */ {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d7e78e40b39..4d105a57237 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -463,6 +463,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2070, "NVIDIA GeForce RTX 2070", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080, "NVIDIA GeForce RTX 2080", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080TI, "NVIDIA GeForce RTX 2080 Ti", DRIVER_NVIDIA_KEPLER, 11264}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_TESLA_T4, "NVIDIA Tesla T4", DRIVER_NVIDIA_KEPLER, 16384}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b3eb0136b0..8d9b41c8a90 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3087,6 +3087,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_RTX2070 = 0x1f07, CARD_NVIDIA_GEFORCE_RTX2080 = 0x1e87, CARD_NVIDIA_GEFORCE_RTX2080TI = 0x1e07, + CARD_NVIDIA_TESLA_T4 = 0x1eb8, CARD_REDHAT_VIRGL = 0x1010, -- 2.30.2

1 0

[PATCH] wined3d: Increase the CS queue size.
by Jan Sikorski 30 Mar '22

30 Mar '22

Final Fantasy XIV routinely runs out of space in the queue, which affects the frame rates. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- On my particular testing set up the change is from ~85 fps to ~100 fps. --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b3eb0136b0..d53eb3985fa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4892,7 +4892,7 @@ enum wined3d_push_constants }; #define WINED3D_CS_QUERY_POLL_INTERVAL 10u -#define WINED3D_CS_QUEUE_SIZE 0x100000u +#define WINED3D_CS_QUEUE_SIZE 0x400000u #define WINED3D_CS_SPIN_COUNT 10000000u #define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1) -- 2.32.0

4 3

[PATCH 1/5] include: Add defines for ID2D1ImageSourceFromWic.
by Ziqing Hui 30 Mar '22

30 Mar '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- include/d2d1_3.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index a33292882df..643212e1a27 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -166,3 +166,21 @@ interface ID2D1ImageSource : ID2D1Image [out] BOOL *resources_discarded ); }; + +[ + object, + uuid(77395441-1c8f-4555-8683-f50dab0fe792), + local, +] +interface ID2D1ImageSourceFromWic : ID2D1ImageSource +{ + HRESULT EnsureCached( + [in, optional] const D2D1_RECT_U *rect_to_fill + ); + HRESULT TrimCache( + [in, optional] const D2D1_RECT_U *rect_to_preserve + ); + void GetSource( + [out] IWICBitmapSource **source + ); +}; -- 2.25.1

3 7

[PATCH] wined3d: Use hashes of graphics pipeline keys for the pipeline cache.
by Jan Sikorski 30 Mar '22

30 Mar '22

Avoid doing full comparisons, which are expensive. There's some possible improvements that can be made if necessary: - Select a better hash function. Murmur64A was picked mainly because it's small and simple. - Don't always hash the entire pipeline key, hash incrementally. - Use an actual hash table instead of a tree, or at least allocate the nodes more contiguously. Note that it is assumed that no hash collision will happen. The probability of one is low (under an assumption that the hash function is good), but we could reasonably use a 128 bit hash to make it even less probable. Hash function implementation based on the one published in SMHasher. https://github.com/aappleby/smhasher/blob/master/src/MurmurHash2.cpp Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 128 ++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 64 insertions(+), 66 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 436973fe76f..e853bd568e2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1844,82 +1844,78 @@ static int wined3d_pipeline_layout_vk_compare(const void *key, const struct wine return memcmp(a->bindings, b->bindings, a->binding_count * sizeof(*a->bindings)); } -static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wine_rb_entry *entry) +uint64_t hash_murmur64a(const void *key, int length, uint64_t seed) { - const struct wined3d_graphics_pipeline_key_vk *a = key; - const struct wined3d_graphics_pipeline_key_vk *b = &WINE_RB_ENTRY_VALUE(entry, - const struct wined3d_graphics_pipeline_vk, entry)->key; - unsigned int i; - int ret; + const uint64_t *qwords = (const uint64_t *)key; + const uint64_t factor = 0xc6a4a7935bd1e995LLU; + const uint64_t *qend = &qwords[length >> 3]; + const uint8_t *bytes = (const uint8_t *)qend; + uint64_t hash = seed ^ (length * factor); + const int shift = 47; - if ((ret = wined3d_uint32_compare(a->pipeline_desc.stageCount, b->pipeline_desc.stageCount))) - return ret; - for (i = 0; i < a->pipeline_desc.stageCount; ++i) + while (qwords != qend) { - if ((ret = wined3d_uint64_compare(a->stages[i].module, b->stages[i].module))) - return ret; - } + uint64_t value = *qwords++; - if ((ret = wined3d_uint32_compare(a->divisor_desc.vertexBindingDivisorCount, - b->divisor_desc.vertexBindingDivisorCount))) - return ret; - if ((ret = memcmp(a->divisors, b->divisors, - a->divisor_desc.vertexBindingDivisorCount * sizeof(*a->divisors)))) - return ret; + value *= factor; + value ^= value >> shift; + value *= factor; - if ((ret = wined3d_uint32_compare(a->input_desc.vertexAttributeDescriptionCount, - b->input_desc.vertexAttributeDescriptionCount))) - return ret; - if ((ret = memcmp(a->attributes, b->attributes, - a->input_desc.vertexAttributeDescriptionCount * sizeof(*a->attributes)))) - return ret; - if ((ret = wined3d_uint32_compare(a->input_desc.vertexBindingDescriptionCount, - b->input_desc.vertexBindingDescriptionCount))) - return ret; - if ((ret = memcmp(a->bindings, b->bindings, - a->input_desc.vertexBindingDescriptionCount * sizeof(*a->bindings)))) - return ret; - - if ((ret = wined3d_uint32_compare(a->ia_desc.topology, b->ia_desc.topology))) - return ret; - if ((ret = wined3d_uint32_compare(a->ia_desc.primitiveRestartEnable, b->ia_desc.primitiveRestartEnable))) - return ret; - - if ((ret = wined3d_uint32_compare(a->ts_desc.patchControlPoints, b->ts_desc.patchControlPoints))) - return ret; + hash ^= value; + hash *= factor; + } - if ((ret = memcmp(&a->viewport, &b->viewport, sizeof(a->viewport)))) - return ret; + switch (length & 7) + { + case 7: hash ^= (uint64_t)(bytes[6]) << 48; + case 6: hash ^= (uint64_t)(bytes[5]) << 40; + case 5: hash ^= (uint64_t)(bytes[4]) << 32; + case 4: hash ^= (uint64_t)(bytes[3]) << 24; + case 3: hash ^= (uint64_t)(bytes[2]) << 16; + case 2: hash ^= (uint64_t)(bytes[1]) << 8; + case 1: hash ^= (uint64_t)(bytes[0]); - if ((ret = memcmp(&a->scissor, &b->scissor, sizeof(a->scissor)))) - return ret; + hash *= factor; + }; - if ((ret = memcmp(&a->rs_desc, &b->rs_desc, sizeof(a->rs_desc)))) - return ret; + hash ^= hash >> shift; + hash *= factor; + hash ^= hash >> shift; - if ((ret = wined3d_uint32_compare(a->ms_desc.rasterizationSamples, b->ms_desc.rasterizationSamples))) - return ret; - if ((ret = wined3d_uint32_compare(a->ms_desc.alphaToCoverageEnable, b->ms_desc.alphaToCoverageEnable))) - return ret; - if ((ret = wined3d_uint32_compare(a->sample_mask, b->sample_mask))) - return ret; + return hash; +} - if ((ret = memcmp(&a->ds_desc, &b->ds_desc, sizeof(a->ds_desc)))) - return ret; +static uint64_t wined3d_graphics_pipeline_vk_key_hash(struct wined3d_graphics_pipeline_key_vk *key) +{ + uint64_t result = 0, i; - if ((ret = wined3d_uint32_compare(a->blend_desc.attachmentCount, b->blend_desc.attachmentCount))) - return ret; - if ((ret = memcmp(a->blend_attachments, b->blend_attachments, - a->blend_desc.attachmentCount * sizeof(*a->blend_attachments)))) - return ret; + for (i = 0; i < key->pipeline_desc.stageCount; ++i) + result = hash_murmur64a(&key->stages[i].module, sizeof(key->stages[i].module), result); - if ((ret = wined3d_uint64_compare(a->pipeline_desc.layout, b->pipeline_desc.layout))) - return ret; + result = hash_murmur64a(key->divisors, key->divisor_desc.vertexBindingDivisorCount * sizeof(*key->divisors), result); + result = hash_murmur64a(key->attributes, key->input_desc.vertexAttributeDescriptionCount * sizeof(*key->attributes), result); + result = hash_murmur64a(key->bindings, key->input_desc.vertexBindingDescriptionCount * sizeof(*key->bindings), result); + result = hash_murmur64a(&key->viewport, sizeof(key->viewport), result); + result = hash_murmur64a(&key->scissor, sizeof(key->scissor), result); + result = hash_murmur64a(&key->sample_mask, sizeof(key->sample_mask), result); + result = hash_murmur64a(key->blend_attachments, key->blend_desc.attachmentCount * sizeof(*key->blend_attachments), result); + result = hash_murmur64a(&key->ia_desc.topology, sizeof(key->ia_desc.topology), result); + result = hash_murmur64a(&key->ia_desc.primitiveRestartEnable, sizeof(key->ia_desc.primitiveRestartEnable), result); + result = hash_murmur64a(&key->ts_desc.patchControlPoints, sizeof(key->ts_desc.patchControlPoints), result); + result = hash_murmur64a(&key->rs_desc, sizeof(key->rs_desc), result); + result = hash_murmur64a(&key->ms_desc.rasterizationSamples, sizeof(key->ms_desc.rasterizationSamples), result); + result = hash_murmur64a(&key->ms_desc.alphaToCoverageEnable, sizeof(key->ms_desc.alphaToCoverageEnable), result); + result = hash_murmur64a(&key->ds_desc, sizeof(key->ds_desc), result); + result = hash_murmur64a(&key->pipeline_desc.layout, sizeof(key->pipeline_desc.layout), result); + result = hash_murmur64a(&key->pipeline_desc.renderPass, sizeof(key->pipeline_desc.renderPass), result); - if ((ret = wined3d_uint64_compare(a->pipeline_desc.renderPass, b->pipeline_desc.renderPass))) - return ret; + return result; +} - return 0; +static int wined3d_graphics_pipeline_vk_compare(const void *hash, const struct wine_rb_entry *entry) +{ + return wined3d_uint64_compare(*(uint64_t *)hash, + WINE_RB_ENTRY_VALUE(entry, const struct wined3d_graphics_pipeline_vk, entry)->hash); } static int wined3d_bo_slab_vk_compare(const void *key, const struct wine_rb_entry *entry) @@ -3120,15 +3116,17 @@ static VkPipeline wined3d_context_vk_get_graphics_pipeline(struct wined3d_contex struct wined3d_graphics_pipeline_vk *pipeline_vk; struct wined3d_graphics_pipeline_key_vk *key; struct wine_rb_entry *entry; + uint64_t hash; VkResult vr; key = &context_vk->graphics.pipeline_key_vk; - if ((entry = wine_rb_get(&context_vk->graphics_pipelines, key))) + hash = wined3d_graphics_pipeline_vk_key_hash(key); + if ((entry = wine_rb_get(&context_vk->graphics_pipelines, &hash))) return WINE_RB_ENTRY_VALUE(entry, struct wined3d_graphics_pipeline_vk, entry)->vk_pipeline; if (!(pipeline_vk = heap_alloc(sizeof(*pipeline_vk)))) return VK_NULL_HANDLE; - pipeline_vk->key = *key; + pipeline_vk->hash = hash; if ((vr = VK_CALL(vkCreateGraphicsPipelines(device_vk->vk_device, VK_NULL_HANDLE, 1, &key->pipeline_desc, NULL, &pipeline_vk->vk_pipeline))) < 0) @@ -3138,7 +3136,7 @@ static VkPipeline wined3d_context_vk_get_graphics_pipeline(struct wined3d_contex return VK_NULL_HANDLE; } - if (wine_rb_put(&context_vk->graphics_pipelines, &pipeline_vk->key, &pipeline_vk->entry) == -1) + if (wine_rb_put(&context_vk->graphics_pipelines, &pipeline_vk->hash, &pipeline_vk->entry) == -1) ERR("Failed to insert pipeline.\n"); return pipeline_vk->vk_pipeline; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b3eb0136b0..34b7c9eab29 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2521,7 +2521,7 @@ struct wined3d_graphics_pipeline_key_vk struct wined3d_graphics_pipeline_vk { struct wine_rb_entry entry; - struct wined3d_graphics_pipeline_key_vk key; + uint64_t hash; VkPipeline vk_pipeline; }; -- 2.32.0

2 3

[v2 PATCH] user32: Add suspend-resume notification API stubs.
by Nikolay Sivov 30 Mar '22

30 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: add unregister stub as well. dlls/user32/misc.c | 18 ++++++++++++++++++ dlls/user32/user32.spec | 2 ++ include/winuser.h | 2 ++ 3 files changed, 22 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 25d0b676667..04ba0a8810c 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -443,6 +443,24 @@ BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) return TRUE; } +/********************************************************************** + * RegisterSuspendResumeNotification (USER32.@) + */ +HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE recipient, DWORD flags) +{ + FIXME("%p, %#x: stub.\n", recipient, flags); + return (HPOWERNOTIFY)0xdeadbeef; +} + +/********************************************************************** + * UnregisterSuspendResumeNotification (USER32.@) + */ +BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY handle) +{ + FIXME("%p: stub.\n", handle); + return TRUE; +} + /***************************************************************************** * GetGestureConfig (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index aae124ebdcc..5d0c6746a51 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -608,6 +608,7 @@ @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow (long) +@ stdcall RegisterSuspendResumeNotification(long long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) @ stdcall RegisterTouchHitTestingWindow(long long) @@ -783,6 +784,7 @@ @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey # @ stub UnregisterMessagePumpHook @ stdcall UnregisterPowerSettingNotification(ptr) +@ stdcall UnregisterSuspendResumeNotification(ptr) @ stdcall UnregisterTouchWindow(long) @ stdcall UnregisterUserApiHook() @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) diff --git a/include/winuser.h b/include/winuser.h index 898c9034e33..bb585efd16d 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4128,6 +4128,7 @@ WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); +WINUSERAPI HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE,DWORD); WINUSERAPI BOOL WINAPI RegisterTouchWindow(HWND,ULONG); WINUSERAPI UINT WINAPI RegisterWindowMessageA(LPCSTR); WINUSERAPI UINT WINAPI RegisterWindowMessageW(LPCWSTR); @@ -4300,6 +4301,7 @@ WINUSERAPI BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE); WINUSERAPI BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY); WINUSERAPI BOOL WINAPI UnregisterHotKey(HWND,INT); WINUSERAPI BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY); +WINUSERAPI BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY); WINUSERAPI BOOL WINAPI UnregisterTouchWindow(HWND); WINUSERAPI BOOL WINAPI UpdateWindow(HWND); WINUSERAPI BOOL WINAPI UserHandleGrantAccess(HANDLE,HANDLE,BOOL); -- 2.35.1

2 1

[PATCH] hid: Implement HidD_GetPhysicalDescriptor.
by Mohamad Al-Jaf 30 Mar '22

30 Mar '22

The game INVERSUS Deluxe calls upon this function and crashes without it. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- Proton-Issue: https://github.com/ValveSoftware/Proton/issues/5710 --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 37dfdbce307..67c4473129d 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -9,7 +9,7 @@ @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor @ stdcall HidD_GetNumInputBuffers(long ptr) -@ stub HidD_GetPhysicalDescriptor +@ stdcall HidD_GetPhysicalDescriptor(long ptr long) @ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) @ stdcall HidD_GetSerialNumberString(long ptr long) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index a82ba8392a1..e01ab2a35e7 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -121,6 +121,12 @@ BOOLEAN WINAPI HidD_SetNumInputBuffers( HANDLE file, ULONG num_buffer ) return sync_ioctl( file, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &num_buffer, sizeof(num_buffer), NULL, 0 ); } +BOOLEAN WINAPI HidD_GetPhysicalDescriptor( HANDLE file, void *buffer, ULONG buffer_len ) +{ + TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); + return sync_ioctl( file, IOCTL_GET_PHYSICAL_DESCRIPTOR, NULL, 0, buffer, buffer_len ); +} + BOOLEAN WINAPI HidD_GetProductString( HANDLE file, void *buffer, ULONG buffer_len ) { TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 22f64e687e7..72470079a79 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -41,6 +41,7 @@ BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULO BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers); +BOOLEAN WINAPI HidD_GetPhysicalDescriptor(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); -- 2.35.1

1 0

[PATCH 3/3] crypt32: Use CRT allocation functions.
by Hans Leidekker 30 Mar '22

30 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index cce90125bc0..4a94bed9b6b 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -18,6 +18,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include <stdio.h> #include "windef.h" @@ -136,17 +137,17 @@ HLRUCACHE WINAPI I_CryptFreeLruCache(HLRUCACHE h, DWORD unk0, DWORD unk1) LPVOID WINAPI CryptMemAlloc(ULONG cbSize) { - return HeapAlloc(GetProcessHeap(), 0, cbSize); + return malloc(cbSize); } LPVOID WINAPI CryptMemRealloc(LPVOID pv, ULONG cbSize) { - return HeapReAlloc(GetProcessHeap(), 0, pv, cbSize); + return realloc(pv, cbSize); } VOID WINAPI CryptMemFree(LPVOID pv) { - HeapFree(GetProcessHeap(), 0, pv); + free(pv); } DWORD WINAPI I_CryptAllocTls(void) -- 2.30.2

1 0

[PATCH 2/3] crypt32: Consistently use CryptMemAlloc/Free().
by Hans Leidekker 30 Mar '22

30 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/cert.c | 12 ++++++------ dlls/crypt32/chain.c | 4 ++-- dlls/crypt32/msg.c | 4 ++-- dlls/crypt32/pfx.c | 12 +++++------- dlls/crypt32/rootstore.c | 9 ++++----- dlls/crypt32/serialize.c | 4 ++-- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b7789fd6fcd..ad39b7d18c7 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -677,7 +677,7 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties for (i = 0; i < info->cProvParam; i++) size += sizeof(CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; - prop = HeapAlloc(GetProcessHeap(), 0, size); + prop = CryptMemAlloc(size); if (!prop) { SetLastError(ERROR_OUTOFMEMORY); @@ -687,7 +687,7 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties copy_KeyProvInfoProperty(info, prop); ret = ContextPropertyList_SetProperty(properties, CERT_KEY_PROV_INFO_PROP_ID, (const BYTE *)prop, size); - HeapFree(GetProcessHeap(), 0, prop); + CryptMemFree(prop); return ret; } @@ -865,7 +865,7 @@ static BOOL CRYPT_AcquirePrivateKeyFromProvInfo(PCCERT_CONTEXT pCert, DWORD dwFl CERT_KEY_PROV_INFO_PROP_ID, 0, &size); if (ret) { - info = HeapAlloc(GetProcessHeap(), 0, size); + info = CryptMemAlloc(size); if (info) { ret = CertGetCertificateContextProperty(pCert, @@ -901,7 +901,7 @@ static BOOL CRYPT_AcquirePrivateKeyFromProvInfo(PCCERT_CONTEXT pCert, DWORD dwFl SetLastError(CRYPT_E_NO_KEY_PROPERTY); } if (allocated) - HeapFree(GetProcessHeap(), 0, info); + CryptMemFree(info); return ret; } @@ -953,7 +953,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, if (ret) { - info = HeapAlloc(GetProcessHeap(), 0, size); + info = CryptMemAlloc(size); ret = CertGetCertificateContextProperty(pCert, CERT_KEY_PROV_INFO_PROP_ID, info, &size); if (ret) @@ -1003,7 +1003,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, } } } - HeapFree(GetProcessHeap(), 0, info); + CryptMemFree(info); if (cert_in_store) CertFreeCertificateContext(cert_in_store); return ret; diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 3e9bdb66e0a..cf244f2ac6c 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2007,7 +2007,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con if(!res) return NULL; - urls = HeapAlloc(GetProcessHeap(), 0, size); + urls = CryptMemAlloc(size); if(!urls) return NULL; @@ -2045,7 +2045,7 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con } } - HeapFree(GetProcessHeap(), 0, urls); + CryptMemFree(urls); return issuer; } diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 6087f423f8c..63884d0c275 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1666,12 +1666,12 @@ static BOOL CRYPT_ExportEncryptedKey(CMSG_CONTENT_ENCRYPT_INFO *info, DWORD i, static LPVOID WINAPI mem_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, size); + return CryptMemAlloc(size); } static VOID WINAPI mem_free(LPVOID pv) { - HeapFree(GetProcessHeap(), 0, pv); + CryptMemFree(pv); } diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index fbcc7c72c89..54eb7f25e1b 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -28,7 +27,6 @@ #include "crypt32_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -55,17 +53,17 @@ static HCRYPTPROV import_key( cert_store_data_t data, DWORD flags ) } } - params.buf = key = malloc( size ); + params.buf = key = CryptMemAlloc( size ); if (CRYPT32_CALL( import_store_key, &params ) || !CryptImportKey( prov, key, size, 0, flags & CRYPT_EXPORTABLE, &cryptkey )) { WARN( "CryptImportKey failed %08lx\n", GetLastError() ); CryptReleaseContext( prov, 0 ); - free( key ); + CryptMemFree( key ); return 0; } CryptDestroyKey( cryptkey ); - free( key ); + CryptMemFree( key ); return prov; } @@ -177,10 +175,10 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor struct import_store_cert_params import_params = { data, i, NULL, &size }; if (CRYPT32_CALL( import_store_cert, &import_params ) != STATUS_BUFFER_TOO_SMALL) break; - import_params.buf = cert = malloc( size ); + import_params.buf = cert = CryptMemAlloc( size ); if (!CRYPT32_CALL( import_store_cert, &import_params )) ctx = CertCreateContext( CERT_STORE_CERTIFICATE_CONTEXT, X509_ASN_ENCODING, cert, size, 0, NULL ); - free( cert ); + CryptMemFree( cert ); if (!ctx) { WARN( "CertCreateContext failed %08lx\n", GetLastError() ); diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 43256c71039..ab3a396b651 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -622,19 +621,19 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) if (from) { - params.buffer = malloc( params.size ); + params.buffer = CryptMemAlloc( params.size ); while (!CRYPT32_CALL( enum_root_certs, &params )) { if (needed > params.size) { - free( params.buffer ); - params.buffer = malloc( needed ); + CryptMemFree( params.buffer ); + params.buffer = CryptMemAlloc( needed ); params.size = needed; } else CertAddEncodedCertificateToStore( from, X509_ASN_ENCODING, params.buffer, needed, CERT_STORE_ADD_NEW, NULL ); } - free( params.buffer ); + CryptMemFree( params.buffer ); check_and_store_certs(from, store); } CertCloseStore(from, 0); diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index e1e2593169d..47ab834bf48 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -72,7 +72,7 @@ static DWORD serialize_KeyProvInfoProperty(const CRYPT_KEY_PROV_INFO *info, stru if (!ret) return size; - store = HeapAlloc(GetProcessHeap(), 0, size); + store = CryptMemAlloc(size); if (!store) return 0; param = (struct store_CRYPT_KEY_PROV_PARAM *)(store + 1); @@ -331,7 +331,7 @@ static DWORD read_serialized_KeyProvInfoProperty(const struct store_CRYPT_KEY_PR for (i = 0; i < store->cProvParam; i++) size += sizeof(CRYPT_KEY_PROV_PARAM) + param[i].cbData; - info = HeapAlloc(GetProcessHeap(), 0, size); + info = CryptMemAlloc(size); if (!info) { SetLastError(ERROR_OUTOFMEMORY); -- 2.30.2

1 0

[PATCH 1/3] crypt32: Correctly free memory in CNG_ImportRSAPubKey().
by Hans Leidekker 30 Mar '22

30 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/cert.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 33811dfadc1..b7789fd6fcd 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2720,7 +2720,7 @@ static BOOL CNG_ImportRSAPubKey(CERT_PUBLIC_KEY_INFO *info, BCRYPT_KEY_HANDLE *k else { FIXME("Unsupported RSA algorithm: %#x\n", hdr->aiKeyAlg); - CryptMemFree(hdr); + LocalFree(hdr); SetLastError(NTE_BAD_ALGID); return FALSE; } @@ -2762,7 +2762,7 @@ static BOOL CNG_ImportRSAPubKey(CERT_PUBLIC_KEY_INFO *info, BCRYPT_KEY_HANDLE *k CryptMemFree(rsakey); done: - CryptMemFree(hdr); + LocalFree(hdr); if (alg) BCryptCloseAlgorithmProvider(alg, 0); if (status) SetLastError(RtlNtStatusToDosError(status)); return !status; @@ -2773,7 +2773,6 @@ BOOL CNG_ImportPubKey(CERT_PUBLIC_KEY_INFO *pubKeyInfo, BCRYPT_KEY_HANDLE *key) if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_ECC_PUBLIC_KEY)) return CNG_ImportECCPubKey(pubKeyInfo, key); - if (!strcmp(pubKeyInfo->Algorithm.pszObjId, szOID_RSA_RSA)) return CNG_ImportRSAPubKey(pubKeyInfo, key); -- 2.30.2

1 0

[PATCH] user32: Add RegisterSuspendResumeNotification() stub.
by Nikolay Sivov 30 Mar '22

30 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- The Legend of Heroes: Zero no Kiseki Kai game crashes on it. dlls/user32/misc.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 25d0b676667..2e9ea897502 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -443,6 +443,15 @@ BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) return TRUE; } +/********************************************************************** + * RegisterSuspendResumeNotification (USER32.@) + */ +HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE recipient, DWORD flags) +{ + FIXME("%p, %#x: stub.\n", recipient, flags); + return (HPOWERNOTIFY)0xdeadbeef; +} + /***************************************************************************** * GetGestureConfig (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index aae124ebdcc..53a1cefc451 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -608,6 +608,7 @@ @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow (long) +@ stdcall RegisterSuspendResumeNotification(long long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) @ stdcall RegisterTouchHitTestingWindow(long long) diff --git a/include/winuser.h b/include/winuser.h index 898c9034e33..9a28d1436b9 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4128,6 +4128,7 @@ WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); +WINUSERAPI HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE,DWORD); WINUSERAPI BOOL WINAPI RegisterTouchWindow(HWND,ULONG); WINUSERAPI UINT WINAPI RegisterWindowMessageA(LPCSTR); WINUSERAPI UINT WINAPI RegisterWindowMessageW(LPCWSTR); -- 2.35.1

2 1

[PATCH 1/4] kernelbase: Check handle validity in unsafe_mem_from_HLOCAL.
by Rémi Bernon 30 Mar '22

30 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/memory.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 3cb596e5814..765d5dea3d8 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -598,9 +598,11 @@ struct mem_entry * the output jpeg's > 1 MB if not */ #define HLOCAL_STORAGE (sizeof(HLOCAL) * 2) -static inline struct mem_entry *mem_from_HLOCAL( HLOCAL handle ) +static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { - return (struct mem_entry *)((char *)handle - 2); + struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); + if (mem->magic != MAGIC_LOCAL_USED) return NULL; + return mem; } static inline HLOCAL HLOCAL_from_mem( struct mem_entry *mem ) @@ -709,8 +711,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalFree( HLOCAL handle ) } else /* HANDLE */ { - mem = mem_from_HLOCAL( handle ); - if (mem->magic == MAGIC_LOCAL_USED) + if ((mem = unsafe_mem_from_HLOCAL( handle ))) { mem->magic = 0xdead; if (mem->ptr) @@ -745,6 +746,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalFree( HLOCAL handle ) */ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle ) { + struct mem_entry *mem; void *ret = NULL; TRACE_(globalmem)( "handle %p\n", handle ); @@ -767,8 +769,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle ) RtlLockHeap( GetProcessHeap() ); __TRY { - struct mem_entry *mem = mem_from_HLOCAL( handle ); - if (mem->magic == MAGIC_LOCAL_USED) + if ((mem = unsafe_mem_from_HLOCAL( handle ))) { ret = mem->ptr; if (!mem->ptr) SetLastError( ERROR_DISCARDED ); @@ -826,10 +827,9 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f LocalFree( handle ); } } - else if (!is_pointer( handle ) && (flags & LMEM_DISCARDABLE)) + else if ((mem = unsafe_mem_from_HLOCAL( handle )) && (flags & LMEM_DISCARDABLE)) { /* change the flags to make our block "discardable" */ - mem = mem_from_HLOCAL( handle ); mem->flags |= LMEM_DISCARDABLE >> 8; ret = handle; } @@ -843,10 +843,9 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f if (!(flags & LMEM_MOVEABLE)) heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; ret = HeapReAlloc( GetProcessHeap(), heap_flags, handle, size ); } - else + else if ((mem = unsafe_mem_from_HLOCAL( handle ))) { /* reallocate a moveable block */ - mem = mem_from_HLOCAL( handle ); if (size != 0) { if (size <= INT_MAX - HLOCAL_STORAGE) @@ -886,6 +885,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f else WARN_(globalmem)( "not freeing memory associated with locked handle\n" ); } } + else SetLastError( ERROR_INVALID_HANDLE ); } RtlUnlockHeap( GetProcessHeap() ); return ret; @@ -897,6 +897,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f */ BOOL WINAPI DECLSPEC_HOTPATCH LocalUnlock( HLOCAL handle ) { + struct mem_entry *mem; BOOL ret = FALSE; TRACE_(globalmem)( "handle %p\n", handle ); @@ -910,8 +911,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH LocalUnlock( HLOCAL handle ) RtlLockHeap( GetProcessHeap() ); __TRY { - struct mem_entry *mem = mem_from_HLOCAL( handle ); - if (mem->magic == MAGIC_LOCAL_USED) + if ((mem = unsafe_mem_from_HLOCAL( handle ))) { if (mem->lock) { -- 2.35.1

1 3

[PATCH 1/2] api-ms-win-core-privateprofile-l1-1-0: Add dll.
by Mohamad Al-Jaf 30 Mar '22

30 Mar '22

Needed for native mfc42u.dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51850 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- The bug report does not mention that the tool cannot run without mfc42u.dll, which requires this API set. --- configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-privateprofile-l1-1-0.spec | 14 ++++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec diff --git a/configure.ac b/configure.ac index 9b2c111119f..9630405bfcd 100644 --- a/configure.ac +++ b/configure.ac @@ -2416,6 +2416,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namespace-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-normalization-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-path-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-privateprofile-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-privateprofile-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processenvironment-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processenvironment-l1-2-0) diff --git a/dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in b/dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in new file mode 100644 index 00000000000..c8b8ef84aef --- /dev/null +++ b/dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-privateprofile-l1-1-0.dll diff --git a/dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec b/dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec new file mode 100644 index 00000000000..c8153c3a296 --- /dev/null +++ b/dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec @@ -0,0 +1,14 @@ +@ stdcall GetPrivateProfileIntA(str str long str) kernel32.GetPrivateProfileIntA +@ stdcall GetPrivateProfileIntW(wstr wstr long wstr) kernel32.GetPrivateProfileIntW +@ stdcall GetPrivateProfileSectionW(wstr ptr long wstr) kernel32.GetPrivateProfileSectionW +@ stdcall GetPrivateProfileStringA(str str str ptr long str) kernel32.GetPrivateProfileStringA +@ stdcall GetPrivateProfileStringW(wstr wstr wstr ptr long wstr) kernel32.GetPrivateProfileStringW +@ stdcall GetProfileIntA(str str long) kernel32.GetProfileIntA +@ stdcall GetProfileIntW(wstr wstr long) kernel32.GetProfileIntW +@ stdcall GetProfileSectionA(str ptr long) kernel32.GetProfileSectionA +@ stdcall GetProfileSectionW(wstr ptr long) kernel32.GetProfileSectionW +@ stdcall GetProfileStringA(str str str ptr long) kernel32.GetProfileStringA +@ stdcall GetProfileStringW(wstr wstr wstr ptr long) kernel32.GetProfileStringW +@ stdcall WritePrivateProfileSectionA(str str str) kernel32.WritePrivateProfileSectionA +@ stdcall WritePrivateProfileStringA(str str str str) kernel32.WritePrivateProfileStringA +@ stdcall WritePrivateProfileStringW(wstr wstr wstr wstr) kernel32.WritePrivateProfileStringW -- 2.34.1

5 15

[PATCH v2] chakra: Add stub dll.
by Mohamad Al-Jaf 30 Mar '22

30 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52741 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Remove duplicate wine-bug link. - Remove unnecessary -mno-cygwin flag (copy paste mistake). --- configure.ac | 1 + dlls/chakra/Makefile.in | 5 ++ dlls/chakra/chakra.spec | 160 ++++++++++++++++++++++++++++++++++++++++ dlls/chakra/version.rc | 26 +++++++ 4 files changed, 192 insertions(+) create mode 100644 dlls/chakra/Makefile.in create mode 100644 dlls/chakra/chakra.spec create mode 100644 dlls/chakra/version.rc diff --git a/configure.ac b/configure.ac index e509b232d11..f9ac5e45ed4 100644 --- a/configure.ac +++ b/configure.ac @@ -2372,6 +2372,7 @@ WINE_CONFIG_MAKEFILE(dlls/capi2032) WINE_CONFIG_MAKEFILE(dlls/cards) WINE_CONFIG_MAKEFILE(dlls/cdosys) WINE_CONFIG_MAKEFILE(dlls/cfgmgr32) +WINE_CONFIG_MAKEFILE(dlls/chakra) WINE_CONFIG_MAKEFILE(dlls/clusapi) WINE_CONFIG_MAKEFILE(dlls/cng.sys) WINE_CONFIG_MAKEFILE(dlls/combase) diff --git a/dlls/chakra/Makefile.in b/dlls/chakra/Makefile.in new file mode 100644 index 00000000000..7ca3e00c6d7 --- /dev/null +++ b/dlls/chakra/Makefile.in @@ -0,0 +1,5 @@ +MODULE = chakra.dll + +EXTRADLLFLAGS = -Wb,--prefer-native + +RC_SRCS = version.rc diff --git a/dlls/chakra/chakra.spec b/dlls/chakra/chakra.spec new file mode 100644 index 00000000000..4116c40850c --- /dev/null +++ b/dlls/chakra/chakra.spec @@ -0,0 +1,160 @@ +@ stub JsProjectWinRTNamespace +@ stub JsSetProjectionEnqueueCallback +@ stub CreateChakraEngine +@ stub DumpDiagInfo +@ stub JsDiscardBackgroundParse +@ stub JsInitializeJITServer +@ stub JsQueueBackgroundParse +@ stub MemProtectHeapAddRootSection +@ stub MemProtectHeapCollect +@ stub MemProtectHeapCreate +@ stub MemProtectHeapDestroy +@ stub MemProtectHeapDisableCollection +@ stub MemProtectHeapIsValidObject +@ stub MemProtectHeapMemSize +@ stub MemProtectHeapNotifyCurrentThreadDetach +@ stub MemProtectHeapProtectCurrentThread +@ stub MemProtectHeapRemoveRootSection +@ stub MemProtectHeapReportHeapSize +@ stub MemProtectHeapRootAlloc +@ stub MemProtectHeapRootAllocLeaf +@ stub MemProtectHeapRootRealloc +@ stub MemProtectHeapRootReallocLeaf +@ stub MemProtectHeapSynchronizeWithCollector +@ stub MemProtectHeapUnprotectCurrentThread +@ stub MemProtectHeapUnrootAndZero +@ stub RecyclerNativeHeapAddExternalMemoryUsage +@ stub RecyclerNativeHeapAllocLeaf +@ stub RecyclerNativeHeapAllocLeafFinalized +@ stub RecyclerNativeHeapAllocTraced +@ stub RecyclerNativeHeapAllocTracedFinalized +@ stub RecyclerNativeHeapCollectGarbageInThread +@ stub RecyclerNativeHeapCreateWeakReference +@ stub RecyclerNativeHeapGetRealAddressFromInterior +@ stub RecyclerNativeHeapGetStrongReference +@ stub RecyclerNativeHeapHasWeakReferenceCleanupOccurred +@ stub RecyclerNativeHeapRootAddRef +@ stub RecyclerNativeHeapRootRelease +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub JsAddRef +@ stub JsBoolToBoolean +@ stub JsBooleanToBool +@ stub JsCallFunction +@ stub JsCollectGarbage +@ stub JsConstructObject +@ stub JsConvertValueToBoolean +@ stub JsConvertValueToNumber +@ stub JsConvertValueToObject +@ stub JsConvertValueToString +@ stub JsCreateArray +@ stub JsCreateArrayBuffer +@ stub JsCreateContext +@ stub JsCreateDataView +@ stub JsCreateError +@ stub JsCreateExternalArrayBuffer +@ stub JsCreateExternalObject +@ stub JsCreateFunction +@ stub JsCreateNamedFunction +@ stub JsCreateObject +@ stub JsCreateRangeError +@ stub JsCreateReferenceError +@ stub JsCreateRuntime +@ stub JsCreateSymbol +@ stub JsCreateSyntaxError +@ stub JsCreateThreadService +@ stub JsCreateTypeError +@ stub JsCreateTypedArray +@ stub JsCreateURIError +@ stub JsDefineProperty +@ stub JsDeleteIndexedProperty +@ stub JsDeleteProperty +@ stub JsDisableRuntimeExecution +@ stub JsDisposeRuntime +@ stub JsDoubleToNumber +@ stub JsEnableRuntimeExecution +@ stub JsEnumerateHeap +@ stub JsEquals +@ stub JsGetAndClearException +@ stub JsGetArrayBufferStorage +@ stub JsGetContextData +@ stub JsGetContextOfObject +@ stub JsGetCurrentContext +@ stub JsGetDataViewStorage +@ stub JsGetExtensionAllowed +@ stub JsGetExternalData +@ stub JsGetFalseValue +@ stub JsGetGlobalObject +@ stub JsGetIndexedPropertiesExternalData +@ stub JsGetIndexedProperty +@ stub JsGetNullValue +@ stub JsGetOwnPropertyDescriptor +@ stub JsGetOwnPropertyNames +@ stub JsGetOwnPropertySymbols +@ stub JsGetProperty +@ stub JsGetPropertyIdFromName +@ stub JsGetPropertyIdFromSymbol +@ stub JsGetPropertyIdType +@ stub JsGetPropertyNameFromId +@ stub JsGetPrototype +@ stub JsGetRuntime +@ stub JsGetRuntimeMemoryLimit +@ stub JsGetRuntimeMemoryUsage +@ stub JsGetStringLength +@ stub JsGetSymbolFromPropertyId +@ stub JsGetTrueValue +@ stub JsGetTypedArrayInfo +@ stub JsGetTypedArrayStorage +@ stub JsGetUndefinedValue +@ stub JsGetValueType +@ stub JsHasException +@ stub JsHasExternalData +@ stub JsHasIndexedPropertiesExternalData +@ stub JsHasIndexedProperty +@ stub JsHasProperty +@ stub JsIdle +@ stub JsInspectableToObject +@ stub JsInstanceOf +@ stub JsIntToNumber +@ stub JsIsEnumeratingHeap +@ stub JsIsRuntimeExecutionDisabled +@ stub JsNumberToDouble +@ stub JsNumberToInt +@ stub JsObjectToInspectable +@ stub JsParseScript +@ stub JsParseScriptWithAttributes +@ stub JsParseSerializedScript +@ stub JsParseSerializedScriptWithCallback +@ stub JsPointerToString +@ stub JsPreventExtension +@ stub JsRelease +@ stub JsRunScript +@ stub JsRunSerializedScript +@ stub JsRunSerializedScriptWithCallback +@ stub JsSerializeScript +@ stub JsSetContextData +@ stub JsSetCurrentContext +@ stub JsSetException +@ stub JsSetExternalData +@ stub JsSetIndexedPropertiesToExternalData +@ stub JsSetIndexedProperty +@ stub JsSetObjectBeforeCollectCallback +@ stub JsSetPromiseContinuationCallback +@ stub JsSetProperty +@ stub JsSetPrototype +@ stub JsSetRuntimeBeforeCollectCallback +@ stub JsSetRuntimeMemoryAllocationCallback +@ stub JsSetRuntimeMemoryLimit +@ stub JsStartDebugging +@ stub JsStartProfiling +@ stub JsStopProfiling +@ stub JsStrictEquals +@ stub JsStringToPointer +@ stub JsValueToVariant +@ stub JsVarAddRef +@ stub JsVarRelease +@ stub JsVarToExtension +@ stub JsVarToScriptDirect +@ stub JsVariantToValue diff --git a/dlls/chakra/version.rc b/dlls/chakra/version.rc new file mode 100644 index 00000000000..a73bf2bc5ad --- /dev/null +++ b/dlls/chakra/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine chakra" +#define WINE_FILENAME_STR "chakra.dll" +#define WINE_FILEVERSION 11,0,22000,348 +#define WINE_FILEVERSION_STR "11.0.22000.348" +#define WINE_PRODUCTVERSION 11,00,22000,348 +#define WINE_PRODUCTVERSION_STR "11.00.22000.348" + +#include "wine/wine_common_ver.rc" -- 2.35.1

1 0

[PATCH] setupapi: Return CR_SUCCESS for CM_Get_DevNode_Status{_Ex}.
by Zhiyi Zhang 30 Mar '22

30 Mar '22

One Piece: Pirate Warriors 4 relies on CM_Get_DevNode_Status() to return CR_SUCCESS. Otherwise, it shows a graphics driver error dialog and exits. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/stubs.c | 5 ++--- include/cfgmgr32.h | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4b1585c8df6..75185de047c 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -455,8 +455,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST dev, ULONG flags) { - FIXME("%p %p 0x%08lx 0x%08lx: stub\n", status, problem, dev, flags); - return CR_FAILURE; + return CM_Get_DevNode_Status_Ex(status, problem, dev, flags, NULL); } /*********************************************************************** @@ -466,7 +465,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST ULONG flags, HMACHINE machine) { FIXME("%p %p 0x%08lx 0x%08lx %p: stub\n", status, problem, dev, flags, machine); - return CR_FAILURE; + return CR_SUCCESS; } /*********************************************************************** diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 7c4f4714126..d300c4babaa 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -234,6 +234,8 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG,PULONG,DEVINST,ULONG); +CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG,PULONG,DEVINST,ULONG,HMACHINE); CMAPI CONFIGRET WINAPI CM_Get_Sibling(PDEVINST,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Sibling_Ex(PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine); CMAPI WORD WINAPI CM_Get_Version(void); -- 2.32.0

1 0

[PATCH] sxs: Use CRT memory allocation functions.
by Nikolay Sivov 30 Mar '22

30 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/sxs/cache.c | 76 +++++++++++++++++++++--------------------- dlls/sxs/name.c | 34 +++++++++---------- dlls/sxs/sxs.c | 6 ++-- dlls/sxs/sxs_private.h | 10 ------ 4 files changed, 58 insertions(+), 68 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index 02403501231..a924a359700 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -89,7 +89,7 @@ static ULONG WINAPI cache_Release( IAssemblyCache *iface ) { TRACE("destroying %p\n", cache); CloseHandle( cache->lock ); - HeapFree( GetProcessHeap(), 0, cache ); + free( cache ); } return refs; } @@ -115,7 +115,7 @@ static WCHAR *build_assembly_name( const WCHAR *arch, const WCHAR *name, const W buflen += lstrlenW( name ); buflen += lstrlenW( token ); buflen += lstrlenW( version ); - if (!(ret = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( buflen * sizeof(WCHAR) ))) return NULL; *len = swprintf( ret, buflen, fmtW, arch, name, token, version ); return wcslwr( ret ); } @@ -128,15 +128,15 @@ static WCHAR *build_dll_path( const WCHAR *arch, const WCHAR *name, const WCHAR if (!(path = build_assembly_name( arch, name, token, version, &len ))) return NULL; len += build_sxs_path( sxsdir ) + 2; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if (!(ret = malloc( len * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, path ); + free( path ); return NULL; } lstrcpyW( ret, sxsdir ); lstrcatW( ret, path ); lstrcatW( ret, L"\\" ); - HeapFree( GetProcessHeap(), 0, path ); + free( path ); return ret; } @@ -151,7 +151,7 @@ static WCHAR *build_policy_name( const WCHAR *arch, const WCHAR *name, const WCH buflen += lstrlenW( arch ); buflen += lstrlenW( name ); buflen += lstrlenW( token ); - if (!(ret = HeapAlloc( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( buflen * sizeof(WCHAR) ))) return NULL; *len = swprintf( ret, buflen, fmtW, arch, name, token ); return wcslwr( ret ); } @@ -168,13 +168,13 @@ static WCHAR *build_policy_path( const WCHAR *arch, const WCHAR *name, const WCH len += ARRAY_SIZE(fmtW); len += build_sxs_path( sxsdir ); len += lstrlenW( version ); - if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if (!(ret = malloc( len * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, path ); + free( path ); return NULL; } swprintf( ret, len, fmtW, sxsdir, path, version ); - HeapFree( GetProcessHeap(), 0, path ); + free( path ); return ret; } @@ -259,7 +259,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( } done: - HeapFree( GetProcessHeap(), 0, path ); + free( path ); IAssemblyName_Release( name_obj ); cache_unlock( cache ); return hr; @@ -339,9 +339,9 @@ static void free_assembly( struct assembly *assembly ) struct file *file = LIST_ENTRY( item, struct file, entry ); list_remove( &file->entry ); SysFreeString( file->name ); - HeapFree( GetProcessHeap(), 0, file ); + free( file ); } - HeapFree( GetProcessHeap(), 0, assembly ); + free( assembly ); } static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) @@ -386,7 +386,7 @@ static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) if (hr != S_OK) goto done; - if (!(f = HeapAlloc( GetProcessHeap(), 0, sizeof(struct file) ))) + if (!(f = malloc( sizeof(*f) ))) { IXMLDOMNamedNodeMap_Release( attrs ); hr = E_OUTOFMEMORY; @@ -397,7 +397,7 @@ static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) IXMLDOMNamedNodeMap_Release( attrs ); if (!f->name) { - HeapFree( GetProcessHeap(), 0, f ); + free( f ); hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; goto done; } @@ -450,7 +450,7 @@ static HRESULT parse_assembly( IXMLDOMDocument *doc, struct assembly **assembly hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; goto done; } - if (!(a = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct assembly) ))) + if (!(a = calloc(1, sizeof(*a) ))) { hr = E_OUTOFMEMORY; goto done; @@ -497,9 +497,9 @@ static WCHAR *build_policy_filename( const WCHAR *arch, const WCHAR *name, const len += ARRAY_SIZE(policiesW) - 1; len += lstrlenW( version ); len += ARRAY_SIZE(suffixW) - 1; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + if (!(ret = malloc( (len + 1) * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, fullname ); + free( fullname ); return NULL; } lstrcpyW( ret, sxsdir ); @@ -511,7 +511,7 @@ static WCHAR *build_policy_filename( const WCHAR *arch, const WCHAR *name, const lstrcatW( ret, version ); lstrcatW( ret, suffixW ); - HeapFree( GetProcessHeap(), 0, fullname ); + free( fullname ); return ret; } @@ -526,7 +526,7 @@ static HRESULT install_policy( const WCHAR *manifest, struct assembly *assembly if (!dst) return E_OUTOFMEMORY; ret = CopyFileW( manifest, dst, FALSE ); - HeapFree( GetProcessHeap(), 0, dst ); + free( dst ); if (!ret) { HRESULT hr = HRESULT_FROM_WIN32( GetLastError() ); @@ -544,10 +544,10 @@ static WCHAR *build_source_filename( const WCHAR *manifest, struct file *file ) p = wcsrchr( manifest, '\\' ); if (!p) p = wcsrchr( manifest, '/' ); - if (!p) return strdupW( manifest ); + if (!p) return wcsdup( manifest ); len = p - manifest + 1; - if (!(src = HeapAlloc( GetProcessHeap(), 0, (len + lstrlenW( file->name ) + 1) * sizeof(WCHAR) ))) + if (!(src = malloc( (len + lstrlenW( file->name ) + 1) * sizeof(WCHAR) ))) return NULL; memcpy( src, manifest, len * sizeof(WCHAR) ); @@ -567,9 +567,9 @@ static WCHAR *build_manifest_filename( const WCHAR *arch, const WCHAR *name, con len += build_sxs_path( sxsdir ); len += ARRAY_SIZE(manifestsW) - 1; len += ARRAY_SIZE(suffixW) - 1; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + if (!(ret = malloc( (len + 1) * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, fullname ); + free( fullname ); return NULL; } lstrcpyW( ret, sxsdir ); @@ -577,7 +577,7 @@ static WCHAR *build_manifest_filename( const WCHAR *arch, const WCHAR *name, con lstrcatW( ret, fullname ); lstrcatW( ret, suffixW ); - HeapFree( GetProcessHeap(), 0, fullname ); + free( fullname ); return ret; } @@ -615,7 +615,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!dst) return E_OUTOFMEMORY; ret = CopyFileW( manifest, dst, FALSE ); - HeapFree( GetProcessHeap(), 0, dst ); + free( dst ); if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); @@ -633,9 +633,9 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!(src = build_source_filename( manifest, file ))) goto done; len = len_sxsdir + len_name + lstrlenW( file->name ); - if (!(dst = HeapAlloc( GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR) ))) + if (!(dst = malloc( (len + 2) * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, src ); + free( src ); goto done; } lstrcpyW( dst, sxsdir ); @@ -647,8 +647,8 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl for (p = dst; *p; p++) *p = towlower( *p ); ret = CopyFileW( src, dst, FALSE ); - HeapFree( GetProcessHeap(), 0, src ); - HeapFree( GetProcessHeap(), 0, dst ); + free( src ); + free( dst ); if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); @@ -659,7 +659,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl hr = S_OK; done: - HeapFree( GetProcessHeap(), 0, name ); + free( name ); return hr; } @@ -711,7 +711,7 @@ static HRESULT uninstall_assembly( struct assembly *assembly ) name = build_assembly_name( assembly->arch, assembly->name, assembly->token, assembly->version, &len_name ); if (!name) return E_OUTOFMEMORY; - if (!(dirname = HeapAlloc( GetProcessHeap(), 0, (len_sxsdir + len_name + 1) * sizeof(WCHAR) ))) + if (!(dirname = malloc( (len_sxsdir + len_name + 1) * sizeof(WCHAR) ))) goto done; lstrcpyW( dirname, sxsdir ); lstrcpyW( dirname + len_sxsdir, name ); @@ -719,20 +719,20 @@ static HRESULT uninstall_assembly( struct assembly *assembly ) LIST_FOR_EACH_ENTRY( file, &assembly->files, struct file, entry ) { len = len_sxsdir + len_name + 1 + lstrlenW( file->name ); - if (!(filename = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) goto done; + if (!(filename = malloc( (len + 1) * sizeof(WCHAR) ))) goto done; lstrcpyW( filename, dirname ); lstrcatW( filename, backslashW ); lstrcatW( filename, file->name ); if (!DeleteFileW( filename )) WARN( "failed to delete file %lu\n", GetLastError() ); - HeapFree( GetProcessHeap(), 0, filename ); + free( filename ); } RemoveDirectoryW( dirname ); hr = S_OK; done: - HeapFree( GetProcessHeap(), 0, dirname ); - HeapFree( GetProcessHeap(), 0, name ); + free( dirname ); + free( name ); return hr; } @@ -800,7 +800,7 @@ static HRESULT WINAPI cache_UninstallAssembly( done: if (name_obj) IAssemblyName_Release( name_obj ); - HeapFree( GetProcessHeap(), 0, path ); + free( path ); free_assembly( assembly ); if (doc) IXMLDOMDocument_Release( doc ); if (SUCCEEDED(init)) CoUninitialize(); @@ -834,7 +834,7 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) *obj = NULL; - cache = HeapAlloc( GetProcessHeap(), 0, sizeof(struct cache) ); + cache = malloc( sizeof(*cache) ); if (!cache) return E_OUTOFMEMORY; @@ -843,7 +843,7 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) cache->lock = CreateMutexW( NULL, FALSE, cache_mutex_nameW ); if (!cache->lock) { - HeapFree( GetProcessHeap(), 0, cache ); + free( cache ); return HRESULT_FROM_WIN32( GetLastError() ); } *obj = &cache->IAssemblyCache_iface; diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 29368b6d788..4772c7317c5 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -88,12 +88,12 @@ static ULONG WINAPI name_Release( IAssemblyName *iface ) if (!refs) { TRACE("destroying %p\n", name); - HeapFree( GetProcessHeap(), 0, name->name ); - HeapFree( GetProcessHeap(), 0, name->arch ); - HeapFree( GetProcessHeap(), 0, name->token ); - HeapFree( GetProcessHeap(), 0, name->type ); - HeapFree( GetProcessHeap(), 0, name->version ); - HeapFree( GetProcessHeap(), 0, name ); + free( name->name ); + free( name->arch ); + free( name->token ); + free( name->type ); + free( name->version ); + free( name ); } return refs; } @@ -251,9 +251,9 @@ static HRESULT WINAPI name_GetVersion( TRACE("%p, %p, %p\n", iface, high, low); if (!name->version) return HRESULT_FROM_WIN32( ERROR_NOT_FOUND ); - if (!(version = strdupW( name->version ))) return E_OUTOFMEMORY; + if (!(version = wcsdup( name->version ))) return E_OUTOFMEMORY; hr = parse_version( version, high, low ); - HeapFree( GetProcessHeap(), 0, version ); + free( version ); return hr; } @@ -300,7 +300,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int *len ) if (!*p) return NULL; *len = p - str; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, *len * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( *len * sizeof(WCHAR) ))) return NULL; memcpy( ret, str + 1, (*len - 1) * sizeof(WCHAR) ); ret[*len - 1] = 0; return ret; @@ -314,7 +314,7 @@ static HRESULT parse_displayname( struct name *name, const WCHAR *displayname ) p = q = displayname; while (*q && *q != ',') q++; len = q - p; - if (!(name->name = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(name->name = malloc( (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( name->name, p, len * sizeof(WCHAR) ); name->name[len] = 0; if (!*q) return S_OK; @@ -376,7 +376,7 @@ HRESULT WINAPI CreateAssemblyNameObject( if (!assembly || !assembly[0] || flags != CANOF_PARSE_DISPLAY_NAME) return E_INVALIDARG; - if (!(name = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*name) ))) + if (!(name = calloc(1, sizeof(*name) ))) return E_OUTOFMEMORY; name->IAssemblyName_iface.lpVtbl = &name_vtbl; @@ -385,12 +385,12 @@ HRESULT WINAPI CreateAssemblyNameObject( hr = parse_displayname( name, assembly ); if (hr != S_OK) { - HeapFree( GetProcessHeap(), 0, name->name ); - HeapFree( GetProcessHeap(), 0, name->arch ); - HeapFree( GetProcessHeap(), 0, name->token ); - HeapFree( GetProcessHeap(), 0, name->type ); - HeapFree( GetProcessHeap(), 0, name->version ); - HeapFree( GetProcessHeap(), 0, name ); + free( name->name ); + free( name->arch ); + free( name->token ); + free( name->type ); + free( name->version ); + free( name ); return hr; } *obj = &name->IAssemblyName_iface; diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 934aa9345c8..150a49a322f 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -19,11 +19,11 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(sxs); @@ -147,7 +147,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff goto out; } - assembly_info = heap_alloc(bytes_assembly_info); + assembly_info = malloc(bytes_assembly_info); if (!(retval = QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, assembly_info, bytes_assembly_info, &bytes_assembly_info))) @@ -219,6 +219,6 @@ out: if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX) DeactivateActCtx(0, cookie); - heap_free(assembly_info); + free(assembly_info); return retval; } diff --git a/dlls/sxs/sxs_private.h b/dlls/sxs/sxs_private.h index c03e6db566e..4ae6bb8e2fc 100644 --- a/dlls/sxs/sxs_private.h +++ b/dlls/sxs/sxs_private.h @@ -26,13 +26,3 @@ enum name_attr_id }; const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id ) DECLSPEC_HIDDEN; - -static inline WCHAR *strdupW( const WCHAR *src ) -{ - WCHAR *dst; - - if (!src) return NULL; - dst = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( src ) + 1) * sizeof(WCHAR) ); - if (dst) lstrcpyW( dst, src ); - return dst; -} -- 2.35.1

1 0

[PATCH] fusion: Use CRT memory allocation functions.
by Nikolay Sivov 30 Mar '22

30 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/fusion/asmcache.c | 44 +++++++++++++++++++------------------- dlls/fusion/asmenum.c | 14 ++++++------ dlls/fusion/asmname.c | 46 +++++++++++++++++++--------------------- dlls/fusion/assembly.c | 26 +++++++++++------------ dlls/fusion/fusionpriv.h | 14 ------------ 5 files changed, 64 insertions(+), 80 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index b9cb505de86..88805bb354b 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -62,7 +62,7 @@ static BOOL create_full_path(LPCWSTR path) BOOL ret = TRUE; int len; - if (!(new_path = heap_alloc((lstrlenW(path) + 1) * sizeof(WCHAR)))) return FALSE; + if (!(new_path = malloc((lstrlenW(path) + 1) * sizeof(WCHAR)))) return FALSE; lstrcpyW(new_path, path); @@ -100,7 +100,7 @@ static BOOL create_full_path(LPCWSTR path) new_path[len] = '\\'; } - heap_free(new_path); + free(new_path); return ret; } @@ -197,7 +197,7 @@ static ULONG WINAPI IAssemblyCacheImpl_Release(IAssemblyCache *iface) if (!refCount) { CloseHandle( cache->lock ); - heap_free( cache ); + free( cache ); } return refCount; } @@ -255,7 +255,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) goto done; - if (!(path = heap_alloc( len * sizeof(WCHAR) ))) + if (!(path = malloc( len * sizeof(WCHAR) ))) { hr = E_OUTOFMEMORY; goto done; @@ -290,7 +290,7 @@ done: IAssemblyName_Release( asmname ); if (next) IAssemblyName_Release( next ); if (asmenum) IAssemblyEnum_Release( asmenum ); - heap_free( path ); + free( path ); cache_unlock( cache ); return hr; } @@ -372,7 +372,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_CreateAssemblyCacheItem(IAssemblyCache *ppAsmItem = NULL; - if (!(item = heap_alloc(sizeof(*item)))) return E_OUTOFMEMORY; + if (!(item = malloc(sizeof(*item)))) return E_OUTOFMEMORY; item->IAssemblyCacheItem_iface.lpVtbl = &AssemblyCacheItemVtbl; item->ref = 1; @@ -395,22 +395,22 @@ static HRESULT copy_file( const WCHAR *src_dir, DWORD src_len, const WCHAR *dst_ DWORD len = lstrlenW( filename ); HRESULT hr = S_OK; - if (!(src_file = heap_alloc( (src_len + len + 1) * sizeof(WCHAR) ))) + if (!(src_file = malloc( (src_len + len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( src_file, src_dir, src_len * sizeof(WCHAR) ); lstrcpyW( src_file + src_len, filename ); - if (!(dst_file = heap_alloc( (dst_len + len + 1) * sizeof(WCHAR) ))) + if (!(dst_file = malloc( (dst_len + len + 1) * sizeof(WCHAR) ))) { - heap_free( src_file ); + free( src_file ); return E_OUTOFMEMORY; } memcpy( dst_file, dst_dir, dst_len * sizeof(WCHAR) ); lstrcpyW( dst_file + dst_len, filename ); if (!CopyFileW( src_file, dst_file, FALSE )) hr = HRESULT_FROM_WIN32( GetLastError() ); - heap_free( src_file ); - heap_free( dst_file ); + free( src_file ); + free( dst_file ); return hr; } @@ -483,7 +483,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); dst_len += lstrlenW(asmdir) + lstrlenW(name) + lstrlenW(version) + lstrlenW(token); - if (!(dst_dir = heap_alloc(dst_len * sizeof(WCHAR)))) + if (!(dst_dir = malloc(dst_len * sizeof(WCHAR)))) { hr = E_OUTOFMEMORY; goto done; @@ -523,13 +523,13 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, } done: - heap_free(name); - heap_free(token); - heap_free(version); - heap_free(asmpath); - heap_free(dst_dir); - for (i = 0; i < count; i++) heap_free(external_files[i]); - heap_free(external_files); + free(name); + free(token); + free(version); + free(asmpath); + free(dst_dir); + for (i = 0; i < count; i++) free(external_files[i]); + free(external_files); assembly_release(assembly); cache_unlock( cache ); return hr; @@ -560,14 +560,14 @@ HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved *ppAsmCache = NULL; - if (!(cache = heap_alloc(sizeof(*cache)))) return E_OUTOFMEMORY; + if (!(cache = malloc(sizeof(*cache)))) return E_OUTOFMEMORY; cache->IAssemblyCache_iface.lpVtbl = &AssemblyCacheVtbl; cache->ref = 1; cache->lock = CreateMutexW( NULL, FALSE, cache_mutex_nameW ); if (!cache->lock) { - heap_free( cache ); + free( cache ); return HRESULT_FROM_WIN32( GetLastError() ); } *ppAsmCache = &cache->IAssemblyCache_iface; @@ -620,7 +620,7 @@ static ULONG WINAPI IAssemblyCacheItemImpl_Release(IAssemblyCacheItem *iface) TRACE("(%p)->(ref before = %lu)\n", This, refCount + 1); if (!refCount) - heap_free(This); + free(This); return refCount; } diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index d545e2533b5..8a35951accc 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -105,10 +105,10 @@ static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) list_remove(&asmname->entry); IAssemblyName_Release(asmname->name); - heap_free(asmname); + free(asmname); } - heap_free(This); + free(This); } return refCount; @@ -354,7 +354,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, } swprintf(disp, ARRAY_SIZE(disp), name_fmt, parent, version, token); - if (!(asmname = heap_alloc(sizeof(*asmname)))) + if (!(asmname = malloc(sizeof(*asmname)))) { hr = E_OUTOFMEMORY; break; @@ -364,7 +364,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, CANOF_PARSE_DISPLAY_NAME, NULL); if (FAILED(hr)) { - heap_free(asmname); + free(asmname); break; } @@ -372,7 +372,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, if (FAILED(hr)) { IAssemblyName_Release(asmname->name); - heap_free(asmname); + free(asmname); break; } @@ -475,7 +475,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, if (dwFlags == 0 || dwFlags == ASM_CACHE_ROOT) return E_INVALIDARG; - if (!(asmenum = heap_alloc(sizeof(*asmenum)))) return E_OUTOFMEMORY; + if (!(asmenum = malloc(sizeof(*asmenum)))) return E_OUTOFMEMORY; asmenum->IAssemblyEnum_iface.lpVtbl = &AssemblyEnumVtbl; asmenum->ref = 1; @@ -486,7 +486,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, hr = enumerate_gac(asmenum, pName); if (FAILED(hr)) { - heap_free(asmenum); + free(asmenum); return hr; } } diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 8a6531df0b8..1d4d588762d 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -114,12 +114,12 @@ static ULONG WINAPI IAssemblyNameImpl_Release(IAssemblyName *iface) if (!refCount) { - heap_free(This->path); - heap_free(This->displayname); - heap_free(This->name); - heap_free(This->culture); - heap_free(This->procarch); - heap_free(This); + free(This->path); + free(This->displayname); + free(This->name); + free(This->culture); + free(This->procarch); + free(This); } return refCount; @@ -521,7 +521,7 @@ HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) { IAssemblyNameImpl *name = unsafe_impl_from_IAssemblyName(iface); - name->path = strdupW(path); + name->path = wcsdup(path); if (!name->path) return E_OUTOFMEMORY; @@ -576,12 +576,10 @@ static HRESULT parse_version(IAssemblyNameImpl *name, LPWSTR version) static HRESULT parse_culture(IAssemblyNameImpl *name, LPCWSTR culture) { - static const WCHAR empty[] = {0}; - if (lstrlenW(culture) == 2) - name->culture = strdupW(culture); + name->culture = wcsdup(culture); else - name->culture = strdupW(empty); + name->culture = wcsdup(L""); return S_OK; } @@ -662,7 +660,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int len ) BOOL quoted = FALSE; unsigned int i = 0; - if (!(ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( (len + 1) * sizeof(WCHAR) ))) return NULL; if (*p == '\"') { quoted = TRUE; @@ -671,7 +669,7 @@ static WCHAR *parse_value( const WCHAR *str, unsigned int len ) while (*p && *p != '\"') ret[i++] = *p++; if ((quoted && *p != '\"') || (!quoted && *p == '\"')) { - heap_free( ret ); + free( ret ); return NULL; } ret[i] = 0; @@ -687,11 +685,11 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam if (!szAssemblyName) return S_OK; - name->displayname = strdupW(szAssemblyName); + name->displayname = wcsdup(szAssemblyName); if (!name->displayname) return E_OUTOFMEMORY; - str = strdupW(szAssemblyName); + str = wcsdup(szAssemblyName); save = str; if (!str) { @@ -709,7 +707,7 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam goto done; } - name->name = strdupW(str); + name->name = wcsdup(str); if (!name->name) { hr = E_OUTOFMEMORY; @@ -768,7 +766,7 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam hr = parse_procarch( name, name->procarch ); } - heap_free( value ); + free( value ); if (FAILED(hr)) goto done; @@ -777,13 +775,13 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam } done: - heap_free(save); + free(save); if (FAILED(hr)) { - heap_free(name->displayname); - heap_free(name->name); - heap_free(name->culture); - heap_free(name->procarch); + free(name->displayname); + free(name->name); + free(name->culture); + free(name->procarch); } return hr; } @@ -808,7 +806,7 @@ HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, (!szAssemblyName || !*szAssemblyName)) return E_INVALIDARG; - if (!(name = heap_alloc_zero(sizeof(*name)))) return E_OUTOFMEMORY; + if (!(name = calloc(1, sizeof(*name)))) return E_OUTOFMEMORY; name->IAssemblyName_iface.lpVtbl = &AssemblyNameVtbl; name->ref = 1; @@ -816,7 +814,7 @@ HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, hr = parse_display_name(name, szAssemblyName); if (FAILED(hr)) { - heap_free(name); + free(name); return hr; } diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 83f08888f8a..48d5308dd4b 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -540,7 +540,7 @@ static HRESULT parse_metadata_header(ASSEMBLY *assembly, DWORD *hdrsz) metadatahdr = (METADATAHDR *)ptr; - if (!(assembly->metadatahdr = heap_alloc(sizeof(*assembly->metadatahdr)))) return E_OUTOFMEMORY; + if (!(assembly->metadatahdr = malloc(sizeof(*assembly->metadatahdr)))) return E_OUTOFMEMORY; size = FIELD_OFFSET(METADATAHDR, Version); memcpy(assembly->metadatahdr, metadatahdr, size); @@ -645,9 +645,9 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) *out = NULL; - if (!(assembly = heap_alloc_zero(sizeof(*assembly)))) return E_OUTOFMEMORY; + if (!(assembly = calloc(1, sizeof(*assembly)))) return E_OUTOFMEMORY; - assembly->path = strdupW(file); + assembly->path = wcsdup(file); if (!assembly->path) { hr = E_OUTOFMEMORY; @@ -696,12 +696,12 @@ HRESULT assembly_release(ASSEMBLY *assembly) if (!assembly) return S_OK; - heap_free(assembly->metadatahdr); - heap_free(assembly->path); + free(assembly->metadatahdr); + free(assembly->path); UnmapViewOfFile(assembly->data); CloseHandle(assembly->hmap); CloseHandle(assembly->hfile); - heap_free(assembly); + free(assembly); return S_OK; } @@ -714,7 +714,7 @@ static LPWSTR assembly_dup_str(const ASSEMBLY *assembly, DWORD index) len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - if ((cpy = heap_alloc(len * sizeof(WCHAR)))) + if ((cpy = malloc(len * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, str, -1, cpy, len); return cpy; @@ -749,7 +749,7 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) { - WCHAR *cpy = heap_alloc((lstrlenW(assembly->path) + 1) * sizeof(WCHAR)); + WCHAR *cpy = malloc((lstrlenW(assembly->path) + 1) * sizeof(WCHAR)); *path = cpy; if (cpy) lstrcpyW(cpy, assembly->path); @@ -776,7 +776,7 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) if (!asmtbl) return E_FAIL; - if (!(*version = heap_alloc(24 * sizeof(WCHAR)))) + if (!(*version = malloc(24 * sizeof(WCHAR)))) return E_OUTOFMEMORY; swprintf(*version, 24, format, asmtbl->MajorVersion, asmtbl->MinorVersion, @@ -846,7 +846,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) for (i = size - 1; i >= size - 8; i--) tokbytes[size - i - 1] = hashdata[i]; - if (!(tok = heap_alloc((TOKEN_LENGTH + 1) * sizeof(WCHAR)))) + if (!(tok = malloc((TOKEN_LENGTH + 1) * sizeof(WCHAR)))) { hr = E_OUTOFMEMORY; goto done; @@ -890,7 +890,7 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c if (num_rows <= 0) return S_OK; - if (!(ret = heap_alloc(num_rows * sizeof(WCHAR *)))) return E_OUTOFMEMORY; + if (!(ret = malloc(num_rows * sizeof(WCHAR *)))) return E_OUTOFMEMORY; for (i = 0; i < num_rows; i++) { @@ -903,8 +903,8 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c ret[i] = assembly_dup_str(assembly, idx); if (!ret[i]) { - for (; i >= 0; i--) heap_free(ret[i]); - heap_free(ret); + for (; i >= 0; i--) free(ret[i]); + free(ret); return E_OUTOFMEMORY; } ptr += assembly->stringsz; /* skip Name field */ diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 22de4ca7846..66ef7b9ff08 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -27,7 +27,6 @@ #include "winbase.h" #include "winuser.h" #include "winver.h" -#include "wine/heap.h" #include <pshpack1.h> @@ -442,19 +441,6 @@ HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *c extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) DECLSPEC_HIDDEN; -static inline LPWSTR strdupW(LPCWSTR src) -{ - LPWSTR dest; - - if (!src) - return NULL; - - if ((dest = heap_alloc((lstrlenW(src) + 1) * sizeof(WCHAR)))) - lstrcpyW(dest, src); - - return dest; -} - #define BYTES_PER_TOKEN 8 #define CHARS_PER_BYTE 2 #define TOKEN_LENGTH (BYTES_PER_TOKEN * CHARS_PER_BYTE + 1) -- 2.35.1

1 0

[v2 PATCH 1/3] scrobj: Use CRT allocation functions.
by Nikolay Sivov 30 Mar '22

30 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: missed some Heap* calls. dlls/scrobj/scrobj.c | 92 ++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 50 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 0df6be1cd44..b01fa60d6a4 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -34,7 +34,6 @@ #include "xmllite.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(scrobj); @@ -243,15 +242,6 @@ static void release_typelib(void) ITypeLib_Release(typelib); } -static WCHAR *heap_strdupW(const WCHAR *str) -{ - WCHAR *ret; - size_t size = (wcslen(str) + 1) * sizeof(WCHAR); - if (!(ret = heap_alloc(size))) return NULL; - memcpy(ret, str, size); - return ret; -} - static inline struct scriptlet_global *global_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, struct scriptlet_global, IDispatchEx_iface); @@ -304,7 +294,8 @@ static ULONG WINAPI global_Release(IDispatchEx *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) heap_free(This); + if (!ref) free(This); + return ref; } @@ -495,8 +486,8 @@ static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->language); - heap_free(This); + free(This->language); + free(This); } return ref; @@ -758,7 +749,8 @@ static HRESULT lookup_object_properties(struct scriptlet_instance *object, struc if (!member_cnt) return S_OK; - if (!(object->members = heap_alloc_zero(member_cnt * sizeof(*object->members)))) return E_OUTOFMEMORY; + if (!(object->members = calloc(member_cnt, sizeof(*object->members)))) + return E_OUTOFMEMORY; object->member_cnt = member_cnt; LIST_FOR_EACH_ENTRY(member, &factory->members, struct scriptlet_member, entry) @@ -858,7 +850,8 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s struct script_host *host; HRESULT hres; - if (!(host = heap_alloc_zero(sizeof(*host)))) return E_OUTOFMEMORY; + if (!(host = calloc(1, sizeof(*host)))) + return E_OUTOFMEMORY; host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; @@ -866,7 +859,7 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s host->ref = 1; host->state = SCRIPTSTATE_CLOSED; - if (!(host->language = heap_strdupW(language))) + if (!(host->language = wcsdup(language))) { IActiveScriptSite_Release(&host->IActiveScriptSite_iface); return E_OUTOFMEMORY; @@ -990,10 +983,10 @@ static ULONG WINAPI scriptlet_Release(IDispatchEx *iface) unsigned i; for (i = 0; i < This->member_cnt; i++) SysFreeString(This->members[i].name); - heap_free(This->members); + free(This->members); detach_script_hosts(&This->hosts); if (This->global) IDispatchEx_Release(&This->global->IDispatchEx_iface); - heap_free(This); + free(This); } return ref; } @@ -1197,13 +1190,14 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis IDispatch *script_dispatch; HRESULT hres; - if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; + if (!(obj = calloc(1, sizeof(*obj)))) + return E_OUTOFMEMORY; obj->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; obj->ref = 1; list_init(&obj->hosts); - if (!(obj->global = heap_alloc(sizeof(*obj->global)))) + if (!(obj->global = malloc(sizeof(*obj->global)))) { IDispatchEx_Release(&obj->IDispatchEx_iface); return E_OUTOFMEMORY; @@ -1325,7 +1319,7 @@ static HRESULT read_xml_value(struct scriptlet_factory *factory, WCHAR **ret) HRESULT hres; hres = IXmlReader_GetValue(factory->xml_reader, &str, &len); if (FAILED(hres)) return hres; - if (!(*ret = heap_alloc((len + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(*ret = malloc((len + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; memcpy(*ret, str, len * sizeof(WCHAR)); (*ret)[len] = 0; return S_OK; @@ -1414,7 +1408,7 @@ static HRESULT parse_scriptlet_registration(struct scriptlet_factory *factory) size_t progid_len = wcslen(factory->progid); size_t version_len = wcslen(factory->version); - if (!(factory->versioned_progid = heap_alloc((progid_len + version_len + 2) * sizeof(WCHAR)))) + if (!(factory->versioned_progid = malloc((progid_len + version_len + 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; memcpy(factory->versioned_progid, factory->progid, (progid_len + 1) * sizeof(WCHAR)); @@ -1476,13 +1470,13 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(member = heap_alloc(sizeof(*member)))) return E_OUTOFMEMORY; + if (!(member = malloc(sizeof(*member)))) return E_OUTOFMEMORY; member->type = member_type; hres = read_xml_value(factory, &member->name); if (FAILED(hres)) { - heap_free(member); + free(member); return hres; } @@ -1491,7 +1485,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) if (!wcsicmp(member_iter->name, member->name)) { FIXME("Duplicated member %s\n", debugstr_w(member->name)); - heap_free(member); + free(member); return E_FAIL; } } @@ -1530,7 +1524,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(parameter = heap_alloc_zero(sizeof(*parameter)))) return E_OUTOFMEMORY; + if (!(parameter = calloc(1, sizeof(*parameter)))) return E_OUTOFMEMORY; list_add_tail(&member->u.parameters, &parameter->entry); hres = read_xml_value(factory, &parameter->name); @@ -1639,7 +1633,7 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct return E_FAIL; } - if (!(script->body = heap_alloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(script->body = malloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; size = 0; for (;;) @@ -1651,12 +1645,12 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct if (hres == S_FALSE) break; if (size + 1 == buf_size) { - if (!(new_body = heap_realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(new_body = realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; script->body = new_body; } } script->body[size++] = 0; - if (size != buf_size) script->body = heap_realloc(script->body, size * sizeof(WCHAR)); + if (size != buf_size) script->body = realloc(script->body, size * sizeof(WCHAR)); TRACE("body %s\n", debugstr_w(script->body)); return expect_end_element(factory); @@ -1725,7 +1719,7 @@ static HRESULT parse_scriptlet_file(struct scriptlet_factory *factory, const WCH else if (is_xml_name(factory, L"script")) { struct scriptlet_script *script; - if (!(script = heap_alloc_zero(sizeof(*script)))) return E_OUTOFMEMORY; + if (!(script = calloc(1, sizeof(*script)))) return E_OUTOFMEMORY; list_add_tail(&factory->scripts, &script->entry); hres = parse_scriptlet_script(factory, script); if (FAILED(hres)) return hres; @@ -1803,33 +1797,33 @@ static ULONG WINAPI scriptlet_factory_Release(IClassFactory *iface) { struct scriptlet_member *member = LIST_ENTRY(list_head(&This->members), struct scriptlet_member, entry); list_remove(&member->entry); - heap_free(member->name); + free(member->name); if (member->type == MEMBER_METHOD) { while (!list_empty(&member->u.parameters)) { struct method_parameter *parameter = LIST_ENTRY(list_head(&member->u.parameters), struct method_parameter, entry); list_remove(&parameter->entry); - heap_free(parameter->name); - heap_free(parameter); + free(parameter->name); + free(parameter); } } - heap_free(member); + free(member); } while (!list_empty(&This->scripts)) { struct scriptlet_script *script = LIST_ENTRY(list_head(&This->scripts), struct scriptlet_script, entry); list_remove(&script->entry); - heap_free(script->language); - heap_free(script->body); - heap_free(script); + free(script->language); + free(script->body); + free(script); } - heap_free(This->classid_str); - heap_free(This->description); - heap_free(This->versioned_progid); - heap_free(This->progid); - heap_free(This->version); - heap_free(This); + free(This->classid_str); + free(This->description); + free(This->versioned_progid); + free(This->progid); + free(This->version); + free(This); } return ref; } @@ -1888,7 +1882,7 @@ static HRESULT create_scriptlet_factory(const WCHAR *url, struct scriptlet_facto TRACE("%s\n", debugstr_w(url)); - if (!(factory = heap_alloc_zero(sizeof(*factory)))) + if (!(factory = calloc(1, sizeof(*factory)))) { IClassFactory_Release(&factory->IClassFactory_iface); return E_OUTOFMEMORY; @@ -2106,7 +2100,7 @@ static ULONG WINAPI scriptlet_typelib_Release(IGenScriptletTLib *iface) if (!ref) { SysFreeString(This->guid); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; @@ -2424,13 +2418,11 @@ static HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, I *obj = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (!This) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IGenScriptletTLib_iface.lpVtbl = &scriptlet_typelib_vtbl; This->ref = 1; - This->guid = NULL; hr = IGenScriptletTLib_QueryInterface(&This->IGenScriptletTLib_iface, riid, obj); IGenScriptletTLib_Release(&This->IGenScriptletTLib_iface); @@ -2517,11 +2509,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) WCHAR *url; HRESULT hres; - if (!(url = heap_alloc(size * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(url = malloc(size * sizeof(WCHAR)))) return E_OUTOFMEMORY; status = RegQueryValueW(HKEY_CLASSES_ROOT, key_name, url, &size); hres = create_scriptlet_factory(url, &factory); - heap_free(url); + free(url); if (FAILED(hres)) return hres; hres = IClassFactory_QueryInterface(&factory->IClassFactory_iface, riid, ppv); -- 2.35.1

1 2

[PATCH] winex11: Check for invalid format in get_tile_pict
by Alex Henrie 30 Mar '22

30 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52747 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winex11.drv/xrender.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 5ede97fb026..1cb7e67a477 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1230,6 +1230,8 @@ static Picture get_tile_pict( enum wxr_format wxr_format, const XRenderColor *co XRenderColor current_color; } tiles[WXR_NB_FORMATS], *tile; + if (wxr_format == WXR_INVALID_FORMAT) return 0; + tile = &tiles[wxr_format]; if(!tile->xpm) -- 2.35.1

1 0

[PATCH 1/3] scrobj: Use CRT allocation functions.
by Nikolay Sivov 30 Mar '22

30 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 86 +++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 46 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 0df6be1cd44..7f93c146b96 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -34,7 +34,6 @@ #include "xmllite.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(scrobj); @@ -243,15 +242,6 @@ static void release_typelib(void) ITypeLib_Release(typelib); } -static WCHAR *heap_strdupW(const WCHAR *str) -{ - WCHAR *ret; - size_t size = (wcslen(str) + 1) * sizeof(WCHAR); - if (!(ret = heap_alloc(size))) return NULL; - memcpy(ret, str, size); - return ret; -} - static inline struct scriptlet_global *global_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, struct scriptlet_global, IDispatchEx_iface); @@ -304,7 +294,8 @@ static ULONG WINAPI global_Release(IDispatchEx *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) heap_free(This); + if (!ref) free(This); + return ref; } @@ -495,8 +486,8 @@ static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->language); - heap_free(This); + free(This->language); + free(This); } return ref; @@ -758,7 +749,8 @@ static HRESULT lookup_object_properties(struct scriptlet_instance *object, struc if (!member_cnt) return S_OK; - if (!(object->members = heap_alloc_zero(member_cnt * sizeof(*object->members)))) return E_OUTOFMEMORY; + if (!(object->members = calloc(member_cnt, sizeof(*object->members)))) + return E_OUTOFMEMORY; object->member_cnt = member_cnt; LIST_FOR_EACH_ENTRY(member, &factory->members, struct scriptlet_member, entry) @@ -858,7 +850,8 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s struct script_host *host; HRESULT hres; - if (!(host = heap_alloc_zero(sizeof(*host)))) return E_OUTOFMEMORY; + if (!(host = calloc(1, sizeof(*host)))) + return E_OUTOFMEMORY; host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; @@ -866,7 +859,7 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s host->ref = 1; host->state = SCRIPTSTATE_CLOSED; - if (!(host->language = heap_strdupW(language))) + if (!(host->language = wcsdup(language))) { IActiveScriptSite_Release(&host->IActiveScriptSite_iface); return E_OUTOFMEMORY; @@ -990,10 +983,10 @@ static ULONG WINAPI scriptlet_Release(IDispatchEx *iface) unsigned i; for (i = 0; i < This->member_cnt; i++) SysFreeString(This->members[i].name); - heap_free(This->members); + free(This->members); detach_script_hosts(&This->hosts); if (This->global) IDispatchEx_Release(&This->global->IDispatchEx_iface); - heap_free(This); + free(This); } return ref; } @@ -1197,13 +1190,14 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis IDispatch *script_dispatch; HRESULT hres; - if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; + if (!(obj = calloc(1, sizeof(*obj)))) + return E_OUTOFMEMORY; obj->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; obj->ref = 1; list_init(&obj->hosts); - if (!(obj->global = heap_alloc(sizeof(*obj->global)))) + if (!(obj->global = malloc(sizeof(*obj->global)))) { IDispatchEx_Release(&obj->IDispatchEx_iface); return E_OUTOFMEMORY; @@ -1325,7 +1319,7 @@ static HRESULT read_xml_value(struct scriptlet_factory *factory, WCHAR **ret) HRESULT hres; hres = IXmlReader_GetValue(factory->xml_reader, &str, &len); if (FAILED(hres)) return hres; - if (!(*ret = heap_alloc((len + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(*ret = malloc((len + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; memcpy(*ret, str, len * sizeof(WCHAR)); (*ret)[len] = 0; return S_OK; @@ -1414,7 +1408,7 @@ static HRESULT parse_scriptlet_registration(struct scriptlet_factory *factory) size_t progid_len = wcslen(factory->progid); size_t version_len = wcslen(factory->version); - if (!(factory->versioned_progid = heap_alloc((progid_len + version_len + 2) * sizeof(WCHAR)))) + if (!(factory->versioned_progid = malloc((progid_len + version_len + 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; memcpy(factory->versioned_progid, factory->progid, (progid_len + 1) * sizeof(WCHAR)); @@ -1476,13 +1470,13 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(member = heap_alloc(sizeof(*member)))) return E_OUTOFMEMORY; + if (!(member = malloc(sizeof(*member)))) return E_OUTOFMEMORY; member->type = member_type; hres = read_xml_value(factory, &member->name); if (FAILED(hres)) { - heap_free(member); + free(member); return hres; } @@ -1491,7 +1485,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) if (!wcsicmp(member_iter->name, member->name)) { FIXME("Duplicated member %s\n", debugstr_w(member->name)); - heap_free(member); + free(member); return E_FAIL; } } @@ -1530,7 +1524,7 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return E_FAIL; } - if (!(parameter = heap_alloc_zero(sizeof(*parameter)))) return E_OUTOFMEMORY; + if (!(parameter = calloc(1, sizeof(*parameter)))) return E_OUTOFMEMORY; list_add_tail(&member->u.parameters, &parameter->entry); hres = read_xml_value(factory, &parameter->name); @@ -1639,7 +1633,7 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct return E_FAIL; } - if (!(script->body = heap_alloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(script->body = malloc((buf_size = 1024) * sizeof(WCHAR)))) return E_OUTOFMEMORY; size = 0; for (;;) @@ -1651,12 +1645,12 @@ static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct if (hres == S_FALSE) break; if (size + 1 == buf_size) { - if (!(new_body = heap_realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(new_body = realloc(script->body, (buf_size *= 2) * sizeof(WCHAR)))) return E_OUTOFMEMORY; script->body = new_body; } } script->body[size++] = 0; - if (size != buf_size) script->body = heap_realloc(script->body, size * sizeof(WCHAR)); + if (size != buf_size) script->body = realloc(script->body, size * sizeof(WCHAR)); TRACE("body %s\n", debugstr_w(script->body)); return expect_end_element(factory); @@ -1725,7 +1719,7 @@ static HRESULT parse_scriptlet_file(struct scriptlet_factory *factory, const WCH else if (is_xml_name(factory, L"script")) { struct scriptlet_script *script; - if (!(script = heap_alloc_zero(sizeof(*script)))) return E_OUTOFMEMORY; + if (!(script = calloc(1, sizeof(*script)))) return E_OUTOFMEMORY; list_add_tail(&factory->scripts, &script->entry); hres = parse_scriptlet_script(factory, script); if (FAILED(hres)) return hres; @@ -1803,33 +1797,33 @@ static ULONG WINAPI scriptlet_factory_Release(IClassFactory *iface) { struct scriptlet_member *member = LIST_ENTRY(list_head(&This->members), struct scriptlet_member, entry); list_remove(&member->entry); - heap_free(member->name); + free(member->name); if (member->type == MEMBER_METHOD) { while (!list_empty(&member->u.parameters)) { struct method_parameter *parameter = LIST_ENTRY(list_head(&member->u.parameters), struct method_parameter, entry); list_remove(&parameter->entry); - heap_free(parameter->name); - heap_free(parameter); + free(parameter->name); + free(parameter); } } - heap_free(member); + free(member); } while (!list_empty(&This->scripts)) { struct scriptlet_script *script = LIST_ENTRY(list_head(&This->scripts), struct scriptlet_script, entry); list_remove(&script->entry); - heap_free(script->language); - heap_free(script->body); - heap_free(script); + free(script->language); + free(script->body); + free(script); } - heap_free(This->classid_str); - heap_free(This->description); - heap_free(This->versioned_progid); - heap_free(This->progid); - heap_free(This->version); - heap_free(This); + free(This->classid_str); + free(This->description); + free(This->versioned_progid); + free(This->progid); + free(This->version); + free(This); } return ref; } @@ -1888,7 +1882,7 @@ static HRESULT create_scriptlet_factory(const WCHAR *url, struct scriptlet_facto TRACE("%s\n", debugstr_w(url)); - if (!(factory = heap_alloc_zero(sizeof(*factory)))) + if (!(factory = calloc(1, sizeof(*factory)))) { IClassFactory_Release(&factory->IClassFactory_iface); return E_OUTOFMEMORY; @@ -2517,11 +2511,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) WCHAR *url; HRESULT hres; - if (!(url = heap_alloc(size * sizeof(WCHAR)))) return E_OUTOFMEMORY; + if (!(url = malloc(size * sizeof(WCHAR)))) return E_OUTOFMEMORY; status = RegQueryValueW(HKEY_CLASSES_ROOT, key_name, url, &size); hres = create_scriptlet_factory(url, &factory); - heap_free(url); + free(url); if (FAILED(hres)) return hres; hres = IClassFactory_QueryInterface(&factory->IClassFactory_iface, riid, ppv); -- 2.35.1

1 2

[PATCH] ntoskrnl.exe: Make USD pointers volatile to silent a warning.
by Rémi Bernon 29 Mar '22

29 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/instr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 8f1aa4d45a3..05976c38b27 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -497,8 +497,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); #define SIB_BASE( sib, rex ) (((sib) & 7) | (((rex) & REX_B) ? 8 : 0)) /* keep in sync with dlls/ntdll/thread.c:thread_init */ -static const BYTE *wine_user_shared_data = (BYTE *)0x7ffe0000; -static const BYTE *user_shared_data = (BYTE *)0xfffff78000000000; +static const volatile BYTE *const volatile wine_user_shared_data = (BYTE *)0x7ffe0000; +static const volatile BYTE *const volatile user_shared_data = (BYTE *)0xfffff78000000000; static inline DWORD64 *get_int_reg( CONTEXT *context, int index ) { @@ -843,7 +843,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) ULONGLONG temp = 0; TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); - memcpy( &temp, wine_user_shared_data + offset, data_size ); + memcpy( &temp, (BYTE *)wine_user_shared_data + offset, data_size ); store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex, INSTR_OP_MOV ); context->Rip += prefixlen + len + 2; return ExceptionContinueExecution; @@ -869,19 +869,19 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) switch (*instr) { case 0x8a: - store_reg_byte( context, instr[1], wine_user_shared_data + offset, + store_reg_byte( context, instr[1], (BYTE *)wine_user_shared_data + offset, rex, INSTR_OP_MOV ); break; case 0x8b: - store_reg_word( context, instr[1], wine_user_shared_data + offset, + store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset, long_op, rex, INSTR_OP_MOV ); break; case 0x0b: - store_reg_word( context, instr[1], wine_user_shared_data + offset, + store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset, long_op, rex, INSTR_OP_OR ); break; case 0x33: - store_reg_word( context, instr[1], wine_user_shared_data + offset, + store_reg_word( context, instr[1], (BYTE *)wine_user_shared_data + offset, long_op, rex, INSTR_OP_XOR ); break; } @@ -902,7 +902,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) if (offset <= KSHARED_USER_DATA_PAGE_SIZE - data_size) { TRACE("USD offset %#x at %p.\n", (unsigned int)offset, (void *)context->Rip); - memcpy( &context->Rax, wine_user_shared_data + offset, data_size ); + memcpy( &context->Rax, (BYTE *)wine_user_shared_data + offset, data_size ); context->Rip += prefixlen + len + 1; return ExceptionContinueExecution; } -- 2.35.1

2 4

[PATCH] dlls/{mciwave, winmm}: properly handle mmioRead/mmioWrite in case of errors
by Eric Pouech 29 Mar '22

29 Mar '22

In C, an inequality comparison between a signed and an unsigned integer ends up with an unsigned comparison. So, force signed comparison to catch both case of errors and partial read operation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52628 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mciwave/mciwave.c | 3 ++- dlls/winmm/mmio.c | 8 +++----- dlls/winmm/playsound.c | 3 ++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 1d9abce84a3..3bb271f66ec 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -291,7 +291,8 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) if (!pwfx) return MCIERR_OUT_OF_MEMORY; r = mmioRead(wmw->hFile, (HPSTR)pwfx, mmckInfo.cksize); - if (r < sizeof(PCMWAVEFORMAT)) { + /* forcing signed comparison to catch errors (negative value) as well */ + if (r < (LONG)sizeof(PCMWAVEFORMAT)) { HeapFree(GetProcessHeap(), 0, pwfx); return MCIERR_INVALID_FILE; } diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 352da62a215..3bcde1fe34b 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -1231,10 +1231,8 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, while (TRUE) { - LONG ix; - - ix = mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)); - if (ix < 2*sizeof(DWORD)) + /* forcing signed comparison to catch errors as well */ + if (mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)) < (LONG)(2*sizeof(DWORD))) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return ChunkNotFound\n"); @@ -1336,7 +1334,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) ix = mmioWrite(hmmio, (LPSTR)lpck, size); TRACE("after mmioWrite ix = %ld req = %ld, errno = %d\n", ix, size, errno); - if (ix < size) { + if (ix != size) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return CannotWrite\n"); return MMIOERR_CANNOTWRITE; diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 0858f958583..95131bddce6 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -361,7 +361,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); if (!lpWaveFormat) goto errCleanUp; - if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) + /* forcing signed comparison to catch errors as well */ + if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < (LONG)sizeof(PCMWAVEFORMAT)) goto errCleanUp; TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag);

2 1

[PATCH] mciseq: Print data only when successfully read.
by Rémi Bernon 29 Mar '22

29 Mar '22

This may lead to a uninitialized use of twd otherwise. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mciseq/mcimidi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 4211ed5ca4a..2d3c4975296 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -937,8 +937,8 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwFlags) if (TRACE_ON(mcimidi)) { WORD twd; - MIDI_mciReadWord(wmm, &twd); /* == 0 */ - TRACE("Got sequence number %u\n", twd); + if (MIDI_mciReadWord(wmm, &twd)) WARN("Failed to read word\n"); + else TRACE("Got sequence number %u\n", twd); } break; case 0x01: /* any text */ -- 2.35.1

1 0

[PATCH] kernelbase/tests: Initialize input buffer to silent a warning.
by Rémi Bernon 29 Mar '22

29 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- FWIW the issue here is the same as in the other patches sent earlier, where GCC warns about an non-initialized buffer being passed as a pointer to const, probably assuming that it is then an input parameter and that uninitialized data might be read from it. dlls/kernelbase/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 1c0c8a2318b..dc0d3cc1184 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -1189,7 +1189,7 @@ static void test_PathCchCanonicalize(void) static void test_PathCchCanonicalizeEx(void) { - WCHAR path_inW[PATHCCH_MAX_CCH + 1], path_outW[PATHCCH_MAX_CCH]; + WCHAR path_inW[PATHCCH_MAX_CCH + 1] = {0}, path_outW[PATHCCH_MAX_CCH]; CHAR path_outA[4096]; BOOL skip_new_flags = TRUE; HRESULT hr; -- 2.35.1

1 0

[PATCH] user.exe16: Initialize RECT to silent a warning.
by Rémi Bernon 29 Mar '22

29 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user.exe16/message.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 915585267d6..ef34ee5906a 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1385,7 +1385,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case LB_GETSELITEMS: { INT *items32 = (INT *)lParam; - INT16 *items, buffer[512]; + INT16 *items, buffer[512] = {0}; unsigned int i; wParam = min( wParam, 0x7f80 ); /* Must be < 64K */ @@ -1451,7 +1451,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case CB_GETDROPPEDCONTROLRECT: { RECT *r32 = (RECT *)lParam; - RECT16 rect; + RECT16 rect = {0}; lParam = MapLS( &rect ); ret = callback( HWND_16(hwnd), (msg == LB_GETITEMRECT) ? LB_GETITEMRECT16 : CB_GETDROPPEDCONTROLRECT16, -- 2.35.1

1 0

[PATCH] shlwapi/tests: Initialize input buffer to silent a warning.
by Rémi Bernon 29 Mar '22

29 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/shlwapi/tests/clist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 5f88e92a5a6..54bff21ae8d 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -567,7 +567,7 @@ static void test_IStream_Read(void) static void test_IStream_Write(void) { struct dummystream streamobj; - char buff[256]; + char buff[256] = {0}; HRESULT hRet; if (!pIStream_Write) -- 2.35.1

1 0

[PATCH v4 1/5] windows.media.speech: Add IVector<HSTRING>.
by Rémi Bernon 29 Mar '22

29 Mar '22

From: Bernhard Kölbl <besentv(a)gmail.com> And use it in listconstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: Add missing call to impl_from_IIterator_HSTRING. dlls/windows.media.speech/Makefile.in | 3 +- dlls/windows.media.speech/listconstraint.c | 11 +- dlls/windows.media.speech/private.h | 2 + dlls/windows.media.speech/vector.c | 313 +++++++++++++++++++++ 4 files changed, 326 insertions(+), 3 deletions(-) create mode 100644 dlls/windows.media.speech/vector.c diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in index 5dbdb03cf2f..5a8291ba6f0 100644 --- a/dlls/windows.media.speech/Makefile.in +++ b/dlls/windows.media.speech/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ listconstraint.c \ main.c \ recognizer.c \ - synthesizer.c + synthesizer.c \ + vector.c IDL_SRCS = classes.idl diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index d641902f4bc..0c486a415a7 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -36,6 +36,7 @@ struct list_constraint LONG ref; BOOLEAN enabled; + IVector_HSTRING *commands; }; /* @@ -91,7 +92,10 @@ static ULONG WINAPI list_constraint_Release( ISpeechRecognitionListConstraint *i TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) + { + IVector_HSTRING_Release(impl->commands); free(impl); + } return ref; } @@ -337,12 +341,15 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo TRACE("iface %p, commands %p, tag %p, listconstraint %p.\n", iface, commands, tag, listconstraint); + *listconstraint = NULL; + if (!commands) return E_POINTER; - if (!(impl = calloc(1, sizeof(*impl)))) + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + if (FAILED(vector_hstring_create(&impl->commands))) { - *listconstraint = NULL; + free(impl); return E_OUTOFMEMORY; } diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3e2fa9aed38..a09b5f5ef7e 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -66,6 +66,8 @@ HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken * HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); HRESULT typed_event_handlers_clear( struct list* list ); +HRESULT vector_hstring_create( IVector_HSTRING **out ); + #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ { \ diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c new file mode 100644 index 00000000000..13a36499a46 --- /dev/null +++ b/dlls/windows.media.speech/vector.c @@ -0,0 +1,313 @@ +/* WinRT Windows.Media.Speech implementation + * + * Copyright 2022 Bernhard Kölbl for CodeWeavers + * + * 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 + */ + +#include "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(speech); + +/* + * + * IVector<HSTRING> + * + */ + +struct vector_hstring +{ + IVector_HSTRING IVector_HSTRING_iface; + LONG ref; + + UINT32 size; + UINT32 capacity; + HSTRING *elements; +}; + +static inline struct vector_hstring *impl_from_IVector_HSTRING( IVector_HSTRING *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_hstring, IVector_HSTRING_iface); +} + +static HRESULT WINAPI vector_hstring_QueryInterface( IVector_HSTRING *iface, REFIID iid, void **out ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IVector_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IVector_HSTRING_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_hstring_AddRef( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_hstring_Release( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + { + IVector_HSTRING_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_hstring_GetIids( IVector_HSTRING *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetRuntimeClassName( IVector_HSTRING *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetTrustLevel( IVector_HSTRING *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetAt( IVector_HSTRING *iface, UINT32 index, HSTRING *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + return WindowsDuplicateString(impl->elements[index], value); +} + +static HRESULT WINAPI vector_hstring_get_Size( IVector_HSTRING *iface, UINT32 *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + TRACE( "iface %p, value %p.\n", iface, value ); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetView( IVector_HSTRING *iface, IVectorView_HSTRING **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_IndexOf( IVector_HSTRING *iface, HSTRING element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_SetAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING tmp; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (index >= impl->size) return E_BOUNDS; + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + WindowsDeleteString(impl->elements[index]); + impl->elements[index] = tmp; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_InsertAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING tmp, *tmp2 = impl->elements; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp2; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + impl->elements[index] = tmp; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_RemoveAt( IVector_HSTRING *iface, UINT32 index ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + + WindowsDeleteString(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Append( IVector_HSTRING *iface, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_HSTRING_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_hstring_RemoveAtEnd( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) WindowsDeleteString(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Clear( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_HSTRING_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetMany( IVector_HSTRING *iface, UINT32 start_index, + UINT32 items_size, HSTRING *items, UINT32 *count ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HRESULT hr; + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + if (FAILED(hr = WindowsDuplicateString(impl->elements[i], &items[i-start_index]))) goto error; + } + *count = i - start_index; + + return S_OK; + +error: + *count = 0; + while (i-- > start_index) WindowsDeleteString(items[i-start_index]); + return hr; +} + +static HRESULT WINAPI vector_hstring_ReplaceAll( IVector_HSTRING *iface, UINT32 count, HSTRING *items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_HSTRING_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_HSTRING_Append(iface, items[i]); + return hr; +} + +static const struct IVector_HSTRINGVtbl vector_hstring_vtbl = +{ + /* IUnknown methods */ + vector_hstring_QueryInterface, + vector_hstring_AddRef, + vector_hstring_Release, + /* IInspectable methods */ + vector_hstring_GetIids, + vector_hstring_GetRuntimeClassName, + vector_hstring_GetTrustLevel, + /* IVector<HSTRING> methods */ + vector_hstring_GetAt, + vector_hstring_get_Size, + vector_hstring_GetView, + vector_hstring_IndexOf, + vector_hstring_SetAt, + vector_hstring_InsertAt, + vector_hstring_RemoveAt, + vector_hstring_Append, + vector_hstring_RemoveAtEnd, + vector_hstring_Clear, + vector_hstring_GetMany, + vector_hstring_ReplaceAll, +}; + +HRESULT vector_hstring_create( IVector_HSTRING **out ) +{ + struct vector_hstring *impl; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_HSTRING_iface.lpVtbl = &vector_hstring_vtbl; + impl->ref = 1; + + *out = &impl->IVector_HSTRING_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

1 4

[PATCH v3 1/5] windows.media.speech: Add IVector<HSTRING>.
by Rémi Bernon 29 Mar '22

29 Mar '22

From: Bernhard Kölbl <besentv(a)gmail.com> And use it in listconstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Handle allocation failures. v3: Add a missing check and fix size handling in error path in PATCH 5. dlls/windows.media.speech/Makefile.in | 3 +- dlls/windows.media.speech/listconstraint.c | 11 +- dlls/windows.media.speech/private.h | 2 + dlls/windows.media.speech/vector.c | 313 +++++++++++++++++++++ 4 files changed, 326 insertions(+), 3 deletions(-) create mode 100644 dlls/windows.media.speech/vector.c diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in index 5dbdb03cf2f..5a8291ba6f0 100644 --- a/dlls/windows.media.speech/Makefile.in +++ b/dlls/windows.media.speech/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ listconstraint.c \ main.c \ recognizer.c \ - synthesizer.c + synthesizer.c \ + vector.c IDL_SRCS = classes.idl diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index d641902f4bc..0c486a415a7 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -36,6 +36,7 @@ struct list_constraint LONG ref; BOOLEAN enabled; + IVector_HSTRING *commands; }; /* @@ -91,7 +92,10 @@ static ULONG WINAPI list_constraint_Release( ISpeechRecognitionListConstraint *i TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) + { + IVector_HSTRING_Release(impl->commands); free(impl); + } return ref; } @@ -337,12 +341,15 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo TRACE("iface %p, commands %p, tag %p, listconstraint %p.\n", iface, commands, tag, listconstraint); + *listconstraint = NULL; + if (!commands) return E_POINTER; - if (!(impl = calloc(1, sizeof(*impl)))) + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + if (FAILED(vector_hstring_create(&impl->commands))) { - *listconstraint = NULL; + free(impl); return E_OUTOFMEMORY; } diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3e2fa9aed38..a09b5f5ef7e 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -66,6 +66,8 @@ HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken * HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); HRESULT typed_event_handlers_clear( struct list* list ); +HRESULT vector_hstring_create( IVector_HSTRING **out ); + #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ { \ diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c new file mode 100644 index 00000000000..13a36499a46 --- /dev/null +++ b/dlls/windows.media.speech/vector.c @@ -0,0 +1,313 @@ +/* WinRT Windows.Media.Speech implementation + * + * Copyright 2022 Bernhard Kölbl for CodeWeavers + * + * 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 + */ + +#include "private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(speech); + +/* + * + * IVector<HSTRING> + * + */ + +struct vector_hstring +{ + IVector_HSTRING IVector_HSTRING_iface; + LONG ref; + + UINT32 size; + UINT32 capacity; + HSTRING *elements; +}; + +static inline struct vector_hstring *impl_from_IVector_HSTRING( IVector_HSTRING *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_hstring, IVector_HSTRING_iface); +} + +static HRESULT WINAPI vector_hstring_QueryInterface( IVector_HSTRING *iface, REFIID iid, void **out ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IVector_HSTRING)) + { + IInspectable_AddRef((*out = &impl->IVector_HSTRING_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_hstring_AddRef( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_hstring_Release( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + { + IVector_HSTRING_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_hstring_GetIids( IVector_HSTRING *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetRuntimeClassName( IVector_HSTRING *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetTrustLevel( IVector_HSTRING *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_GetAt( IVector_HSTRING *iface, UINT32 index, HSTRING *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + return WindowsDuplicateString(impl->elements[index], value); +} + +static HRESULT WINAPI vector_hstring_get_Size( IVector_HSTRING *iface, UINT32 *value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + TRACE( "iface %p, value %p.\n", iface, value ); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetView( IVector_HSTRING *iface, IVectorView_HSTRING **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_hstring_IndexOf( IVector_HSTRING *iface, HSTRING element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_SetAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING tmp; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (index >= impl->size) return E_BOUNDS; + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + WindowsDeleteString(impl->elements[index]); + impl->elements[index] = tmp; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_InsertAt( IVector_HSTRING *iface, UINT32 index, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HSTRING tmp, *tmp2 = impl->elements; + HRESULT hr; + + TRACE( "iface %p, index %u, value %p.\n", iface, index, value ); + + if (FAILED(hr = WindowsDuplicateString(value, &tmp))) return hr; + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp2; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + impl->elements[index] = tmp; + return S_OK; +} + +static HRESULT WINAPI vector_hstring_RemoveAt( IVector_HSTRING *iface, UINT32 index ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + + WindowsDeleteString(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Append( IVector_HSTRING *iface, HSTRING value ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_HSTRING_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_hstring_RemoveAtEnd( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) WindowsDeleteString(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_hstring_Clear( IVector_HSTRING *iface ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_HSTRING_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_hstring_GetMany( IVector_HSTRING *iface, UINT32 start_index, + UINT32 items_size, HSTRING *items, UINT32 *count ) +{ + struct vector_hstring *impl = impl_from_IVector_HSTRING(iface); + HRESULT hr; + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + if (FAILED(hr = WindowsDuplicateString(impl->elements[i], &items[i-start_index]))) goto error; + } + *count = i - start_index; + + return S_OK; + +error: + *count = 0; + while (i-- > start_index) WindowsDeleteString(items[i-start_index]); + return hr; +} + +static HRESULT WINAPI vector_hstring_ReplaceAll( IVector_HSTRING *iface, UINT32 count, HSTRING *items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_HSTRING_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_HSTRING_Append(iface, items[i]); + return hr; +} + +static const struct IVector_HSTRINGVtbl vector_hstring_vtbl = +{ + /* IUnknown methods */ + vector_hstring_QueryInterface, + vector_hstring_AddRef, + vector_hstring_Release, + /* IInspectable methods */ + vector_hstring_GetIids, + vector_hstring_GetRuntimeClassName, + vector_hstring_GetTrustLevel, + /* IVector<HSTRING> methods */ + vector_hstring_GetAt, + vector_hstring_get_Size, + vector_hstring_GetView, + vector_hstring_IndexOf, + vector_hstring_SetAt, + vector_hstring_InsertAt, + vector_hstring_RemoveAt, + vector_hstring_Append, + vector_hstring_RemoveAtEnd, + vector_hstring_Clear, + vector_hstring_GetMany, + vector_hstring_ReplaceAll, +}; + +HRESULT vector_hstring_create( IVector_HSTRING **out ) +{ + struct vector_hstring *impl; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_HSTRING_iface.lpVtbl = &vector_hstring_vtbl; + impl->ref = 1; + + *out = &impl->IVector_HSTRING_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

3 7

[PATCH] winevulkan: Update to VK spec version 1.3.210.
by Georg Lehmann 29 Mar '22

29 Mar '22

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2a3129bacfe..505aaa81c60 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.3.208" +VK_XML_VERSION = "1.3.210" WINE_VK_VERSION = (1, 3) # Filenames to create. -- 2.35.1

1 0

[tools 1/2] testbot/cgi: Add an API to set the page refresh interval.
by Francois Gouget 29 Mar '22

29 Mar '22

It can be called early, removing the need to override GeneratePage() just for that purpose. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 19 +++++++++++++++++++ testbot/lib/WineTestBot/CGI/PageBase.pm | 15 ++++++++++++++- testbot/web/Activity.pl | 8 ++++---- testbot/web/JobDetails.pl | 16 ++++------------ testbot/web/PatchesList.pl | 10 +--------- testbot/web/index.pl | 15 ++++----------- 6 files changed, 46 insertions(+), 37 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index d5874129a..6197e4e38 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -141,6 +141,25 @@ sub escapeHTML($$) return $self->{CGIObj}->escapeHTML($String); } +=pod +=over 12 + +=head1 C<SetRefreshInterval()> + +Sets the page refresh interval in seconds. + +This can be called at any point before GenerateHttpHeaders(). + +=back +=cut + +sub SetRefreshInterval($$) +{ + my ($self, $Seconds) = @_; + + $self->{PageBase}->SetRefreshInterval($Seconds); +} + # # CGI parameters support diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 6eba0e0eb..5ce070189 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -81,7 +81,8 @@ sub new($$$$@) my ($Page, $Request, $RequiredRole) = @_; my $self = {Request => $Request, - Session => undef}; + Session => undef, + Refresh => undef}; $self = bless $self, $class; if (defined($RequiredRole) && $RequiredRole ne "") @@ -111,6 +112,13 @@ sub CreatePageBase($$$@) return WineTestBot::CGI::PageBase->new(@_); } +sub SetRefreshInterval($$) +{ + my ($self, $Seconds) = @_; + + $self->{Refresh} = $Seconds; +} + # # Session management @@ -363,6 +371,11 @@ sub GenerateHttpHeaders($) # HTTP/1.0 $Request->headers_out->add("Pragma", "no-cache"); + if ($self->{Refresh}) + { + $self->{Request}->headers_out->add("Refresh", $self->{Refresh}); + } + # Force char set $Request->content_type("text/html; charset=UTF-8"); diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index d98f50a6c..cbe3f8721 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -56,6 +56,10 @@ sub _initialize($$$) # either). $self->SetParam("Hours", $HOURS_DEFAULT); } + if ($self->GetParam("Hours") <= $HOURS_DEFAULT) + { + $self->SetRefreshInterval(60); + } } sub GetPageTitle($$) @@ -69,10 +73,6 @@ sub GeneratePage($) { my ($self) = @_; - if ($self->GetParam("Hours") <= $HOURS_DEFAULT) - { - $self->{Request}->headers_out->add("Refresh", "60"); - } $self->SUPER::GeneratePage(); } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 8d93957ce..5e302c098 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -57,6 +57,10 @@ sub _initialize($$$) $self->{JobId} = $JobId; $self->SUPER::_initialize($Request, $RequiredRole, CreateStepsTasks(undef, $self->{Job})); + if ($self->{Job}->Status =~ /^(?:queued|running)$/) + { + $self->SetRefreshInterval(30); + } } sub GetPageTitle($) @@ -241,18 +245,6 @@ sub SortKeys($$$) return \@SortedKeys; } -sub GeneratePage($) -{ - my ($self) = @_; - - if ($self->{Job}->Status =~ /^(queued|running)$/) - { - $self->{Request}->headers_out->add("Refresh", "30"); - } - - $self->SUPER::GeneratePage(); -} - sub InitMoreInfo($) { my ($self) = @_; diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 6728a285f..04ca0208c 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -33,6 +33,7 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->SUPER::_initialize($Request, $RequiredRole, CreatePatches()); + $self->SetRefreshInterval(60); } sub SortKeys($$$) @@ -65,15 +66,6 @@ sub GetActions($$) return []; } -sub GeneratePage($) -{ - my ($self) = @_; - - $self->{Request}->headers_out->add("Refresh", "60"); - - $self->SUPER::GeneratePage(); -} - sub GenerateDataCell($$$$$) { my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 451258ec6..1f362fc32 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -268,6 +268,10 @@ sub _initialize($$$) # Replace with the default value so the cutoff can be calculated $self->SetParam("Days", $DAYS_DEFAULT); } + if (!$self->GetErrMessage() and $self->GetParam("Days") <= $DAYS_DEFAULT) + { + $self->SetRefreshInterval(60); + } # The action is a no-op so unset it to not need to redefine OnAction() $self->SetParam("Action", undef); } @@ -280,17 +284,6 @@ sub OutputDot($$) "width='20' height='20' />"; } -sub GeneratePage($) -{ - my ($self) = @_; - - if (!$self->GetErrMessage() and $self->GetParam("Days") <= $DAYS_DEFAULT) - { - $self->{Request}->headers_out->add("Refresh", "60"); - } - $self->SUPER::GeneratePage(); -} - sub GenerateBody($) { my ($self) = @_; -- 2.30.2

1 1

[tools] testbot/cgi: Add Page::SetError().
by Francois Gouget 29 Mar '22

29 Mar '22

This provides a proper API to set the page error, particularly for non-child classes. Use it in CollectionBlock. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 8 ++++++-- testbot/lib/ObjectModel/CGI/Page.pm | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 053b22545..58ece69f3 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -617,8 +617,12 @@ sub OnItemAction($$$) if ($Action eq "Delete") { my $ErrMessage = $self->{Collection}->DeleteItem($Item); - $self->{EnclosingPage}->{ErrMessage} = $ErrMessage; - return ! defined($ErrMessage); + if (defined $ErrMessage) + { + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } + return 1; } $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index f7e3c93b8..a79155950 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -309,6 +309,14 @@ sub GetErrMessage($) return $self->{ErrMessage}; } +sub SetError($$$) +{ + my ($self, $ErrField, $ErrMessage) = @_; + + $self->{ErrField} = $ErrField; + $self->{ErrMessage} = $ErrMessage; +} + sub GenerateErrorDiv($) { my ($self) = @_; -- 2.30.2

1 0

[tools] testbot/cgi: Document and tweak the action error handling.
by Francois Gouget 29 Mar '22

29 Mar '22

Fix OnAction() so it returns an error when OnItemAction() fails to apply an action to a selected item. OnItemAction() should not return success on unknown item actions. Also the action is a user-supplied parameter so a proper error message shoulf be displayed when it is invalid instead of having OnAction() and OnItemAction() just die. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 16 ++++++++++++---- testbot/lib/ObjectModel/CGI/FormPage.pm | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 6f5c4d5fa..58bf927ca 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -603,6 +603,10 @@ This method is called to apply $Action to each selected item. Note that it is the responsibility of this method to validate the property values by calling Validate() before performing the action. +Returns true on success. In case an error occurs while performing the action on +any of the selected items, the enclosing page's error message is set and +false is returned. + =back =cut @@ -617,7 +621,8 @@ sub OnItemAction($$$) return ! defined($ErrMessage); } - return 1; + $self->{EnclosingPage}->SetError(undef, "No per-Item action defined for $Action"); + return 0; } @@ -668,6 +673,9 @@ Implements the "Add" and per-item actions. Note that it is the responsibility of this method to validate the property values by calling Validate() before performing the action. +Returns true on success. Otherwise the enclosing page's error message is set +and false is returned. + =back =cut @@ -692,15 +700,15 @@ sub OnAction($$) exit($self->{EnclosingPage}->Redirect($Target)); } - my $Ok = 1; foreach my $Key (@{$self->{Collection}->GetKeys()}) { - if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key)) && $Ok) + if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key))) { my $Item = $self->{Collection}->GetItem($Key); - $Ok = $self->CallOnItemAction($Item, $Action); + return 0 if (!$self->CallOnItemAction($Item, $Action)); } } + return 1; } 1; diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 83b078b24..0f4c5cd0e 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -596,6 +596,9 @@ actions. Note that it is the responsibility of this method to validate the property values by calling Validate() before performing the action. +Returns true on success. Otherwise sets the page's error message and returns +false. + =back =cut @@ -603,7 +606,8 @@ sub OnAction($$) { my ($self, $Action) = @_; - die "No action defined for $Action"; + $self->{EnclosingPage}->SetError(undef, "No action defined for $Action"); + return 0; } 1; -- 2.30.2

1 0

[tools] testbot/cgi: Simplify the default CollectionBlock::GetAction() implementation.
by Francois Gouget 29 Mar '22

29 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 58bf927ca..053b22545 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -654,13 +654,9 @@ sub GetActions($) { my ($self) = @_; - my @Actions; - if ($self->CallGetDetailsPage()) - { - $Actions[0] = "Add " . $self->{Collection}->GetItemName(); - } - - return \@Actions; + return $self->CallGetDetailsPage() ? + ["Add ". $self->{Collection}->GetItemName()] : + []; } =pod -- 2.30.2

1 0

[tools] testbot/cgi: Fix handling of '0' in text fields.
by Francois Gouget 29 Mar '22

29 Mar '22

'0' should be set as the field's initial value even though it evaluates to false. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 0f4c5cd0e..b85ccb297 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -300,7 +300,7 @@ sub GenerateField($$$) print "50' rows='", int(($MaxLength + 49) / 50); } print "'>"; - if ($Value) + if (defined $Value) { print $self->CGI->escapeHTML($Value), "'"; } @@ -313,7 +313,7 @@ sub GenerateField($$$) $Size=45 if ($Size > 45); print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), "' maxlength='", $PropertyDescriptor->GetMaxLength(), "' size='$Size'"; - if ($Value && $InputType ne "password") + if (defined $Value && $InputType ne "password") { print " value='", $self->CGI->escapeHTML($Value), "'"; } -- 2.30.2

1 0

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

29 Mar '22

One of Chrome crypto plugins depends on this. v2: Rebased. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 1 + dlls/crypt32/tests/cert.c | 59 ++++++++++++++------------------------- 2 files changed, 22 insertions(+), 38 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 33811dfadc1..81ebb59d27c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1006,6 +1006,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, HeapFree(GetProcessHeap(), 0, 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 608d2c8c1b7..3f164e6d606 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3906,55 +3906,42 @@ static void testAcquireCertPrivateKey(void) CERT_KEY_CONTEXT keyContext; /* Don't cache provider */ + SetLastError(0xdeadbeef); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "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 = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, NULL, NULL); - ok(ret || - broken(!ret), /* win95 */ - "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 = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "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 = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_CACHE_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "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 || - broken(!ret), /* win95 */ - "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); /* Remove the cached provider */ CryptReleaseContext(keyContext.hCryptProv, 0); @@ -3965,21 +3952,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 = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret || - broken(!ret), /* win95 */ - "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 || - broken(!ret), /* win95 */ - "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); CryptReleaseContext(certCSP, 0); CryptDestroyKey(key); -- 2.35.1

1 0

[PATCH v2 3/3] fonts: Add Segoe UI Symbol font replacement.
by Dmitry Timoshkov 29 Mar '22

29 Mar '22

Segoe UI Symbol font is used by many WPF .Net applications. This patch adds the font with just single glyph 0x25d4 (which is part of the Geometric Shapes unicode block), created by modifying glyph 'one in the circle' from the OpenSymbol font. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- fonts/Makefile.in | 1 + fonts/seguisym.sfd | 99 +++++++++++++++++++++++++++++++++++++++++++++ fonts/seguisym.ttf | Bin 0 -> 1688 bytes 3 files changed, 100 insertions(+) create mode 100644 fonts/seguisym.sfd create mode 100644 fonts/seguisym.ttf diff --git a/fonts/Makefile.in b/fonts/Makefile.in index b8021851987..afce01fdb8d 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -4,6 +4,7 @@ FONT_SRCS = \ fixedsys_jp.sfd \ marlett.sfd \ ms_sans_serif.sfd \ + seguisym.sfd \ small_fonts.sfd \ small_fonts_jp.sfd \ symbol.sfd \ diff --git a/fonts/seguisym.sfd b/fonts/seguisym.sfd new file mode 100644 index 00000000000..476969b3fc1 --- /dev/null +++ b/fonts/seguisym.sfd @@ -0,0 +1,99 @@ +SplineFontDB: 3.0 +FontName: WineSegoeUISymbol +FullName: Segoe UI Symbol +FamilyName: Segoe UI Symbol +Weight: Regular +Copyright: Copyright (C) 2022 Dmitry Timoshkov +UComments: "#pragma makedep install" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -119 +UnderlineWidth: 119 +Ascent: 1638 +Descent: 410 +LayerCount: 2 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 +XUID: [1021 135 1692684408 1110823] +FSType: 0 +OS2Version: 2 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +PfmFamily: 17 +TTFWeight: 400 +TTFWidth: 5 +LineGap: 0 +VLineGap: 0 +Panose: 2 11 5 2 4 2 4 2 2 3 +OS2TypoAscent: 1491 +OS2TypoAOffset: 0 +OS2TypoDescent: -431 +OS2TypoDOffset: 0 +OS2TypoLinegap: 269 +OS2WinAscent: 2210 +OS2WinAOffset: 0 +OS2WinDescent: 514 +OS2WinDOffset: 0 +HheadAscent: 2210 +HheadAOffset: 0 +HheadDescent: -514 +HheadDOffset: 0 +OS2SubXSize: 1434 +OS2SubYSize: 1331 +OS2SubXOff: 0 +OS2SubYOff: 283 +OS2SupXSize: 1434 +OS2SupYSize: 1331 +OS2SupXOff: 0 +OS2SupYOff: 977 +OS2StrikeYSize: 102 +OS2StrikeYPos: 530 +OS2FamilyClass: 2053 +OS2Vendor: 'Wine' +OS2CodePages: 00000001.40000000 +OS2UnicodeRanges: 8000006f.1200fbef.0064c000.00000002 +DEI: 91125 +Encoding: Custom +UnicodeInterp: none +NameList: Adobe Glyph List +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 1 +WinInfo: 0 38 14 +Grid +-2048 741 m 0 + 4096 741 l 0 +918 2662 m 0 + 918 -1434 l 0 +EndSplineSet +BeginChars: 256 1 + +StartChar: uni25D4 +Encoding: 255 9684 0 +Width: 1764 +Flags: WO +LayerCount: 2 +Fore +SplineSet +882.5 731 m 24,0,-1 + 882 1372 l 0,1,2 + 586.611 1347.2 586.611 1347.2 426 1184 c 0,3,4 + 240 995 240 995 240 730 c 0,5,6 + 240 459.078 240 459.078 426 276 c 0,7,8 + 617 88 617 88 882 88 c 0,9,10 + 1142.95 88 1142.95 88 1334 276 c 0,11,12 + 1534.8 473.599 1534.8 473.599 1522 730 c 0,13,-1 + 882.5 731 l 24,0,-1 +140 730 m 0,14,15 + 140 1036 140 1036 358 1254 c 0,16,17 + 574 1470 574 1470 882 1470 c 0,18,19 + 1188 1470 1188 1470 1404 1254 c 0,20,21 + 1620 1035 1620 1035 1620 730 c 0,22,23 + 1620 421 1620 421 1404 208 c 0,24,25 + 1189 -10 1189 -10 882 -10 c 0,26,27 + 573 -10 573 -10 358 208 c 0,28,29 + 140 420 140 420 140 730 c 0,14,15 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/fonts/seguisym.ttf b/fonts/seguisym.ttf new file mode 100644 index 0000000000000000000000000000000000000000..9dc577f45388d30d2049fb18bb1d8493c9e897c0 GIT binary patch literal 1688 zcmds1U1(cn7=FI<m(1BF8Dm4N`b8UELE5v^+DZvhY>4(kr){zc12t{aBrM4Z$?3Mp zz<R%nUFsCX>D`9dASh!xuVgZYij~D|mjkbc2=j-jr#|1wsj~=zw|<BBd!P5`d*AoG z-wy<U0jxpCbJ=X}8A{YxC&-5mEQ~qcd#@CzdV%uGOSM7+v5{9PUm`uZbkvi`m<d3? zn|7mAXf-xB83~q0Ia;c=R~FxvPtiU^`BJ%9SbkAEyH0$aG+Cx%@K@t|#@bDJxLos& z?>>jGD1S^jUUioWI0fd`<CO2J6^=LXG!D@IIAvKc)QYh;=1tmf0NUY(+wwZMriYn- zhIU8&iK4^f6H_n6(m!EmlnUTP>VvhvcxLlwD`$R6ISNf_Ik+Zz<`1877?*P{h@{}w zFanK%`@=PAr3iF07!8~>>xMW5)@GhI$7#H`&-JgdqV0;B+D=n5_-XnY;O@e2KVbPY zwNN`$sTVPm+DL7f-}ujqf#?}6h(4pN{UIS(Sw;z}Lefb>_C27Xu-Y^w)qx=xkmLqG z%Bc<RQ84$$LQjSZewt3?Dx0Fe4;APCKZ3K2M}u#fzpJSpYs+Syos3{~U0^KTi5R%) ztXt;wbVt_+v92q%snnf_C4NtL*utC6cp{ldB@@YvCjDXYx?eW)x6fvbD?!|o;i((I zee8I`h**jE-aSb<HK`}#Q<F)#cTXZ7v6AwUhxMla-8<*cUlcopdGU*Z+oyY7F(I68 zw|mvU;$Obn)2?Z+-Sh4z{xANIA6>ZcIgg>!>vpgCU;3B7?e#W-Z5zb<TYHU%c!&D? zDG=ky>0^z5crL^`9>A>-8;FUC5SxgLl@MD<h&R;<Gj=dTmej|BccL0%4TE?q#5$h9 zhau*@;f?S6n~)+CVhaz7W0-}D2HI$%f)dK`AhD0y5poAM$sx+1M!QF^Hl-YKjq6(U zKSF*Km~|WNW~Eg2<i6Pv>DZ1VGqsA>Y|C7w=C;a5TskeF$Q&+bi9F^wFECyWi_}$V zE|%P)%+JY%c5Tt6Vm|O+rLDlsm@k%As|A8A{p+ko@g^gxcn)6zn|wNm`mcGiZr#he z%~DZ1qqdxu|H%7a>paK`n(Rg;s7taA8~cNL6q3NfVzX6o>(aLOkJ`3P%^^D1x$I6V z)sSuNP)}1(T7GV;AzLrS=Ce4)GayLYhe1(56Ix`oUU44FOax}ZHz;`3wmaXE{sj6$ B2nYZG literal 0 HcmV?d00001 -- 2.35.1

1 0

[PATCH v2 2/3] dwrite: Add Segoe UI Symbol fallback range for the Geometric Shapes unicode block.
by Dmitry Timoshkov 29 Mar '22

29 Mar '22

As discussed on wine-devel with just Geometric Shapes unicode block. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/analyzer.c | 8 ++++++++ dlls/dwrite/tests/layout.c | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7ffcfa8070c..0087c126322 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -220,6 +220,13 @@ static const DWRITE_UNICODE_RANGE cjk_ranges[] = { 0x4e00, 0x9fff }, /* CJK Unified Ideographs */ }; +static const WCHAR *SegoeUI_Symbol_families[] = { L"Segoe UI Symbol" }; + +static const DWRITE_UNICODE_RANGE SegoeUI_Symbol_ranges[] = +{ + { 0x25a0, 0x25ff }, /* Geometric Shapes */ +}; + struct fallback_mapping { DWRITE_UNICODE_RANGE *ranges; UINT32 ranges_count; @@ -236,6 +243,7 @@ static const struct fallback_mapping fontfallback_neutral_data[] = { (WCHAR **)families, ARRAY_SIZE(families) } MAPPING_RANGE(cjk_ranges, cjk_families), + MAPPING_RANGE(SegoeUI_Symbol_ranges, SegoeUI_Symbol_families), #undef MAPPING_RANGE }; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 42274a95611..420d236fe22 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6602,19 +6602,18 @@ todo_wine { hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, families[i], DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); -todo_wine_if(families[i] == NULL) ok(hr == S_OK, "%u: %s - got %#x\n", i, wine_dbgstr_w(families[i]), hr); if (hr != S_OK) continue; ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); get_font_name(font, name, ARRAY_SIZE(name)); -todo_wine +todo_wine_if(families[i] != NULL) ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); ok(hr == S_OK, "got %#x\n", hr); -todo_wine +todo_wine_if(families[i] != NULL) ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); IDWriteFont_Release(font); -- 2.35.1

1 0

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