- wine-devel - winehq.org

[PATCH 3/6] win32u: Move NtUserPostMessage implementation from user32.
by Jacek Caban 06 Apr '22

06 Apr '22

3 2

[PATCH 2/6] win32u: Move NtUserPostThreadMessage implementation from user32.
by Jacek Caban 06 Apr '22

06 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 29 ++--------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 24 ++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ 7 files changed, 36 insertions(+), 29 deletions(-)

3 2

[PATCH 1/6] win32u: Add missing return in NtUserExitingThread implementation.
by Jacek Caban 06 Apr '22

06 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH 1/9] mf/tests: Simplify handling of broken Win7 results.
by Rémi Bernon 06 Apr '22

06 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Sending tests first instead, as the review that more tests may be useful. It's not all completely related to H264, but I'm thinking that using the ColorConvertDMO transform instead of a videoconvert element might be best to correctly support H264 transform format changes, although none of the games I've tried are doing that. dlls/mf/tests/mf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 31a84e47bc1..b2dd807dd33 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6631,6 +6631,7 @@ static void test_h264_decoder(void) IMFMediaType *media_type; IMFTransform *transform; DWORD status, length; + BOOL is_win7 = FALSE; ULONG i, ret, flags; HANDLE output_file; IMFSample *sample; @@ -6741,10 +6742,9 @@ static void test_h264_decoder(void) winetest_push_context("out %lu", i); ok(hr == S_OK, "GetOutputAvailableType returned %#lx\n", hr); check_media_type(media_type, default_outputs[i], -1); - if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL))) - check_media_type(media_type, default_outputs_win7[i], -1); - else - check_media_type(media_type, default_outputs_extra[i], -1); + hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL); + is_win7 = broken(FAILED(hr)); + check_media_type(media_type, is_win7 ? default_outputs_win7[i] : default_outputs_extra[i], -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); winetest_pop_context(); @@ -6772,11 +6772,9 @@ static void test_h264_decoder(void) init_media_type(media_type, output_type_desc, i + 1); } hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - if (broken(hr == MF_E_INVALIDMEDIATYPE)) - { - init_media_type(media_type, output_type_desc_win7, ARRAY_SIZE(output_type_desc_win7) - 1); - hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - } + ok(hr == (is_win7 ? MF_E_INVALIDMEDIATYPE : S_OK), "SetOutputType returned %#lx.\n", hr); + init_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 1, "Release returned %lu\n", ret); -- 2.35.1

1 8

[tools] testbot/cgi: Let CollectionBlock operate in read-only mode.
by Francois Gouget 06 Apr '22

06 Apr '22

When in read-only mode the CollectionBlock does not allow any per-item or global action to be performed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This avoids having to redefine GetItemActions() and GetActions() for the sole purpose of preventing the default actions on a collection block and thus removes a bit of code. When a collection block can operate either in read-only or read-write mode depending on the circumstances (failure blacklist pages) this also makes centralizing the corresponding test a no-brainer. --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 39 ++++++++++++++++--- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 ++++ testbot/web/PatchesList.pl | 13 +------ testbot/web/index.pl | 32 +-------------- 4 files changed, 43 insertions(+), 48 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 40ad61b2b..13c2a62bd 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -53,7 +53,7 @@ use URI::Escape; =item C<new()> -Creates a table showing the content of the specified Collection with +Creates a table showing the content of the specified Collection with optional support for performing actions on selected rows, or performing global actions. Parameters: @@ -67,6 +67,8 @@ ObjectModel::CGI::Page interface. =back +Note that by default the table is in read-write mode (see SetReadWrite()). + =back =cut @@ -76,7 +78,9 @@ sub new($$$@) my ($Collection, $EnclosingPage) = @_; my $self = {Collection => $Collection, - EnclosingPage => $EnclosingPage}; + EnclosingPage => $EnclosingPage, + RW => 1, + }; $self = bless $self, $class; $self->_initialize(@_); return $self; @@ -92,6 +96,28 @@ sub Create($$@) return ObjectModel::CGI::CollectionBlock->new(@_); } +=pod +=over 12 + +=item C<SetReadWrite()> + +If set to true, the table allows selecting rows and applying actions to +them (see GetItemActions()), as well as performing global actions (see +GetActions()). + +Otherwise none of this is allowed, regardless of what GetItemActions() and +GetActions() return. + +=back +=cut + +sub SetReadWrite($$) +{ + my ($self, $RW) = @_; + + $self->{RW} = $RW; +} + sub GetDetailsPage($) { my ($self) = @_; @@ -405,7 +431,7 @@ EOF print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; print "<thead>\n"; - my $ItemActions = $self->GetItemActions(); + my $ItemActions = $self->{RW} ? $self->GetItemActions() : []; $self->GenerateHeaderRow($PropertyDescriptors, $ItemActions); print "</thead>\n"; @@ -459,7 +485,7 @@ EOF print "</div>\n"; } - my $Actions = $self->GetActions(); + my $Actions = $self->{RW} ? $self->GetActions() : []; if (@$Actions != 0) { print "<div class='CollectionBlockActions'>\n"; @@ -499,6 +525,7 @@ column of checkboxes is added. sub GetItemActions($) { #my ($self) = @_; + return ["Delete"]; } @@ -523,7 +550,7 @@ sub OnItemAction($$$) { my ($self, $Item, $Action) = @_; - if ($Action eq "Delete") + if ($self->{RW} and $Action eq "Delete") { my $ErrMessage = $self->{Collection}->DeleteItem($Item); if (defined $ErrMessage) @@ -587,7 +614,7 @@ sub OnAction($$) { my ($self, $Action) = @_; - if ($Action eq "Add " . $self->{Collection}->GetItemName()) + if ($self->{RW} and $Action eq "Add ". $self->{Collection}->GetItemName()) { my $Target = $self->GetDetailsPage(); my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 2de667b89..7bdd27e26 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -87,6 +87,13 @@ sub _initialize($$$$;$) $self->SUPER::_initialize($Request, $RequiredRole); } +sub SetReadWrite($$) +{ + my ($self, $RW) = @_; + + $self->{CollectionBlock}->SetReadWrite($RW); +} + # # HTML page generation diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 49e16d8d2..854c2768a 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -64,18 +64,6 @@ sub GenerateDataCell($$$$$) } } -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - package main; @@ -84,5 +72,6 @@ use WineTestBot::Patches; my $Request = shift; my $Page = ObjectModel::CGI::CollectionPage->new($Request, "", CreatePatches(), \&PatchesBlock::Create); +$Page->SetReadWrite(0); $Page->SetRefreshInterval(60); $Page->GeneratePage(); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index d2dd2b49d..85f8df39f 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -43,18 +43,6 @@ sub SortKeys($$) return \@SortedKeys; } -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -207,18 +195,6 @@ sub SortKeys($$) return $self->{Collection}->SortKeysBySortOrder($Keys); } -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -229,12 +205,6 @@ sub DisplayProperty($$) $PropertyName eq "Description"; } -sub GetDetailsPage($) -{ - #my ($self) = @_; - return undef; -} - package StatusPage; @@ -344,6 +314,7 @@ sub GenerateBody($) my $CutOff = time() - $Days * 24 * 60 * 60; $Jobs->AddFilter("Submitted", [$CutOff], ">="); my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); + $JobsCollectionBlock->SetReadWrite(0); # We need to collect information about the tasks of all jobs except the # pretty rare queued jobs. But doing so one job at a time is inefficient so @@ -384,6 +355,7 @@ EOF print "<h2><a name='vms'></a>VMs</h2>\n"; my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); + $VMsCollectionBlock->SetReadWrite(0); $VMsCollectionBlock->GenerateList(); print "</div>\n"; -- 2.30.2

1 0

[tools 1/2] testbot/SetWinLocale: Add an option to change the locale of VMs.
by Francois Gouget 06 Apr '22

06 Apr '22

The --vm ensures the right TestAgent connection parameters will be used to connect to the specified VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This partially reverts commit 206c7478dcb4 but with some important differences: - It does not parse the VM name to infer the locale to be used. Here --vm is purely a way to specify how to connect to that machine's TestAgentd server. - It does not add back the options for 'refreshing' snapshots, or creating new VMs for the specified locales. Those were not used and are not coming back. --- testbot/bin/SetWinLocale | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 670de4604..e41af2088 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -40,6 +40,7 @@ use WineTestBot::Config; use WineTestBot::Log; use WineTestBot::TestAgent; use WineTestBot::Utils; +use WineTestBot::VMs; my $HKCU_INTERNATIONAL = "HKCU\\Control Panel\\International"; my $HKCU_GEO = "HKCU\\Control Panel\\International\\Geo"; @@ -315,7 +316,7 @@ sub CheckLocale($$) return undef; } -my ($OptHostName, $OptShow, $OptSysCopy, $OptDefCopy, $OptUseIntl, $OptReboot); +my ($OptVM, $OptHostName, $OptShow, $OptSysCopy, $OptDefCopy, $OptUseIntl, $OptReboot); my ($OptDefault, $OptLocale, $OptCountry, $OptSystem, $OptUTF8, $OptMUI, $OptKeyboard); while (@ARGV) { @@ -324,6 +325,10 @@ while (@ARGV) { $Usage = 0; } + elsif ($Arg eq "--vm") + { + $OptVM = CheckValue($Arg, $OptVM); + } elsif ($Arg eq "--show") { $OptShow = 1; @@ -415,10 +420,25 @@ while (@ARGV) } # Check and untaint parameters -my ($Keyboard, $CountryId); +my ($VM, $Keyboard, $CountryId); if (!defined $Usage) { - if (!defined $OptHostName) + if (defined $OptVM) + { + my $VMs = CreateVMs(); + $VM = $VMs->GetItem($OptVM); + if (!$VM) + { + Error("could not find the '$OptVM' VM\n"); + $Usage = 2; + } + elsif (!$Debug and $VM->Role eq "deleted") + { + Error("'$OptVM' is marked for deletion\n"); + $Usage = 2; + } + } + elsif (!defined $OptHostName) { Error("you must specify the Windows machine to work on\n"); $Usage = 2; @@ -510,14 +530,16 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-sys-copy] [--no-def-copy] [--use-intl] [--no-reboot] HOSTNAME\n"; + print "Usage: $name0 [options] --show (HOSTNAME|--vm VM)\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-sys-copy] [--no-def-copy] [--use-intl] [--no-reboot] (HOSTNAME|--vm VM)\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; print " --show Show the locale settings of the specified host and exit.\n"; + print " --vm VM Work on the specified TestBot VM, using its TestAgent\n"; + print " connection parameters.\n"; print " --default DEF Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; print " control panel module, that is roughly ll-CC where ll is an\n"; @@ -604,7 +626,7 @@ if (defined $Usage) exit 0; } -$TA = TestAgent->new($OptHostName, $AgentPort); +$TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); # -- 2.30.2

1 1

[PATCH 2/2] kernelbase: Add support for CREATE_NO_WINDOW flag.
by Jacek Caban 06 Apr '22

06 Apr '22

Based on patches by Eric Pouech and Torge Matthies. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Both Eric and Torge sent patches for this and both used ConsoleFlags for passing the information. While reviewing both series, I was wondering if using ConsoleHandle instead would be cleaner and I think it is. I ended up having a complete third version... Eric, Torge, I hope you will review this. dlls/kernel32/tests/console.c | 3 --- dlls/kernelbase/console.c | 21 +++++++++++++++------ dlls/kernelbase/process.c | 11 +++++++---- include/wine/condrv.h | 5 +++-- programs/conhost/conhost.c | 11 ++++++++--- programs/conhost/conhost.h | 1 + 6 files changed, 34 insertions(+), 18 deletions(-)

2 6

[PATCH] Replace / with : in ConnectionString
by Florian Manschwetus 06 Apr '22

06 Apr '22

From: manschwetusCS <30724946+manschwetusCS(a)users.noreply.github.com> In Windows ODBC it seems to be legal to use "host/port", which is not legal with Linux ODBC. This patch aims to find and replace such in the ConnectionString Signed-off-by: Florian Manschwetus <manschwetus(a)cs-software-gmbh.de> --- dlls/odbc32/proxyodbc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index c1cb44c29fc..3c78d94b69a 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1779,10 +1779,21 @@ SQLRETURN WINAPI SQLDriverConnect(SQLHDBC hdbc, SQLHWND hwnd, SQLCHAR *Connectio SQLCHAR *conn_str_out, SQLSMALLINT conn_str_out_max, SQLSMALLINT *ptr_conn_str_out, SQLUSMALLINT driver_completion) { + static const char *serverStr="SERVER="; struct SQLDriverConnect_params params = { hdbc, hwnd, ConnectionString, Length, conn_str_out, conn_str_out_max, ptr_conn_str_out, driver_completion }; SQLRETURN ret; + SQLCHAR *serverPos; + for (serverPos = strstr(ConnectionString,serverStr);(*serverPos != ';') && (*serverPos != '\0'); ++serverPos) + { + if (*serverPos == '/') + { + *serverPos = ':'; + break; + } + } + TRACE("(hdbc %p, hwnd %p, ConnectionString %s, Length %d, conn_str_out %p, conn_str_out_max %d," " ptr_conn_str_out %p, driver_completion %d)\n", hdbc, hwnd, debugstr_an((const char *)ConnectionString, Length), Length, conn_str_out, conn_str_out_max, -- 2.33.0.windows.2 If you received this email in error, please advise the sender (by return email or otherwise) immediately.

2 2

[PATCH] dlls/urlmon: use I width modifier instead of casting to DWORD
by Eric Pouech 06 Apr '22

06 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/urlmon/sec_mgr.c | 12 +++++------ dlls/urlmon/uri.c | 56 +++++++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 5c79cb2b2500..4529f439b7db 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1153,8 +1153,8 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlActionEx2(IInternetSecurityManage DWORD dwFlags, DWORD_PTR dwReserved, DWORD *pdwOutFlags) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - FIXME("(%p)->(%p %08lx %p %ld %p %ld %08lx %08lx %p) stub\n", This, pUri, dwAction, pPolicy, - cbPolicy, pContext, cbContext, dwFlags, (DWORD)dwReserved, pdwOutFlags); + FIXME("(%p)->(%p %08lx %p %ld %p %ld %08lx %08Ix %p) stub\n", This, pUri, dwAction, pPolicy, + cbPolicy, pContext, cbContext, dwFlags, dwReserved, pdwOutFlags); return E_NOTIMPL; } @@ -1162,7 +1162,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityIdEx2(IInternetSecurityManagerEx IUri *pUri, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - TRACE("(%p)->(%p %p %p %08lx) stub\n", This, pUri, pbSecurityId, pcbSecurityId, (DWORD)dwReserved); + TRACE("(%p)->(%p %p %p %08Ix) stub\n", This, pUri, pbSecurityId, pcbSecurityId, dwReserved); if(dwReserved) FIXME("dwReserved is not supported yet\n"); @@ -1178,8 +1178,8 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicyEx2(IInternetSecurityManag DWORD cbContext, DWORD_PTR dwReserved) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - FIXME("(%p)->(%p %s %p %p %p %ld %08lx) stub\n", This, pUri, debugstr_guid(guidKey), ppPolicy, pcbPolicy, - pContext, cbContext, (DWORD)dwReserved); + FIXME("(%p)->(%p %s %p %p %p %ld %08Ix) stub\n", This, pUri, debugstr_guid(guidKey), ppPolicy, pcbPolicy, + pContext, cbContext, dwReserved); return E_NOTIMPL; } @@ -1993,7 +1993,7 @@ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION WCHAR *ret_url; HRESULT hres; - TRACE("(%p,%p,%u,%lu)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved); + TRACE("(%p,%p,%u,%Iu)\n", pUri, ppSecUri, psuAction, dwReserved); if(!pUri || !ppSecUri) return E_INVALIDARG; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 838f1d0619db..c774fdf01adc 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4662,7 +4662,7 @@ static HRESULT WINAPI UriBuilderFactory_CreateIUriBuilder(IUriBuilderFactory *if IUriBuilder **ppIUriBuilder) { Uri *This = impl_from_IUriBuilderFactory(iface); - TRACE("(%p)->(%08lx %08lx %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + TRACE("(%p)->(%08lx %08Ix %p)\n", This, dwFlags, dwReserved, ppIUriBuilder); if(!ppIUriBuilder) return E_POINTER; @@ -4681,7 +4681,7 @@ static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilder IUriBuilder **ppIUriBuilder) { Uri *This = impl_from_IUriBuilderFactory(iface); - TRACE("(%p)->(%08lx %08lx %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + TRACE("(%p)->(%08lx %08Ix %p)\n", This, dwFlags, dwReserved, ppIUriBuilder); if(!ppIUriBuilder) return E_POINTER; @@ -5286,7 +5286,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU HRESULT hr; parse_data data; - TRACE("(%s %lx %lx %p)\n", debugstr_w(pwzURI), dwFlags, (DWORD)dwReserved, ppURI); + TRACE("(%s %lx %Ix %p)\n", debugstr_w(pwzURI), dwFlags, dwReserved, ppURI); if(!ppURI) return E_INVALIDARG; @@ -5374,7 +5374,7 @@ HRESULT WINAPI CreateUriWithFragment(LPCWSTR pwzURI, LPCWSTR pwzFragment, DWORD DWORD_PTR dwReserved, IUri **ppURI) { HRESULT hres; - TRACE("(%s %s %lx %lx %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, (DWORD)dwReserved, ppURI); + TRACE("(%s %s %lx %Ix %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, dwReserved, ppURI); if(!ppURI) return E_INVALIDARG; @@ -5547,11 +5547,11 @@ static HRESULT WINAPI UriBuilder_CreateUriSimple(IUriBuilder *iface, { UriBuilder *This = impl_from_IUriBuilder(iface); HRESULT hr; - TRACE("(%p)->(%ld %ld %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + TRACE("(%p)->(%ld %Id %p)\n", This, dwAllowEncodingPropertyMask, dwReserved, ppIUri); hr = build_uri(This, ppIUri, 0, UriBuilder_USE_ORIGINAL_FLAGS, dwAllowEncodingPropertyMask); if(hr == E_NOTIMPL) - FIXME("(%p)->(%ld %ld %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + FIXME("(%p)->(%ld %Id %p)\n", This, dwAllowEncodingPropertyMask, dwReserved, ppIUri); return hr; } @@ -5563,7 +5563,7 @@ static HRESULT WINAPI UriBuilder_CreateUri(IUriBuilder *iface, { UriBuilder *This = impl_from_IUriBuilder(iface); HRESULT hr; - TRACE("(%p)->(0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + TRACE("(%p)->(0x%08lx %ld %Id %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, dwReserved, ppIUri); if(dwCreateFlags == -1) hr = build_uri(This, ppIUri, 0, UriBuilder_USE_ORIGINAL_FLAGS, dwAllowEncodingPropertyMask); @@ -5571,7 +5571,7 @@ static HRESULT WINAPI UriBuilder_CreateUri(IUriBuilder *iface, hr = build_uri(This, ppIUri, dwCreateFlags, 0, dwAllowEncodingPropertyMask); if(hr == E_NOTIMPL) - FIXME("(%p)->(0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + FIXME("(%p)->(0x%08lx %ld %Id %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, dwReserved, ppIUri); return hr; } @@ -5584,13 +5584,13 @@ static HRESULT WINAPI UriBuilder_CreateUriWithFlags(IUriBuilder *iface, { UriBuilder *This = impl_from_IUriBuilder(iface); HRESULT hr; - TRACE("(%p)->(0x%08lx 0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwUriBuilderFlags, - dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + TRACE("(%p)->(0x%08lx 0x%08lx %ld %Id %p)\n", This, dwCreateFlags, dwUriBuilderFlags, + dwAllowEncodingPropertyMask, dwReserved, ppIUri); hr = build_uri(This, ppIUri, dwCreateFlags, dwUriBuilderFlags, dwAllowEncodingPropertyMask); if(hr == E_NOTIMPL) - FIXME("(%p)->(0x%08lx 0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwUriBuilderFlags, - dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + FIXME("(%p)->(0x%08lx 0x%08lx %ld %Id %p)\n", This, dwCreateFlags, dwUriBuilderFlags, + dwAllowEncodingPropertyMask, dwReserved, ppIUri); return hr; } @@ -5932,7 +5932,7 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve { UriBuilder *ret; - TRACE("(%p %lx %lx %p)\n", pIUri, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + TRACE("(%p %lx %Ix %p)\n", pIUri, dwFlags, dwReserved, ppIUriBuilder); if(!ppIUriBuilder) return E_POINTER; @@ -5962,8 +5962,8 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve } else { heap_free(ret); *ppIUriBuilder = NULL; - FIXME("(%p %lx %lx %p): Unknown IUri types not supported yet.\n", pIUri, dwFlags, - (DWORD)dwReserved, ppIUriBuilder); + FIXME("(%p %lx %Ix %p): Unknown IUri types not supported yet.\n", pIUri, dwFlags, + dwReserved, ppIUriBuilder); return E_NOTIMPL; } } @@ -6295,7 +6295,7 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d HRESULT hr; IInternetProtocolInfo *info; Uri *relative, *base; - TRACE("(%p %p %lx %p %lx)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + TRACE("(%p %p %lx %p %Ix)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, dwReserved); if(!ppCombinedUri) return E_INVALIDARG; @@ -6309,8 +6309,8 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d base = get_uri_obj(pBaseUri); if(!relative || !base) { *ppCombinedUri = NULL; - FIXME("(%p %p %lx %p %lx) Unknown IUri types not supported yet.\n", - pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + FIXME("(%p %p %lx %p %Ix) Unknown IUri types not supported yet.\n", + pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, dwReserved); return E_NOTIMPL; } @@ -6343,8 +6343,8 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW HRESULT hr; IInternetProtocolInfo *info; - TRACE("(%p %s %lx %p %lx)\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, - ppCombinedUri, (DWORD)dwReserved); + TRACE("(%p %s %lx %p %Ix)\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, + ppCombinedUri, dwReserved); if(!ppCombinedUri) return E_POINTER; @@ -6362,8 +6362,8 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW base = get_uri_obj(pBaseUri); if(!base) { *ppCombinedUri = NULL; - FIXME("(%p %s %lx %p %lx) Unknown IUri's not supported yet.\n", pBaseUri, debugstr_w(pwzRelativeUrl), - dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + FIXME("(%p %s %lx %p %Ix) Unknown IUri's not supported yet.\n", pBaseUri, debugstr_w(pwzRelativeUrl), + dwCombineFlags, ppCombinedUri, dwReserved); return E_NOTIMPL; } @@ -6828,8 +6828,8 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d Uri *uri; IInternetProtocolInfo *info; - TRACE("(%p %d %lx %p %ld %p %lx)\n", pIUri, ParseAction, dwFlags, pwzResult, - cchResult, pcchResult, (DWORD)dwReserved); + TRACE("(%p %d %lx %p %ld %p %Ix)\n", pIUri, ParseAction, dwFlags, pwzResult, + cchResult, pcchResult, dwReserved); if(!pcchResult) return E_POINTER; @@ -6841,8 +6841,8 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d if(!(uri = get_uri_obj(pIUri))) { *pcchResult = 0; - FIXME("(%p %d %lx %p %ld %p %lx) Unknown IUri's not supported for this action.\n", - pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + FIXME("(%p %d %lx %p %ld %p %Ix) Unknown IUri's not supported for this action.\n", + pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, dwReserved); return E_NOTIMPL; } @@ -6896,8 +6896,8 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d default: *pcchResult = 0; hr = E_NOTIMPL; - FIXME("(%p %d %lx %p %ld %p %lx) Partial stub.\n", pIUri, ParseAction, dwFlags, - pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + FIXME("(%p %d %lx %p %ld %p %Ix) Partial stub.\n", pIUri, ParseAction, dwFlags, + pwzResult, cchResult, pcchResult, dwReserved); } return hr;

2 1

[PATCH v2 2/2] kernelbase: Add support for CREATE_NO_WINDOW flag.
by Jacek Caban 06 Apr '22

06 Apr '22

Based on patches by Eric Pouech and Torge Matthies. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Added spawn_process part, spotted and implemented by Eric. dlls/kernel32/tests/console.c | 3 --- dlls/kernelbase/console.c | 21 +++++++++++++++------ dlls/kernelbase/process.c | 11 +++++++---- dlls/ntdll/unix/process.c | 1 + include/wine/condrv.h | 5 +++-- programs/conhost/conhost.c | 11 ++++++++--- programs/conhost/conhost.h | 1 + 7 files changed, 35 insertions(+), 18 deletions(-)

3 3

[PATCH 2/2] win32u: Return -1 for NUMCOLORS with 8-bit display DCs.
by Zhiyi Zhang 06 Apr '22

06 Apr '22

According to tests, GetDeviceCaps(NUMCOLORS) returns -1 for display DCs when the current display mode is 8-bit on newer versions of Windows, which makes sense because lower bit depth display modes are actually emulated with 32-bit modes. Spotted by Marc P <marc.pluhar+winehq(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52679 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 1 - dlls/win32u/driver.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 1d88afafb18..67c932398b9 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2310,7 +2310,6 @@ static void test_display_dc(void) value = GetDeviceCaps(hdc, NUMCOLORS); if (bpps[i] > 8 || (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6)) - todo_wine_if(bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6) ok(value == -1, "Expected -1, got %d.\n", value); else if (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) < 6) ok(value > 16 && value <= 256, "Got %d.\n", value); diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index d1062cb5f3a..75e07d6c4e3 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -294,7 +294,8 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case LOGPIXELSY: return get_system_dpi(); case NUMCOLORS: bpp = NtGdiGetDeviceCaps( dev->hdc, BITSPIXEL ); - return (bpp > 8) ? -1 : (1 << bpp); + /* Newer versions of Windows return -1 for 8-bit and higher */ + return (bpp > 4) ? -1 : (1 << bpp); case COLORRES: /* The observed correspondence between BITSPIXEL and COLORRES is: * BITSPIXEL: 8 -> COLORRES: 18 -- 2.32.0

2 1

[PATCH v2] wusa: Support wow64 architecture identifier.
by Hans Leidekker 06 Apr '22

06 Apr '22

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> v2: Make the helper take an assembly and rename it to is_assembly_wow64(). Some update packages use both x86 and wow64 expressions. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/wusa/main.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 74dfeb68d5f..53534628c31 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -477,6 +477,14 @@ static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) return TRUE; } +static BOOL assembly_is_wow64(const struct assembly_entry *assembly) +{ +#ifdef __x86_64__ + return !wcsicmp(assembly->identity.architecture, L"x86") || !wcsicmp(assembly->identity.architecture, L"wow64"); +#endif + return FALSE; +} + static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *key) { WCHAR path[MAX_PATH]; @@ -484,25 +492,19 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke if (!wcsicmp(key, L"runtime.system32") || !wcsicmp(key, L"runtime.drivers") || !wcsicmp(key, L"runtime.wbem")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_SYSTEMX86; -#endif - if (!csidl) csidl = CSIDL_SYSTEM; + if (assembly_is_wow64(assembly)) csidl = CSIDL_SYSTEMX86; + else csidl = CSIDL_SYSTEM; } else if (!wcsicmp(key, L"runtime.windows") || !wcsicmp(key, L"runtime.inf")) csidl = CSIDL_WINDOWS; else if (!wcsicmp(key, L"runtime.programfiles")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILESX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES; + if (assembly_is_wow64(assembly)) csidl = CSIDL_PROGRAM_FILESX86; + else csidl = CSIDL_PROGRAM_FILES; } else if (!wcsicmp(key, L"runtime.commonfiles")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES_COMMON; + if (assembly_is_wow64(assembly)) csidl = CSIDL_PROGRAM_FILES_COMMONX86; + else csidl = CSIDL_PROGRAM_FILES_COMMON; } #ifdef __x86_64__ else if (!wcsicmp(key, L"runtime.programfilesx86")) csidl = CSIDL_PROGRAM_FILESX86; -- 2.30.2

1 0

[PATCH] wusa: Support wow64 expressions.
by Mohamad Al-Jaf 06 Apr '22

06 Apr '22

Some update packages use both x86 and wow64 expressions. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- programs/wusa/main.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 74dfeb68d5f..2cfaa1a2d63 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -477,6 +477,14 @@ static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) return TRUE; } +static BOOL expression_is_x86(const WCHAR *str) +{ +#ifdef __x86_64__ + return !wcsicmp(str, L"x86") || !wcsicmp(str, L"wow64"); +#endif + return FALSE; +} + static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *key) { WCHAR path[MAX_PATH]; @@ -484,25 +492,19 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke if (!wcsicmp(key, L"runtime.system32") || !wcsicmp(key, L"runtime.drivers") || !wcsicmp(key, L"runtime.wbem")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_SYSTEMX86; -#endif - if (!csidl) csidl = CSIDL_SYSTEM; + if (expression_is_x86(assembly->identity.architecture)) csidl = CSIDL_SYSTEMX86; + else csidl = CSIDL_SYSTEM; } else if (!wcsicmp(key, L"runtime.windows") || !wcsicmp(key, L"runtime.inf")) csidl = CSIDL_WINDOWS; else if (!wcsicmp(key, L"runtime.programfiles")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILESX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES; + if (expression_is_x86(assembly->identity.architecture)) csidl = CSIDL_PROGRAM_FILESX86; + else csidl = CSIDL_PROGRAM_FILES; } else if (!wcsicmp(key, L"runtime.commonfiles")) { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES_COMMON; + if (expression_is_x86(assembly->identity.architecture)) csidl = CSIDL_PROGRAM_FILES_COMMONX86; + else csidl = CSIDL_PROGRAM_FILES_COMMON; } #ifdef __x86_64__ else if (!wcsicmp(key, L"runtime.programfilesx86")) csidl = CSIDL_PROGRAM_FILESX86; -- 2.35.1

1 0

[PATCH v2 1/4] ncrypt: Map STATUS_NOT_SUPPORTED to NTE_NOT_SUPPORTED.
by Mohamad Al-Jaf 06 Apr '22

06 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/ncrypt/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index cc979a539d2..13909a2dd9e 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -40,6 +40,7 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) case STATUS_INVALID_SIGNATURE: return NTE_BAD_SIGNATURE; case STATUS_SUCCESS: return ERROR_SUCCESS; case STATUS_INVALID_PARAMETER: return NTE_INVALID_PARAMETER; + case STATUS_NOT_SUPPORTED: return NTE_NOT_SUPPORTED; case NTE_BAD_DATA: return NTE_BAD_DATA; default: FIXME("unhandled status %#lx\n", status); -- 2.35.1

2 7

[PATCH 2/2] bcrypt: Implement BCryptFreeBuffer().
by Hans Leidekker 06 Apr '22

06 Apr '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 98ae8c97e3a..2c0d2f8f965 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -75,7 +75,7 @@ NTSTATUS WINAPI BCryptEnumContextFunctions( ULONG table, const WCHAR *ctx, ULONG void WINAPI BCryptFreeBuffer( void *buffer ) { - FIXME( "%p\n", buffer ); + free( buffer ); } NTSTATUS WINAPI BCryptRegisterProvider( const WCHAR *provider, ULONG flags, CRYPT_PROVIDER_REG *reg ) -- 2.30.2

2 2

[PATCH] wusa: Reimplement lookup_expression.
by Mohamad Al-Jaf 06 Apr '22

06 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- This is a lot more readable and easily allows for additional expressions to be supported if needed in the future. It also conforms to the general code style in wusa. --- programs/wusa/main.c | 60 ++++++++++++++++++++++++-------------------- programs/wusa/wusa.h | 8 ++++++ 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 74dfeb68d5f..f43e86c0019 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -52,6 +52,31 @@ struct installer_state struct list updates; }; +static const struct expression expression_table[] = +{ + {L"runtime.system32", L"amd64", CSIDL_SYSTEM, NULL}, + {L"runtime.system32", L"x86", CSIDL_SYSTEMX86, NULL}, + {L"runtime.system32", L"wow64", CSIDL_SYSTEMX86, NULL}, + {L"runtime.windows", NULL, CSIDL_WINDOWS, NULL}, + {L"runtime.programfiles", L"amd64", CSIDL_PROGRAM_FILES, NULL}, + {L"runtime.programfiles", L"x86", CSIDL_PROGRAM_FILESX86, NULL}, + {L"runtime.programfiles", L"wow64", CSIDL_PROGRAM_FILESX86, NULL}, + {L"runtime.programfilesX86", L"x86", CSIDL_PROGRAM_FILESX86, NULL}, + {L"runtime.commonfiles", L"amd64", CSIDL_PROGRAM_FILES_COMMON, NULL}, + {L"runtime.commonfiles", L"x86", CSIDL_PROGRAM_FILES_COMMONX86, NULL}, + {L"runtime.commonfiles", L"wow64", CSIDL_PROGRAM_FILES_COMMONX86, NULL}, + {L"runtime.commonfilesX86", L"x86", CSIDL_PROGRAM_FILES_COMMONX86, NULL}, + {L"runtime.programdata", NULL, CSIDL_COMMON_APPDATA, NULL}, + {L"runtime.drivers", L"amd64", CSIDL_SYSTEM, L"\\drivers"}, + {L"runtime.drivers", L"x86", CSIDL_SYSTEMX86, L"\\drivers"}, + {L"runtime.drivers", L"wow64", CSIDL_SYSTEMX86, L"\\drivers"}, + {L"runtime.wbem", L"amd64", CSIDL_SYSTEM, L"\\wbem"}, + {L"runtime.wbem", L"x86", CSIDL_SYSTEMX86, L"\\wbem"}, + {L"runtime.wbem", L"wow64", CSIDL_SYSTEMX86, L"\\wbem"}, + {L"runtime.inf", NULL, CSIDL_WINDOWS, L"\\inf"}, + {L"runtime.fonts", NULL, CSIDL_FONTS, NULL}, +}; + static void * CDECL cabinet_alloc(ULONG cb) { return malloc(cb); @@ -480,36 +505,19 @@ static BOOL strbuf_append(struct strbuf *buf, const WCHAR *str, DWORD len) static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *key) { WCHAR path[MAX_PATH]; + unsigned int i; int csidl = 0; - if (!wcsicmp(key, L"runtime.system32") || !wcsicmp(key, L"runtime.drivers") || !wcsicmp(key, L"runtime.wbem")) - { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_SYSTEMX86; -#endif - if (!csidl) csidl = CSIDL_SYSTEM; - } - else if (!wcsicmp(key, L"runtime.windows") || !wcsicmp(key, L"runtime.inf")) csidl = CSIDL_WINDOWS; - else if (!wcsicmp(key, L"runtime.programfiles")) + for (i = 0; i < ARRAY_SIZE(expression_table); ++i) { + if (wcsicmp(key, expression_table[i].key)) continue; #ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILESX86; + if (expression_table[i].architecture) + if (wcsicmp(assembly->identity.architecture, expression_table[i].architecture)) continue; #endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES; - } - else if (!wcsicmp(key, L"runtime.commonfiles")) - { -#ifdef __x86_64__ - if (!wcsicmp(assembly->identity.architecture, L"x86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; -#endif - if (!csidl) csidl = CSIDL_PROGRAM_FILES_COMMON; + csidl = expression_table[i].csidl; + break; } -#ifdef __x86_64__ - else if (!wcsicmp(key, L"runtime.programfilesx86")) csidl = CSIDL_PROGRAM_FILESX86; - else if (!wcsicmp(key, L"runtime.commonfilesx86")) csidl = CSIDL_PROGRAM_FILES_COMMONX86; -#endif - else if (!wcsicmp(key, L"runtime.programdata")) csidl = CSIDL_COMMON_APPDATA; - else if (!wcsicmp(key, L"runtime.fonts")) csidl = CSIDL_FONTS; if (!csidl) { @@ -522,9 +530,7 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke return NULL; } - if (!wcsicmp(key, L"runtime.inf")) wcscat(path, L"\\inf"); - else if (!wcsicmp(key, L"runtime.drivers")) wcscat(path, L"\\drivers"); - else if (!wcsicmp(key, L"runtime.wbem")) wcscat(path, L"\\wbem"); + if (expression_table[i].append) wcscat(path, expression_table[i].append); return strdupW(path); } diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h index da679a27f07..fa8e37979e2 100644 --- a/programs/wusa/wusa.h +++ b/programs/wusa/wusa.h @@ -33,6 +33,14 @@ struct assembly_identity WCHAR *pubkey_token; }; +struct expression +{ + const WCHAR *key; + const WCHAR *architecture; + int csidl; + const WCHAR *append; +}; + struct dependency_entry { struct list entry; -- 2.35.1

2 7

[PATCH 1/2] bcrypt: Fix array index in BCryptEnumAlgorithms().
by Hans Leidekker 06 Apr '22

06 Apr '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 11 ++++++----- dlls/bcrypt/tests/bcrypt.c | 12 +++++++++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2ffeff66d7b..98ae8c97e3a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -147,7 +147,7 @@ NTSTATUS WINAPI BCryptEnumAlgorithms( ULONG type, ULONG *ret_count, BCRYPT_ALGOR BCRYPT_SIGNATURE_OPERATION |\ BCRYPT_RNG_OPERATION; BCRYPT_ALGORITHM_IDENTIFIER *list; - ULONG i, count = 0; + ULONG i, j, count = 0; TRACE( "%#lx, %p, %p, %#lx\n", type, ret_count, ret_list, flags ); @@ -160,12 +160,13 @@ NTSTATUS WINAPI BCryptEnumAlgorithms( ULONG type, ULONG *ret_count, BCRYPT_ALGOR if (!(list = malloc( count * sizeof(*list) ))) return STATUS_NO_MEMORY; - for (i = 0; i < ARRAY_SIZE( builtin_algorithms ); i++) + for (i = 0, j = 0; i < ARRAY_SIZE( builtin_algorithms ); i++) { if (!match_operation_type( type, builtin_algorithms[i].class )) continue; - list[i].pszName = (WCHAR *)builtin_algorithms[i].name; - list[i].dwClass = builtin_algorithms[i].class; - list[i].dwFlags = 0; + list[j].pszName = (WCHAR *)builtin_algorithms[i].name; + list[j].dwClass = builtin_algorithms[i].class; + list[j].dwFlags = 0; + j++; } *ret_count = count; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index df650379cfb..08ce360cac0 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2668,7 +2668,7 @@ static void test_BCryptEnumAlgorithms(void) { BCRYPT_ALGORITHM_IDENTIFIER *list; NTSTATUS ret; - ULONG count; + ULONG count, op; ret = BCryptEnumAlgorithms(0, NULL, NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); @@ -2689,6 +2689,16 @@ static void test_BCryptEnumAlgorithms(void) ok(list != NULL, "NULL list\n"); ok(count, "got %lu\n", count); BCryptFreeBuffer( list ); + + op = BCRYPT_CIPHER_OPERATION | BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION | BCRYPT_SIGNATURE_OPERATION | + BCRYPT_SECRET_AGREEMENT_OPERATION; + count = 0; + list = NULL; + ret = BCryptEnumAlgorithms(op, &count, &list, 0); + ok(!ret, "got %#lx\n", ret); + ok(list != NULL, "NULL list\n"); + ok(count, "got %lu\n", count); + BCryptFreeBuffer( list ); } static void test_aes_vector(void) -- 2.30.2

1 0

[PATCH] dlls/dwrite/tests: don't outdent todo_wine (generated mingw GCC11 warnings)
by Eric Pouech 06 Apr '22

06 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dwrite/tests/layout.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 43b6efa107b..c3445550650 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4805,19 +4805,19 @@ static void test_system_fallback(void) g_source = tests[i].text; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &length, &font, &scale); - todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr != S_OK) continue; ok(length == 1, "Unexpected length %u\n", length); ok(scale == 1.0f, "got %f\n", scale); get_font_name(font, name, ARRAY_SIZE(name)); - todo_wine + todo_wine ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine + todo_wine ok(exists, "%s missing character %#x\n", wine_dbgstr_w(name), g_source[0]); IDWriteFont_Release(font);

3 2

[PATCH v4 1/2] dwrite: Add Segoe UI Symbol fallback range for the Geometric Shapes unicode block.
by Dmitry Timoshkov 06 Apr '22

06 Apr '22

As discussed on wine-devel with just Geometric Shapes unicode block. v4: Rebased. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/analyzer.c | 8 ++++++++ 1 file changed, 8 insertions(+) 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 }; -- 2.35.1

1 0

Re: Dmitry Timoshkov : dwrite/tests: Add some fallback tests for Segoe UI Symbol.
by Eric Pouech 06 Apr '22

06 Apr '22

Hi Dmitry + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, > + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &length, &font, &scale); > + todo_wine > + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); > + if (hr != S_OK) continue; would you mind not outdenting the todo_wine... it generates tons of FIXME with mingw's GCC11 TIA

2 2

[PATCH] dlls/mciavi32: use I width modifier instead of casting to DWORD
by Eric Pouech 06 Apr '22

06 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mciavi32/mciavi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 64a1a0fbd7d0..dcd07032fecb 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -1063,11 +1063,11 @@ LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SAVE: case MCI_UNDO: case MCI_UNFREEZE: - TRACE("Unsupported function [0x%x] flags=%08lx\n", wMsg, (DWORD)dwParam1); + TRACE("Unsupported function [0x%x] flags=%08Ix\n", wMsg, dwParam1); return MCIERR_UNSUPPORTED_FUNCTION; case MCI_SPIN: case MCI_ESCAPE: - WARN("Unsupported command [0x%x] %08lx\n", wMsg, (DWORD)dwParam1); + WARN("Unsupported command [0x%x] %08Ix\n", wMsg, dwParam1); break; case MCI_OPEN: case MCI_CLOSE:

1 0

[PATCH] dlls/comdlg32: use I width modifier instead of casting to LONG
by Eric Pouech 06 Apr '22

06 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/comdlg32/fontdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 03c712c6bc2e..4bf041e85b3c 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -937,7 +937,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO } } - TRACE("WM_COMMAND wParam=%08lX lParam=%08IX\n", (LONG)wParam, lParam); + TRACE("WM_COMMAND wParam=%08IX lParam=%08IX\n", wParam, lParam); switch (LOWORD(wParam)) { case cmb1:

1 0

[PATCH] dlls/comdlg32: use I width modifier instead of casting to LONG
by Eric Pouech 06 Apr '22

06 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/comdlg32/fontdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 03c712c6bc2e..4bf041e85b3c 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -937,7 +937,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO } } - TRACE("WM_COMMAND wParam=%08lX lParam=%08IX\n", (LONG)wParam, lParam); + TRACE("WM_COMMAND wParam=%08IX lParam=%08IX\n", wParam, lParam); switch (LOWORD(wParam)) { case cmb1:

1 0

[PATCH] dlls/comdlg32: use I width modifier instead of casting to LONG
by Eric Pouech 06 Apr '22

06 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/comdlg32/fontdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 03c712c6bc2e..4bf041e85b3c 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -937,7 +937,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO } } - TRACE("WM_COMMAND wParam=%08lX lParam=%08IX\n", (LONG)wParam, lParam); + TRACE("WM_COMMAND wParam=%08IX lParam=%08IX\n", wParam, lParam); switch (LOWORD(wParam)) { case cmb1:

1 0

[PATCH v2 1/7] include/winerror.h: Add missing WinRT HRESULT codes.
by Bernhard Kölbl 05 Apr '22

05 Apr '22

Taken from MSDN and original winerror.h. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/winerror.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index b63b74a5b18..d51d5648cdb 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2578,6 +2578,25 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define E_CHANGED_STATE _HRESULT_TYPEDEF_(0x8000000C) #define E_ILLEGAL_STATE_CHANGE _HRESULT_TYPEDEF_(0x8000000D) #define E_ILLEGAL_METHOD_CALL _HRESULT_TYPEDEF_(0x8000000E) +#define RO_E_METADATA_NAME_NOT_FOUND _HRESULT_TYPEDEF_(0x8000000F) +#define RO_E_METADATA_NAME_IS_NAMESPACE _HRESULT_TYPEDEF_(0x80000010) +#define RO_E_METADATA_INVALID_TYPE_FORMAT _HRESULT_TYPEDEF_(0x80000011) +#define RO_E_INVALID_METADATA_FILE _HRESULT_TYPEDEF_(0x80000012) +#define RO_E_CLOSED _HRESULT_TYPEDEF_(0x80000013) +#define RO_E_EXCLUSIVE_WRITE _HRESULT_TYPEDEF_(0x80000014) +#define RO_E_CHANGE_NOTIFICATION_IN_PROGRESS _HRESULT_TYPEDEF_(0x80000015) +#define RO_E_ERROR_STRING_NOT_FOUND _HRESULT_TYPEDEF_(0x80000016) +#define E_STRING_NOT_NULL_TERMINATED _HRESULT_TYPEDEF_(0x80000017) +#define E_ILLEGAL_DELEGATE_ASSIGNMENT _HRESULT_TYPEDEF_(0x80000018) +#define E_ASYNC_OPERATION_NOT_STARTED _HRESULT_TYPEDEF_(0x80000019) +#define E_APPLICATION_EXITING _HRESULT_TYPEDEF_(0x8000001A) +#define E_APPLICATION_VIEW_EXITING _HRESULT_TYPEDEF_(0x8000001B) +#define RO_E_MUST_BE_AGILE _HRESULT_TYPEDEF_(0x8000001C) +#define RO_E_UNSUPPORTED_FROM_MTA _HRESULT_TYPEDEF_(0x8000001D) +#define RO_E_COMMITTED _HRESULT_TYPEDEF_(0x8000001E) +#define RO_E_BLOCKED_CROSS_ASTA_CALL _HRESULT_TYPEDEF_(0x8000001F) +#define RO_E_CANNOT_ACTIVATE_FULL_TRUST_SERVER _HRESULT_TYPEDEF_(0x80000020) +#define RO_E_CANNOT_ACTIVATE_UNIVERSAL_APPLICATION_SERVER _HRESULT_TYPEDEF_(0x80000021) #define E_NOTIMPL _HRESULT_TYPEDEF_(0x80004001) #define E_NOINTERFACE _HRESULT_TYPEDEF_(0x80004002) -- 2.35.1

2 8

[tools] testbot/cgi: Move SecureConnection() and MakeSecureURL() to PageBase.
by Francois Gouget 05 Apr '22

05 Apr '22

This is where they are used and it is a reminder that they are meant for CGI scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 49 ++++++++++++++++++++++++- testbot/lib/WineTestBot/Utils.pm | 49 +------------------------ testbot/web/Login.pl | 3 +- 3 files changed, 51 insertions(+), 50 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 3073ac220..55e015d58 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -36,7 +36,7 @@ providing a common banner, navigation menu and cascading style sheets. =cut use Exporter 'import'; -our @EXPORT = qw(CreatePageBase); +our @EXPORT = qw(CreatePageBase MakeSecureURL); use Apache2::Const -compile => qw(REDIRECT); use CGI::Cookie; @@ -120,9 +120,54 @@ sub SetRefreshInterval($$) # -# Session management +# Session management and security # +=pod +=over 12 + +=item C<SecureConnection()> + +Returns true if the user accessed the website over a secure connection. + +This relies on the web server setting the $HTTPS environment variable for CGI +scripts. + +=back +=cut + +sub SecureConnection() +{ + return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; +} + +=pod +=over 12 + +=item C<MakeSecureURL()> + +Builds a URL that accesses this website using https if possible. +The parameter should be an absolute path that includes neither the protocol +nor the hostname. + +This relies on the web server setting the $HTTP_HOST environment variable for +CGI scripts. However $HTTP_HOST which may not match the official website +hostname. As such this should only be used for providing URLs back to the user +accessing the website, not for URLs sent to third-parties. + +See also WineTestBot::Utils::MakeOfficialURL(). + +=back +=cut + +sub MakeSecureURL($) +{ + my ($URL) = @_; + + my $Protocol = ($UseSSL || SecureConnection()) ? "https://" : "http://"; + return $Protocol . ($ENV{"HTTP_HOST"} || $WebHostName) . $URL; +} + sub UnsetCookies($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 2ebad4597..f24243e90 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -27,7 +27,7 @@ WineTestBot::Utils - Utility functions =cut use Exporter 'import'; -our @EXPORT = qw(SecureConnection MakeSecureURL MakeOfficialURL GetTaskURL +our @EXPORT = qw(MakeOfficialURL GetTaskURL GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir GetMTime DurationToString BuildEMailRecipient IsValidFileName @@ -46,51 +46,6 @@ use WineTestBot::Config; =pod =over 12 -=item C<SecureConnection()> - -Returns true if the user accessed the website over a secure connection. - -This relies on the web server setting the $HTTPS environment variable for CGI -scripts. - -=back -=cut - -sub SecureConnection() -{ - return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; -} - -=pod -=over 12 - -=item C<MakeSecureURL()> - -Builds a URL that accesses this website using https if possible. -The parameter should be an absolute path that includes neither the protocol -nor the hostname. - -This relies on the web server setting the $HTTP_HOST environment variable for -CGI scripts. However $HTTP_HOST which may not match the official website -hostname. As such this should only be used for providing URLs back to the user -accessing the website, not for URLs sent to third-parties. - -See also MakeOfficialURL(). - -=back -=cut - -sub MakeSecureURL($) -{ - my ($URL) = @_; - - my $Protocol = ($UseSSL || SecureConnection()) ? "https://" : "http://"; - return $Protocol . ($ENV{"HTTP_HOST"} || $WebHostName) . $URL; -} - -=pod -=over 12 - =item C<MakeOfficialURL()> Creates a URL pointing to the official website. @@ -101,7 +56,7 @@ This is the method to use in non-CGI scripts and to build URLs sent to any third-party (e.g. via email); where a third party is any user other than the one currently browsing the website. -See also MakeSecureURL(). +See also WineTestBot::CGI::PageBase::MakeSecureURL(). =back =cut diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index b1f82a94b..837617d8d 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -25,9 +25,10 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use ObjectModel::BasicPropertyDescriptor; + use WineTestBot::Config; use WineTestBot::Users; -use WineTestBot::Utils; +use WineTestBot::CGI::PageBase; use WineTestBot::CGI::Sessions; -- 2.30.2

1 0

[tools] testbot/web: Skip GetDisplayValue() for the JobDetails page.
by Francois Gouget 05 Apr '22

05 Apr '22

The job details page knows which property it is accessing so there is no need to go through the generic GetDisplayValue(). This makes the code more readable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 5e538f884..da4ad7e96 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -88,7 +88,7 @@ sub GenerateDataCell($$$$) if ($PropertyName eq "VM") { print "<td><a href='#k", $self->escapeHTML($StepTask->GetKey()), "'>"; - print $self->escapeHTML($self->GetDisplayValue($StepTask, $PropertyDescriptor)); + print $self->escapeHTML($StepTask->VM->Name); print "</a></td>\n"; } elsif ($PropertyName eq "FileName") @@ -100,7 +100,7 @@ sub GenerateDataCell($$$$) my $URI = "/GetFile.pl?JobKey=" . uri_escape($JobId) . "&StepKey=" . uri_escape($StepTask->StepNo); print "<td><a href='" . $self->escapeHTML($URI) . "'>"; - print $self->escapeHTML($self->GetDisplayValue($StepTask, $PropertyDescriptor)); + print $self->escapeHTML($StepTask->FileName); print "</a></td>\n"; } else -- 2.30.2

1 0

website: apt-key is deprecated
by Floris Renaud 05 Apr '22

05 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52439 On April 21, 2022, Ubuntu Jammy Jellyfish will be released. On this version of Ubuntu, it is no longer possible to add the Winehq key through apt-key. This is also no longer possible on Debian Bookworm. To make the installation of Wine on the different Ubuntu and Debian distributions the same, the idea is to switch to .sources files. This will allow the WineHQ repository to be added with: Download and install the key: wget -nc https://dl.winehq.org/wine-builds/winehq.key sudo mv winehq.key /usr/share/keyrings/winehq-archive.key Download and install the sources file for your distro, for example bookworm wget -nc https://dl.winehq.org/wine-builds/winehq-bookworm.sources sudo mv winehq-bookworm.sources /etc/apt/sources.list.d/ Where winehq-bookworm.sources contains the following: Types: deb URIs: https://dl.winehq.org/wine-builds/debian Suites: bookworm Components: main Architectures: amd64 i386 Signed-By: /usr/share/keyrings/winehq-archive.key In the future (starting with apt version 2.3.10), this approach also makes it possible to embed the winehq key in the .sources file. Attached are the sources files for the supported Debian and Ubuntu versions and already for Ubuntu Jammy. Can these files be uploaded to dl.winehq.org? Floris

3 4

[PATCH v2 1/2] kernel32/tests: Add more CreateProcess console management tests.
by Jacek Caban 05 Apr '22

05 Apr '22

From: Eric Pouech <eric.pouech(a)gmail.com> - check for console bits after create process - add tests for CREATE_NO_WINDOW flag in CreateProcess Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 91 +++++++++++++++++++++++++++++------ 1 file changed, 77 insertions(+), 14 deletions(-)

2 1

[PATCH] dlls/urlmon: use I width modifier instead of casting to DWORD
by Eric Pouech 05 Apr '22

05 Apr '22

--- dlls/urlmon/sec_mgr.c | 12 +++++------ dlls/urlmon/uri.c | 56 +++++++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 5c79cb2b2500..4529f439b7db 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1153,8 +1153,8 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlActionEx2(IInternetSecurityManage DWORD dwFlags, DWORD_PTR dwReserved, DWORD *pdwOutFlags) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - FIXME("(%p)->(%p %08lx %p %ld %p %ld %08lx %08lx %p) stub\n", This, pUri, dwAction, pPolicy, - cbPolicy, pContext, cbContext, dwFlags, (DWORD)dwReserved, pdwOutFlags); + FIXME("(%p)->(%p %08lx %p %ld %p %ld %08lx %08Ix %p) stub\n", This, pUri, dwAction, pPolicy, + cbPolicy, pContext, cbContext, dwFlags, dwReserved, pdwOutFlags); return E_NOTIMPL; } @@ -1162,7 +1162,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityIdEx2(IInternetSecurityManagerEx IUri *pUri, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - TRACE("(%p)->(%p %p %p %08lx) stub\n", This, pUri, pbSecurityId, pcbSecurityId, (DWORD)dwReserved); + TRACE("(%p)->(%p %p %p %08Ix) stub\n", This, pUri, pbSecurityId, pcbSecurityId, dwReserved); if(dwReserved) FIXME("dwReserved is not supported yet\n"); @@ -1178,8 +1178,8 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicyEx2(IInternetSecurityManag DWORD cbContext, DWORD_PTR dwReserved) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - FIXME("(%p)->(%p %s %p %p %p %ld %08lx) stub\n", This, pUri, debugstr_guid(guidKey), ppPolicy, pcbPolicy, - pContext, cbContext, (DWORD)dwReserved); + FIXME("(%p)->(%p %s %p %p %p %ld %08Ix) stub\n", This, pUri, debugstr_guid(guidKey), ppPolicy, pcbPolicy, + pContext, cbContext, dwReserved); return E_NOTIMPL; } @@ -1993,7 +1993,7 @@ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION WCHAR *ret_url; HRESULT hres; - TRACE("(%p,%p,%u,%lu)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved); + TRACE("(%p,%p,%u,%Iu)\n", pUri, ppSecUri, psuAction, dwReserved); if(!pUri || !ppSecUri) return E_INVALIDARG; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 838f1d0619db..c774fdf01adc 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4662,7 +4662,7 @@ static HRESULT WINAPI UriBuilderFactory_CreateIUriBuilder(IUriBuilderFactory *if IUriBuilder **ppIUriBuilder) { Uri *This = impl_from_IUriBuilderFactory(iface); - TRACE("(%p)->(%08lx %08lx %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + TRACE("(%p)->(%08lx %08Ix %p)\n", This, dwFlags, dwReserved, ppIUriBuilder); if(!ppIUriBuilder) return E_POINTER; @@ -4681,7 +4681,7 @@ static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilder IUriBuilder **ppIUriBuilder) { Uri *This = impl_from_IUriBuilderFactory(iface); - TRACE("(%p)->(%08lx %08lx %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + TRACE("(%p)->(%08lx %08Ix %p)\n", This, dwFlags, dwReserved, ppIUriBuilder); if(!ppIUriBuilder) return E_POINTER; @@ -5286,7 +5286,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU HRESULT hr; parse_data data; - TRACE("(%s %lx %lx %p)\n", debugstr_w(pwzURI), dwFlags, (DWORD)dwReserved, ppURI); + TRACE("(%s %lx %Ix %p)\n", debugstr_w(pwzURI), dwFlags, dwReserved, ppURI); if(!ppURI) return E_INVALIDARG; @@ -5374,7 +5374,7 @@ HRESULT WINAPI CreateUriWithFragment(LPCWSTR pwzURI, LPCWSTR pwzFragment, DWORD DWORD_PTR dwReserved, IUri **ppURI) { HRESULT hres; - TRACE("(%s %s %lx %lx %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, (DWORD)dwReserved, ppURI); + TRACE("(%s %s %lx %Ix %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, dwReserved, ppURI); if(!ppURI) return E_INVALIDARG; @@ -5547,11 +5547,11 @@ static HRESULT WINAPI UriBuilder_CreateUriSimple(IUriBuilder *iface, { UriBuilder *This = impl_from_IUriBuilder(iface); HRESULT hr; - TRACE("(%p)->(%ld %ld %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + TRACE("(%p)->(%ld %Id %p)\n", This, dwAllowEncodingPropertyMask, dwReserved, ppIUri); hr = build_uri(This, ppIUri, 0, UriBuilder_USE_ORIGINAL_FLAGS, dwAllowEncodingPropertyMask); if(hr == E_NOTIMPL) - FIXME("(%p)->(%ld %ld %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + FIXME("(%p)->(%ld %Id %p)\n", This, dwAllowEncodingPropertyMask, dwReserved, ppIUri); return hr; } @@ -5563,7 +5563,7 @@ static HRESULT WINAPI UriBuilder_CreateUri(IUriBuilder *iface, { UriBuilder *This = impl_from_IUriBuilder(iface); HRESULT hr; - TRACE("(%p)->(0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + TRACE("(%p)->(0x%08lx %ld %Id %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, dwReserved, ppIUri); if(dwCreateFlags == -1) hr = build_uri(This, ppIUri, 0, UriBuilder_USE_ORIGINAL_FLAGS, dwAllowEncodingPropertyMask); @@ -5571,7 +5571,7 @@ static HRESULT WINAPI UriBuilder_CreateUri(IUriBuilder *iface, hr = build_uri(This, ppIUri, dwCreateFlags, 0, dwAllowEncodingPropertyMask); if(hr == E_NOTIMPL) - FIXME("(%p)->(0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + FIXME("(%p)->(0x%08lx %ld %Id %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, dwReserved, ppIUri); return hr; } @@ -5584,13 +5584,13 @@ static HRESULT WINAPI UriBuilder_CreateUriWithFlags(IUriBuilder *iface, { UriBuilder *This = impl_from_IUriBuilder(iface); HRESULT hr; - TRACE("(%p)->(0x%08lx 0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwUriBuilderFlags, - dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + TRACE("(%p)->(0x%08lx 0x%08lx %ld %Id %p)\n", This, dwCreateFlags, dwUriBuilderFlags, + dwAllowEncodingPropertyMask, dwReserved, ppIUri); hr = build_uri(This, ppIUri, dwCreateFlags, dwUriBuilderFlags, dwAllowEncodingPropertyMask); if(hr == E_NOTIMPL) - FIXME("(%p)->(0x%08lx 0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwUriBuilderFlags, - dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + FIXME("(%p)->(0x%08lx 0x%08lx %ld %Id %p)\n", This, dwCreateFlags, dwUriBuilderFlags, + dwAllowEncodingPropertyMask, dwReserved, ppIUri); return hr; } @@ -5932,7 +5932,7 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve { UriBuilder *ret; - TRACE("(%p %lx %lx %p)\n", pIUri, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + TRACE("(%p %lx %Ix %p)\n", pIUri, dwFlags, dwReserved, ppIUriBuilder); if(!ppIUriBuilder) return E_POINTER; @@ -5962,8 +5962,8 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve } else { heap_free(ret); *ppIUriBuilder = NULL; - FIXME("(%p %lx %lx %p): Unknown IUri types not supported yet.\n", pIUri, dwFlags, - (DWORD)dwReserved, ppIUriBuilder); + FIXME("(%p %lx %Ix %p): Unknown IUri types not supported yet.\n", pIUri, dwFlags, + dwReserved, ppIUriBuilder); return E_NOTIMPL; } } @@ -6295,7 +6295,7 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d HRESULT hr; IInternetProtocolInfo *info; Uri *relative, *base; - TRACE("(%p %p %lx %p %lx)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + TRACE("(%p %p %lx %p %Ix)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, dwReserved); if(!ppCombinedUri) return E_INVALIDARG; @@ -6309,8 +6309,8 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d base = get_uri_obj(pBaseUri); if(!relative || !base) { *ppCombinedUri = NULL; - FIXME("(%p %p %lx %p %lx) Unknown IUri types not supported yet.\n", - pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + FIXME("(%p %p %lx %p %Ix) Unknown IUri types not supported yet.\n", + pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, dwReserved); return E_NOTIMPL; } @@ -6343,8 +6343,8 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW HRESULT hr; IInternetProtocolInfo *info; - TRACE("(%p %s %lx %p %lx)\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, - ppCombinedUri, (DWORD)dwReserved); + TRACE("(%p %s %lx %p %Ix)\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, + ppCombinedUri, dwReserved); if(!ppCombinedUri) return E_POINTER; @@ -6362,8 +6362,8 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW base = get_uri_obj(pBaseUri); if(!base) { *ppCombinedUri = NULL; - FIXME("(%p %s %lx %p %lx) Unknown IUri's not supported yet.\n", pBaseUri, debugstr_w(pwzRelativeUrl), - dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + FIXME("(%p %s %lx %p %Ix) Unknown IUri's not supported yet.\n", pBaseUri, debugstr_w(pwzRelativeUrl), + dwCombineFlags, ppCombinedUri, dwReserved); return E_NOTIMPL; } @@ -6828,8 +6828,8 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d Uri *uri; IInternetProtocolInfo *info; - TRACE("(%p %d %lx %p %ld %p %lx)\n", pIUri, ParseAction, dwFlags, pwzResult, - cchResult, pcchResult, (DWORD)dwReserved); + TRACE("(%p %d %lx %p %ld %p %Ix)\n", pIUri, ParseAction, dwFlags, pwzResult, + cchResult, pcchResult, dwReserved); if(!pcchResult) return E_POINTER; @@ -6841,8 +6841,8 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d if(!(uri = get_uri_obj(pIUri))) { *pcchResult = 0; - FIXME("(%p %d %lx %p %ld %p %lx) Unknown IUri's not supported for this action.\n", - pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + FIXME("(%p %d %lx %p %ld %p %Ix) Unknown IUri's not supported for this action.\n", + pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, dwReserved); return E_NOTIMPL; } @@ -6896,8 +6896,8 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d default: *pcchResult = 0; hr = E_NOTIMPL; - FIXME("(%p %d %lx %p %ld %p %lx) Partial stub.\n", pIUri, ParseAction, dwFlags, - pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + FIXME("(%p %d %lx %p %ld %p %Ix) Partial stub.\n", pIUri, ParseAction, dwFlags, + pwzResult, cchResult, pcchResult, dwReserved); } return hr;

2 1

[PATCH v2 5/5] wineoss: Move get_endpoint_ids to the unixlib.
by Huw Davies 05 Apr '22

05 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- v2: Don't use OSS_DEVNAME_SIZE dlls/wineoss.drv/mmdevdrv.c | 251 ++++++++++-------------------------- dlls/wineoss.drv/oss.c | 207 +++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 19 +++ 3 files changed, 294 insertions(+), 183 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e5206627528..fd35a439c5a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -53,6 +53,7 @@ #include "wine/debug.h" #include "wine/list.h" +#include "wine/unicode.h" #include "wine/unixlib.h" #include "unixlib.h" @@ -147,11 +148,10 @@ typedef struct _SessionMgr { } SessionMgr; typedef struct _OSSDevice { + struct list entry; EDataFlow flow; - char devnode[OSS_DEVNODE_SIZE]; GUID guid; - - struct list entry; + char devnode[0]; } OSSDevice; static struct list g_devices = LIST_INIT(g_devices); @@ -346,25 +346,6 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -/* dst must be large enough to hold devnode */ -static void oss_clean_devnode(char *dest, const char *devnode) -{ - const char *dot, *slash; - size_t len; - - strcpy(dest, devnode); - dot = strrchr(dest, '.'); - if(!dot) - return; - - slash = strrchr(dest, '/'); - if(slash && dot < slash) - return; - - len = dot - dest; - dest[len] = '\0'; -} - static int open_device(const char *device, EDataFlow flow) { int flags = ((flow == eRender) ? O_WRONLY : O_RDONLY) | O_NONBLOCK; @@ -372,44 +353,6 @@ static int open_device(const char *device, EDataFlow flow) return open(device, flags, 0); } -static UINT get_default_index(EDataFlow flow) -{ - int fd = -1, err; - UINT i; - oss_audioinfo ai; - char devnode[OSS_DEVNODE_SIZE]; - OSSDevice *dev_item; - - fd = open_device("/dev/dsp", flow); - if(fd < 0){ - WARN("Couldn't open default device!\n"); - return 0; - } - - ai.dev = -1; - if((err = ioctl(fd, SNDCTL_ENGINEINFO, &ai)) < 0){ - WARN("SNDCTL_ENGINEINFO failed: %d (%s)\n", err, strerror(errno)); - close(fd); - return 0; - } - - close(fd); - - TRACE("Default devnode: %s\n", ai.devnode); - oss_clean_devnode(devnode, ai.devnode); - i = 0; - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ - if(dev_item->flow == flow){ - if(!strcmp(devnode, dev_item->devnode)) - return i; - ++i; - } - } - - WARN("Couldn't find default device! Choosing first.\n"); - return 0; -} - static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) { OSSDevice *dev_item; @@ -419,138 +362,80 @@ static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) return NULL; } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, - UINT *num, UINT *def_index) +static void device_add(OSSDevice *oss_dev) { - int i, mixer_fd; - oss_sysinfo sysinfo; - static int print_once = 0; + if(get_ossdevice_from_guid(&oss_dev->guid)) /* already in list */ + HeapFree(GetProcessHeap(), 0, oss_dev); + else + list_add_tail(&g_devices, &oss_dev->entry); +} - static const WCHAR outW[] = {'O','u','t',':',' ',0}; - static const WCHAR inW[] = {'I','n',':',' ',0}; +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, + UINT *num, UINT *def_index) +{ + struct get_endpoint_ids_params params; + GUID *guids = NULL; + WCHAR **ids = NULL; + unsigned int i; TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); - mixer_fd = open("/dev/mixer", O_RDONLY, 0); - if(mixer_fd < 0){ - ERR("OSS /dev/mixer doesn't seem to exist\n"); - return AUDCLNT_E_SERVICE_NOT_RUNNING; - } - - if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ - close(mixer_fd); - - if(errno == EINVAL){ - ERR("OSS version too old, need at least OSSv4\n"); - return AUDCLNT_E_SERVICE_NOT_RUNNING; - } - - ERR("Error getting SNDCTL_SYSINFO: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; - } - - if(!print_once){ - TRACE("OSS sysinfo:\n"); - TRACE("product: %s\n", sysinfo.product); - TRACE("version: %s\n", sysinfo.version); - TRACE("versionnum: %x\n", sysinfo.versionnum); - TRACE("numaudios: %d\n", sysinfo.numaudios); - TRACE("nummixers: %d\n", sysinfo.nummixers); - TRACE("numcards: %d\n", sysinfo.numcards); - TRACE("numaudioengines: %d\n", sysinfo.numaudioengines); - print_once = 1; - } - - if(sysinfo.numaudios <= 0){ - WARN("No audio devices!\n"); - close(mixer_fd); - return AUDCLNT_E_SERVICE_NOT_RUNNING; - } - - *ids = HeapAlloc(GetProcessHeap(), 0, sysinfo.numaudios * sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, sysinfo.numaudios * sizeof(GUID)); - - *num = 0; - for(i = 0; i < sysinfo.numaudios; ++i){ - oss_audioinfo ai = {0}; - char devnode[OSS_DEVNODE_SIZE]; - OSSDevice *dev_item; - int fd; - - ai.dev = i; - if(ioctl(mixer_fd, SNDCTL_AUDIOINFO, &ai) < 0){ - WARN("Error getting AUDIOINFO for dev %d: %d (%s)\n", i, errno, - strerror(errno)); - continue; - } - - oss_clean_devnode(devnode, ai.devnode); - - /* check for duplicates */ - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ - if(dev_item->flow == flow && !strcmp(devnode, dev_item->devnode)) - break; + params.flow = flow; + params.size = 1000; + params.endpoints = NULL; + do{ + HeapFree(GetProcessHeap(), 0, params.endpoints); + params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); + OSS_CALL(get_endpoint_ids, &params); + }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if(FAILED(params.result)) goto end; + + ids = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if(!ids || !guids){ + params.result = E_OUTOFMEMORY; + goto end; + } + + for(i = 0; i < params.num; i++){ + unsigned int name_size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + unsigned int dev_size = strlen(params.endpoints[i].device) + 1; + OSSDevice *oss_dev; + + ids[i] = HeapAlloc(GetProcessHeap(), 0, name_size); + oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size])); + if(!ids[i] || !oss_dev){ + HeapFree(GetProcessHeap, 0, oss_dev); + params.result = E_OUTOFMEMORY; + goto end; } - if(&dev_item->entry != &g_devices) - continue; - - fd = open_device(devnode, flow); - if(fd < 0){ - WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", - devnode, errno, strerror(errno)); - continue; - } - close(fd); - - if((flow == eCapture && (ai.caps & PCM_CAP_INPUT)) || - (flow == eRender && (ai.caps & PCM_CAP_OUTPUT))){ - size_t len, prefix_len; - const WCHAR *prefix; - - dev_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*dev_item)); - - dev_item->flow = flow; - get_device_guid(flow, devnode, &dev_item->guid); - strcpy(dev_item->devnode, devnode); - - (*guids)[*num] = dev_item->guid; - - len = MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, NULL, 0); - if(flow == eRender){ - prefix = outW; - prefix_len = ARRAY_SIZE(outW) - 1; - len += prefix_len; - }else{ - prefix = inW; - prefix_len = ARRAY_SIZE(inW) - 1; - len += prefix_len; - } - (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, - len * sizeof(WCHAR)); - if(!(*ids)[*num]){ - for(i = 0; i < *num; ++i) - HeapFree(GetProcessHeap(), 0, (*ids)[i]); - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, *guids); - HeapFree(GetProcessHeap(), 0, dev_item); - close(mixer_fd); - return E_OUTOFMEMORY; - } - memcpy((*ids)[*num], prefix, prefix_len * sizeof(WCHAR)); - MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, - (*ids)[*num] + prefix_len, len - prefix_len); - - list_add_tail(&g_devices, &dev_item->entry); - - (*num)++; + memcpy(ids[i], params.endpoints[i].name, name_size); + get_device_guid(flow, params.endpoints[i].device, guids + i); + + oss_dev->flow = flow; + oss_dev->guid = guids[i]; + memcpy(oss_dev->devnode, params.endpoints[i].device, dev_size); + device_add(oss_dev); + } + *def_index = params.default_idx; + +end: + HeapFree(GetProcessHeap(), 0, params.endpoints); + if(FAILED(params.result)){ + HeapFree(GetProcessHeap(), 0, guids); + if(ids){ + for(i = 0; i < params.num; i++) + HeapFree(GetProcessHeap(), 0, ids[i]); + HeapFree(GetProcessHeap(), 0, ids); } + }else{ + *ids_out = ids; + *guids_out = guids; + *num = params.num; } - close(mixer_fd); - - *def_index = get_default_index(flow); - - return S_OK; + return params.result; } HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 9c1de25acb5..ab7751ac174 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -29,11 +29,13 @@ #include <sys/ioctl.h> #include <fcntl.h> #include <unistd.h> +#include <errno.h> #include <sys/soundcard.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" +#include "audioclient.h" #include "wine/debug.h" #include "wine/unixlib.h" @@ -88,7 +90,212 @@ static NTSTATUS test_connect(void *args) return STATUS_SUCCESS; } +/* dst must be large enough to hold devnode */ +static void oss_clean_devnode(char *dest, const char *devnode) +{ + const char *dot, *slash; + size_t len; + + strcpy(dest, devnode); + dot = strrchr(dest, '.'); + if(!dot) + return; + + slash = strrchr(dest, '/'); + if(slash && dot < slash) + return; + + len = dot - dest; + dest[len] = '\0'; +} + +static int open_device(const char *device, EDataFlow flow) +{ + int flags = ((flow == eRender) ? O_WRONLY : O_RDONLY) | O_NONBLOCK; + + return open(device, flags, 0); +} + +static void get_default_device(EDataFlow flow, char device[OSS_DEVNODE_SIZE]) +{ + int fd, err; + oss_audioinfo ai; + + device[0] = '\0'; + fd = open_device("/dev/dsp", flow); + if(fd < 0){ + WARN("Couldn't open default device!\n"); + return; + } + + ai.dev = -1; + if((err = ioctl(fd, SNDCTL_ENGINEINFO, &ai)) < 0){ + WARN("SNDCTL_ENGINEINFO failed: %d (%s)\n", err, strerror(errno)); + close(fd); + return; + } + close(fd); + + TRACE("Default devnode: %s\n", ai.devnode); + oss_clean_devnode(device, ai.devnode); + return; +} + +static NTSTATUS get_endpoint_ids(void *args) +{ + struct get_endpoint_ids_params *params = args; + oss_sysinfo sysinfo; + oss_audioinfo ai; + static int print_once = 0; + static const WCHAR outW[] = {'O','u','t',':',' ',0}; + static const WCHAR inW[] = {'I','n',':',' ',0}; + struct endpoint_info + { + WCHAR name[ARRAY_SIZE(ai.name) + ARRAY_SIZE(outW)]; + char device[OSS_DEVNODE_SIZE]; + } *info; + unsigned int i, j, num, needed, name_len, device_len, default_idx = 0; + char default_device[OSS_DEVNODE_SIZE]; + struct endpoint *endpoint; + int mixer_fd; + char *ptr; + + mixer_fd = open("/dev/mixer", O_RDONLY, 0); + if(mixer_fd < 0){ + ERR("OSS /dev/mixer doesn't seem to exist\n"); + params->result = AUDCLNT_E_SERVICE_NOT_RUNNING; + return STATUS_SUCCESS; + } + + if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ + close(mixer_fd); + if(errno == EINVAL){ + ERR("OSS version too old, need at least OSSv4\n"); + params->result = AUDCLNT_E_SERVICE_NOT_RUNNING; + return STATUS_SUCCESS; + } + + ERR("Error getting SNDCTL_SYSINFO: %d (%s)\n", errno, strerror(errno)); + params->result = E_FAIL; + return STATUS_SUCCESS; + } + + if(!print_once){ + TRACE("OSS sysinfo:\n"); + TRACE("product: %s\n", sysinfo.product); + TRACE("version: %s\n", sysinfo.version); + TRACE("versionnum: %x\n", sysinfo.versionnum); + TRACE("numaudios: %d\n", sysinfo.numaudios); + TRACE("nummixers: %d\n", sysinfo.nummixers); + TRACE("numcards: %d\n", sysinfo.numcards); + TRACE("numaudioengines: %d\n", sysinfo.numaudioengines); + print_once = 1; + } + + if(sysinfo.numaudios <= 0){ + WARN("No audio devices!\n"); + close(mixer_fd); + params->result = AUDCLNT_E_SERVICE_NOT_RUNNING; + return STATUS_SUCCESS; + } + + info = malloc(sysinfo.numaudios * sizeof(*info)); + if(!info){ + close(mixer_fd); + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + get_default_device(params->flow, default_device); + + num = 0; + for(i = 0; i < sysinfo.numaudios; ++i){ + char devnode[OSS_DEVNODE_SIZE]; + int fd, prefix_len; + const WCHAR *prefix; + + memset(&ai, 0, sizeof(ai)); + ai.dev = i; + if(ioctl(mixer_fd, SNDCTL_AUDIOINFO, &ai) < 0){ + WARN("Error getting AUDIOINFO for dev %d: %d (%s)\n", i, errno, + strerror(errno)); + continue; + } + + oss_clean_devnode(devnode, ai.devnode); + + /* check for duplicates */ + for(j = 0; j < num; j++) + if(!strcmp(devnode, info[j].device)) + break; + if(j < num) + continue; + + fd = open_device(devnode, params->flow); + if(fd < 0){ + WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", + devnode, errno, strerror(errno)); + continue; + } + close(fd); + + if((params->flow == eCapture && !(ai.caps & PCM_CAP_INPUT)) || + (params->flow == eRender && !(ai.caps & PCM_CAP_OUTPUT))) + continue; + + strcpy(info[num].device, devnode); + + if(params->flow == eRender){ + prefix = outW; + prefix_len = ARRAY_SIZE(outW) - 1; + }else{ + prefix = inW; + prefix_len = ARRAY_SIZE(inW) - 1; + } + memcpy(info[num].name, prefix, prefix_len * sizeof(WCHAR)); + ntdll_umbstowcs(ai.name, strlen(ai.name) + 1, info[num].name + prefix_len, + ARRAY_SIZE(info[num].name) - prefix_len); + if(!strcmp(default_device, info[num].device)) + default_idx = num; + num++; + } + close(mixer_fd); + + needed = num * sizeof(*params->endpoints); + endpoint = params->endpoints; + ptr = (char *)(endpoint + num); + + for(i = 0; i < num; i++){ + name_len = wcslen(info[i].name) + 1; + device_len = strlen(info[i].device) + 1; + needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); + + if(needed <= params->size){ + endpoint->name = (WCHAR *)ptr; + memcpy(endpoint->name, info[i].name, name_len * sizeof(WCHAR)); + ptr += name_len * sizeof(WCHAR); + endpoint->device = ptr; + memcpy(endpoint->device, info[i].device, device_len); + ptr += (device_len + 1) & ~1; + endpoint++; + } + } + free(info); + + params->num = num; + params->default_idx = default_idx; + + if(needed > params->size){ + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } else + params->result = S_OK; + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, + get_endpoint_ids, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index d4fb5db3102..1a80794f150 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mmdeviceapi.h" + /* From <dlls/mmdevapi/mmdevapi.h> */ enum DriverPriority { @@ -30,9 +32,26 @@ struct test_connect_params enum DriverPriority priority; }; +struct endpoint +{ + WCHAR *name; + char *device; +}; + +struct get_endpoint_ids_params +{ + EDataFlow flow; + struct endpoint *endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; +}; + enum oss_funcs { oss_test_connect, + oss_get_endpoint_ids, }; extern unixlib_handle_t oss_handle; -- 2.25.1

2 1

[PATCH v2 4/5] wineoss: Move get_ossdevice_from_guid() earlier in the file.
by Huw Davies 05 Apr '22

05 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 8a0011ff9eb..e5206627528 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -410,6 +410,15 @@ static UINT get_default_index(EDataFlow flow) return 0; } +static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) +{ + OSSDevice *dev_item; + LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry) + if(IsEqualGUID(guid, &dev_item->guid)) + return dev_item; + return NULL; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, UINT *def_index) { @@ -544,15 +553,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, return S_OK; } -static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) -{ - OSSDevice *dev_item; - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry) - if(IsEqualGUID(guid, &dev_item->guid)) - return dev_item; - return NULL; -} - HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { -- 2.25.1

2 1

[PATCH v2 3/5] wineoss: Add a helper to open the device.
by Huw Davies 05 Apr '22

05 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c72f29b5540..8a0011ff9eb 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -365,6 +365,13 @@ static void oss_clean_devnode(char *dest, const char *devnode) dest[len] = '\0'; } +static int open_device(const char *device, EDataFlow flow) +{ + int flags = ((flow == eRender) ? O_WRONLY : O_RDONLY) | O_NONBLOCK; + + return open(device, flags, 0); +} + static UINT get_default_index(EDataFlow flow) { int fd = -1, err; @@ -373,11 +380,7 @@ static UINT get_default_index(EDataFlow flow) char devnode[OSS_DEVNODE_SIZE]; OSSDevice *dev_item; - if(flow == eRender) - fd = open("/dev/dsp", O_WRONLY | O_NONBLOCK); - else - fd = open("/dev/dsp", O_RDONLY | O_NONBLOCK); - + fd = open_device("/dev/dsp", flow); if(fd < 0){ WARN("Couldn't open default device!\n"); return 0; @@ -482,10 +485,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, if(&dev_item->entry != &g_devices) continue; - if(flow == eRender) - fd = open(devnode, O_WRONLY | O_NONBLOCK, 0); - else - fd = open(devnode, O_RDONLY | O_NONBLOCK, 0); + fd = open_device(devnode, flow); if(fd < 0){ WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", devnode, errno, strerror(errno)); @@ -578,14 +578,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, return hr; } - if(oss_dev->flow == eRender) - This->fd = open(oss_dev->devnode, O_WRONLY | O_NONBLOCK, 0); - else if(oss_dev->flow == eCapture) - This->fd = open(oss_dev->devnode, O_RDONLY | O_NONBLOCK, 0); - else{ - HeapFree(GetProcessHeap(), 0, This); - return E_INVALIDARG; - } + This->fd = open_device(oss_dev->devnode, oss_dev->flow); if(This->fd < 0){ WARN("Unable to open device %s: %d (%s)\n", oss_dev->devnode, errno, strerror(errno)); @@ -1236,11 +1229,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, outpwfx = NULL; } - if(This->dataflow == eRender) - fd = open(This->devnode, O_WRONLY | O_NONBLOCK, 0); - else if(This->dataflow == eCapture) - fd = open(This->devnode, O_RDONLY | O_NONBLOCK, 0); - + fd = open_device(This->devnode, This->dataflow); if(fd < 0){ WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); -- 2.25.1

2 1

[PATCH v2 2/5] wineoss: Pass a buffer to oss_clean_devnode().
by Huw Davies 05 Apr '22

05 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 0269f0fa536..c72f29b5540 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -346,27 +346,23 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static const char *oss_clean_devnode(const char *devnode) +/* dst must be large enough to hold devnode */ +static void oss_clean_devnode(char *dest, const char *devnode) { - static char ret[OSS_DEVNODE_SIZE]; - const char *dot, *slash; size_t len; - dot = strrchr(devnode, '.'); + strcpy(dest, devnode); + dot = strrchr(dest, '.'); if(!dot) - return devnode; + return; - slash = strrchr(devnode, '/'); + slash = strrchr(dest, '/'); if(slash && dot < slash) - return devnode; - - len = dot - devnode; - - memcpy(ret, devnode, len); - ret[len] = '\0'; + return; - return ret; + len = dot - dest; + dest[len] = '\0'; } static UINT get_default_index(EDataFlow flow) @@ -374,7 +370,7 @@ static UINT get_default_index(EDataFlow flow) int fd = -1, err; UINT i; oss_audioinfo ai; - const char *devnode; + char devnode[OSS_DEVNODE_SIZE]; OSSDevice *dev_item; if(flow == eRender) @@ -397,7 +393,7 @@ static UINT get_default_index(EDataFlow flow) close(fd); TRACE("Default devnode: %s\n", ai.devnode); - devnode = oss_clean_devnode(ai.devnode); + oss_clean_devnode(devnode, ai.devnode); i = 0; LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ if(dev_item->flow == flow){ @@ -465,7 +461,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, *num = 0; for(i = 0; i < sysinfo.numaudios; ++i){ oss_audioinfo ai = {0}; - const char *devnode; + char devnode[OSS_DEVNODE_SIZE]; OSSDevice *dev_item; int fd; @@ -476,7 +472,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, continue; } - devnode = oss_clean_devnode(ai.devnode); + oss_clean_devnode(devnode, ai.devnode); /* check for duplicates */ LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ -- 2.25.1

2 1

[PATCH v2 1/5] wineoss: Introduce a test_connect syscall.
by Huw Davies 05 Apr '22

05 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/Makefile.in | 4 +- dlls/wineoss.drv/mmdevdrv.c | 60 ++++++----------------- dlls/wineoss.drv/oss.c | 94 ++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 40 +++++++++++++++ 4 files changed, 153 insertions(+), 45 deletions(-) create mode 100644 dlls/wineoss.drv/oss.c create mode 100644 dlls/wineoss.drv/unixlib.h diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index ce96ca73bf4..d48db94b929 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -1,5 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineoss.drv +UNIXLIB = wineoss.so IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(OSS4_LIBS) @@ -11,4 +12,5 @@ C_SRCS = \ midi.c \ midipatch.c \ mmaux.c \ - mmdevdrv.c + mmdevdrv.c \ + oss.c diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index b340db00c3c..0269f0fa536 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1,5 +1,6 @@ /* * Copyright 2011 Andrew Eikum for CodeWeavers + * 2022 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,10 +36,9 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winnls.h" #include "winreg.h" -#include "wine/debug.h" -#include "wine/list.h" #include "ole2.h" #include "mmdeviceapi.h" @@ -51,10 +51,18 @@ #include "audiopolicy.h" #include "audioclient.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unixlib.h" + +#include "unixlib.h" + WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) +unixlib_handle_t oss_handle = 0; + static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; @@ -233,6 +241,9 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: + if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, + &oss_handle, sizeof(oss_handle), NULL)) + return FALSE; g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; @@ -254,52 +265,13 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -/* From <dlls/mmdevapi/mmdevapi.h> */ -enum DriverPriority { - Priority_Unavailable = 0, - Priority_Low, - Priority_Neutral, - Priority_Preferred -}; - int WINAPI AUDDRV_GetPriority(void) { - int mixer_fd; - oss_sysinfo sysinfo; - - /* Attempt to determine if we are running on OSS or ALSA's OSS - * compatibility layer. There is no official way to do that, so just check - * for validity as best as possible, without rejecting valid OSS - * implementations. */ - - mixer_fd = open("/dev/mixer", O_RDONLY, 0); - if(mixer_fd < 0){ - TRACE("Priority_Unavailable: open failed\n"); - return Priority_Unavailable; - } - - sysinfo.version[0] = 0xFF; - sysinfo.versionnum = ~0; - if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ - TRACE("Priority_Unavailable: ioctl failed\n"); - close(mixer_fd); - return Priority_Unavailable; - } - - close(mixer_fd); - - if(sysinfo.version[0] < '4' || sysinfo.version[0] > '9'){ - TRACE("Priority_Low: sysinfo.version[0]: %x\n", sysinfo.version[0]); - return Priority_Low; - } - if(sysinfo.versionnum & 0x80000000){ - TRACE("Priority_Low: sysinfo.versionnum: %x\n", sysinfo.versionnum); - return Priority_Low; - } + struct test_connect_params params; - TRACE("Priority_Preferred: Seems like valid OSS!\n"); + OSS_CALL(test_connect, &params); - return Priority_Preferred; + return params.priority; } static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c new file mode 100644 index 00000000000..9c1de25acb5 --- /dev/null +++ b/dlls/wineoss.drv/oss.c @@ -0,0 +1,94 @@ +/* + * OSS driver (unixlib) + * + * Copyright 2011 Andrew Eikum for CodeWeavers + * 2022 Huw Davies + * + * 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 + */ + +#if 0 +#pragma makedep unix +#endif + +#include <stdarg.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/ioctl.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/soundcard.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" + +#include "wine/debug.h" +#include "wine/unixlib.h" + +#include "unixlib.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oss); + +static NTSTATUS test_connect(void *args) +{ + struct test_connect_params *params = args; + int mixer_fd; + oss_sysinfo sysinfo; + + /* Attempt to determine if we are running on OSS or ALSA's OSS + * compatibility layer. There is no official way to do that, so just check + * for validity as best as possible, without rejecting valid OSS + * implementations. */ + + mixer_fd = open("/dev/mixer", O_RDONLY, 0); + if(mixer_fd < 0){ + TRACE("Priority_Unavailable: open failed\n"); + params->priority = Priority_Unavailable; + return STATUS_SUCCESS; + } + + sysinfo.version[0] = 0xFF; + sysinfo.versionnum = ~0; + if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ + TRACE("Priority_Unavailable: ioctl failed\n"); + close(mixer_fd); + params->priority = Priority_Unavailable; + return STATUS_SUCCESS; + } + + close(mixer_fd); + + if(sysinfo.version[0] < '4' || sysinfo.version[0] > '9'){ + TRACE("Priority_Low: sysinfo.version[0]: %x\n", sysinfo.version[0]); + params->priority = Priority_Low; + return STATUS_SUCCESS; + } + if(sysinfo.versionnum & 0x80000000){ + TRACE("Priority_Low: sysinfo.versionnum: %x\n", sysinfo.versionnum); + params->priority = Priority_Low; + return STATUS_SUCCESS; + } + + TRACE("Priority_Preferred: Seems like valid OSS!\n"); + + params->priority = Priority_Preferred; + return STATUS_SUCCESS; +} + +unixlib_entry_t __wine_unix_call_funcs[] = +{ + test_connect, +}; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h new file mode 100644 index 00000000000..d4fb5db3102 --- /dev/null +++ b/dlls/wineoss.drv/unixlib.h @@ -0,0 +1,40 @@ +/* + * Copyright 2022 Huw Davies + * + * 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 + */ + +/* From <dlls/mmdevapi/mmdevapi.h> */ +enum DriverPriority +{ + Priority_Unavailable = 0, + Priority_Low, + Priority_Neutral, + Priority_Preferred +}; + +struct test_connect_params +{ + enum DriverPriority priority; +}; + +enum oss_funcs +{ + oss_test_connect, +}; + +extern unixlib_handle_t oss_handle; + +#define OSS_CALL(func, params) __wine_unix_call(oss_handle, oss_ ## func, params) -- 2.25.1

2 1

[PATCH] shell32/tests: Use CRT memory allocation functions.
by Nikolay Sivov 05 Apr '22

05 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/tests/assoc.c | 7 +++---- dlls/shell32/tests/autocomplete.c | 5 ++--- dlls/shell32/tests/ebrowser.c | 13 ++++++------- dlls/shell32/tests/msg.h | 9 ++++----- dlls/shell32/tests/shelldispatch.c | 5 ++--- dlls/shell32/tests/shelllink.c | 5 ++--- dlls/shell32/tests/shlexec.c | 9 ++++----- dlls/shell32/tests/shlfolder.c | 21 ++++++++++----------- dlls/shell32/tests/shlview.c | 9 ++++----- 9 files changed, 37 insertions(+), 46 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 403390d8a09..0e28d9f0355 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -25,7 +25,6 @@ #include "shlguid.h" #include "shobjidl.h" -#include "wine/heap.h" #include "wine/test.h" @@ -104,8 +103,8 @@ static struct assoc_getstring_test getstring_tests[] = static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCWSTR expected_string, int line) { IQueryAssociations *assoc; + WCHAR *buffer; HRESULT hr; - WCHAR *buffer = NULL; DWORD len; hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); @@ -122,19 +121,19 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW return; } - buffer = heap_alloc(len * sizeof(WCHAR)); + buffer = malloc(len * sizeof(WCHAR)); ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); hr = IQueryAssociations_GetString(assoc, 0, str, NULL, buffer, &len); ok_(__FILE__, line)(hr == S_OK, "GetString returned 0x%lx, expected S_OK\n", hr); ok_(__FILE__, line)(lstrcmpW(buffer, expected_string) == 0, "GetString returned %s, expected %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(expected_string)); + free(buffer); } else { ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%lx, expected failure\n", hr); } IQueryAssociations_Release(assoc); - heap_free(buffer); } static void test_IQueryAssociations_GetString(void) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 0631126c021..d0df5b225c1 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -28,7 +28,6 @@ #include "shldisp.h" #include "shlobj.h" -#include "wine/heap.h" #include "wine/test.h" static HWND hMainWnd, hEdit; @@ -317,7 +316,7 @@ static ULONG WINAPI string_enumerator_Release(IEnumString *iface) ULONG ref = InterlockedDecrement(&this->ref); if (!ref) - heap_free(this); + free(this); return ref; } @@ -426,7 +425,7 @@ static HRESULT string_enumerator_create(void **ppv, WCHAR **suggestions, int cou { struct string_enumerator *object; - object = heap_alloc_zero(sizeof(*object)); + object = calloc(1, sizeof(*object)); object->IEnumString_iface.lpVtbl = &string_enumerator_vtbl; object->IACList_iface.lpVtbl = &aclist_vtbl; object->ref = 1; diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 257084053a7..9402388f643 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -26,7 +26,6 @@ #include "shlobj.h" #include "shlwapi.h" -#include "wine/heap.h" #include "wine/test.h" #include "initguid.h" @@ -193,7 +192,7 @@ static ULONG WINAPI IExplorerPaneVisibility_fnRelease(IExplorerPaneVisibility *i ULONG ref = InterlockedDecrement(&This->ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -239,7 +238,7 @@ static IExplorerPaneVisibilityImpl *create_explorerpanevisibility(void) { IExplorerPaneVisibilityImpl *epv; - epv = heap_alloc_zero(sizeof(*epv)); + epv = calloc(1, sizeof(*epv)); epv->IExplorerPaneVisibility_iface.lpVtbl = &epvvt; epv->ref = 1; @@ -282,7 +281,7 @@ static ULONG WINAPI ICommDlgBrowser3_fnRelease(ICommDlgBrowser3 *iface) ULONG ref = InterlockedDecrement(&This->ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -393,7 +392,7 @@ static ICommDlgBrowser3Impl *create_commdlgbrowser3(void) { ICommDlgBrowser3Impl *cdb; - cdb = heap_alloc_zero(sizeof(*cdb)); + cdb = calloc(1, sizeof(*cdb)); cdb->ICommDlgBrowser3_iface.lpVtbl = &cdbvtbl; cdb->ref = 1; @@ -450,7 +449,7 @@ static ULONG WINAPI IServiceProvider_fnRelease(IServiceProvider *iface) LONG ref = InterlockedDecrement(&This->ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -491,7 +490,7 @@ static const IServiceProviderVtbl spvtbl = static IServiceProviderImpl *create_serviceprovider(void) { - IServiceProviderImpl *sp = heap_alloc(sizeof(*sp)); + IServiceProviderImpl *sp = malloc(sizeof(*sp)); sp->IServiceProvider_iface.lpVtbl = &spvtbl; sp->ref = 1; return sp; diff --git a/dlls/shell32/tests/msg.h b/dlls/shell32/tests/msg.h index a6c16ae05e6..a2b723cfb89 100644 --- a/dlls/shell32/tests/msg.h +++ b/dlls/shell32/tests/msg.h @@ -21,7 +21,6 @@ #include <assert.h> #include <windows.h> -#include "wine/heap.h" #include "wine/test.h" /* undocumented SWP flags - from SDK 3.1 */ @@ -68,13 +67,13 @@ static void add_message(struct msg_sequence **seq, int sequence_index, if (!msg_seq->sequence) { msg_seq->size = 10; - msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (struct message)); + msg_seq->sequence = malloc(msg_seq->size * sizeof (struct message)); } if (msg_seq->count == msg_seq->size) { msg_seq->size *= 2; - msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); + msg_seq->sequence = realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); } assert(msg_seq->sequence); @@ -91,7 +90,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index, static void flush_sequence(struct msg_sequence **seg, int sequence_index) { struct msg_sequence *msg_seq = seg[sequence_index]; - heap_free(msg_seq->sequence); + free(msg_seq->sequence); msg_seq->sequence = NULL; msg_seq->count = msg_seq->size = 0; } @@ -289,5 +288,5 @@ static void init_msg_sequences(struct msg_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = heap_alloc_zero(sizeof(struct msg_sequence)); + seq[i] = calloc(1, sizeof(struct msg_sequence)); } diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 3894f67dd11..67659f72345 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -27,7 +27,6 @@ #include "shlwapi.h" #include "winsvc.h" -#include "wine/heap.h" #include "wine/test.h" #include "initguid.h" @@ -278,7 +277,7 @@ static void test_namespace(void) GetFullPathNameW(winetestW, MAX_PATH, tempW, NULL); len = GetLongPathNameW(tempW, NULL, 0); - long_pathW = heap_alloc(len * sizeof(WCHAR)); + long_pathW = malloc(len * sizeof(WCHAR)); GetLongPathNameW(tempW, long_pathW, len); V_VT(&var) = VT_BSTR; @@ -350,7 +349,7 @@ static void test_namespace(void) SysFreeString(V_BSTR(&var)); } - heap_free(long_pathW); + free(long_pathW); RemoveDirectoryW(winetestW); SetCurrentDirectoryW(curW); IShellDispatch_Release(sd); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index e4e1e664038..8cbc46696ab 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -29,7 +29,6 @@ #include "shellapi.h" #include "commoncontrols.h" -#include "wine/heap.h" #include "wine/test.h" #include "shell32_test.h" @@ -70,12 +69,12 @@ static LPITEMIDLIST path_to_pidl(const char* path) int len; len=MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); - pathW = heap_alloc(len * sizeof(WCHAR)); + pathW = malloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len); r=pSHILCreateFromPath(pathW, &pidl, NULL); ok(r == S_OK, "SHILCreateFromPath failed (0x%08lx)\n", r); - heap_free(pathW); + free(pathW); } return pidl; } diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index cea7245f387..50c2e84578b 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -40,7 +40,6 @@ #include "shlwapi.h" #include "ddeml.h" -#include "wine/heap.h" #include "wine/test.h" #include "shell32_test.h" @@ -756,7 +755,7 @@ static LSTATUS myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) if (dwMaxLen > ARRAY_SIZE(szNameBuf)) { /* Name too big: alloc a buffer for it */ - if (!(lpszName = heap_alloc(dwMaxLen*sizeof(CHAR)))) + if (!(lpszName = malloc(dwMaxLen*sizeof(CHAR)))) { ret = ERROR_NOT_ENOUGH_MEMORY; goto cleanup; @@ -791,7 +790,7 @@ static LSTATUS myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) cleanup: /* Free buffer if allocated */ if (lpszName != szNameBuf) - heap_free(lpszName); + free(lpszName); if(lpszSubKey) RegCloseKey(hSubKey); return ret; @@ -851,11 +850,11 @@ static void create_test_verb_dde(const char* classname, const char* verb, } else { - cmd = heap_alloc(strlen(argv0) + 10 + strlen(child_file) + 2 + strlen(cmdtail) + 1); + cmd = malloc(strlen(argv0) + 10 + strlen(child_file) + 2 + strlen(cmdtail) + 1); sprintf(cmd,"%s shlexec \"%s\" %s", argv0, child_file, cmdtail); rc=RegSetValueExA(hkey_cmd, NULL, 0, REG_SZ, (LPBYTE)cmd, strlen(cmd)+1); ok(rc == ERROR_SUCCESS, "setting command failed with %ld\n", rc); - heap_free(cmd); + free(cmd); } if (ddeexec) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 7b81ef98110..f99045c33d5 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -37,7 +37,6 @@ #include "ocidl.h" #include "oleauto.h" -#include "wine/heap.h" #include "wine/test.h" #include <initguid.h> @@ -75,7 +74,7 @@ static WCHAR *make_wstr(const char *str) if(!len || len < 0) return NULL; - ret = heap_alloc(len * sizeof(WCHAR)); + ret = malloc(len * sizeof(WCHAR)); if(!ret) return NULL; @@ -3032,7 +3031,7 @@ static void test_SHGetIDListFromObject(void) hres = pSHGetIDListFromObject(NULL, &pidl); ok(hres == E_NOINTERFACE, "Got %lx\n", hres); - punkimpl = heap_alloc(sizeof(*punkimpl)); + punkimpl = malloc(sizeof(*punkimpl)); punkimpl->IUnknown_iface.lpVtbl = &vt_IUnknown; punkimpl->ifaces = ifaces; punkimpl->unknown = 0; @@ -3049,7 +3048,7 @@ static void test_SHGetIDListFromObject(void) "interface not requested.\n"); ok(!punkimpl->unknown, "Got %ld unknown.\n", punkimpl->unknown); - heap_free(punkimpl); + free(punkimpl); pidl_desktop = NULL; SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); @@ -3203,7 +3202,7 @@ static void test_SHGetItemFromObject(void) hres = pSHGetItemFromObject(NULL, &IID_IUnknown, (void**)&punk); ok(hres == E_NOINTERFACE, "Got 0x%08lx\n", hres); - punkimpl = heap_alloc(sizeof(*punkimpl)); + punkimpl = malloc(sizeof(*punkimpl)); punkimpl->IUnknown_iface.lpVtbl = &vt_IUnknown; punkimpl->ifaces = ifaces; punkimpl->unknown = 0; @@ -3221,7 +3220,7 @@ static void test_SHGetItemFromObject(void) "interface not requested.\n"); ok(!punkimpl->unknown, "Got %ld unknown.\n", punkimpl->unknown); - heap_free(punkimpl); + free(punkimpl); /* Test IShellItem */ hres = pSHGetItemFromObject((IUnknown*)psfdesktop, &IID_IShellItem, (void**)&psi); @@ -4584,7 +4583,7 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) WCHAR *strW = make_wstr(U(filename).cStr); ok_(__FILE__,l)(!lstrcmpW(path, strW), "didn't get expected path (%s), instead: %s\n", wine_dbgstr_w(path), U(filename).cStr); - heap_free(strW); + free(strW); } IShellFolder_Release(parent); @@ -4918,8 +4917,8 @@ static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, L path2 = make_wstr(exp_data->path_2); verify_pidl(pidls[0], path1); verify_pidl(pidls[1], path2); - heap_free(path1); - heap_free(path2); + free(path1); + free(path2); exp_data->missing_events--; @@ -5027,8 +5026,8 @@ static void test_SHChangeNotify(BOOL test_new_delivery) do_events(); ok(exp_data->missing_events == 0, "%s: Expected wndproc to be called\n", exp_data->id); - heap_free(path1); - heap_free(path2); + free(path1); + free(path2); } } diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index b405a84bc19..a83f3137509 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -38,7 +38,6 @@ #include "initguid.h" -#include "wine/heap.h" #include "wine/test.h" #include "msg.h" @@ -150,7 +149,7 @@ static IDataObject* IDataObjectImpl_Construct(void) { IDataObjectImpl *obj; - obj = heap_alloc(sizeof(*obj)); + obj = malloc(sizeof(*obj)); obj->IDataObject_iface.lpVtbl = &IDataObjectImpl_Vtbl; obj->ref = 1; @@ -188,7 +187,7 @@ static ULONG WINAPI IDataObjectImpl_Release(IDataObject * iface) ULONG ref = InterlockedDecrement(&This->ref); if (!ref) - heap_free(This); + free(This); return ref; } @@ -275,7 +274,7 @@ static IShellBrowser* IShellBrowserImpl_Construct(void) { IShellBrowserImpl *browser; - browser = heap_alloc(sizeof(*browser)); + browser = malloc(sizeof(*browser)); browser->IShellBrowser_iface.lpVtbl = &IShellBrowserImpl_Vtbl; browser->ref = 1; @@ -318,7 +317,7 @@ static ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface) ULONG ref = InterlockedDecrement(&This->ref); if (!ref) - heap_free(This); + free(This); return ref; } -- 2.35.1

2 1

[tools] testbot: GetTaskURL() should load URI::Escape only when needed.
by Francois Gouget 05 Apr '22

05 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The build VM does not have URI::Escape and this dependency caused the build to fail (Reconfig.pl which uses Utils.pm failed to start). There is really no compeling reason to install URI::Escape on the build VM so I decided to tweak GetTaskURL() to only import URI::Escape when needed which should not happen in the VM code. What this really shows is that GetTaskURL() probably does not belong in Utils but I'm not sure where else to put it. So that patch will at least fix the immediate issue. Since GetTaskURL() depends closely on the web side some place in WineTestBot::CGI may seem logical. But it's actually used by non-CGI scripts and having them use CGI::something would be wrong. Maybe the Tasks module is the least bad option though that's another place that should really not depend on URI::escape. --- testbot/lib/WineTestBot/Utils.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 13529c323..cf749310d 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -34,7 +34,6 @@ our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString BatchQuote ShQuote ShArgv2Cmd); use Fcntl qw(O_CREAT O_EXCL O_WRONLY); -use URI::Escape; use WineTestBot::Config; @@ -89,7 +88,11 @@ sub GetTaskURL($$$;$$) my $StepTask = 100 * $StepNo + $TaskNo; my $URL = "/JobDetails.pl?Key=$JobId"; $URL .= "&s$StepTask=1" if ($ShowScreenshot); - $URL .= "&f$StepTask=". uri_escape($LogName) if ($LogName); + if (defined $LogName) + { + require URI::Escape; + $URL .= "&f$StepTask=". URI::Escape::uri_escape($LogName); + } return "$URL#k$StepTask"; } -- 2.30.2

1 0

[PATCH vkd3d 1/5] configure: Check for xcb-event and xcb-icccm.
by Zebediah Figura 05 Apr '22

05 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 308bdda13..77fa41c86 100644 --- a/configure.ac +++ b/configure.ac @@ -126,7 +126,7 @@ AS_IF([test "x$with_spirv_tools" = "xyes"], HAVE_XCB=no AS_IF([test "x$with_xcb" != "xno"], - [PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], + [PKG_CHECK_MODULES([XCB], [xcb xcb-event xcb-icccm xcb-keysyms], [AC_DEFINE([HAVE_XCB], [1], [Define to 1 if you have libxcb.]) HAVE_XCB=yes], [HAVE_XCB=no])]) -- 2.35.1

4 14

[PATCH] xmllite/tests: Use wide string literals for the writer tests.
by Nikolay Sivov 05 Apr '22

05 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/tests/writer.c | 674 ++++++++++++++---------------------- 1 file changed, 266 insertions(+), 408 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 2f6edb26d16..3e1c362664e 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -32,8 +32,6 @@ #include "initguid.h" DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); -static const WCHAR aW[] = {'a',0}; - #define EXPECT_REF(obj, ref) _expect_ref((IUnknown *)obj, ref, __LINE__) static void _expect_ref(IUnknown *obj, ULONG ref, int line) { @@ -92,19 +90,6 @@ static void check_output(IStream *stream, const char *expected, BOOL todo, int l #define CHECK_OUTPUT_TODO(stream, expected) check_output(stream, expected, TRUE, __LINE__) #define CHECK_OUTPUT_RAW(stream, expected, size) check_output_raw(stream, expected, size, __LINE__) -static WCHAR *strdupAtoW(const char *str) -{ - WCHAR *ret = NULL; - DWORD len; - - if (!str) return ret; - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = malloc(len * sizeof(WCHAR)); - if (ret) - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - return ret; -} - static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property) { HRESULT hr; @@ -116,30 +101,29 @@ static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property) /* used to test all Write* methods for consistent error state */ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) { - static const WCHAR aW[] = {'a',0}; HRESULT hr; /* FIXME: add WriteAttributes */ - hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"a", NULL, L"a"); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteCData(writer, aW); + hr = IXmlWriter_WriteCData(writer, L"a"); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteCharEntity(writer, aW[0]); + hr = IXmlWriter_WriteCharEntity(writer, 'a'); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteChars(writer, aW, 1); + hr = IXmlWriter_WriteChars(writer, L"a", 1); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteComment(writer, aW); + hr = IXmlWriter_WriteComment(writer, L"a"); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteDocType(writer, aW, NULL, NULL, NULL); + hr = IXmlWriter_WriteDocType(writer, L"a", NULL, NULL, NULL); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW); + hr = IXmlWriter_WriteElementString(writer, NULL, L"a", NULL, L"a"); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteEndDocument(writer); @@ -148,40 +132,40 @@ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) hr = IXmlWriter_WriteEndElement(writer); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteEntityRef(writer, aW); + hr = IXmlWriter_WriteEntityRef(writer, L"a"); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteFullEndElement(writer); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteName(writer, aW); + hr = IXmlWriter_WriteName(writer, L"a"); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteNmToken(writer, aW); + hr = IXmlWriter_WriteNmToken(writer, L"a"); ok(hr == exp_hr, "Unexpected hr %#lx, expected %#lx.\n", hr, exp_hr); /* FIXME: add WriteNode */ /* FIXME: add WriteNodeShallow */ - hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); + hr = IXmlWriter_WriteProcessingInstruction(writer, L"a", L"a"); ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL); + hr = IXmlWriter_WriteQualifiedName(writer, L"a", NULL); ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteRaw(writer, aW); + hr = IXmlWriter_WriteRaw(writer, L"a"); ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteRawChars(writer, aW, 1); + hr = IXmlWriter_WriteRawChars(writer, L"a", 1); ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); - hr = IXmlWriter_WriteString(writer, aW); + hr = IXmlWriter_WriteString(writer, L"a"); ok(hr == exp_hr, "Unexpected hr %#lx., expected %#lx.\n", hr, exp_hr); /* FIXME: add WriteSurrogateCharEntity */ @@ -340,25 +324,25 @@ static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output) /* TODO: WriteAttributes */ - hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"a", NULL, L"a"); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteCData(writer, aW); + hr = IXmlWriter_WriteCData(writer, L"a"); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCharEntity(writer, 0x100); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteChars(writer, aW, 1); + hr = IXmlWriter_WriteChars(writer, L"a", 1); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteComment(writer, aW); + hr = IXmlWriter_WriteComment(writer, L"a"); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteDocType(writer, aW, NULL, NULL, NULL); + hr = IXmlWriter_WriteDocType(writer, L"a", NULL, NULL, NULL); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL); + hr = IXmlWriter_WriteElementString(writer, NULL, L"a", NULL, NULL); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); @@ -367,40 +351,40 @@ static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output) hr = IXmlWriter_WriteEndElement(writer); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteEntityRef(writer, aW); + hr = IXmlWriter_WriteEntityRef(writer, L"a"); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteFullEndElement(writer); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteName(writer, aW); + hr = IXmlWriter_WriteName(writer, L"a"); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteNmToken(writer, aW); + hr = IXmlWriter_WriteNmToken(writer, L"a"); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); /* TODO: WriteNode */ /* TODO: WriteNodeShallow */ - hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); + hr = IXmlWriter_WriteProcessingInstruction(writer, L"a", L"a"); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL); + hr = IXmlWriter_WriteQualifiedName(writer, L"a", NULL); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteRaw(writer, aW); + hr = IXmlWriter_WriteRaw(writer, L"a"); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteRawChars(writer, aW, 1); + hr = IXmlWriter_WriteRawChars(writer, L"a", 1); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteString(writer, aW); + hr = IXmlWriter_WriteString(writer, L"a"); ok(hr == MX_E_ENCODING, "Unexpected hr %#lx.\n", hr); /* TODO: WriteSurrogateCharEntity */ @@ -412,9 +396,6 @@ static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output) static void test_writeroutput(void) { - static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; - static const WCHAR usasciiW[] = {'u','s','-','a','s','c','i','i',0}; - static const WCHAR dummyW[] = {'d','u','m','m','y',0}; static const WCHAR utf16_outputW[] = {0xfeff,'<','a'}; IXmlWriterOutput *output; IXmlWriter *writer; @@ -428,7 +409,7 @@ static void test_writeroutput(void) EXPECT_REF(output, 1); IUnknown_Release(output); - hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, utf16W, &output); + hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, L"utf-16", &output); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); unk = NULL; hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); @@ -458,7 +439,7 @@ static void test_writeroutput(void) /* create with us-ascii */ output = NULL; - hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, usasciiW, &output); + hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, L"us-ascii", &output); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(output); @@ -475,7 +456,7 @@ static void test_writeroutput(void) hr = IXmlWriter_SetOutput(writer, output); ok(hr == S_OK, "Failed to set writer output, hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Write failed, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -505,7 +486,7 @@ static void test_writeroutput(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); output = NULL; - hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, dummyW, &output); + hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, L"dummy", &output); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); test_invalid_output_encoding(writer, output); @@ -522,9 +503,6 @@ static void test_writestartdocument(void) static const char fullprolog[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"; static const char *prologversion2 = "<?xml version=\"1.0\" encoding=\"uS-asCii\"?>"; static const char prologversion[] = "<?xml version=\"1.0\"?>"; - static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; - static const WCHAR usasciiW[] = {'u','S','-','a','s','C','i','i',0}; - static const WCHAR xmlW[] = {'x','m','l',0}; IXmlWriterOutput *output; IXmlWriter *writer; IStream *stream; @@ -537,7 +515,7 @@ static void test_writestartdocument(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + hr = IXmlWriter_WriteProcessingInstruction(writer, L"xml", L"version=\"1.0\""); ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -565,7 +543,7 @@ static void test_writestartdocument(void) /* now add PI manually, and try to start a document */ stream = writer_set_output(writer); - hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + hr = IXmlWriter_WriteProcessingInstruction(writer, L"xml", L"version=\"1.0\""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); @@ -575,7 +553,7 @@ static void test_writestartdocument(void) ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); /* another attempt to add 'xml' PI */ - hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + hr = IXmlWriter_WriteProcessingInstruction(writer, L"xml", L"version=\"1.0\""); ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -591,7 +569,7 @@ static void test_writestartdocument(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); output = NULL; - hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, usasciiW, &output); + hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, L"uS-asCii", &output); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); @@ -646,8 +624,6 @@ static void test_flush(void) static void test_omitxmldeclaration(void) { static const char prologversion[] = "<?xml version=\"1.0\"?>"; - static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; - static const WCHAR xmlW[] = {'x','m','l',0}; IXmlWriter *writer; HGLOBAL hglobal; IStream *stream; @@ -683,7 +659,7 @@ static void test_omitxmldeclaration(void) /* now add PI manually, and try to start a document */ stream = writer_set_output(writer); - hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + hr = IXmlWriter_WriteProcessingInstruction(writer, L"xml", L"version=\"1.0\""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -708,7 +684,7 @@ static void test_omitxmldeclaration(void) CHECK_OUTPUT(stream, prologversion); /* another attempt to add 'xml' PI */ - hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + hr = IXmlWriter_WriteProcessingInstruction(writer, L"xml", L"version=\"1.0\""); ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -723,9 +699,6 @@ static void test_bom(void) static const WCHAR piW[] = {0xfeff,'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','"','1','.','0','"','?','>'}; static const WCHAR aopenW[] = {0xfeff,'<','a'}; static const WCHAR afullW[] = {0xfeff,'<','a',' ','/','>'}; - static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; - static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; - static const WCHAR xmlW[] = {'x','m','l',0}; static const WCHAR bomW[] = {0xfeff}; IXmlWriterOutput *output; IXmlWriter *writer; @@ -736,7 +709,7 @@ static void test_bom(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); + hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, L"utf-16", &output); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); @@ -763,13 +736,13 @@ static void test_bom(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); + hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, L"utf-16", &output); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + hr = IXmlWriter_WriteProcessingInstruction(writer, L"xml", L"version=\"1.0\""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -784,13 +757,13 @@ static void test_bom(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); + hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, L"utf-16", &output); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -805,7 +778,7 @@ static void test_bom(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, utf16W, &output); + hr = CreateXmlWriterOutputWithEncodingName((IUnknown*)stream, NULL, L"utf-16", &output); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, output); @@ -813,7 +786,7 @@ static void test_bom(void) writer_set_property(writer, XmlWriterProperty_Indent); - hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL); + hr = IXmlWriter_WriteElementString(writer, NULL, L"a", NULL, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -830,67 +803,13 @@ static void test_bom(void) IXmlWriter_Release(writer); } -static HRESULT write_start_element(IXmlWriter *writer, const char *prefix, const char *local, - const char *uri) -{ - WCHAR *prefixW, *localW, *uriW; - HRESULT hr; - - prefixW = strdupAtoW(prefix); - localW = strdupAtoW(local); - uriW = strdupAtoW(uri); - - hr = IXmlWriter_WriteStartElement(writer, prefixW, localW, uriW); - - free(prefixW); - free(localW); - free(uriW); - - return hr; -} - -static HRESULT write_element_string(IXmlWriter *writer, const char *prefix, const char *local, - const char *uri, const char *value) -{ - WCHAR *prefixW, *localW, *uriW, *valueW; - HRESULT hr; - - prefixW = strdupAtoW(prefix); - localW = strdupAtoW(local); - uriW = strdupAtoW(uri); - valueW = strdupAtoW(value); - - hr = IXmlWriter_WriteElementString(writer, prefixW, localW, uriW, valueW); - - free(prefixW); - free(localW); - free(uriW); - free(valueW); - - return hr; -} - -static HRESULT write_string(IXmlWriter *writer, const char *str) -{ - WCHAR *strW; - HRESULT hr; - - strW = strdupAtoW(str); - - hr = IXmlWriter_WriteString(writer, strW); - - free(strW); - - return hr; -} - static void test_WriteStartElement(void) { static const struct { - const char *prefix; - const char *local; - const char *uri; + const WCHAR *prefix; + const WCHAR *local; + const WCHAR *uri; const char *output; const char *output_partial; HRESULT hr; @@ -899,22 +818,21 @@ static void test_WriteStartElement(void) } start_element_tests[] = { - { "prefix", "local", "uri", "<prefix:local xmlns:prefix=\"uri\" />", "<prefix:local" }, - { NULL, "local", "uri", "<local xmlns=\"uri\" />", "<local" }, - { "", "local", "uri", "<local xmlns=\"uri\" />", "<local" }, - { "", "local", "uri", "<local xmlns=\"uri\" />", "<local" }, + { L"prefix", L"local", L"uri", "<prefix:local xmlns:prefix=\"uri\" />", "<prefix:local" }, + { NULL, L"local", L"uri", "<local xmlns=\"uri\" />", "<local" }, + { L"", L"local", L"uri", "<local xmlns=\"uri\" />", "<local" }, + { L"", L"local", L"uri", "<local xmlns=\"uri\" />", "<local" }, - { "prefix", NULL, NULL, NULL, NULL, E_INVALIDARG }, - { NULL, NULL, "uri", NULL, NULL, E_INVALIDARG }, + { L"prefix", NULL, NULL, NULL, NULL, E_INVALIDARG }, + { NULL, NULL, L"uri", NULL, NULL, E_INVALIDARG }, { NULL, NULL, NULL, NULL, NULL, E_INVALIDARG }, - { NULL, "prefix:local", "uri", NULL, NULL, WC_E_NAMECHARACTER }, - { "pre:fix", "local", "uri", NULL, NULL, WC_E_NAMECHARACTER }, - { NULL, ":local", "uri", NULL, NULL, WC_E_NAMECHARACTER }, - { ":", "local", "uri", NULL, NULL, WC_E_NAMECHARACTER }, - { NULL, "local", "http://www.w3.org/2000/xmlns/", NULL, NULL, WR_E_XMLNSPREFIXDECLARATION }, - { "prefix", "local", "http://www.w3.org/2000/xmlns/", NULL, NULL, WR_E_XMLNSURIDECLARATION }, + { NULL, L"prefix:local", L"uri", NULL, NULL, WC_E_NAMECHARACTER }, + { L"pre:fix", L"local", L"uri", NULL, NULL, WC_E_NAMECHARACTER }, + { NULL, L":local", L"uri", NULL, NULL, WC_E_NAMECHARACTER }, + { L":", L"local", L"uri", NULL, NULL, WC_E_NAMECHARACTER }, + { NULL, L"local", L"http://www.w3.org/2000/xmlns/", NULL, NULL, WR_E_XMLNSPREFIXDECLARATION }, + { L"prefix", L"local", L"http://www.w3.org/2000/xmlns/", NULL, NULL, WR_E_XMLNSURIDECLARATION }, }; - static const WCHAR aW[] = {'a',0}; IXmlWriter *writer; IStream *stream; unsigned int i; @@ -923,12 +841,12 @@ static void test_WriteStartElement(void) hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_start_element(writer, NULL, "a", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); - hr = write_start_element(writer, NULL, "a", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); @@ -945,7 +863,7 @@ static void test_WriteStartElement(void) hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); + hr = IXmlWriter_WriteProcessingInstruction(writer, L"a", L"a"); ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); @@ -955,27 +873,27 @@ static void test_WriteStartElement(void) hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_element_string(writer, NULL, "b", NULL, "value"); + hr = IXmlWriter_WriteElementString(writer, NULL, L"b", NULL, L"value"); ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); - hr = write_start_element(writer, "prefix", "a", "uri"); + hr = IXmlWriter_WriteStartElement(writer, L"prefix", L"a", L"uri"); ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); - hr = write_element_string(writer, NULL, "b", NULL, "value"); + hr = IXmlWriter_WriteElementString(writer, NULL, L"b", NULL, L"value"); ok(hr == S_OK, "Failed to write element string, hr %#lx.\n", hr); - hr = write_element_string(writer, NULL, "c", NULL, NULL); + hr = IXmlWriter_WriteElementString(writer, NULL, L"c", NULL, NULL); ok(hr == S_OK, "Failed to write element string, hr %#lx.\n", hr); - hr = write_start_element(writer, NULL, "d", "uri"); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"d", L"uri"); ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); - hr = write_start_element(writer, "", "e", "uri"); + hr = IXmlWriter_WriteStartElement(writer, L"", L"e", L"uri"); ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); - hr = write_start_element(writer, "prefix2", "f", "uri"); + hr = IXmlWriter_WriteStartElement(writer, L"prefix2", L"f", L"uri"); ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -1001,7 +919,7 @@ static void test_WriteStartElement(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr); - hr = write_start_element(writer, start_element_tests[i].prefix, start_element_tests[i].local, + hr = IXmlWriter_WriteStartElement(writer, start_element_tests[i].prefix, start_element_tests[i].local, start_element_tests[i].uri); ok(hr == start_element_tests[i].hr, "%u: unexpected hr %#lx.\n", i, hr); @@ -1031,39 +949,39 @@ static void test_WriteElementString(void) { static const struct { - const char *prefix; - const char *local; - const char *uri; - const char *value; + const WCHAR *prefix; + const WCHAR *local; + const WCHAR *uri; + const WCHAR *value; const char *output; HRESULT hr; int todo; } element_string_tests[] = { - { "prefix", "local", "uri", "value", "<prefix:local xmlns:prefix=\"uri\">value</prefix:local>" }, - { NULL, "local", "uri", "value", "<local xmlns=\"uri\">value</local>" }, - { "", "local", "uri", "value", "<local xmlns=\"uri\">value</local>" }, - { "prefix", "local", "uri", NULL, "<prefix:local xmlns:prefix=\"uri\" />" }, - { NULL, "local", "uri", NULL, "<local xmlns=\"uri\" />" }, - { "", "local", "uri", NULL, "<local xmlns=\"uri\" />" }, - { NULL, "local", NULL, NULL, "<local />" }, - { "prefix", "local", "uri", "", "<prefix:local xmlns:prefix=\"uri\"></prefix:local>" }, - { NULL, "local", "uri", "", "<local xmlns=\"uri\"></local>" }, - { "", "local", "uri", "", "<local xmlns=\"uri\"></local>" }, - { NULL, "local", NULL, "", "<local></local>" }, - { "", "local", "http://www.w3.org/2000/xmlns/", NULL, "<local xmlns=\"http://www.w3.org/2000/xmlns/\" />" }, - - { "prefix", NULL, NULL, "value", NULL, E_INVALIDARG }, - { NULL, NULL, "uri", "value", NULL, E_INVALIDARG }, - { NULL, NULL, NULL, "value", NULL, E_INVALIDARG }, - { NULL, "prefix:local", "uri", "value", NULL, WC_E_NAMECHARACTER }, - { NULL, ":local", "uri", "value", NULL, WC_E_NAMECHARACTER }, - { ":", "local", "uri", "value", NULL, WC_E_NAMECHARACTER }, - { "prefix", "local", NULL, "value", NULL, WR_E_NSPREFIXWITHEMPTYNSURI }, - { "prefix", "local", "", "value", NULL, WR_E_NSPREFIXWITHEMPTYNSURI }, - { NULL, "local", "http://www.w3.org/2000/xmlns/", "value", NULL, WR_E_XMLNSPREFIXDECLARATION }, - { "prefix", "local", "http://www.w3.org/2000/xmlns/", "value", NULL, WR_E_XMLNSURIDECLARATION }, + { L"prefix", L"local", L"uri", L"value", "<prefix:local xmlns:prefix=\"uri\">value</prefix:local>" }, + { NULL, L"local", L"uri", L"value", "<local xmlns=\"uri\">value</local>" }, + { L"", L"local", L"uri", L"value", "<local xmlns=\"uri\">value</local>" }, + { L"prefix", L"local", L"uri", NULL, "<prefix:local xmlns:prefix=\"uri\" />" }, + { NULL, L"local", L"uri", NULL, "<local xmlns=\"uri\" />" }, + { L"", L"local", L"uri", NULL, "<local xmlns=\"uri\" />" }, + { NULL, L"local", NULL, NULL, "<local />" }, + { L"prefix", L"local", L"uri", L"", "<prefix:local xmlns:prefix=\"uri\"></prefix:local>" }, + { NULL, L"local", L"uri", L"", "<local xmlns=\"uri\"></local>" }, + { L"", L"local", L"uri", L"", "<local xmlns=\"uri\"></local>" }, + { NULL, L"local", NULL, L"", "<local></local>" }, + { L"", L"local", L"http://www.w3.org/2000/xmlns/", NULL, "<local xmlns=\"http://www.w3.org/2000/xmlns/\" />" }, + + { L"prefix", NULL, NULL, L"value", NULL, E_INVALIDARG }, + { NULL, NULL, L"uri", L"value", NULL, E_INVALIDARG }, + { NULL, NULL, NULL, L"value", NULL, E_INVALIDARG }, + { NULL, L"prefix:local", L"uri", L"value", NULL, WC_E_NAMECHARACTER }, + { NULL, L":local", L"uri", L"value", NULL, WC_E_NAMECHARACTER }, + { L":", L"local", L"uri", L"value", NULL, WC_E_NAMECHARACTER }, + { L"prefix", L"local", NULL, L"value", NULL, WR_E_NSPREFIXWITHEMPTYNSURI }, + { L"prefix", L"local", L"", L"value", NULL, WR_E_NSPREFIXWITHEMPTYNSURI }, + { NULL, L"local", L"http://www.w3.org/2000/xmlns/", L"value", NULL, WR_E_XMLNSPREFIXDECLARATION }, + { L"prefix", L"local", L"http://www.w3.org/2000/xmlns/", L"value", NULL, WR_E_XMLNSURIDECLARATION }, }; IXmlWriter *writer; IStream *stream; @@ -1073,48 +991,48 @@ static void test_WriteElementString(void) hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_element_string(writer, NULL, "b", NULL, "value"); + hr = IXmlWriter_WriteElementString(writer, NULL, L"b", NULL, L"value"); ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); - hr = write_start_element(writer, NULL, "a", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_element_string(writer, NULL, "b", NULL, "value"); + hr = IXmlWriter_WriteElementString(writer, NULL, L"b", NULL, L"value"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_element_string(writer, NULL, "b", NULL, NULL); + hr = IXmlWriter_WriteElementString(writer, NULL, L"b", NULL, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_element_string(writer, "prefix", "b", "uri", NULL); + hr = IXmlWriter_WriteElementString(writer, L"prefix", L"b", L"uri", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_start_element(writer, "prefix", "c", "uri"); + hr = IXmlWriter_WriteStartElement(writer, L"prefix", L"c", L"uri"); ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); - hr = write_element_string(writer, "prefix", "d", NULL, NULL); + hr = IXmlWriter_WriteElementString(writer, L"prefix", L"d", NULL, NULL); ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); - hr = write_element_string(writer, "prefix2", "d", "uri", NULL); + hr = IXmlWriter_WriteElementString(writer, L"prefix2", L"d", L"uri", NULL); ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); - hr = write_element_string(writer, NULL, "e", "uri", NULL); + hr = IXmlWriter_WriteElementString(writer, NULL, L"e", L"uri", NULL); ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); - hr = write_element_string(writer, "prefix", "f", "uri2", NULL); + hr = IXmlWriter_WriteElementString(writer, L"prefix", L"f", L"uri2", NULL); ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); - hr = write_element_string(writer, NULL, "g", "uri3", NULL); + hr = IXmlWriter_WriteElementString(writer, NULL, L"g", L"uri3", NULL); ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); - hr = write_element_string(writer, "prefix", "h", NULL, NULL); + hr = IXmlWriter_WriteElementString(writer, L"prefix", L"h", NULL, NULL); ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); - hr = write_element_string(writer, "prefix_i", "i", NULL, NULL); + hr = IXmlWriter_WriteElementString(writer, L"prefix_i", L"i", NULL, NULL); ok(hr == WR_E_NSPREFIXWITHEMPTYNSURI, "Failed to write element, hr %#lx.\n", hr); - hr = write_element_string(writer, "", "j", "uri", NULL); + hr = IXmlWriter_WriteElementString(writer, L"", L"j", L"uri", NULL); ok(hr == S_OK, "Failed to write element, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -1143,7 +1061,7 @@ static void test_WriteElementString(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr); - hr = write_element_string(writer, element_string_tests[i].prefix, element_string_tests[i].local, + hr = IXmlWriter_WriteElementString(writer, element_string_tests[i].prefix, element_string_tests[i].local, element_string_tests[i].uri, element_string_tests[i].value); ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#lx.\n", i, hr); @@ -1180,10 +1098,10 @@ static void test_WriteEndElement(void) stream = writer_set_output(writer); - hr = write_start_element(writer, NULL, "a", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_start_element(writer, NULL, "b", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); @@ -1203,8 +1121,6 @@ static void test_WriteEndElement(void) static void test_writeenddocument(void) { - static const WCHAR aW[] = {'a',0}; - static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; IStream *stream; HGLOBAL hglobal; @@ -1229,16 +1145,16 @@ static void test_writeenddocument(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); @@ -1262,9 +1178,6 @@ static void test_writeenddocument(void) static void test_WriteComment(void) { - static const WCHAR closeW[] = {'-','-','>',0}; - static const WCHAR aW[] = {'a',0}; - static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -1274,7 +1187,7 @@ static void test_WriteComment(void) writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); - hr = IXmlWriter_WriteComment(writer, aW); + hr = IXmlWriter_WriteComment(writer, L"a"); ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); @@ -1282,19 +1195,19 @@ static void test_WriteComment(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteComment(writer, aW); + hr = IXmlWriter_WriteComment(writer, L"a"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteComment(writer, aW); + hr = IXmlWriter_WriteComment(writer, L"a"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteComment(writer, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteComment(writer, closeW); + hr = IXmlWriter_WriteComment(writer, L"-->"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -1308,10 +1221,6 @@ static void test_WriteComment(void) static void test_WriteCData(void) { - static const WCHAR closeW[] = {']',']','>',0}; - static const WCHAR close2W[] = {'a',']',']','>','b',0}; - static const WCHAR aW[] = {'a',0}; - static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -1321,24 +1230,24 @@ static void test_WriteCData(void) writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); - hr = IXmlWriter_WriteCData(writer, aW); + hr = IXmlWriter_WriteCData(writer, L"a"); ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); - hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteCData(writer, aW); + hr = IXmlWriter_WriteCData(writer, L"a"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCData(writer, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteCData(writer, closeW); + hr = IXmlWriter_WriteCData(writer, L"]]>"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteCData(writer, close2W); + hr = IXmlWriter_WriteCData(writer, L"a]]>b"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -1359,8 +1268,7 @@ static void test_WriteCData(void) static void test_WriteRaw(void) { - static const WCHAR rawW[] = {'a','<',':',0}; - static const WCHAR aW[] = {'a',0}; + static const WCHAR rawW[] = L"a<:"; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -1391,7 +1299,7 @@ static void test_WriteRaw(void) hr = IXmlWriter_WriteRaw(writer, rawW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW); + hr = IXmlWriter_WriteElementString(writer, NULL, L"a", NULL, L"a"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); @@ -1417,7 +1325,6 @@ static void test_WriteRaw(void) static void test_writer_state(void) { - static const WCHAR aW[] = {'a',0}; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -1440,7 +1347,7 @@ static void test_writer_state(void) /* WriteAttributeString */ stream = writer_set_output(writer); - hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"a", NULL, L"a"); ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); @@ -1467,7 +1374,7 @@ static void test_writer_state(void) /* WriteCData */ stream = writer_set_output(writer); - hr = IXmlWriter_WriteCData(writer, aW); + hr = IXmlWriter_WriteCData(writer, L"a"); ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); @@ -1476,7 +1383,7 @@ static void test_writer_state(void) /* WriteName */ stream = writer_set_output(writer); - hr = IXmlWriter_WriteName(writer, aW); + hr = IXmlWriter_WriteName(writer, L"a"); ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); @@ -1485,7 +1392,7 @@ static void test_writer_state(void) /* WriteNmToken */ stream = writer_set_output(writer); - hr = IXmlWriter_WriteNmToken(writer, aW); + hr = IXmlWriter_WriteNmToken(writer, L"a"); ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); @@ -1494,7 +1401,7 @@ static void test_writer_state(void) /* WriteString */ stream = writer_set_output(writer); - hr = IXmlWriter_WriteString(writer, aW); + hr = IXmlWriter_WriteString(writer, L"a"); ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); @@ -1505,9 +1412,6 @@ static void test_writer_state(void) static void test_indentation(void) { - static const WCHAR commentW[] = {'c','o','m','m','e','n','t',0}; - static const WCHAR aW[] = {'a',0}; - static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -1523,13 +1427,13 @@ static void test_indentation(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteComment(writer, commentW); + hr = IXmlWriter_WriteComment(writer, L"comment"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); @@ -1549,13 +1453,13 @@ static void test_indentation(void) /* WriteElementString */ stream = writer_set_output(writer); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); + hr = IXmlWriter_WriteElementString(writer, NULL, L"b", NULL, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); + hr = IXmlWriter_WriteElementString(writer, NULL, L"b", NULL, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); @@ -1575,35 +1479,14 @@ static void test_indentation(void) IXmlWriter_Release(writer); } -static HRESULT write_attribute_string(IXmlWriter *writer, const char *prefix, const char *local, - const char *uri, const char *value) -{ - WCHAR *prefixW, *localW, *uriW, *valueW; - HRESULT hr; - - prefixW = strdupAtoW(prefix); - localW = strdupAtoW(local); - uriW = strdupAtoW(uri); - valueW = strdupAtoW(value); - - hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, uriW, valueW); - - free(prefixW); - free(localW); - free(uriW); - free(valueW); - - return hr; -} - static void test_WriteAttributeString(void) { static const struct { - const char *prefix; - const char *local; - const char *uri; - const char *value; + const WCHAR *prefix; + const WCHAR *local; + const WCHAR *uri; + const WCHAR *value; const char *output; const char *output_partial; HRESULT hr; @@ -1613,62 +1496,62 @@ static void test_WriteAttributeString(void) } attribute_tests[] = { - { NULL, "a", NULL, "b", "<e a=\"b\" />", "<e a=\"b\"" }, - { "", "a", NULL, "b", "<e a=\"b\" />", "<e a=\"b\"" }, - { NULL, "a", "", "b", "<e a=\"b\" />", "<e a=\"b\"" }, - { "", "a", "", "b", "<e a=\"b\" />", "<e a=\"b\"" }, - { "prefix", "local", "uri", "b", "<e prefix:local=\"b\" xmlns:prefix=\"uri\" />", "<e prefix:local=\"b\"" }, - { NULL, "a", "http://www.w3.org/2000/xmlns/", "defuri", "<e xmlns:a=\"defuri\" />", "<e xmlns:a=\"defuri\"" }, - { "xmlns", "a", NULL, "uri", "<e xmlns:a=\"uri\" />", "<e xmlns:a=\"uri\"" }, - { "xmlns", "a", "", "uri", "<e xmlns:a=\"uri\" />", "<e xmlns:a=\"uri\"" }, - { "prefix", "xmlns", "uri", "value", "<e prefix:xmlns=\"value\" xmlns:prefix=\"uri\" />", "<e prefix:xmlns=\"value\"" }, - { "prefix", "xmlns", "uri", NULL, "<e prefix:xmlns=\"\" xmlns:prefix=\"uri\" />", "<e prefix:xmlns=\"\"" }, - { "prefix", "xmlns", "uri", "", "<e prefix:xmlns=\"\" xmlns:prefix=\"uri\" />", "<e prefix:xmlns=\"\"" }, - { "prefix", "xmlns", NULL, "uri", "<e xmlns=\"uri\" />", "<e xmlns=\"uri\"" }, - { "prefix", "xmlns", "", "uri", "<e xmlns=\"uri\" />", "<e xmlns=\"uri\"" }, - { "xml", "space", NULL, "preserve", "<e xml:space=\"preserve\" />", "<e xml:space=\"preserve\"" }, - { "xml", "space", "", "preserve", "<e xml:space=\"preserve\" />", "<e xml:space=\"preserve\"" }, - { "xml", "space", NULL, "default", "<e xml:space=\"default\" />", "<e xml:space=\"default\"" }, - { "xml", "space", "", "default", "<e xml:space=\"default\" />", "<e xml:space=\"default\"" }, - { "xml", "a", NULL, "value", "<e xml:a=\"value\" />", "<e xml:a=\"value\"" }, - { "xml", "a", "", "value", "<e xml:a=\"value\" />", "<e xml:a=\"value\"" }, + { NULL, L"a", NULL, L"b", "<e a=\"b\" />", "<e a=\"b\"" }, + { L"", L"a", NULL, L"b", "<e a=\"b\" />", "<e a=\"b\"" }, + { NULL, L"a", L"", L"b", "<e a=\"b\" />", "<e a=\"b\"" }, + { L"", L"a", L"", L"b", "<e a=\"b\" />", "<e a=\"b\"" }, + { L"prefix", L"local", L"uri", L"b", "<e prefix:local=\"b\" xmlns:prefix=\"uri\" />", "<e prefix:local=\"b\"" }, + { NULL, L"a", L"http://www.w3.org/2000/xmlns/", L"defuri", "<e xmlns:a=\"defuri\" />", "<e xmlns:a=\"defuri\"" }, + { L"xmlns", L"a", NULL, L"uri", "<e xmlns:a=\"uri\" />", "<e xmlns:a=\"uri\"" }, + { L"xmlns", L"a", L"", L"uri", "<e xmlns:a=\"uri\" />", "<e xmlns:a=\"uri\"" }, + { L"prefix", L"xmlns", L"uri", L"value", "<e prefix:xmlns=\"value\" xmlns:prefix=\"uri\" />", "<e prefix:xmlns=\"value\"" }, + { L"prefix", L"xmlns", L"uri", NULL, "<e prefix:xmlns=\"\" xmlns:prefix=\"uri\" />", "<e prefix:xmlns=\"\"" }, + { L"prefix", L"xmlns", L"uri", L"", "<e prefix:xmlns=\"\" xmlns:prefix=\"uri\" />", "<e prefix:xmlns=\"\"" }, + { L"prefix", L"xmlns", NULL, L"uri", "<e xmlns=\"uri\" />", "<e xmlns=\"uri\"" }, + { L"prefix", L"xmlns", L"", L"uri", "<e xmlns=\"uri\" />", "<e xmlns=\"uri\"" }, + { L"xml", L"space", NULL, L"preserve", "<e xml:space=\"preserve\" />", "<e xml:space=\"preserve\"" }, + { L"xml", L"space", L"", L"preserve", "<e xml:space=\"preserve\" />", "<e xml:space=\"preserve\"" }, + { L"xml", L"space", NULL, L"default", "<e xml:space=\"default\" />", "<e xml:space=\"default\"" }, + { L"xml", L"space", L"", L"default", "<e xml:space=\"default\" />", "<e xml:space=\"default\"" }, + { L"xml", L"a", NULL, L"value", "<e xml:a=\"value\" />", "<e xml:a=\"value\"" }, + { L"xml", L"a", L"", L"value", "<e xml:a=\"value\" />", "<e xml:a=\"value\"" }, /* Autogenerated prefix names. */ - { NULL, "a", "defuri", NULL, "<e p1:a=\"\" xmlns:p1=\"defuri\" />", "<e p1:a=\"\"", S_OK, 1, 1, 1 }, - { NULL, "a", "defuri", "b", "<e p1:a=\"b\" xmlns:p1=\"defuri\" />", "<e p1:a=\"b\"", S_OK, 1, 1, 1 }, - { "", "a", "defuri", NULL, "<e p1:a=\"\" xmlns:p1=\"defuri\" />", "<e p1:a=\"\"", S_OK, 1, 1, 1 }, - { NULL, "a", "defuri", "", "<e p1:a=\"\" xmlns:p1=\"defuri\" />", "<e p1:a=\"\"", S_OK, 1, 1, 1 }, - { "", "a", "defuri", "b", "<e p1:a=\"b\" xmlns:p1=\"defuri\" />", "<e p1:a=\"b\"", S_OK, 1, 1, 1 }, + { NULL, L"a", L"defuri", NULL, "<e p1:a=\"\" xmlns:p1=\"defuri\" />", "<e p1:a=\"\"", S_OK, 1, 1, 1 }, + { NULL, L"a", L"defuri", L"b", "<e p1:a=\"b\" xmlns:p1=\"defuri\" />", "<e p1:a=\"b\"", S_OK, 1, 1, 1 }, + { L"", L"a", L"defuri", NULL, "<e p1:a=\"\" xmlns:p1=\"defuri\" />", "<e p1:a=\"\"", S_OK, 1, 1, 1 }, + { NULL, L"a", L"defuri", L"", "<e p1:a=\"\" xmlns:p1=\"defuri\" />", "<e p1:a=\"\"", S_OK, 1, 1, 1 }, + { L"", L"a", L"defuri", L"b", "<e p1:a=\"b\" xmlns:p1=\"defuri\" />", "<e p1:a=\"b\"", S_OK, 1, 1, 1 }, /* Failing cases. */ - { NULL, NULL, "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", E_INVALIDARG }, - { "", "a", "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION, 1, 1, 1 }, - { "", NULL, "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", E_INVALIDARG }, - { "", "", "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", E_INVALIDARG, 1, 1, 1 }, - { NULL, "", "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", E_INVALIDARG, 1, 1, 1 }, - { "prefix", "a", "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", WR_E_XMLNSURIDECLARATION, 1, 1, 1 }, - { "prefix", NULL, "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", E_INVALIDARG }, - { "prefix", NULL, NULL, "b", "<e />", "<e", E_INVALIDARG }, - { "prefix", NULL, "uri", NULL, "<e />", "<e", E_INVALIDARG }, - { "xml", NULL, NULL, "value", "<e />", "<e", E_INVALIDARG }, - { "xmlns", "a", "defuri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION }, - { "xmlns", "a", "b", "uri", "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION }, - { NULL, "xmlns", "uri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION, 0, 0, 1 }, - { "xmlns", NULL, "uri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION, 0, 0, 1 }, - { "pre:fix", "local", "uri", "b", "<e />", "<e", WC_E_NAMECHARACTER }, - { "pre:fix", NULL, "uri", "b", "<e />", "<e", E_INVALIDARG }, - { "prefix", "lo:cal", "uri", "b", "<e />", "<e", WC_E_NAMECHARACTER }, - { "xmlns", NULL, NULL, "uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, - { "xmlns", NULL, "", "uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, - { "xmlns", "", NULL, "uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, - { "xmlns", "", "", "uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, - { "xml", "space", "", "value", "<e />", "<e", WR_E_INVALIDXMLSPACE }, - { "xml", "space", NULL, "value", "<e />", "<e", WR_E_INVALIDXMLSPACE }, - { "xml", "a", "uri", "value", "<e />", "<e", WR_E_XMLPREFIXDECLARATION }, - { "xml", "space", NULL, "preServe", "<e />", "<e", WR_E_INVALIDXMLSPACE }, - { "xml", "space", NULL, "defAult", "<e />", "<e", WR_E_INVALIDXMLSPACE }, - { "xml", "space", NULL, NULL, "<e />", "<e", WR_E_INVALIDXMLSPACE }, - { "xml", "space", NULL, "", "<e />", "<e", WR_E_INVALIDXMLSPACE }, + { NULL, NULL, L"http://www.w3.org/2000/xmlns/", L"defuri", "<e />", "<e", E_INVALIDARG }, + { L"", L"a", L"http://www.w3.org/2000/xmlns/", L"defuri", "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION, 1, 1, 1 }, + { L"", NULL, L"http://www.w3.org/2000/xmlns/", L"defuri", "<e />", "<e", E_INVALIDARG }, + { L"", L"", L"http://www.w3.org/2000/xmlns/", L"defuri", "<e />", "<e", E_INVALIDARG, 1, 1, 1 }, + { NULL, L"", L"http://www.w3.org/2000/xmlns/", L"defuri", "<e />", "<e", E_INVALIDARG, 1, 1, 1 }, + { L"prefix", L"a", L"http://www.w3.org/2000/xmlns/", L"defuri", "<e />", "<e", WR_E_XMLNSURIDECLARATION, 1, 1, 1 }, + { L"prefix", NULL, L"http://www.w3.org/2000/xmlns/", L"defuri", "<e />", "<e", E_INVALIDARG }, + { L"prefix", NULL, NULL, L"b", "<e />", "<e", E_INVALIDARG }, + { L"prefix", NULL, L"uri", NULL, "<e />", "<e", E_INVALIDARG }, + { L"xml", NULL, NULL, L"value", "<e />", "<e", E_INVALIDARG }, + { L"xmlns", L"a", L"defuri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION }, + { L"xmlns", L"a", L"b", L"uri", "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION }, + { NULL, L"xmlns", L"uri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION, 0, 0, 1 }, + { L"xmlns", NULL, L"uri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION, 0, 0, 1 }, + { L"pre:fix", L"local", L"uri", L"b", "<e />", "<e", WC_E_NAMECHARACTER }, + { L"pre:fix", NULL, L"uri", L"b", "<e />", "<e", E_INVALIDARG }, + { L"prefix", L"lo:cal", L"uri", L"b", "<e />", "<e", WC_E_NAMECHARACTER }, + { L"xmlns", NULL, NULL, L"uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, + { L"xmlns", NULL, L"", L"uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, + { L"xmlns", L"", NULL, L"uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, + { L"xmlns", L"", L"", L"uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, + { L"xml", L"space", L"", L"value", "<e />", "<e", WR_E_INVALIDXMLSPACE }, + { L"xml", L"space", NULL, L"value", "<e />", "<e", WR_E_INVALIDXMLSPACE }, + { L"xml", L"a", L"uri", L"value", "<e />", "<e", WR_E_XMLPREFIXDECLARATION }, + { L"xml", L"space", NULL, L"preServe", "<e />", "<e", WR_E_INVALIDXMLSPACE }, + { L"xml", L"space", NULL, L"defAult", "<e />", "<e", WR_E_INVALIDXMLSPACE }, + { L"xml", L"space", NULL, NULL, "<e />", "<e", WR_E_INVALIDXMLSPACE }, + { L"xml", L"space", NULL, L"", "<e />", "<e", WR_E_INVALIDXMLSPACE }, }; IXmlWriter *writer; @@ -1688,10 +1571,10 @@ static void test_WriteAttributeString(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Failed to start document, hr %#lx.\n", hr); - hr = write_start_element(writer, NULL, "e", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"e", NULL); ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); - hr = write_attribute_string(writer, attribute_tests[i].prefix, attribute_tests[i].local, + hr = IXmlWriter_WriteAttributeString(writer, attribute_tests[i].prefix, attribute_tests[i].local, attribute_tests[i].uri, attribute_tests[i].value); todo_wine_if(attribute_tests[i].todo_hr) ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#lx, expected %#lx.\n", i, hr, attribute_tests[i].hr); @@ -1717,32 +1600,32 @@ static void test_WriteAttributeString(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_start_element(writer, "p", "a", "outeruri"); + hr = IXmlWriter_WriteStartElement(writer, L"p", L"a", L"outeruri"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_attribute_string(writer, "prefix", "local", "uri", "b"); + hr = IXmlWriter_WriteAttributeString(writer, L"prefix", L"local", L"uri", L"b"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_attribute_string(writer, NULL, "a", NULL, "b"); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"a", NULL, L"b"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_attribute_string(writer, "xmlns", "prefix", NULL, "uri"); + hr = IXmlWriter_WriteAttributeString(writer, L"xmlns", L"prefix", NULL, L"uri"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_attribute_string(writer, "p", "attr", NULL, "value"); + hr = IXmlWriter_WriteAttributeString(writer, L"p", L"attr", NULL, L"value"); ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr); - hr = write_attribute_string(writer, "prefix", "local", NULL, "b"); + hr = IXmlWriter_WriteAttributeString(writer, L"prefix", L"local", NULL, L"b"); todo_wine ok(hr == WR_E_DUPLICATEATTRIBUTE, "Unexpected hr %#lx.\n", hr); - hr = write_start_element(writer, NULL, "b", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_attribute_string(writer, NULL, "attr2", "outeruri", "value"); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"attr2", L"outeruri", L"value"); ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr); - hr = write_attribute_string(writer, "pr", "attr3", "outeruri", "value"); + hr = IXmlWriter_WriteAttributeString(writer, L"pr", L"attr3", L"outeruri", L"value"); ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); @@ -1764,13 +1647,13 @@ static void test_WriteAttributeString(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_start_element(writer, NULL, "e", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"e", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_attribute_string(writer, "xmlns", "prefix", NULL, "uri"); + hr = IXmlWriter_WriteAttributeString(writer, L"xmlns", L"prefix", NULL, L"uri"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_attribute_string(writer, "prefix", "attr", NULL, "value"); + hr = IXmlWriter_WriteAttributeString(writer, L"prefix", L"attr", NULL, L"value"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); @@ -1789,7 +1672,6 @@ static void test_WriteAttributeString(void) static void test_WriteFullEndElement(void) { - static const WCHAR aW[] = {'a',0}; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -1806,7 +1688,7 @@ static void test_WriteFullEndElement(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteFullEndElement(writer); @@ -1831,10 +1713,10 @@ static void test_WriteFullEndElement(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteFullEndElement(writer); @@ -1857,7 +1739,6 @@ static void test_WriteFullEndElement(void) static void test_WriteCharEntity(void) { - static const WCHAR aW[] = {'a',0}; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -1873,13 +1754,13 @@ static void test_WriteCharEntity(void) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteCharEntity(writer, 0x100); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_WriteEndDocument(writer); @@ -1906,31 +1787,31 @@ static void test_WriteString(void) writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); - hr = write_string(writer, "a"); + hr = IXmlWriter_WriteString(writer, L"a"); ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); - hr = write_string(writer, NULL); + hr = IXmlWriter_WriteString(writer, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_string(writer, ""); + hr = IXmlWriter_WriteString(writer, L""); ok(hr == E_UNEXPECTED, "Unexpected hr %#lx.\n", hr); stream = writer_set_output(writer); - hr = write_start_element(writer, NULL, "b", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_string(writer, NULL); + hr = IXmlWriter_WriteString(writer, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_string(writer, ""); + hr = IXmlWriter_WriteString(writer, L""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_string(writer, "a"); + hr = IXmlWriter_WriteString(writer, L"a"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* WriteString automatically escapes markup characters */ - hr = write_string(writer, "<&\">="); + hr = IXmlWriter_WriteString(writer, L"<&\">="); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -1942,10 +1823,10 @@ static void test_WriteString(void) stream = writer_set_output(writer); - hr = write_start_element(writer, NULL, "b", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = write_string(writer, NULL); + hr = IXmlWriter_WriteString(writer, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -1954,7 +1835,7 @@ static void test_WriteString(void) CHECK_OUTPUT(stream, "<b"); - hr = write_string(writer, ""); + hr = IXmlWriter_WriteString(writer, L""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -1974,13 +1855,13 @@ static void test_WriteString(void) writer_set_property(writer, XmlWriterProperty_Indent); - hr = write_start_element(writer, NULL, "a", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); - hr = write_start_element(writer, NULL, "b", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"b", NULL); ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); - hr = write_string(writer, "text"); + hr = IXmlWriter_WriteString(writer, L"text"); ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -2015,10 +1896,10 @@ static void test_WriteString(void) stream = writer_set_output(writer); - hr = write_start_element(writer, NULL, "a", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"a", NULL); ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); - hr = write_start_element(writer, NULL, "b", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"b", NULL); ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); @@ -2031,10 +1912,10 @@ static void test_WriteString(void) "<a>\r\n" " <b />"); - hr = write_start_element(writer, NULL, "c", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"c", NULL); ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); - hr = write_attribute_string(writer, NULL, "attr", NULL, "value"); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"attr", NULL, L"value"); ok(hr == S_OK, "Failed to write attribute string, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -2045,7 +1926,7 @@ static void test_WriteString(void) " <b />\r\n" " <c attr=\"value\""); - hr = write_string(writer, "text"); + hr = IXmlWriter_WriteString(writer, L"text"); ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr); hr = IXmlWriter_Flush(writer); @@ -2067,10 +1948,10 @@ static void test_WriteString(void) " <b />\r\n" " <c attr=\"value\">text</c>"); - hr = write_start_element(writer, NULL, "d", NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"d", NULL); ok(hr == S_OK, "Failed to start element, hr %#lx.\n", hr); - hr = write_string(writer, ""); + hr = IXmlWriter_WriteString(writer, L""); ok(hr == S_OK, "Failed to write a string, hr %#lx.\n", hr); hr = IXmlWriter_WriteEndElement(writer); @@ -2102,60 +1983,37 @@ static void test_WriteString(void) IStream_Release(stream); } -static HRESULT write_doctype(IXmlWriter *writer, const char *name, const char *pubid, const char *sysid, - const char *subset) -{ - WCHAR *nameW, *pubidW, *sysidW, *subsetW; - HRESULT hr; - - nameW = strdupAtoW(name); - pubidW = strdupAtoW(pubid); - sysidW = strdupAtoW(sysid); - subsetW = strdupAtoW(subset); - - hr = IXmlWriter_WriteDocType(writer, nameW, pubidW, sysidW, subsetW); - - free(nameW); - free(pubidW); - free(sysidW); - free(subsetW); - - return hr; -} - static void test_WriteDocType(void) { static const struct { - const char *name; - const char *pubid; - const char *sysid; - const char *subset; + const WCHAR *name; + const WCHAR *pubid; + const WCHAR *sysid; + const WCHAR *subset; const char *output; } doctype_tests[] = { - { "a", "", NULL, NULL, "<!DOCTYPE a PUBLIC \"\" \"\">" }, - { "a", NULL, NULL, NULL, "<!DOCTYPE a>" }, - { "a", NULL, "", NULL, "<!DOCTYPE a SYSTEM \"\">" }, - { "a", "", "", NULL, "<!DOCTYPE a PUBLIC \"\" \"\">" }, - { "a", "pubid", "", NULL, "<!DOCTYPE a PUBLIC \"pubid\" \"\">" }, - { "a", "pubid", NULL, NULL, "<!DOCTYPE a PUBLIC \"pubid\" \"\">" }, - { "a", "", "sysid", NULL, "<!DOCTYPE a PUBLIC \"\" \"sysid\">" }, - { "a", NULL, NULL, "", "<!DOCTYPE a []>" }, - { "a", NULL, NULL, "subset", "<!DOCTYPE a [subset]>" }, - { "a", "", NULL, "subset", "<!DOCTYPE a PUBLIC \"\" \"\" [subset]>" }, - { "a", NULL, "", "subset", "<!DOCTYPE a SYSTEM \"\" [subset]>" }, - { "a", "", "", "subset", "<!DOCTYPE a PUBLIC \"\" \"\" [subset]>" }, - { "a", "pubid", NULL, "subset", "<!DOCTYPE a PUBLIC \"pubid\" \"\" [subset]>" }, - { "a", "pubid", "", "subset", "<!DOCTYPE a PUBLIC \"pubid\" \"\" [subset]>" }, - { "a", NULL, "sysid", "subset", "<!DOCTYPE a SYSTEM \"sysid\" [subset]>" }, - { "a", "", "sysid", "subset", "<!DOCTYPE a PUBLIC \"\" \"sysid\" [subset]>" }, - { "a", "pubid", "sysid", "subset", "<!DOCTYPE a PUBLIC \"pubid\" \"sysid\" [subset]>" }, + { L"a", L"", NULL, NULL, "<!DOCTYPE a PUBLIC \"\" \"\">" }, + { L"a", NULL, NULL, NULL, "<!DOCTYPE a>" }, + { L"a", NULL, L"", NULL, "<!DOCTYPE a SYSTEM \"\">" }, + { L"a", L"", L"", NULL, "<!DOCTYPE a PUBLIC \"\" \"\">" }, + { L"a", L"pubid", L"", NULL, "<!DOCTYPE a PUBLIC \"pubid\" \"\">" }, + { L"a", L"pubid", NULL, NULL, "<!DOCTYPE a PUBLIC \"pubid\" \"\">" }, + { L"a", L"", L"sysid", NULL, "<!DOCTYPE a PUBLIC \"\" \"sysid\">" }, + { L"a", NULL, NULL, L"", "<!DOCTYPE a []>" }, + { L"a", NULL, NULL, L"subset", "<!DOCTYPE a [subset]>" }, + { L"a", L"", NULL, L"subset", "<!DOCTYPE a PUBLIC \"\" \"\" [subset]>" }, + { L"a", NULL, L"", L"subset", "<!DOCTYPE a SYSTEM \"\" [subset]>" }, + { L"a", L"", L"", L"subset", "<!DOCTYPE a PUBLIC \"\" \"\" [subset]>" }, + { L"a", L"pubid", NULL, L"subset", "<!DOCTYPE a PUBLIC \"pubid\" \"\" [subset]>" }, + { L"a", L"pubid", L"", L"subset", "<!DOCTYPE a PUBLIC \"pubid\" \"\" [subset]>" }, + { L"a", NULL, L"sysid", L"subset", "<!DOCTYPE a SYSTEM \"sysid\" [subset]>" }, + { L"a", L"", L"sysid", L"subset", "<!DOCTYPE a PUBLIC \"\" \"sysid\" [subset]>" }, + { L"a", L"pubid", L"sysid", L"subset", "<!DOCTYPE a PUBLIC \"pubid\" \"sysid\" [subset]>" }, }; static const WCHAR pubidW[] = {'p',0x100,'i','d',0}; - static const WCHAR nameW[] = {'-','a',0}; - static const WCHAR emptyW[] = { 0 }; IXmlWriter *writer; IStream *stream; unsigned int i; @@ -2169,15 +2027,15 @@ static void test_WriteDocType(void) hr = IXmlWriter_WriteDocType(writer, NULL, NULL, NULL, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - hr = IXmlWriter_WriteDocType(writer, emptyW, NULL, NULL, NULL); + hr = IXmlWriter_WriteDocType(writer, L"", NULL, NULL, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Name validation. */ - hr = IXmlWriter_WriteDocType(writer, nameW, NULL, NULL, NULL); + hr = IXmlWriter_WriteDocType(writer, L"-a", NULL, NULL, NULL); ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#lx.\n", hr); /* Pubid validation. */ - hr = IXmlWriter_WriteDocType(writer, aW, pubidW, NULL, NULL); + hr = IXmlWriter_WriteDocType(writer, L"a", pubidW, NULL, NULL); ok(hr == WC_E_PUBLICID, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); @@ -2186,7 +2044,7 @@ static void test_WriteDocType(void) { stream = writer_set_output(writer); - hr = write_doctype(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid, + hr = IXmlWriter_WriteDocType(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid, doctype_tests[i].subset); ok(hr == S_OK, "%u: failed to write doctype, hr %#lx.\n", i, hr); @@ -2195,7 +2053,7 @@ static void test_WriteDocType(void) CHECK_OUTPUT(stream, doctype_tests[i].output); - hr = write_doctype(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid, + hr = IXmlWriter_WriteDocType(writer, doctype_tests[i].name, doctype_tests[i].pubid, doctype_tests[i].sysid, doctype_tests[i].subset); ok(hr == WR_E_INVALIDACTION, "Unexpected hr %#lx.\n", hr); -- 2.35.1

1 0

[PATCH 1/2] ncrypt: Implement NCryptIsAlgSupported.
by Mohamad Al-Jaf 05 Apr '22

05 Apr '22

Microsoft Edge calls this function expecting an implementation. Without it, Internet browsing does not work. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- If you want to test this patch in Microsoft Edge, you have to wait a few minutes after opening it before it becomes usable. --- dlls/ncrypt/main.c | 24 ++++++++++++++++++++++-- dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 1 + 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index cc979a539d2..912f7ef643e 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -415,8 +415,28 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { - FIXME("(%#Ix, %s, %#lx): stub\n", provider, wine_dbgstr_w(algid), flags); - return NTE_NOT_SUPPORTED; + NCRYPT_KEY_HANDLE key; + SECURITY_STATUS status; + + TRACE("(%#Ix, %s, %#lx)\n", provider, wine_dbgstr_w(algid), flags); + + if (!provider) return NTE_INVALID_HANDLE; + if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (flags == NCRYPT_SILENT_FLAG) + { + FIXME("Silent flag not implemented\n"); + } + else if (flags) + { + ERR("Invalid flags %#lx\n", flags); + return NTE_BAD_FLAGS; + } + + status = NCryptCreatePersistedKey(provider, &key, algid, NULL, 0, 0); + NCryptFinalizeKey(key, 0); + NCryptFreeObject(key); + NCryptFreeObject(provider); + return status; } BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index bb914616373..60b367260d5 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -77,7 +77,7 @@ @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) -@ stub NCryptIsAlgSupported(long wstr long) +@ stdcall NCryptIsAlgSupported(long wstr long) @ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey diff --git a/include/ncrypt.h b/include/ncrypt.h index c09a1ec8676..18198fdc5bb 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -118,6 +118,7 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, const WCHAR *, NCryptBufferDesc *, NCRYPT_KEY_HANDLE *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); -- 2.35.1

2 4

[PATCH] d2d1/tests: Add tests for D2D1Grayscale effect.
by Ziqing Hui 05 Apr '22

05 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/effect.c | 1 + dlls/d2d1/tests/d2d1.c | 119 ++++++++++++++++++++++++++++++++++---- include/d2d1effects_2.idl | 1 + 3 files changed, 111 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index e7215c4b38a..601932b005b 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -27,6 +27,7 @@ static const struct d2d_effect_info builtin_effects[] = {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, {&CLSID_D2D1Crop, 1, 1, 1}, {&CLSID_D2D1Shadow, 1, 1, 1}, + {&CLSID_D2D1Grayscale, 1, 1, 1}, }; static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 722f46bffe6..826526d9d38 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -20,7 +20,7 @@ #include <limits.h> #include <math.h> #include <float.h> -#include "d2d1_1.h" +#include "d2d1_3.h" #include "d3d11.h" #include "wincrypt.h" #include "wine/test.h" @@ -9925,13 +9925,15 @@ static void test_mt_factory(BOOL d3d11) static void test_effect(BOOL d3d11) { - unsigned int i, j, min_inputs, max_inputs, str_size, input_count; + unsigned int i, j, min_inputs, max_inputs, str_size, input_count, factory_version; D2D1_BITMAP_PROPERTIES bitmap_desc; D2D1_BUFFER_PRECISION precision; ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; - ID2D1Factory1 *factory; + ID2D1Factory1 *factory1; + ID2D1Factory2 *factory2; + ID2D1Factory3 *factory3; ID2D1Bitmap *bitmap; ID2D1Effect *effect; D2D1_SIZE_U size; @@ -9943,28 +9945,43 @@ static void test_effect(BOOL d3d11) const struct effect_test { const CLSID *clsid; + UINT32 factory_version; UINT32 default_input_count; UINT32 min_inputs; UINT32 max_inputs; } effect_tests[] = { - {&CLSID_D2D12DAffineTransform, 1, 1, 1}, - {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, - {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, - {&CLSID_D2D1Crop, 1, 1, 1}, - {&CLSID_D2D1Shadow, 1, 1, 1}, + {&CLSID_D2D12DAffineTransform, 1, 1, 1, 1}, + {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1, 1}, + {&CLSID_D2D1Composite, 1, 2, 1, 0xffffffff}, + {&CLSID_D2D1Crop, 1, 1, 1, 1}, + {&CLSID_D2D1Shadow, 1, 1, 1, 1}, + {&CLSID_D2D1Grayscale, 3, 1, 1, 1}, }; if (!init_test_context(&ctx, d3d11)) return; - if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory1))) { win_skip("ID2D1Factory1 is not supported.\n"); release_test_context(&ctx); return; } + factory_version = 1; + if (SUCCEEDED(ID2D1Factory1_QueryInterface(factory1, &IID_ID2D1Factory2, (void **)&factory2))) + { + ID2D1Factory2_Release(factory2); + factory_version = 2; + } + if (SUCCEEDED(ID2D1Factory1_QueryInterface(factory1, &IID_ID2D1Factory3, (void **)&factory3))) + { + ID2D1Factory3_Release(factory3); + factory_version = 3; + } + if (factory_version < 3) + win_skip("ID2D1Factory%u is not supported.\n", factory_version + 1); hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -9973,6 +9990,9 @@ static void test_effect(BOOL d3d11) { const struct effect_test *test = effect_tests + i; + if (factory_version < test->factory_version) + continue; + winetest_push_context("Test %u", i); hr = ID2D1DeviceContext_CreateEffect(context, test->clsid, &effect); @@ -10109,7 +10129,7 @@ static void test_effect(BOOL d3d11) } ID2D1DeviceContext_Release(context); - ID2D1Factory1_Release(factory); + ID2D1Factory1_Release(factory1); release_test_context(&ctx); } @@ -10350,6 +10370,84 @@ static void test_effect_crop(BOOL d3d11) release_test_context(&ctx); } +static void test_effect_grayscale(BOOL d3d11) +{ + DWORD colour, expected_colour, luminance; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + struct d2d1_test_context ctx; + struct resource_readback rb; + ID2D1DeviceContext *context; + D2D1_SIZE_U input_size; + ID2D1Factory3 *factory; + ID2D1Bitmap1 *bitmap; + ID2D1Effect *effect; + ID2D1Image *output; + unsigned int i; + HRESULT hr; + + const DWORD test_pixels[] = {0xffffffff, 0x12345678, 0x89abcdef, 0x77777777, 0xdeadbeef}; + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory3, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory3 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Grayscale, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(test_pixels); ++i) + { + DWORD pixel = test_pixels[i]; + winetest_push_context("Test %u", i); + + set_size_u(&input_size, 1, 1); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(context, input_size, &pixel, sizeof(pixel), &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE); + ID2D1Effect_GetOutput(effect, &output); + + ID2D1DeviceContext_BeginDraw(context); + ID2D1DeviceContext_Clear(context, 0); + ID2D1DeviceContext_DrawImage(context, output, NULL, NULL, 0, 0); + hr = ID2D1DeviceContext_EndDraw(context, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + get_surface_readback(&ctx, &rb); + colour = get_readback_colour(&rb, 0, 0); + luminance = (DWORD)(0.299f * ((pixel >> 16) & 0xff) + + 0.587f * ((pixel >> 8) & 0xff) + + 0.114f * ((pixel >> 0) & 0xff) + 0.5f); + expected_colour = (pixel & 0xff000000) | (luminance << 16) | (luminance << 8) | luminance; + todo_wine ok(compare_colour(colour, expected_colour, 1), + "Got unexpected colour %#lx, expected %#lx.\n", colour, expected_colour); + release_resource_readback(&rb); + + ID2D1Image_Release(output); + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + } + + ID2D1Effect_Release(effect); + ID2D1DeviceContext_Release(context); + ID2D1Factory3_Release(factory); + release_test_context(&ctx); +} + static void test_stroke_contains_point(BOOL d3d11) { ID2D1TransformedGeometry *transformed_geometry; @@ -10735,6 +10833,7 @@ START_TEST(d2d1) queue_test(test_effect); queue_test(test_effect_2d_affine); queue_test(test_effect_crop); + queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); run_queued_tests(); diff --git a/include/d2d1effects_2.idl b/include/d2d1effects_2.idl index 79895361118..9cd93a8d3bf 100644 --- a/include/d2d1effects_2.idl +++ b/include/d2d1effects_2.idl @@ -18,6 +18,7 @@ import "d2d1effects_1.idl"; +cpp_quote("DEFINE_GUID(CLSID_D2D1Grayscale, 0x36dde0eb,0x3725,0x42e0,0x83,0x6d,0x52,0xfb,0x20,0xae,0xe6,0x44);") cpp_quote("DEFINE_GUID(CLSID_D2D1HighlightsShadows, 0xcadc8384,0x323f,0x4c7e,0xa3,0x61,0x2e,0x2b,0x24,0xdf,0x6e,0xe4);") typedef enum D2D1_HIGHLIGHTSANDSHADOWS_PROP -- 2.25.1

3 2

[PATCH] combase/tests: Add some RoGetActivationFactory tests with manifest.
by Rémi Bernon 05 Apr '22

05 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/combase/tests/Makefile.in | 7 +- dlls/combase/tests/combase.manifest | 15 ++ dlls/combase/tests/combase.rc | 22 +++ dlls/combase/tests/roapi.c | 52 +++++++ dlls/combase/tests/wine.combase.test.c | 159 ++++++++++++++++++++++ dlls/combase/tests/wine.combase.test.spec | 3 + 6 files changed, 256 insertions(+), 2 deletions(-) create mode 100644 dlls/combase/tests/combase.manifest create mode 100644 dlls/combase/tests/combase.rc create mode 100644 dlls/combase/tests/wine.combase.test.c create mode 100644 dlls/combase/tests/wine.combase.test.spec diff --git a/dlls/combase/tests/Makefile.in b/dlls/combase/tests/Makefile.in index 1c3d77725b3..99c036b78d9 100644 --- a/dlls/combase/tests/Makefile.in +++ b/dlls/combase/tests/Makefile.in @@ -1,6 +1,9 @@ TESTDLL = combase.dll IMPORTS = combase -C_SRCS = \ +SOURCES = \ roapi.c \ - string.c + string.c \ + combase.rc \ + wine.combase.test.c \ + wine.combase.test.spec diff --git a/dlls/combase/tests/combase.manifest b/dlls/combase/tests/combase.manifest new file mode 100644 index 00000000000..72f3ac915e0 --- /dev/null +++ b/dlls/combase/tests/combase.manifest @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + type="win32" + name="wine.combase.test" + version="1.0.0.0" + processorArchitecture="*" + /> +<description>Wine combase test suite</description> +<file name="wine.combase.test.dll"> + <activatableClass name="Wine.Test.Missing" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1"/> + <activatableClass name="Wine.Test.Class" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1"/> + <activatableClass name="Wine.Test.Trusted" threadingModel="both" xmlns="urn:schemas-microsoft-com:winrt.v1"/> +</file> +</assembly> diff --git a/dlls/combase/tests/combase.rc b/dlls/combase/tests/combase.rc new file mode 100644 index 00000000000..865bf703d5c --- /dev/null +++ b/dlls/combase/tests/combase.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2022 Rémi Bernon 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 "winuser.h" + +/* @makedep: combase.manifest */ +1 RT_MANIFEST combase.manifest diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index b1ac15a08cb..1fb8e3e5dc0 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -28,12 +28,31 @@ #include "wine/test.h" +static void load_resource(const WCHAR *filename) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "failed to create %s, error %lu\n", debugstr_w(filename), GetLastError()); + + res = FindResourceW(NULL, filename, L"TESTDLL"); + ok(res != 0, "couldn't find resource\n"); + ptr = LockResource(LoadResource(GetModuleHandleW(NULL), res)); + WriteFile(file, ptr, SizeofResource(GetModuleHandleW(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleW(NULL), res), "couldn't write resource\n"); + CloseHandle(file); +} + static void test_ActivationFactories(void) { HRESULT hr; HSTRING str, str2; IActivationFactory *factory = NULL; IInspectable *inspect = NULL; + ULONG ref; hr = WindowsCreateString(L"Windows.Data.Xml.Dom.XmlDocument", ARRAY_SIZE(L"Windows.Data.Xml.Dom.XmlDocument") - 1, &str); @@ -63,10 +82,43 @@ static void test_ActivationFactories(void) WindowsDeleteString(str2); WindowsDeleteString(str); + + hr = WindowsCreateString(L"Wine.Test.Missing", ARRAY_SIZE(L"Wine.Test.Missing") - 1, &str); + ok(hr == S_OK, "WindowsCreateString returned %#lx.\n", hr); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned %#lx.\n", hr); + ok(factory == NULL, "got factory %p.\n", factory); + WindowsDeleteString(str); + hr = WindowsCreateString(L"Wine.Test.Class", ARRAY_SIZE(L"Wine.Test.Class") - 1, &str); + ok(hr == S_OK, "WindowsCreateString returned %#lx.\n", hr); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + todo_wine + ok(hr == E_NOTIMPL, "RoGetActivationFactory returned %#lx.\n", hr); + ok(factory == NULL, "got factory %p.\n", factory); + WindowsDeleteString(str); + hr = WindowsCreateString(L"Wine.Test.Trusted", ARRAY_SIZE(L"Wine.Test.Trusted") - 1, &str); + ok(hr == S_OK, "WindowsCreateString returned %#lx.\n", hr); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + todo_wine + ok(hr == S_OK, "RoGetActivationFactory returned %#lx.\n", hr); + todo_wine + ok(!!factory, "got factory %p.\n", factory); + if (!factory) ref = 0; + else ref = IActivationFactory_Release(factory); + ok(ref == 0, "Release returned %lu\n", ref); + WindowsDeleteString(str); + RoUninitialize(); } START_TEST(roapi) { + BOOL ret; + + load_resource(L"wine.combase.test.dll"); + test_ActivationFactories(); + + ret = DeleteFileW(L"wine.combase.test.dll"); + ok(ret, "Failed to delete file, error %lu\n", GetLastError()); } diff --git a/dlls/combase/tests/wine.combase.test.c b/dlls/combase/tests/wine.combase.test.c new file mode 100644 index 00000000000..e6171c6c6e7 --- /dev/null +++ b/dlls/combase/tests/wine.combase.test.c @@ -0,0 +1,159 @@ +/* + * Copyright 2022 Rémi Bernon 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 <stdarg.h> +#include <stddef.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" + +#include "initguid.h" +#include "inspectable.h" +#include "roapi.h" +#include "winstring.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(combase); + +struct factory +{ + IActivationFactory IActivationFactory_iface; + LONG ref; + BOOL trusted; +}; + +static inline struct factory *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct factory, IActivationFactory_iface); +} + +static HRESULT WINAPI factory_QueryInterface(IActivationFactory *iface, REFIID iid, void **out) +{ + struct factory *impl = impl_from_IActivationFactory(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_IActivationFactory)) + { + IInspectable_AddRef((*out = &impl->IActivationFactory_iface)); + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef(IActivationFactory *iface) +{ + struct factory *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI factory_Release(IActivationFactory *iface) +{ + struct factory *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + return ref; +} + +static HRESULT WINAPI factory_GetIids(IActivationFactory *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 factory_GetRuntimeClassName(IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetTrustLevel(IActivationFactory *iface, TrustLevel *trust_level) +{ + struct factory *impl = impl_from_IActivationFactory(iface); + + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + + if (!impl->trusted) return E_NOTIMPL; + + *trust_level = BaseTrust; + return S_OK; +} + +static HRESULT WINAPI factory_ActivateInstance(IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + /* IInspectable methods */ + factory_GetIids, + factory_GetRuntimeClassName, + factory_GetTrustLevel, + /* IActivationFactory methods */ + factory_ActivateInstance, +}; + +static struct factory class_factory = {{&factory_vtbl}, 0}; +static struct factory trusted_factory = {{&factory_vtbl}, 0, TRUE}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("stub!\n"); + return S_OK; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + const WCHAR *buffer = WindowsGetStringRawBuffer(classid, NULL); + + FIXME("class %s, factory %p stub!\n", debugstr_w(buffer), factory); + + if (!wcscmp(buffer, L"Wine.Test.Class")) + { + IActivationFactory_AddRef((*factory = &class_factory.IActivationFactory_iface)); + return S_OK; + } + if (!wcscmp(buffer, L"Wine.Test.Trusted")) + { + IActivationFactory_AddRef((*factory = &trusted_factory.IActivationFactory_iface)); + return S_OK; + } + + return REGDB_E_CLASSNOTREG; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/combase/tests/wine.combase.test.spec b/dlls/combase/tests/wine.combase.test.spec new file mode 100644 index 00000000000..20a8bfa98ea --- /dev/null +++ b/dlls/combase/tests/wine.combase.test.spec @@ -0,0 +1,3 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) -- 2.35.1

2 1

[PATCH vkd3d 01/11] vkd3d-shader/hlsl: Report failure when encountering matrix instructions.
by Matteo Bruni 05 Apr '22

05 Apr '22

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- The immediate reason for this patch is to avoid returning a broken shader in test_reflection() in Wine's d3dcompiler:hlsl_d3d11 tests. libs/vkd3d-shader/hlsl_sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 94765f9e..9b6fa371 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -2067,7 +2067,7 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * { if (instr->data_type->type == HLSL_CLASS_MATRIX) { - FIXME("Matrix operations need to be lowered.\n"); + hlsl_fixme(ctx, &instr->loc, "Matrix operations need to be lowered."); break; } else if (instr->data_type->type == HLSL_CLASS_OBJECT) -- 2.34.1

2 21

[PATCH 1/2] kernel32/tests: Add broken results for GlobalMemoryStatus test.
by Rémi Bernon 05 Apr '22

05 Apr '22

As seen on win81_cw-gtx560-32 and win81_cw-rx460-32. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 566e2d6b987..a27e3296c01 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1505,8 +1505,12 @@ static void test_GlobalMemoryStatus(void) ok( memex.ullAvailExtendedVirtual == 0, "got ullAvailExtendedVirtual %#I64x\n", memex.ullAvailExtendedVirtual ); ok( mem.dwMemoryLoad == memex.dwMemoryLoad, "got dwMemoryLoad %lu\n", mem.dwMemoryLoad ); - ok( mem.dwTotalPhys == min( ~(SIZE_T)0 >> 1, memex.ullTotalPhys ), "got dwTotalPhys %#Ix\n", mem.dwTotalPhys ); - ok( IS_WITHIN_RANGE( mem.dwAvailPhys, min( ~(SIZE_T)0 >> 1, memex.ullAvailPhys ) ), "got dwAvailPhys %#Ix\n", mem.dwAvailPhys ); + ok( mem.dwTotalPhys == min( ~(SIZE_T)0 >> 1, memex.ullTotalPhys ) || + broken( mem.dwTotalPhys == ~(SIZE_T)0 ) /* Win <= 8.1 with RAM size > 4GB */, + "got dwTotalPhys %#Ix\n", mem.dwTotalPhys ); + ok( IS_WITHIN_RANGE( mem.dwAvailPhys, min( ~(SIZE_T)0 >> 1, memex.ullAvailPhys ) ) || + broken( mem.dwAvailPhys == ~(SIZE_T)0 ) /* Win <= 8.1 with RAM size > 4GB */, + "got dwAvailPhys %#Ix\n", mem.dwAvailPhys ); #ifndef _WIN64 todo_wine_if(memex.ullTotalPageFile > 0xfff7ffff) #endif -- 2.35.1

1 1

[PATCH 1/4] include: Add CWMAEncMediaObject class declaration to wmcodecdsp.idl.
by Rémi Bernon 05 Apr '22

05 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index ae2a42419b4..4ad965ab3d9 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -45,6 +45,11 @@ coclass CMSH264DecoderMFT {} ] coclass CWMADecMediaObject {}; +[ + uuid(70f598e9-f4ab-495a-99e2-a7c4d3d89abf) +] +coclass CWMAEncMediaObject {}; + [ uuid(93af0c51-2275-45d2-a35b-f2ba21caed00) ] -- 2.35.1

1 3

[PATCH 1/6] kernel32/tests: Add console reallocation tests.
by Torge Matthies 05 Apr '22

05 Apr '22

Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/kernel32/tests/console.c | 46 +++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 98692760acf..9195ac204f7 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4689,7 +4689,7 @@ static void copy_change_subsystem(const char* in, const char* out, DWORD subsyst CloseHandle(hFile); } -static BOOL check_whether_child_attached(const char* exec, DWORD flags) +static BOOL check_subprocess(const char* exec, const char* verb, DWORD flags) { STARTUPINFOA si = { sizeof(si) }; PROCESS_INFORMATION info; @@ -4698,7 +4698,7 @@ static BOOL check_whether_child_attached(const char* exec, DWORD flags) BOOL res; DWORD ret; - sprintf(buf, "\"%s\" console check_console", exec); + sprintf(buf, "\"%s\" console %s", exec, verb); res = CreateProcessA(NULL, buf, NULL, NULL, FALSE, flags, NULL, NULL, &si, &info); ok(res, "CreateProcess failed: %lu %s\n", GetLastError(), buf); CloseHandle(info.hThread); @@ -4711,6 +4711,18 @@ static BOOL check_whether_child_attached(const char* exec, DWORD flags) return exit_code != 0; } +static BOOL check_whether_child_attached(const char* exec, DWORD flags) +{ + return check_subprocess(exec, "check_console", flags); +} + +static BOOL check_same_console(const char* exec, DWORD flags) +{ + char buf[MAX_PATH]; + sprintf(buf, "check_same_console %lx", GetCurrentProcessId()); + return check_subprocess(exec, buf, flags); +} + static void test_CreateProcessCUI(void) { char guiexec[MAX_PATH]; @@ -4726,14 +4738,33 @@ static void test_CreateProcessCUI(void) strcat(cuiexec, "console_cui.exe"); copy_change_subsystem(argv[0], cuiexec, IMAGE_SUBSYSTEM_WINDOWS_CUI); + AllocConsole(); + + res = check_same_console(cuiexec, 0); + ok(res, "Expected child to be attached to the same console\n"); + res = check_same_console(cuiexec, DETACHED_PROCESS); + ok(!res, "Expected child to be attached to a different console\n"); + res = check_same_console(cuiexec, CREATE_NO_WINDOW); + todo_wine ok(!res, "Expected child to be attached to a different console\n"); + res = check_same_console(cuiexec, CREATE_NO_WINDOW|DETACHED_PROCESS); + ok(!res, "Expected child to be attached to a different console\n"); + res = check_same_console(cuiexec, CREATE_NO_WINDOW|CREATE_NEW_CONSOLE); + ok(!res, "Expected child to be attached to a different console\n"); + FreeConsole(); res = check_whether_child_attached(guiexec, DETACHED_PROCESS); ok(!res, "Don't expecting child to be attached to a console\n"); + res = check_whether_child_attached(guiexec, CREATE_NO_WINDOW); + ok(!res, "Don't expecting child to be attached to a console\n"); res = check_whether_child_attached(guiexec, 0); ok(!res, "Don't expecting child to be attached to a console\n"); res = check_whether_child_attached(cuiexec, DETACHED_PROCESS); ok(!res, "Don't expecting child to be attached to a console\n"); + res = check_whether_child_attached(cuiexec, CREATE_NO_WINDOW); + ok(res, "Expecting child to be attached to a console\n"); + res = check_whether_child_attached(cuiexec, CREATE_NO_WINDOW|DETACHED_PROCESS); + ok(!res, "Don't expecting child to be attached to a console\n"); res = check_whether_child_attached(cuiexec, 0); ok(res, "Expecting child to be attached to a console\n"); @@ -4774,6 +4805,17 @@ START_TEST(console) ExitProcess(GetConsoleCP() != 0); } + if (argc > 3 && !strcmp(argv[2], "check_same_console")) + { + DWORD parent_pid, count, pids[2]; + sscanf(argv[3], "%lx", &parent_pid); + count = GetConsoleProcessList(pids, ARRAY_SIZE(pids)); + while (count--) + if (pids[count] == parent_pid) + ExitProcess(1); + ExitProcess(0); + } + test_current = argc >= 3 && !strcmp(argv[2], "--current"); using_pseudo_console = argc >= 3 && !strcmp(argv[2], "--pseudo-console"); -- 2.35.1

3 7

[PATCH 1/2] kernel32/tests: Add more CreateProcess console management tests.
by Jacek Caban 05 Apr '22

05 Apr '22

From: Eric Pouech <eric.pouech(a)gmail.com> - check for console bits after create process - add tests for CREATE_NO_WINDOW flag in CreateProcess Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Eric, I simplified check_child_console_bits error handling a bit. We already test for success with ok() macro, so there is no need to check it again. dlls/kernel32/tests/console.c | 91 +++++++++++++++++++++++++++++------ 1 file changed, 77 insertions(+), 14 deletions(-)

1 0

[tools 1/2] testbot/web: Add MakeOfficialURL() for sending URLs to third-parties.
by Francois Gouget 05 Apr '22

05 Apr '22

It should be used whenever sending a URL to a third-party. Also document SecureConnection() and MakeSecureURL(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 38 +++++++++++++++++++++++++++++--- testbot/web/Register.pl | 5 ++--- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 13529c323..bc501ff32 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -27,7 +27,8 @@ WineTestBot::Utils - Utility functions =cut use Exporter 'import'; -our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString +our @EXPORT = qw(SecureConnection MakeSecureURL MakeOfficialURL GetTaskURL + GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir GetMTime DurationToString BuildEMailRecipient IsValidFileName BuildTag SanitizeTag LocaleName NotifyAdministrator @@ -50,7 +51,8 @@ use WineTestBot::Config; Returns true if the user accessed the website over a secure connection. -This relies on the web server setting the $HTTPS environment variable. +This relies on the web server setting the $HTTPS environment variable for CGI +scripts. =back =cut @@ -69,12 +71,16 @@ Builds a URL that accesses this website using https if possible. The parameter should be an absolute path that includes neither the protocol nor the hostname. -Note that this method uses $HTTP_HOST which may not match the official website +This relies on the web server setting the $HTTP_HOST environment variable for +CGI scripts. However $HTTP_HOST which may not match the official website hostname. As such this should only be used for providing URLs back to the user accessing the website, not for URLs sent to third-parties. +See also MakeOfficialURL(). + =back =cut + sub MakeSecureURL($) { my ($URL) = @_; @@ -83,6 +89,32 @@ sub MakeSecureURL($) return $Protocol . ($ENV{"HTTP_HOST"} || $WebHostName) . $URL; } +=pod +=over 12 + +=item C<MakeOfficialURL()> + +Creates a URL pointing to the official website. +The parameter should be an absolute path that includes neither the protocol +nor the hostname. + +This is the method to use in non-CGI scripts and to build URLs sent to any +third-party (e.g. via email); where a third party is any user other than the +one currently browsing the website. + +See also MakeSecureURL(). + +=back +=cut + +sub MakeOfficialURL($) +{ + my ($URL) = @_; + + my $Protocol = $UseSSL ? "https://" : "http://"; + return "$Protocol$WebHostName$URL"; +} + sub GetTaskURL($$$;$$) { my ($JobId, $StepNo, $TaskNo, $ShowScreenshot, $LogName) = @_; diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index bbea0eb12..b10be75e7 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -139,9 +139,8 @@ sub OnSendRequest($) { $Msg .= "Remarks:\n" . $self->GetParam("Remarks") . "\n"; } - my $URL = ($UseSSL ? "https://" : "http://") . $WebHostName . - "/admin/UserDetails.pl?Key=" . uri_escape($self->GetParam("Name")); - $Msg .= "\nTo approve or deny the request, please go to " . $URL; + my $URL = MakeOfficialURL("/admin/UserDetails.pl?Key=". uri_escape($self->GetParam("Name"))); + $Msg .= "\nTo approve or deny the request, please go to $URL"; NotifyAdministrator("winetestbot account request", $Msg); return 1; -- 2.30.2

1 1

[tools] testbot/cgi: Let FormPage operate in read-only mode.
by Francois Gouget 05 Apr '22

05 Apr '22

The FormPage is in read-write mode by default as this is the most common case, but calling SetReadWrite(0) puts it in read-only mode where it shows the field values but does not allow modifying them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This will be useful for the failure blacklist details page as it will operate either in read-only mode or in read-write mode. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 27 +++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index dfcd55e12..c6a8c6bf1 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -70,6 +70,8 @@ properties that the form should show or allow editing, as specified by DisplayProperty(). It may be undefined if determining the property list is delegated to GetPropertyDescriptors(). +By default the form allows modifying the field values. + See also Page::new(). =back @@ -82,11 +84,30 @@ sub _initialize($$$$) $self->SUPER::_initialize($Request, $RequiredRole); $self->{PropertyDescriptors} = $PropertyDescriptors; + $self->{RW} = 1; $self->{HasRequired} = !1; $self->{ActionPerformed} = !1; $self->{Method} = "post"; } +=pod +=over 12 + +=item C<SetReadWrite()> + +If set to true, the form allows editing the fields. +Otherwise it only shows their values. + +=back +=cut + +sub SetReadWrite($$) +{ + my ($self, $RW) = @_; + + $self->{RW} = $RW; +} + # # Property handling @@ -167,10 +188,12 @@ sub DisplayProperty($$) # type the appropriate key value would also be cumbersome so this is # currently not supported. But they can be displayed. $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" : - # All other properties can be edited... + # All other properties can displayed, + !$self->{RW} ? "ro" : + # and even edited if in read-write mode... $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : $PropertyDescriptor->GetType() ne "S" ? "rw" : - # ...except autoincrement ones (shown as <unset> if undefined) + # ...except autoincrement ones "ro"; } -- 2.30.2

1 0

[tools] testbot: Add Collection::GetSortedItems().
by Francois Gouget 05 Apr '22

05 Apr '22

This provides a default comparison function for items, letting them override it as appropriate for subclasses. Collection::GetSortedItems() then returns the collection's items sorted according to that order. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 22 +++++++++++ testbot/lib/ObjectModel/Item.pm | 53 ++++++++++++++++++++++++++ testbot/lib/WineTestBot/Patches.pm | 10 ++--- testbot/lib/WineTestBot/SpecialJobs.pm | 15 ++------ testbot/lib/WineTestBot/VMs.pm | 12 ++++++ 5 files changed, 94 insertions(+), 18 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index dd0be12d5..93a4502ef 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -395,6 +395,28 @@ sub GetItems($) =pod =over 12 +=item C<GetSortedItems()> + +Returns all the Item objects present in the Collection in the order defined +by the Item's Compare() method. + +See also GetItems() for the exact set of items being returned. + +=back +=cut + +sub GetSortedItems($$) +{ + my ($self, $Items) = @_; + + $self->Load() if (!$self->{Loaded}); + my @SortedItems = sort { $a->Compare($b) } values %{$self->{Items}}; + return \@SortedItems; +} + +=pod +=over 12 + =item C<GetItemsCount()> Returns how many Items are present in the Collection. diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index fb125f015..9cec7b47b 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -363,6 +363,59 @@ sub GetKey($) return $Key; } +=pod +=over 12 + +=item C<Compare()> + +$A->Compare($B) return a negative, zero or positive value depending on whether +$A is less than, equal to, or greater than $B respectively. + +Neither object can be undefined, and both must be of the same type. + +The comparison is based on the Item's key fields which are compared in their +order in the property descriptors list, and based on their types (so numeric +comparison for numeric values, and alphabetical otherwise). + +Note that the comparison is not particularly optimised so if it is called +many times it would probably be more efficient to redefine it. + +=back +=cut + +sub Compare($$) +{ + my ($self, $B) = @_; + + foreach my $PropertyDescriptor (@{$self->{PropertyDescriptors}}) + { + next if (!$PropertyDescriptor->GetIsKey()); + + my $ColNames = $PropertyDescriptor->GetColNames(); + if ($PropertyDescriptor->GetClass() eq "Basic") + { + my $ColName = $ColNames->[0]; + my $ColType = $PropertyDescriptor->GetType(); + return ($ColType eq "N" or $ColType eq "S" or $ColType eq "DT") ? + $self->{ColValues}{$ColName} <=> $B->{ColValues}{$ColName} : + $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + } + if ($PropertyDescriptor->GetClass() eq "Enum") + { + my $ColName = $ColNames->[0]; + return $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + } + + # A Detailref cannot be a key so this is an Itemref + foreach my $ColName (@$ColNames) + { + my $Cmp = $self->{ColValues}{$ColName} cmp $B->{ColValues}{$ColName}; + return $Cmp if ($Cmp); + } + } + return 0; +} + sub GetFullKey($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index cc0fbe94a..6891fa509 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -268,12 +268,11 @@ sub Submit($$;$) my $WinVMs = CreateVMs(); $WinVMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); $WinVMs->AddFilter("Role", ["base"]); - my $SortedKeys = $WinVMs->SortKeysBySortOrder($WinVMs->GetKeys()); + my $SortedVMs = $WinVMs->GetSortedItems(); my $Tasks; - foreach my $VMKey (@$SortedKeys) + foreach my $VM (@$SortedVMs) { - my $VM = $WinVMs->GetItem($VMKey); my ($ErrMessage, $Missions) = ParseMissionStatement($VM->Missions); next if (defined $ErrMessage); @@ -338,12 +337,11 @@ sub Submit($$;$) my $WineVMs = CreateVMs(); $WineVMs->AddFilter("Type", ["wine"]); $WineVMs->AddFilter("Role", ["base"]); - my $SortedKeys = $WineVMs->SortKeysBySortOrder($WineVMs->GetKeys()); + my $SortedVMs = $WineVMs->GetSortedItems(); my $Tasks; - foreach my $VMKey (@$SortedKeys) + foreach my $VM (@$SortedVMs) { - my $VM = $WineVMs->GetItem($VMKey); my ($ErrMessage, $Missions) = ParseMissionStatement($VM->Missions); next if (defined $ErrMessage); diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index 360e1ffe8..e8677ecfd 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -54,10 +54,7 @@ sub GetReconfigVMs($$) $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); $VMs->AddFilter("Type", [$VMType]); $VMs->FilterEnabledRole(); - - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - my @SortedVMs = map { $VMs->GetItem($_) } @$SortedKeys; - return \@SortedVMs; + return $VMs->GetSortedItems(); } sub AddReconfigJob($$$) @@ -132,10 +129,7 @@ sub GetWindowsTestVMs($$$) { $VMs->FilterEnabledRole(); } - - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - my @SortedVMs = map { $VMs->GetItem($_) } @$SortedKeys; - return \@SortedVMs; + return $VMs->GetSortedItems(); } sub AddWindowsTestJob($$$$$) @@ -219,10 +213,7 @@ sub GetWineTestVMs($) $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); $VMs->AddFilter("Type", ["wine"]); $VMs->FilterEnabledRole(); - - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - my @SortedVMs = map { $VMs->GetItem($_) } @$SortedKeys; - return \@SortedVMs; + return $VMs->GetSortedItems(); } sub AddWineTestJob($$) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 65f633354..ee0c1be24 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -177,6 +177,18 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +sub Compare($$) +{ + my ($self, $B) = @_; + + # Sort retired and deleted VMs last + my %RoleOrders = ("retired" => 1, "deleted" => 2); + + return ($RoleOrders{$self->Role} || 0) <=> ($RoleOrders{$B->Role} || 0) || + $self->SortOrder <=> $B->SortOrder || + $self->Name <=> $B->Name; +} + sub HasEnabledRole($) { my ($self) = @_; -- 2.30.2

1 0

[tools] testbot/cgi: Replace CollectionPage with SimpleCollectionPage.
by Francois Gouget 05 Apr '22

05 Apr '22

The old CollectionPage is not used anymore so replace it with the new implementation. This means CollectionBlockForPage and the CallXxx() trampolines are not needed anymore either. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Removes quite a bit of code. Yay! --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 169 +++-------------- .../ObjectModel/CGI/CollectionBlockForPage.pm | 154 --------------- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 179 ++++-------------- .../ObjectModel/CGI/SimpleCollectionPage.pm | 138 -------------- testbot/web/JobDetails.pl | 4 +- testbot/web/PatchesList.pl | 4 +- testbot/web/admin/BranchesList.pl | 4 +- testbot/web/admin/UsersList.pl | 4 +- testbot/web/admin/VMsList.pl | 4 +- 9 files changed, 73 insertions(+), 587 deletions(-) delete mode 100644 testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm delete mode 100644 testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index cbe22f90f..40ad61b2b 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -37,32 +37,6 @@ Also, because this is only one part of a web page, some methods, such as those dealing with errors, are delegated to the EnclosingPage object which must implement the ObjectModel::CGI::Page interface. -Other methods are designed so they can be overridden by the enclosing page as -a way to allow it to modify how the collection block looks or behaves. These -methods can be identified by their CallXxx() trampoline. The override -mechanism works as follows: -- The CollectionBlock class and any subclass should never call overridable - methods directly. Instead they should call the corresponding CallXxx() - trampoline. -- The CollectionBlock class provides a default CallXxx() implementation which - simply calls the corresponding Xxx() method. This allows using the - CollectionBlock as is. -- Pages that want to customize the CollectionBlock behavior should use the - CollectionBlockForPage class instead. That class provides an alternative - implementation for each CallXxx(...) method that calls - $self->{EnclosingPage}->Xxx($CollectionBlock, ...). Note how the Xxx() - method in the enclosing page gets an extra parameter so it can both know - which collection block it received the call from, and call the collection - block methods. -- The page should in turn provide implementations for all the Xxx() methods. - The simplest way to do so is for such pages use CollectionPage as their base - class. CollectionPage provides default Xxx($CollectionBlock,...) - implementations that just reflect these calls back to - $CollectionBlock->Xxx(). - -Of course an alternative way for a page to customize the collection block -behavior is to subclass it and use that subclass instead. - =cut package ObjectModel::CGI::CollectionBlock; @@ -118,13 +92,6 @@ sub Create($$@) return ObjectModel::CGI::CollectionBlock->new(@_); } -sub CallGetDetailsPage($) -{ - my ($self) = @_; - - return $self->GetDetailsPage(); -} - sub GetDetailsPage($) { my ($self) = @_; @@ -144,14 +111,14 @@ sub escapeHTML($$) # Error handling framework # -sub CallGenerateErrorDiv($) +sub GenerateErrorDiv($) { my ($self) = @_; $self->{EnclosingPage}->GenerateErrorDiv(); } -sub CallGenerateErrorPopup($) +sub GenerateErrorPopup($) { my ($self) = @_; @@ -163,13 +130,6 @@ sub CallGenerateErrorPopup($) # Individual item property support # -sub CallDisplayProperty($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $self->DisplayProperty($PropertyDescriptor); -} - =pod =over 12 @@ -190,13 +150,6 @@ sub DisplayProperty($$) return $PropertyDescriptor->GetClass ne "Detailref"; } -sub CallSortKeys($$) -{ - my ($self, $Keys) = @_; - - return $self->SortKeys($Keys); -} - sub SortKeys($$) { my ($self, $Keys) = @_; @@ -204,13 +157,6 @@ sub SortKeys($$) return $Keys; } -sub CallGetDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - return $self->GetDisplayValue($Item, $PropertyDescriptor); -} - sub GetDisplayValue($$$) { my ($self, $Item, $PropertyDescriptor) = @_; @@ -258,13 +204,6 @@ sub GetDisplayValue($$$) return $Value; } -sub CallGetEscapedDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - return $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); -} - sub GetEscapedDisplayValue($$$) { my ($self, $Item, $PropertyDescriptor) = @_; @@ -286,8 +225,7 @@ sub GetEscapedDisplayValue($$$) } else { - $Value = $self->escapeHTML($self->CallGetDisplayValue($Item, - $PropertyDescriptor)); + $Value = $self->escapeHTML($self->GetDisplayValue($Item, $PropertyDescriptor)); } return $Value; @@ -298,13 +236,6 @@ sub GetEscapedDisplayValue($$$) # Item cell generation # -sub CallGenerateHeaderCell($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $self->GenerateHeaderCell($PropertyDescriptor); -} - sub GenerateHeaderCell($$) { my ($self, $PropertyDescriptor) = @_; @@ -312,13 +243,6 @@ sub GenerateHeaderCell($$) "</th>\n"; } -sub CallGenerateDataCell($$$$) -{ - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; - - return $self->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); -} - sub GenerateDataCell($$$$) { my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; @@ -347,7 +271,7 @@ sub GenerateDataCell($$$$) } print "<a href='", $self->escapeHTML($Query), "'>"; } - print $self->CallGetEscapedDisplayValue($Item, $PropertyDescriptor); + print $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); if ($NeedLink) { print "</a>"; @@ -360,13 +284,6 @@ sub GenerateDataCell($$$$) # Collection table generation # -sub CallGenerateFormStart($) -{ - my ($self) = @_; - - $self->GenerateFormStart(); -} - sub GenerateFormStart($) { my ($self) = @_; @@ -384,13 +301,6 @@ sub GenerateFormStart($) } } -sub CallGenerateHeaderRow($$$) -{ - my ($self, $PropertyDescriptors, $ItemActions) = @_; - - $self->GenerateHeaderRow($PropertyDescriptors, $ItemActions); -} - sub GenerateHeaderRow($$$) { my ($self, $PropertyDescriptors, $ItemActions) = @_; @@ -402,9 +312,9 @@ sub GenerateHeaderRow($$$) } foreach my $PropertyDescriptor (@$PropertyDescriptors) { - if ($self->CallDisplayProperty($PropertyDescriptor)) + if ($self->DisplayProperty($PropertyDescriptor)) { - $self->CallGenerateHeaderCell($PropertyDescriptor); + $self->GenerateHeaderCell($PropertyDescriptor); } } @@ -419,13 +329,6 @@ sub SelName($$) return "sel_" . $Key; } -sub CallGenerateDataRow($$$$$$) -{ - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - - $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); -} - sub GenerateDataRow($$$$$$) { my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; @@ -438,21 +341,14 @@ sub GenerateDataRow($$$$$$) } foreach my $PropertyDescriptor (@$PropertyDescriptors) { - if ($self->CallDisplayProperty($PropertyDescriptor)) + if ($self->DisplayProperty($PropertyDescriptor)) { - $self->CallGenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); + $self->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); } } print "</tr>\n"; } -sub CallGenerateFormEnd($) -{ - my ($self) = @_; - - $self->GenerateFormEnd(); -} - sub GenerateFormEnd($) { #my ($self) = @_; @@ -503,26 +399,26 @@ EOF } print "<div class='CollectionBlock'>\n"; - $self->CallGenerateFormStart(); - $self->CallGenerateErrorDiv(); + $self->GenerateFormStart(); + $self->GenerateErrorDiv(); print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; print "<thead>\n"; - my $ItemActions = $self->CallGetItemActions(); - $self->CallGenerateHeaderRow($PropertyDescriptors, $ItemActions); + my $ItemActions = $self->GetItemActions(); + $self->GenerateHeaderRow($PropertyDescriptors, $ItemActions); print "</thead>\n"; print "<tbody>\n"; - my $DetailsPage = $self->CallGetDetailsPage(); + my $DetailsPage = $self->GetDetailsPage(); my $Row = 0; - my $Keys = $self->CallSortKeys($self->{Collection}->GetKeys()); + my $Keys = $self->SortKeys($self->{Collection}->GetKeys()); foreach my $Key (@$Keys) { my $Class = ($Row % 2) == 0 ? "even" : "odd"; my $Item = $self->{Collection}->GetItem($Key); - $self->CallGenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, - $Class, $ItemActions); + $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, + $Class, $ItemActions); $Row++; } if (@$Keys == 0) @@ -563,7 +459,7 @@ EOF print "</div>\n"; } - my $Actions = $self->CallGetActions(); + my $Actions = $self->GetActions(); if (@$Actions != 0) { print "<div class='CollectionBlockActions'>\n"; @@ -574,8 +470,8 @@ EOF print "</div>\n"; } - $self->CallGenerateErrorPopup(undef); - $self->CallGenerateFormEnd(); + $self->GenerateErrorPopup(undef); + $self->GenerateFormEnd(); print "</div>\n"; } @@ -584,13 +480,6 @@ EOF # Per-item actions handling # -sub CallGetItemActions($) -{ - my ($self) = @_; - - return $self->GetItemActions(); -} - =pod =over 12 @@ -613,13 +502,6 @@ sub GetItemActions($) return ["Delete"]; } -sub CallOnItemAction($$$) -{ - my ($self, $Item, $Action) = @_; - - return $self->OnItemAction($Item, $Action); -} - =pod =over 12 @@ -661,13 +543,6 @@ sub OnItemAction($$$) # Actions handling # -sub CallGetActions($) -{ - my ($self) = @_; - - return $self->GetActions(); -} - =pod =over 12 @@ -685,7 +560,7 @@ sub GetActions($) { my ($self) = @_; - return $self->CallGetDetailsPage() ? + return $self->GetDetailsPage() ? ["Add ". $self->{Collection}->GetItemName()] : []; } @@ -714,7 +589,7 @@ sub OnAction($$) if ($Action eq "Add " . $self->{Collection}->GetItemName()) { - my $Target = $self->CallGetDetailsPage(); + my $Target = $self->GetDetailsPage(); my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { @@ -732,7 +607,7 @@ sub OnAction($$) if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key))) { my $Item = $self->{Collection}->GetItem($Key); - return 0 if (!$self->CallOnItemAction($Item, $Action)); + return 0 if (!$self->OnItemAction($Item, $Action)); } } return 1; diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm deleted file mode 100644 index 5bdc7d32e..000000000 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ /dev/null @@ -1,154 +0,0 @@ -# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- -# Collection block for list pages -# -# Copyright 2009 Ge van Geldorp -# Copyright 2014, 2017-2018, 2022 Francois Gouget -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - -use strict; - -package ObjectModel::CGI::CollectionBlockForPage; - -=head1 NAME - -ObjectModel::CGI::CollectionBlockForPage - Collection block for list pages - -Allows the CollectionPage class to provide implementations for most of the -CollectionBlock methods. See CollectionBlock for details. - -=cut - -use ObjectModel::CGI::CollectionBlock; -our @ISA = qw(ObjectModel::CGI::CollectionBlock); - - -sub CallGetDetailsPage($) -{ - my ($self) = @_; - - return $self->{EnclosingPage}->GetDetailsPage($self); -} - - -# -# Item properties support -# - -sub CallDisplayProperty($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $self->{EnclosingPage}->DisplayProperty($self, $PropertyDescriptor); -} - -sub CallSortKeys($$) -{ - my ($self, $Keys) = @_; - - return $self->{EnclosingPage}->SortKeys($self, $Keys); -} - -sub CallGetDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - return $self->{EnclosingPage}->GetDisplayValue($self, $Item, $PropertyDescriptor); -} - - -# -# Item cell generation -# - -sub CallGenerateHeaderCell($$) -{ - my ($self, $PropertyDescriptor) = @_; - - return $self->{EnclosingPage}->GenerateHeaderCell($self, $PropertyDescriptor); -} - -sub CallGenerateDataCell($$$$) -{ - my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; - - return $self->{EnclosingPage}->GenerateDataCell($self, $Item, $PropertyDescriptor, $DetailsPage); -} - - -# -# Collection table generation -# - -sub CallGenerateFormStart($) -{ - my ($self) = @_; - - $self->{EnclosingPage}->GenerateFormStart($self); -} - -sub CallGenerateHeaderRow($$$) -{ - my ($self, $PropertyDescriptors, $ItemActions) = @_; - - $self->{EnclosingPage}->GenerateHeaderRow($self, $PropertyDescriptors, $ItemActions); -} - -sub CallGenerateDataRow($$$$$$) -{ - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - - $self->{EnclosingPage}->GenerateDataRow($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); -} - -sub CallGenerateFormEnd($) -{ - my ($self) = @_; - - $self->{EnclosingPage}->GenerateFormEnd($self); -} - - -# -# Per-item actions handling -# - -sub CallGetItemActions($) -{ - my ($self) = @_; - - return $self->{EnclosingPage}->GetItemActions($self); -} - -sub CallOnItemAction($$$) -{ - my ($self, $Item, $Action) = @_; - - return $self->{EnclosingPage}->OnItemAction($self, $Item, $Action); -} - - -# -# Actions handling -# - -sub CallGetActions($) -{ - my ($self) = @_; - - return $self->{EnclosingPage}->GetActions($self); -} - -1; diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index ddbbd663e..2de667b89 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -26,106 +26,65 @@ package ObjectModel::CGI::CollectionPage; ObjectModel::CGI::CollectionPage - Base class for list pages -Generates a page containing a single collection block. +A page containing a single collection block. -It uses the CollectionBlockForPage class which means CollectionPage implements -both the ObjectModel::CGI::Page and ObjectModel::CGI::CollectionBlock -interfaces. The latter allows it to customize the collection block without -having to define a CollectionBlock subclass. +The CollectionPage instances have the following properties: +=over +=item Collection +The collection containing the items to be shown in the CollectionBlock widget. + +=item CollectionBlock +The widget showing the items in the specified collection. + +=item ActionPerformed +Set to true if an action was specified and succeeded. +=back =cut use ObjectModel::CGI::Page; our @ISA = qw(ObjectModel::CGI::Page); -use ObjectModel::CGI::CollectionBlockForPage; - - -sub _initialize($$$$) -{ - my ($self, $Request, $RequiredRole, $Collection) = @_; - - $self->{Collection} = $Collection; - - $self->SUPER::_initialize($Request, $RequiredRole); -} - -sub CreateCollectionBlock($$) -{ - my ($self, $Collection) = @_; - - return ObjectModel::CGI::CollectionBlockForPage->new($Collection, $self); -} - -sub GetDetailsPage($$) -{ - my ($self, $CollectionBlock) = @_; - - return $CollectionBlock->GetDetailsPage(); -} - - -# -# Item properties support -# - -sub DisplayProperty($$$) -{ - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; - - return $CollectionBlock->DisplayProperty($PropertyDescriptor); -} - -sub SortKeys($$$) -{ - my ($self, $CollectionBlock, $Keys) = @_; - - return $CollectionBlock->SortKeys($Keys); -} +# Use require to avoid overriding Page::new() +require ObjectModel::CGI::CollectionBlock; -sub GetDisplayValue($$$$) -{ - my ($self, $CollectionBlock, $Item, $PropertyDescriptor) = @_; - - return $CollectionBlock->GetDisplayValue($Item, $PropertyDescriptor); -} +=pod +=over 12 -# -# Item cell generation -# - -sub GenerateHeaderCell($$$) -{ - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; +=item C<_initialize()> - $CollectionBlock->GenerateHeaderCell($PropertyDescriptor); -} +Sets up the new page object. -sub GenerateDataCell($$$$$) -{ - my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; +Parameters: +=over - $CollectionBlock->GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); -} +=item Request +=item RequiredRole +See Page::new(). +=item Collection +This is the collection of items that should be shown in the CollectionBlock +widget. -# -# Collection table generation -# +=item BlockCreator +If undefined the page will create an instance of the CollectionBlock class. +Otherwise it will use this function to create the CollectionBlock widget, thus +enabling use of a CollectionBlock subclass. -sub GenerateHeaderRow($$$$) -{ - my ($self, $CollectionBlock, $PropertyDescriptors, $ItemActions) = @_; +=back - $CollectionBlock->GenerateHeaderRow($PropertyDescriptors, $ItemActions); -} +=back +=cut -sub GenerateDataRow($$$$$$$) +sub _initialize($$$$;$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; + my ($self, $Request, $RequiredRole, $Collection, $BlockCreator) = @_; - $CollectionBlock->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); + $self->{Collection} = $Collection; + $BlockCreator ||= \&ObjectModel::CGI::CollectionBlock::Create; + $self->{CollectionBlock} = &$BlockCreator($Collection, $self); + $self->SUPER::_initialize($Request, $RequiredRole); } @@ -153,13 +112,6 @@ sub GenerateTitle($) } } -sub GenerateFormStart($$) -{ - my ($self, $CollectionBlock) = @_; - - $CollectionBlock->GenerateFormStart(); -} - sub GenerateBody($) { my ($self) = @_; @@ -167,69 +119,20 @@ sub GenerateBody($) print "<div class='CollectionPageBody'>\n"; $self->GenerateTitle(); print "<div class='Content'>\n"; - my $CollectionBlock = $self->CreateCollectionBlock($self->{Collection}); - $CollectionBlock->GenerateList(); + $self->{CollectionBlock}->GenerateList(); print "</div>\n"; print "</div>\n"; } -sub GenerateFormEnd($$) -{ - my ($self, $CollectionBlock) = @_; - - $CollectionBlock->GenerateFormEnd(); -} - sub GeneratePage($) { my ($self) = @_; if ($self->GetParam("Action")) { - my $CollectionBlock = $self->CreateCollectionBlock($self->{Collection}); - $self->{ActionPerformed} = $self->OnAction($CollectionBlock, - $self->GetParam("Action")); + $self->{ActionPerformed} = $self->{CollectionBlock}->OnAction($self->GetParam("Action")); } - $self->SUPER::GeneratePage(); } - -# -# Per-item actions handling -# - -sub GetItemActions($$) -{ - my ($self, $CollectionBlock) = @_; - - return $CollectionBlock->GetItemActions(); -} - -sub OnItemAction($$$$) -{ - my ($self, $CollectionBlock, $Item, $Action) = @_; - - return $CollectionBlock->OnItemAction($Item, $Action); -} - - -# -# Actions handling -# - -sub GetActions($$) -{ - my ($self, $CollectionBlock) = @_; - - return $CollectionBlock->GetActions(); -} - -sub OnAction($$$) -{ - my ($self, $CollectionBlock, $Action) = @_; - - $CollectionBlock->OnAction($Action); -} - 1; diff --git a/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm b/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm deleted file mode 100644 index 76e4d5195..000000000 --- a/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm +++ /dev/null @@ -1,138 +0,0 @@ -# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- -# Base class for list pages -# -# Copyright 2009 Ge van Geldorp -# Copyright 2014, 2017-2018, 2022 Francois Gouget -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - -use strict; - -package ObjectModel::CGI::SimpleCollectionPage; - -=head1 NAME - -ObjectModel::CGI::SimpleCollectionPage - Base class for list pages - -A page containing a single collection block. - -The SimpleCollectionPage instances have the following properties: -=over -=item Collection -The collection containing the items to be shown in the CollectionBlock widget. - -=item CollectionBlock -The widget showing the items in the specified collection. - -=item ActionPerformed -Set to true if an action was specified and succeeded. -=back - -=cut - -use ObjectModel::CGI::Page; -our @ISA = qw(ObjectModel::CGI::Page); - -# Use require to avoid overriding Page::new() -require ObjectModel::CGI::CollectionBlock; - - -=pod -=over 12 - -=item C<_initialize()> - -Sets up the new page object. - -Parameters: -=over - -=item Request -=item RequiredRole -See Page::new(). - -=item Collection -This is the collection of items that should be shown in the CollectionBlock -widget. - -=item BlockCreator -If undefined the page will create an instance of the CollectionBlock class. -Otherwise it will use this function to create the CollectionBlock widget, thus -enabling use of a CollectionBlock subclass. - -=back - -=back -=cut - -sub _initialize($$$$;$) -{ - my ($self, $Request, $RequiredRole, $Collection, $BlockCreator) = @_; - - $self->{Collection} = $Collection; - $BlockCreator ||= \&ObjectModel::CGI::CollectionBlock::Create; - $self->{CollectionBlock} = &$BlockCreator($Collection, $self); - $self->SUPER::_initialize($Request, $RequiredRole); -} - - -# -# HTML page generation -# - -sub GetTitle($) -{ - my ($self) = @_; - - my $Title = ucfirst($self->{Collection}->GetCollectionName()); - $Title =~ s/([a-z])([A-Z])/$1 $2/g; - return $Title; -} - -sub GenerateTitle($) -{ - my ($self) = @_; - - my $Title = $self->GetTitle(); - if ($Title) - { - print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; - } -} - -sub GenerateBody($) -{ - my ($self) = @_; - - print "<div class='CollectionPageBody'>\n"; - $self->GenerateTitle(); - print "<div class='Content'>\n"; - $self->{CollectionBlock}->GenerateList(); - print "</div>\n"; - print "</div>\n"; -} - -sub GeneratePage($) -{ - my ($self) = @_; - - if ($self->GetParam("Action")) - { - $self->{ActionPerformed} = $self->{CollectionBlock}->OnAction($self->GetParam("Action")); - } - $self->SUPER::GeneratePage(); -} - -1; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ccd40443a..ae99b212c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -300,8 +300,8 @@ sub OnAction($$) package JobDetailsPage; -use ObjectModel::CGI::SimpleCollectionPage; -our @ISA = qw(ObjectModel::CGI::SimpleCollectionPage); +use ObjectModel::CGI::CollectionPage; +our @ISA = qw(ObjectModel::CGI::CollectionPage); use URI::Escape; diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index e756a76ff..49e16d8d2 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -79,10 +79,10 @@ sub GetActions($) package main; -use ObjectModel::CGI::SimpleCollectionPage; +use ObjectModel::CGI::CollectionPage; use WineTestBot::Patches; my $Request = shift; -my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "", CreatePatches(), \&PatchesBlock::Create); +my $Page = ObjectModel::CGI::CollectionPage->new($Request, "", CreatePatches(), \&PatchesBlock::Create); $Page->SetRefreshInterval(60); $Page->GeneratePage(); diff --git a/testbot/web/admin/BranchesList.pl b/testbot/web/admin/BranchesList.pl index 037023762..27d17fa57 100644 --- a/testbot/web/admin/BranchesList.pl +++ b/testbot/web/admin/BranchesList.pl @@ -22,9 +22,9 @@ use strict; package main; -use ObjectModel::CGI::SimpleCollectionPage; +use ObjectModel::CGI::CollectionPage; use WineTestBot::Branches; my $Request = shift; -my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateBranches()); +my $Page = ObjectModel::CGI::CollectionPage->new($Request, "admin", CreateBranches()); $Page->GeneratePage(); diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 08ae5bffb..f54def261 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -126,9 +126,9 @@ sub OnItemAction($$$) package main; -use ObjectModel::CGI::SimpleCollectionPage; +use ObjectModel::CGI::CollectionPage; use WineTestBot::Users; my $Request = shift; -my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateUsers(), \&UsersBlock::Create); +my $Page = ObjectModel::CGI::CollectionPage->new($Request, "admin", CreateUsers(), \&UsersBlock::Create); $Page->GeneratePage(); diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index d957b4472..cfd5b91f5 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -73,9 +73,9 @@ sub OnItemAction($$$) package main; -use ObjectModel::CGI::SimpleCollectionPage; +use ObjectModel::CGI::CollectionPage; use WineTestBot::VMs; my $Request = shift; -my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateVMs(), \&VMsBlock::Create); +my $Page = ObjectModel::CGI::CollectionPage->new($Request, "admin", CreateVMs(), \&VMsBlock::Create); $Page->GeneratePage(); -- 2.30.2

1 0

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Abort when an unexpected type appears.
by Giovanni Mascellani 05 Apr '22

05 Apr '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index fa845dc4..af5c777f 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1468,7 +1468,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; default: - break; + assert(0); } break; @@ -1494,7 +1494,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; default: - break; + assert(0); } break; @@ -1520,7 +1520,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; default: - break; + assert(0); } break; -- 2.35.1

5 26

[PATCH 1/5] msvcrt/tests: Add test for ioinfo->exflag.
by Paul Gofman 05 Apr '22

05 Apr '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msvcrt/tests/file.c | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index bc26f90643e..78ed8931d7a 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -37,6 +37,20 @@ #include <locale.h> #include <winternl.h> +#define WX_OPEN 0x01 +#define WX_ATEOF 0x02 +#define WX_READNL 0x04 +#define WX_PIPE 0x08 +#define WX_DONTINHERIT 0x10 +#define WX_APPEND 0x20 +#define WX_TTY 0x40 +#define WX_TEXT 0x80 + +#define EF_UTF8 0x01 +#define EF_UTF16 0x02 +#define EF_CRIT_INIT 0x04 +#define EF_UNK_UNICODE 0x08 + #define MSVCRT_FD_BLOCK_SIZE 32 typedef struct { HANDLE handle; @@ -2851,6 +2865,40 @@ static void test_open_hints(void) unlink(tempfile); } +static void test_ioinfo_flags(void) +{ + HANDLE handle; + ioinfo *info; + char *tempf; + int tempfd; + + tempf = _tempnam(".","wne"); + + tempfd = _open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_WTEXT, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + + handle = (HANDLE)_get_osfhandle(tempfd); + info = &__pioinfo[tempfd / MSVCRT_FD_BLOCK_SIZE][tempfd % MSVCRT_FD_BLOCK_SIZE]; + ok(!!info, "NULL info.\n"); + ok(info->handle == handle, "Unexpected handle %p, expected %p.\n", info->handle, handle); + ok(info->exflag == (EF_UTF16 | EF_CRIT_INIT | EF_UNK_UNICODE), "Unexpected exflag %#x.\n", info->exflag); + ok(info->wxflag == (WX_TEXT | WX_OPEN), "Unexpected wxflag %#x.\n", info->wxflag); + + close(tempfd); + + ok(info->handle == INVALID_HANDLE_VALUE, "Unexpected handle %p.\n", info->handle); + ok(info->exflag == (EF_UTF16 | EF_CRIT_INIT | EF_UNK_UNICODE), "Unexpected exflag %#x.\n", info->exflag); + ok(!info->wxflag, "Unexpected wxflag %#x.\n", info->wxflag); + + info = &__pioinfo[(tempfd + 4) / MSVCRT_FD_BLOCK_SIZE][(tempfd + 4) % MSVCRT_FD_BLOCK_SIZE]; + ok(!!info, "NULL info.\n"); + ok(info->handle == INVALID_HANDLE_VALUE, "Unexpected handle %p.\n", info->handle); + ok(!info->exflag, "Unexpected exflag %#x.\n", info->exflag); + + unlink(tempf); + free(tempf); +} + START_TEST(file) { int arg_c; @@ -2925,6 +2973,7 @@ START_TEST(file) test_lseek(); test_fopen_hints(); test_open_hints(); + test_ioinfo_flags(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order -- 2.35.1

2 9

[PATCH 10/10] user32: Use NtUserMessageCall for SendMessageCallbackA implementation.
by Jacek Caban 05 Apr '22

05 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 570 +---------------------------------- dlls/win32u/message.c | 2 +- dlls/win32u/sysparams.c | 3 - dlls/win32u/win32u_private.h | 1 - include/ntuser.h | 1 - 5 files changed, 4 insertions(+), 573 deletions(-)

3 2

[PATCH 09/10] win32u: Move SendMessageCallbackW implementation from user32.
by Jacek Caban 05 Apr '22

05 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 20 ++------------------ dlls/win32u/message.c | 27 +++++++++++++++++++++++++++ dlls/win32u/tests/win32u.c | 1 - 3 files changed, 29 insertions(+), 19 deletions(-)

3 2

[PATCH 08/10] user32: Use NtUserMessageCall for SendNotifyMessageA implementation.
by Jacek Caban 05 Apr '22

05 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)

3 2

[PATCH 07/10] win32u: Move SendNotifyMessageW implementation from user32.
by Jacek Caban 05 Apr '22

05 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 17 +------ dlls/user32/user_main.c | 1 - dlls/win32u/message.c | 94 +++++++++++++++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 1 - 4 files changed, 94 insertions(+), 19 deletions(-)

3 2

[PATCH 06/10] user32: Use NtUserMessageCall for SendMessageA implementation.
by Jacek Caban 05 Apr '22

05 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)

3 2

[PATCH 05/10] user32: Use NtUserMessageCall for SendMessageTimeoutA implementation.
by Jacek Caban 05 Apr '22

05 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)

3 2

[PATCH 04/10] win32u: Move SendMessageW implementation from user32.
by Jacek Caban 05 Apr '22

05 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 14 +------------- dlls/user32/user_main.c | 2 -- dlls/win32u/message.c | 19 ++++++++++++++----- dlls/win32u/ntuser_private.h | 2 -- 4 files changed, 15 insertions(+), 22 deletions(-)

3 2

[PATCH 03/10] win32u: Move SendMessageTimeoutW implementation from user32.
by Jacek Caban 05 Apr '22

05 Apr '22

3 2

[PATCH 02/10] win32u: Use public declaration for NtUserPostMessage.
by Jacek Caban 05 Apr '22

05 Apr '22

2 1

[PATCH 01/10] win32u: Return LRESULT from NtUserMessageCall.
by Jacek Caban 05 Apr '22

05 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 3 +- dlls/user32/winproc.c | 4 +- dlls/win32u/message.c | 20 +++----- dlls/win32u/tests/win32u.c | 97 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 4 +- dlls/win32u/window.c | 8 ++- dlls/win32u/wrappers.c | 4 +- include/ntuser.h | 29 ++++++++--- 8 files changed, 138 insertions(+), 31 deletions(-)

3 2

[PATCH v2 1/3] kernel32/tests: Add some GlobalMemoryStatusEx tests.
by Rémi Bernon 05 Apr '22

05 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Relax ullAvailPageFile check a bit, it's not always synced. dlls/kernel32/tests/heap.c | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index c597ff9590b..fc4ece81e00 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1264,6 +1264,67 @@ static void test_GlobalMemoryStatus(void) wine_dbgstr_longlong(mem.dwAvailVirtual), wine_dbgstr_longlong(memex.ullAvailVirtual)); } +static void test_GlobalMemoryStatusEx(void) +{ + char buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 16]; /* some Win 7 versions need a larger info */ + SYSTEM_PERFORMANCE_INFORMATION *perf_info = (void *)buffer; + SYSTEM_BASIC_INFORMATION basic_info; + MEMORYSTATUSEX memex = {0}, expect; + VM_COUNTERS_EX vmc; + NTSTATUS status; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = GlobalMemoryStatusEx( &memex ); + ok( !ret, "GlobalMemoryStatusEx succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + + do + { + status = NtQuerySystemInformation( SystemBasicInformation, &basic_info, sizeof(basic_info), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQuerySystemInformation( SystemPerformanceInformation, perf_info, sizeof(buffer), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &vmc, sizeof(vmc), NULL ); + ok( !status, "NtQueryInformationProcess returned %#lx\n", status ); + memex.dwLength = sizeof(MEMORYSTATUSEX); + ret = GlobalMemoryStatusEx( &memex ); + ok( ret, "GlobalMemoryStatusEx succeeded\n" ); + } while (memex.ullAvailPhys != (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize); + + ok( basic_info.PageSize, "got 0 PageSize\n" ); + ok( basic_info.MmNumberOfPhysicalPages, "got 0 MmNumberOfPhysicalPages\n" ); + ok( !!basic_info.HighestUserAddress, "got 0 HighestUserAddress\n" ); + ok( !!basic_info.LowestUserAddress, "got 0 LowestUserAddress\n" ); + ok( perf_info->TotalCommittedPages, "got 0 TotalCommittedPages\n" ); + ok( perf_info->TotalCommitLimit, "got 0 TotalCommitLimit\n" ); + ok( perf_info->AvailablePages, "got 0 AvailablePages\n" ); + + expect.dwMemoryLoad = (memex.ullTotalPhys - memex.ullAvailPhys) / (memex.ullTotalPhys / 100); + expect.ullTotalPhys = (ULONGLONG)basic_info.MmNumberOfPhysicalPages * basic_info.PageSize; + expect.ullAvailPhys = (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize; + expect.ullTotalPageFile = (ULONGLONG)perf_info->TotalCommitLimit * basic_info.PageSize; + expect.ullAvailPageFile = (ULONGLONG)(perf_info->TotalCommitLimit - perf_info->TotalCommittedPages) * basic_info.PageSize; + expect.ullTotalVirtual = (ULONG_PTR)basic_info.HighestUserAddress - (ULONG_PTR)basic_info.LowestUserAddress + 1; + expect.ullAvailVirtual = expect.ullTotalVirtual - (ULONGLONG)vmc.WorkingSetSize /* approximate */; + expect.ullAvailExtendedVirtual = 0; + + ok( memex.dwMemoryLoad == expect.dwMemoryLoad, "got dwMemoryLoad %lu\n", memex.dwMemoryLoad ); + todo_wine + ok( memex.ullTotalPhys == expect.ullTotalPhys, "got ullTotalPhys %#I64x\n", memex.ullTotalPhys ); + ok( memex.ullAvailPhys == expect.ullAvailPhys, "got ullAvailPhys %#I64x\n", memex.ullAvailPhys ); + todo_wine + ok( memex.ullTotalPageFile == expect.ullTotalPageFile, "got ullTotalPageFile %#I64x\n", memex.ullTotalPageFile ); + /* allow some variability, page file is not always in sync on Windows */ + ok( memex.ullAvailPageFile - expect.ullAvailPageFile + 32 * basic_info.PageSize <= 64 * basic_info.PageSize, + "got ullAvailPageFile %#I64x\n", memex.ullAvailPageFile ); + todo_wine + ok( memex.ullTotalVirtual == expect.ullTotalVirtual, "got ullTotalVirtual %#I64x\n", memex.ullTotalVirtual ); + todo_wine + ok( memex.ullAvailVirtual <= expect.ullAvailVirtual, "got ullAvailVirtual %#I64x\n", memex.ullAvailVirtual ); + ok( memex.ullAvailExtendedVirtual == 0, "got ullAvailExtendedVirtual %#I64x\n", memex.ullAvailExtendedVirtual ); +} + START_TEST(heap) { int argc; @@ -1298,6 +1359,7 @@ START_TEST(heap) test_HeapQueryInformation(); test_GetPhysicallyInstalledSystemMemory(); test_GlobalMemoryStatus(); + test_GlobalMemoryStatusEx(); if (pRtlGetNtGlobalFlags) { -- 2.35.1

2 4

[PATCH 1/6] include: Add CWMAEncMediaObject class declaration to wmcodecdsp.idl.
by Rémi Bernon 05 Apr '22

05 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index ae2a42419b4..4ad965ab3d9 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -45,6 +45,11 @@ coclass CMSH264DecoderMFT {} ] coclass CWMADecMediaObject {}; +[ + uuid(70f598e9-f4ab-495a-99e2-a7c4d3d89abf) +] +coclass CWMAEncMediaObject {}; + [ uuid(93af0c51-2275-45d2-a35b-f2ba21caed00) ] -- 2.35.1

3 12

[PATCH] dlls/mciavi32: use I width modifier instead of casting to DWORD
by Eric Pouech 05 Apr '22

05 Apr '22

--- dlls/mciavi32/mciavi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 64a1a0fbd7d0..dcd07032fecb 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -1063,11 +1063,11 @@ LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SAVE: case MCI_UNDO: case MCI_UNFREEZE: - TRACE("Unsupported function [0x%x] flags=%08lx\n", wMsg, (DWORD)dwParam1); + TRACE("Unsupported function [0x%x] flags=%08Ix\n", wMsg, dwParam1); return MCIERR_UNSUPPORTED_FUNCTION; case MCI_SPIN: case MCI_ESCAPE: - WARN("Unsupported command [0x%x] %08lx\n", wMsg, (DWORD)dwParam1); + WARN("Unsupported command [0x%x] %08Ix\n", wMsg, dwParam1); break; case MCI_OPEN: case MCI_CLOSE:

1 0

[PATCH] dlls/comdlg32: use I width modifier instead of casting to LONG
by Eric Pouech 05 Apr '22

05 Apr '22

--- dlls/comdlg32/fontdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 03c712c6bc2e..4bf041e85b3c 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -937,7 +937,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO } } - TRACE("WM_COMMAND wParam=%08lX lParam=%08IX\n", (LONG)wParam, lParam); + TRACE("WM_COMMAND wParam=%08IX lParam=%08IX\n", wParam, lParam); switch (LOWORD(wParam)) { case cmb1:

1 0

[v4 PATCH] dwrite/tests: Add some fallback tests for Segoe UI Symbol.
by Nikolay Sivov 05 Apr '22

05 Apr '22

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v4: removed parts that are not relevant for tested functionality, fixed compilation warnings. dlls/dwrite/tests/layout.c | 81 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77c6ff2034..43b6efa107b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4747,6 +4747,86 @@ if (font) { IDWriteFactory2_Release(factory2); } +static void get_font_name(IDWriteFont *font, WCHAR *name, UINT32 size) +{ + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 index; + BOOL exists; + HRESULT hr; + + hr = IDWriteFont_GetFontFamily(font, &family); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(index != UINT_MAX && exists, "Name was not found.\n"); + hr = IDWriteLocalizedStrings_GetString(names, index, name, size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); +} + +static void test_system_fallback(void) +{ + static const struct fallback_test + { + const WCHAR text[2]; + const WCHAR *name; + } + tests[] = + { + { { 0x25d4, 0}, L"Segoe UI Symbol" }, + }; + IDWriteFontFallback *fallback; + IDWriteFactory2 *factory; + IDWriteFont *font; + UINT32 i, length; + WCHAR name[256]; + BOOL exists; + float scale; + HRESULT hr; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory2))) + { + win_skip("System font fallback API is not supported.\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + g_source = tests[i].text; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &length, &font, &scale); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) continue; + ok(length == 1, "Unexpected length %u\n", length); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); + todo_wine + ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine + ok(exists, "%s missing character %#x\n", wine_dbgstr_w(name), g_source[0]); + + IDWriteFont_Release(font); + } + + IDWriteFontFallback_Release(fallback); + IDWriteFactory2_Release(factory); +} + static void test_FontFallbackBuilder(void) { IDWriteFontFallback *fallback, *fallback2; @@ -6529,6 +6609,7 @@ START_TEST(layout) test_pixelsnapping(); test_SetWordWrapping(); test_MapCharacters(); + test_system_fallback(); test_FontFallbackBuilder(); test_SetTypography(); test_SetLastLineWrapping(); -- 2.35.1

1 0

[PATCH 1/2] winex11: Invoke Key event handlers immediately, keeping pace with the XFilterEvent().
by Byeongsik Jeon 05 Apr '22

05 Apr '22

1. GCS_COMPSTR: XFilterEvent() True case, XIMPreeditDrawCallCallback() is invoked by XFilterEvent() internally. immediately processing. GCS_RESULTSTR: XFilterEvent() False case. X11DRV_XIMLookupChars() is invoked by KeyPress event handler. delayed processing. So, delayed event handler processing causes GCS_COMPSTR, GCS_RESULTSTR pair sequence inverting. In Hangul IME, one key often generates GCS_COMPSTR, GCS_RESULTSTR pairs. The XIM server sends the correct order pair, but the message order inverted through the process_events(). Japanese input system can also produce similar situation. 2. Copying event variable does not guarantee complete state preservation. At the time of delayed processing, the global information that the event handler must refer to may be changed. Ex. XFilterEvent(), KeyPress event handler confirmed. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/winex11.drv/event.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 170111e9c28..149069b0d29 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -445,6 +445,19 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X else continue; /* filtered, ignore it */ } + if (event.type == KeyPress || event.type == KeyRelease) + { + if (prev_event.type) + { + queued |= call_event_handler( display, &prev_event ); + free_event_data( &prev_event ); + prev_event.type = 0; + action = MERGE_DISCARD; + } + queued |= call_event_handler( display, &event ); + continue; + } + get_event_data( &event ); if (prev_event.type) action = merge_events( &prev_event, &event ); switch( action ) -- 2.35.1

1 2

[PATCH 1/6] ntdll/tests: Add some tests for NtQueryDirectoryObject().
by Zebediah Figura 05 Apr '22

05 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 170 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a0702a580b7..f18afa05ae9 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -78,6 +78,16 @@ static NTSTATUS (WINAPI *pNtCompareObjects)(HANDLE,HANDLE); #define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x0003) #define DESKTOP_ALL_ACCESS 0x01ff +#define check_unicode_string(a, b) check_unicode_string_(__LINE__, a, b) +static void check_unicode_string_( int line, const UNICODE_STRING *string, const WCHAR *expect ) +{ + size_t len = wcslen( expect ) * sizeof(WCHAR); + + ok_(__FILE__, line)( !wcscmp( string->Buffer, expect ), "got string %s\n", debugstr_w( string->Buffer )); + ok_(__FILE__, line)( string->Length == len, "got length %u\n", string->Length ); + ok_(__FILE__, line)( string->MaximumLength == len + sizeof(WCHAR), "got max length %u\n", string->MaximumLength ); +} + static void test_case_sensitive (void) { NTSTATUS status; @@ -2500,6 +2510,165 @@ static void test_object_identity(void) pNtClose( h1 ); } +static void test_query_directory(void) +{ + char buffer[200]; + DIRECTORY_BASIC_INFORMATION *info = (void *)buffer; + ULONG context, size, needed_size; + HANDLE dir, child1, child2; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + NTSTATUS status; + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest" ); + InitializeObjectAttributes( &attr, &string, 0, 0, NULL ); + status = NtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + ok( !status, "got %#x\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#x\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#x\n", context ); + todo_wine ok( !size, "got size %u\n", size ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Telamon" ); + status = NtCreateMutant( &child1, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#x\n", status ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest\\Oileus" ); + status = NtCreateMutant( &child2, GENERIC_ALL, &attr, FALSE ); + ok( !status, "got %#x\n", status ); + + status = NtQueryDirectoryObject( NULL, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( status == STATUS_INVALID_HANDLE, "got %#x\n", status ); + + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, NULL, &size ); + ok( status == STATUS_ACCESS_VIOLATION, "got %#x\n", status ); + + context = 0xdeadbeef; + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#x\n", status ); + ok( context == 1, "got context %#x\n", context ); + ok( size && size < sizeof(buffer), "got size %u\n", size ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine + { + ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + ok( !info[1].ObjectName.Length, "got length %u\n", info[1].ObjectName.Length ); + ok( !info[1].ObjectName.MaximumLength, "got max length %u\n", info[1].ObjectName.MaximumLength ); + ok( !info[1].ObjectTypeName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + ok( !info[1].ObjectTypeName.Length, "got length %u\n", info[1].ObjectTypeName.Length ); + ok( !info[1].ObjectTypeName.MaximumLength, "got max length %u\n", info[1].ObjectTypeName.MaximumLength ); + } + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#x\n", status ); + ok( context == 2, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Telamon" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#x\n", status ); + ok( context == 2, "got context %#x\n", context ); + todo_wine ok( !size, "got size %u\n", size ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); + ok( !status, "got %#x\n", status ); + ok( context == 1, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + + needed_size = size; + + size = 0xdeadbeef; + context = 0xdeadbeef; + status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#x\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#x\n", context ); + todo_wine ok( size == needed_size, "expected size %u, got %u\n", needed_size, size ); + + size = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, needed_size - 1, TRUE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#x\n", status ); + todo_wine ok( size == needed_size, "expected size %u, got %u\n", needed_size, size ); + ok( info[0].ObjectName.Length == 0xcccc, "got length %u\n", info[0].ObjectName.Length ); + + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, NULL ); + ok( !status, "got %#x\n", status ); + + context = 0; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); + ok( !status, "got %#x\n", status ); + ok( context == 1, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + todo_wine ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); + todo_wine ok( !status, "got %#x\n", status ); + if (!status) + { + ok( context == 2, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + check_unicode_string( &info[1].ObjectName, L"Telamon" ); + check_unicode_string( &info[1].ObjectTypeName, L"Mutant" ); + ok( !info[2].ObjectName.Buffer, "got string %p\n", info[2].ObjectName.Buffer ); + } + + needed_size = size; + size = 0xdeadbeef; + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, needed_size - 1, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_MORE_ENTRIES, "got %#x\n", status ); + if (status == STATUS_MORE_ENTRIES) + { + ok( context == 1, "got context %#x\n", context ); + ok( size > 0 && size < needed_size, "got size %u\n", size ); + check_unicode_string( &info[0].ObjectName, L"Oileus" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + + context = 0xdeadbeef; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, size - 1, FALSE, TRUE, &context, &size ); + todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#x\n", status ); + todo_wine ok( context == 0xdeadbeef, "got context %#x\n", context ); + todo_wine ok( size == needed_size, "expected size %u, got %u\n", needed_size, size ); + ok( info[0].ObjectName.Length == 0xcccc, "got length %u\n", info[0].ObjectName.Length ); + } + + context = 1; + memset( buffer, 0xcc, sizeof(buffer) ); + status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, FALSE, &context, &size ); + todo_wine ok( !status, "got %#x\n", status ); + if (!status) + { + ok( context == 2, "got context %#x\n", context ); + check_unicode_string( &info[0].ObjectName, L"Telamon" ); + check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); + ok( !info[1].ObjectName.Buffer, "got string %p\n", info[1].ObjectName.Buffer ); + } + + NtClose( child1 ); + NtClose( child2 ); + NtClose( dir ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2561,4 +2730,5 @@ START_TEST(om) test_get_next_thread(); test_globalroot(); test_object_identity(); + test_query_directory(); } -- 2.35.1

2 11

[PATCH 1/2] mscoree/tests: Build loadpaths.exe as GUI instead of CUI.
by Esme Povirk 04 Apr '22

04 Apr '22

This prevents unnecessary console windows from being created for it if mscoree_test.exe does not have a console. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index b49465fb16f..a2bb3449839 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -709,7 +709,7 @@ static void test_loadpaths(BOOL neutral) ret = write_resource(exe_source, exe_source); ok(ret, "Could not write resource: %lu\n", GetLastError()); DeleteFileW(exe_name); - ret = compile_cs(exe_source, exe_name, L"exe", L"/reference:libloadpaths.dll"); + ret = compile_cs(exe_source, exe_name, L"winexe", L"/reference:libloadpaths.dll"); if (!ret) return; ret = DeleteFileW(exe_source); ok(ret, "DeleteFileW failed: %lu\n", GetLastError()); -- 2.32.0

1 1

[PATCH 1/4] winegstreamer: Disconnect source pins before calling wg_parser_disconnect().
by Zebediah Figura 04 Apr '22

04 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/quartz_parser.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index bb7a71283c3..f38a0c16215 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1629,6 +1629,15 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) if (!This->sink_connected) return S_OK; + /* Disconnecting source pins triggers a call to wg_parser_stream_disable(). + * The stream pointers are no longer valid after wg_parser_disconnect(), so + * make sure we disable the streams first. */ + for (i = 0; i < This->source_count; ++i) + { + if (This->sources[i]) + free_source_pin(This->sources[i]); + } + wg_parser_disconnect(This->wg_parser); /* read_thread() needs to stay alive to service any read requests GStreamer @@ -1637,12 +1646,6 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) WaitForSingleObject(This->read_thread, INFINITE); CloseHandle(This->read_thread); - for (i = 0; i < This->source_count; ++i) - { - if (This->sources[i]) - free_source_pin(This->sources[i]); - } - This->source_count = 0; free(This->sources); This->sources = NULL; -- 2.35.1

1 3

[PATCH] mscoree: Update Wine Mono to 7.2.0.
by Esme Povirk 04 Apr '22

04 Apr '22

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 1d87eac5b1a..73f44a80f79 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "7.1.1" +#define MONO_VERSION "7.2.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "9dc8e5603b7bc64354eb94ae4ea0f6821424767a3ff44ff0d19e346a490c11ea" +#define MONO_SHA "5f06eafbae3a49ecc31dfcea777075bd44f0cc126e4fb4e28ecefa06eb436323" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 8f3441cd84e..44b2fd88d2a 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "7.1.1" +#define WINE_MONO_VERSION "7.2.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.32.0

2 1

[PATCH 1/4] include: Add IDebugControl4 definition.
by Nikolay Sivov 04 Apr '22

04 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Unreal Engine crash handler is using this. include/dbgeng.h | 361 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) diff --git a/include/dbgeng.h b/include/dbgeng.h index d916d2433a3..e417704915a 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -44,6 +44,8 @@ DEFINE_GUID(IID_IDebugSymbols2, 0x3a707211, 0xafdd, 0x4495, 0xad, 0x4f DEFINE_GUID(IID_IDebugSymbols3, 0xf02fbecc, 0x50ac, 0x4f36, 0x9a, 0xd9, 0xc9, 0x75, 0xe8, 0xf3, 0x2f, 0xf8); DEFINE_GUID(IID_IDebugControl, 0x5182e668, 0x105e, 0x416e, 0xad, 0x92, 0x24, 0xef, 0x80, 0x04, 0x24, 0xba); DEFINE_GUID(IID_IDebugControl2, 0xd4366723, 0x44df, 0x4bed, 0x8c, 0x7e, 0x4c, 0x05, 0x42, 0x4f, 0x45, 0x88); +DEFINE_GUID(IID_IDebugControl3, 0x7df74a86, 0xb03f, 0x407f, 0x90, 0xab, 0xa2, 0x0d, 0xad, 0xce, 0xad, 0x08); +DEFINE_GUID(IID_IDebugControl4, 0x94e60ce9, 0x9b41, 0x4b19, 0x9f, 0xc0, 0x6d, 0x9e, 0xb3, 0x52, 0x72, 0xb3); DEFINE_GUID(IID_IDebugAdvanced, 0xf2df5f53, 0x071f, 0x47bd, 0x9d, 0xe6, 0x57, 0x34, 0xc3, 0xfe, 0xd6, 0x89); DEFINE_GUID(IID_IDebugSystemObjects, 0x6b86fe2c, 0x2c4f, 0x4f0c, 0x9d, 0xa2, 0x17, 0x43, 0x11, 0xac, 0xc3, 0x27); DEFINE_GUID(IID_IDebugSystemObjects2, 0x0ae9f5ff, 0x1852, 0x4679, 0xb0, 0x55, 0x49, 0x4b, 0xee, 0x64, 0x07, 0xee); @@ -501,6 +503,7 @@ DECLARE_INTERFACE_(IDebugSymbolGroup2, IUnknown) #undef INTERFACE typedef IDebugBreakpoint *PDEBUG_BREAKPOINT; +typedef IDebugBreakpoint2 *PDEBUG_BREAKPOINT2; typedef IDebugSymbolGroup2 *PDEBUG_SYMBOL_GROUP2; #define INTERFACE IDebugInputCallbacks @@ -1973,6 +1976,364 @@ DECLARE_INTERFACE_(IDebugControl2, IUnknown) }; #undef INTERFACE +#define INTERFACE IDebugControl3 +DECLARE_INTERFACE_(IDebugControl3, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugControl */ + STDMETHOD(GetInterrupt)(THIS) PURE; + STDMETHOD(SetInterrupt)(THIS_ ULONG flags) PURE; + STDMETHOD(GetInterruptTimeout)(THIS_ ULONG *timeout) PURE; + STDMETHOD(SetInterruptTimeout)(THIS_ ULONG timeout) PURE; + STDMETHOD(GetLogFile)(THIS_ char *buffer, ULONG buffer_size, ULONG *file_size, BOOL *append) PURE; + STDMETHOD(OpenLogFile)(THIS_ const char *file, BOOL append) PURE; + STDMETHOD(CloseLogFile)(THIS) PURE; + STDMETHOD(GetLogMask)(THIS_ ULONG *mask) PURE; + STDMETHOD(SetLogMask)(THIS_ ULONG mask) PURE; + STDMETHOD(Input)(THIS_ char *buffer, ULONG buffer_size, ULONG *input_size) PURE; + STDMETHOD(ReturnInput)(THIS_ const char *buffer) PURE; + STDMETHODV(Output)(THIS_ ULONG mask, const char *format, ...) PURE; + STDMETHOD(OutputVaList)(THIS_ ULONG mask, const char *format, __ms_va_list args) PURE; + STDMETHODV(ControlledOutput)(THIS_ ULONG output_control, ULONG mask, const char *format, ...) PURE; + STDMETHOD(ControlledOutputVaList)(THIS_ ULONG output_control, ULONG mask, const char *format, + __ms_va_list args) PURE; + STDMETHODV(OutputPrompt)(THIS_ ULONG output_control, const char *format, ...) PURE; + STDMETHOD(OutputPromptVaList)(THIS_ ULONG output_control, const char *format, __ms_va_list args) PURE; + STDMETHOD(GetPromptText)(THIS_ char *buffer, ULONG buffer_size, ULONG *text_size) PURE; + STDMETHOD(OutputCurrentState)(THIS_ ULONG output_control, ULONG flags) PURE; + STDMETHOD(OutputVersionInformation)(THIS_ ULONG output_control) PURE; + STDMETHOD(GetNotifyEventHandle)(THIS_ ULONG64 *handle) PURE; + STDMETHOD(SetNotifyEventHandle)(THIS_ ULONG64 handle) PURE; + STDMETHOD(Assemble)(THIS_ ULONG64 offset, const char *code, ULONG64 *end_offset) PURE; + STDMETHOD(Disassemble)(THIS_ ULONG64 offset, ULONG flags, char *buffer, ULONG buffer_size, ULONG *disassm_size, + ULONG64 *end_offset) PURE; + STDMETHOD(GetDisassembleEffectiveOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(OutputDisassembly)(THIS_ ULONG output_control, ULONG64 offset, ULONG flags, ULONG64 *end_offset) PURE; + STDMETHOD(OutputDisassemblyLines)(THIS_ ULONG output_control, ULONG prev_lines, ULONG total_lines, ULONG64 offset, + ULONG flags, ULONG *offset_line, ULONG64 *start_offset, ULONG64 *end_offset, ULONG64 *line_offsets) PURE; + STDMETHOD(GetNearInstruction)(THIS_ ULONG64 offset, LONG delta, ULONG64 *instr_offset) PURE; + STDMETHOD(GetStackTrace)(THIS_ ULONG64 frame_offset, ULONG64 stack_offset, ULONG64 instr_offset, + DEBUG_STACK_FRAME *frames, ULONG frames_size, ULONG *frames_filled) PURE; + STDMETHOD(GetReturnOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(OutputStackTrace)(THIS_ ULONG output_control, DEBUG_STACK_FRAME *frames, ULONG frames_size, + ULONG flags) PURE; + STDMETHOD(GetDebuggeeType)(THIS_ ULONG *_class, ULONG *qualifier) PURE; + STDMETHOD(GetActualProcessorType)(THIS_ ULONG *type) PURE; + STDMETHOD(GetExecutingProcessorType)(THIS_ ULONG *type) PURE; + STDMETHOD(GetNumberPossibleExecutingProcessorTypes)(THIS_ ULONG *count) PURE; + STDMETHOD(GetPossibleExecutingProcessorTypes)(THIS_ ULONG start, ULONG count, ULONG *types) PURE; + STDMETHOD(GetNumberProcessors)(THIS_ ULONG *count) PURE; + STDMETHOD(GetSystemVersion)(THIS_ ULONG *platform_id, ULONG *major, ULONG *minor, char *sp_string, + ULONG sp_string_size, ULONG *sp_string_used, ULONG *sp_number, char *build_string, ULONG build_string_size, + ULONG *build_string_used) PURE; + STDMETHOD(GetPageSize)(THIS_ ULONG *size) PURE; + STDMETHOD(IsPointer64Bit)(THIS) PURE; + STDMETHOD(ReadBugCheckData)(THIS_ ULONG *code, ULONG64 *arg1, ULONG64 *arg2, ULONG64 *arg3, ULONG64 *arg4) PURE; + STDMETHOD(GetNumberSupportedProcessorTypes)(THIS_ ULONG *count) PURE; + STDMETHOD(GetSupportedProcessorTypes)(THIS_ ULONG start, ULONG count, ULONG *types) PURE; + STDMETHOD(GetProcessorTypeNames)(THIS_ ULONG type, char *full_name, ULONG full_name_buffer_size, + ULONG *full_name_size, char *abbrev_name, ULONG abbrev_name_buffer_size, ULONG *abbrev_name_size) PURE; + STDMETHOD(GetEffectiveProcessorType)(THIS_ ULONG *type) PURE; + STDMETHOD(SetEffectiveProcessorType)(THIS_ ULONG type) PURE; + STDMETHOD(GetExecutionStatus)(THIS_ ULONG *status) PURE; + STDMETHOD(SetExecutionStatus)(THIS_ ULONG status) PURE; + STDMETHOD(GetCodeLevel)(THIS_ ULONG *level) PURE; + STDMETHOD(SetCodeLevel)(THIS_ ULONG level) PURE; + STDMETHOD(GetEngineOptions)(THIS_ ULONG *options) PURE; + STDMETHOD(AddEngineOptions)(THIS_ ULONG options) PURE; + STDMETHOD(RemoveEngineOptions)(THIS_ ULONG options) PURE; + STDMETHOD(SetEngineOptions)(THIS_ ULONG options) PURE; + STDMETHOD(GetSystemErrorControl)(THIS_ ULONG *output_level, ULONG *break_level) PURE; + STDMETHOD(SetSystemErrorControl)(THIS_ ULONG output_level, ULONG break_level) PURE; + STDMETHOD(GetTextMacro)(THIS_ ULONG slot, char *buffer, ULONG buffer_size, ULONG *macro_size) PURE; + STDMETHOD(SetTextMacro)(THIS_ ULONG slot, const char *macro) PURE; + STDMETHOD(GetRadix)(THIS_ ULONG *radix) PURE; + STDMETHOD(SetRadix)(THIS_ ULONG radix) PURE; + STDMETHOD(Evaluate)(THIS_ const char *expression, ULONG desired_type, DEBUG_VALUE *value, + ULONG *remainder_index) PURE; + STDMETHOD(CoerceValue)(THIS_ DEBUG_VALUE input, ULONG output_type, DEBUG_VALUE *output) PURE; + STDMETHOD(CoerceValues)(THIS_ ULONG count, DEBUG_VALUE *input, ULONG *output_types, DEBUG_VALUE *output) PURE; + STDMETHOD(Execute)(THIS_ ULONG output_control, const char *command, ULONG flags) PURE; + STDMETHOD(ExecuteCommandFile)(THIS_ ULONG output_control, const char *command_file, ULONG flags) PURE; + STDMETHOD(GetNumberBreakpoints)(THIS_ ULONG *count) PURE; + STDMETHOD(GetBreakpointByIndex)(THIS_ ULONG index, IDebugBreakpoint **bp) PURE; + STDMETHOD(GetBreakpointById)(THIS_ ULONG id, IDebugBreakpoint **bp) PURE; + STDMETHOD(GetBreakpointParameters)(THIS_ ULONG count, ULONG *ids, ULONG start, + DEBUG_BREAKPOINT_PARAMETERS *parameters) PURE; + STDMETHOD(AddBreakpoint)(THIS_ ULONG type, ULONG desired_id, IDebugBreakpoint **bp) PURE; + STDMETHOD(RemoveBreakpoint)(THIS_ IDebugBreakpoint *bp) PURE; + STDMETHOD(AddExtension)(THIS_ const char *path, ULONG flags, ULONG64 *handle) PURE; + STDMETHOD(RemoveExtension)(THIS_ ULONG64 handle) PURE; + STDMETHOD(GetExtensionByPath)(THIS_ const char *path, ULONG64 *handle) PURE; + STDMETHOD(CallExtension)(THIS_ ULONG64 handle, const char *function, const char *args) PURE; + STDMETHOD(GetExtensionFunction)(THIS_ ULONG64 handle, const char *name, void *function) PURE; + STDMETHOD(GetWindbgExtensionApis32)(THIS_ PWINDBG_EXTENSION_APIS32 api) PURE; + STDMETHOD(GetWindbgExtensionApis64)(THIS_ PWINDBG_EXTENSION_APIS64 api) PURE; + STDMETHOD(GetNumberEventFilters)(THIS_ ULONG *specific_events, ULONG *specific_exceptions, + ULONG *arbitrary_exceptions) PURE; + STDMETHOD(GetEventFilterText)(THIS_ ULONG index, char *buffer, ULONG buffer_size, ULONG *text_size) PURE; + STDMETHOD(GetEventFilterCommand)(THIS_ ULONG index, char *buffer, ULONG buffer_size, ULONG *command_size) PURE; + STDMETHOD(SetEventFilterCommand)(THIS_ ULONG index, const char *command) PURE; + STDMETHOD(GetSpecificFilterParameters)(THIS_ ULONG start, ULONG count, + DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(SetSpecificFilterParameters)(THIS_ ULONG start, ULONG count, + DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(GetSpecificFilterArgument)(THIS_ ULONG index, char *buffer, ULONG buffer_size, + ULONG *argument_size) PURE; + STDMETHOD(SetSpecificFilterArgument)(THIS_ ULONG index, const char *argument) PURE; + STDMETHOD(GetExceptionFilterParameters)(THIS_ ULONG count, ULONG *codes, ULONG start, + DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(SetExceptionFilterParameters)(THIS_ ULONG count, DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(GetExceptionFilterSecondCommand)(THIS_ ULONG index, char *buffer, ULONG buffer_size, + ULONG *command_size) PURE; + STDMETHOD(SetExceptionFilterSecondCommand)(THIS_ ULONG index, const char *command) PURE; + STDMETHOD(WaitForEvent)(THIS_ ULONG flags, ULONG timeout) PURE; + STDMETHOD(GetLastEventInformation)(THIS_ ULONG *type, ULONG *pid, ULONG *tid, void *extra_info, + ULONG extra_info_size, ULONG *extra_info_used, char *description, ULONG desc_size, ULONG *desc_used) PURE; + /* IDebugControl2 */ + STDMETHOD(GetCurrentTimeDate)(THIS_ ULONG timedate) PURE; + STDMETHOD(GetCurrentSystemUpTime)(THIS_ ULONG uptime) PURE; + STDMETHOD(GetDumpFormatFlags)(THIS_ ULONG *flags) PURE; + STDMETHOD(GetNumberTextPlacements)(THIS_ ULONG *count) PURE; + STDMETHOD(GetNumberTextReplacement)(THIS_ const char *src_text, ULONG index, char *src_buffer, + ULONG src_buffer_size, ULONG *src_size, char *dst_buffer, ULONG dst_buffer_size, ULONG *dst_size) PURE; + STDMETHOD(SetTextReplacement)(THIS_ const char *src_text, const char *dst_text) PURE; + STDMETHOD(RemoveTextReplacements)(THIS) PURE; + STDMETHOD(OutputTextReplacements)(THIS_ ULONG output_control, ULONG flags) PURE; + /* IDebugControl3 */ + STDMETHOD(GetAssemblyOptions)(THIS_ ULONG *options) PURE; + STDMETHOD(AddAssemblyOptions)(THIS_ ULONG options) PURE; + STDMETHOD(RemoveAssemblyOptions)(THIS_ ULONG options) PURE; + STDMETHOD(SetAssemblyOptions)(THIS_ ULONG options) PURE; + STDMETHOD(GetExpressionSyntax)(THIS_ ULONG *flags) PURE; + STDMETHOD(SetExpressionSyntax)(THIS_ ULONG flags) PURE; + STDMETHOD(SetExpressionSyntaxByName)(THIS_ const char *name) PURE; + STDMETHOD(GetNumberExpressionSyntaxes)(THIS_ ULONG *number) PURE; + STDMETHOD(GetExpressionSyntaxNames)(THIS_ ULONG index, char *fullname, ULONG fullname_buffer_size, + ULONG *fullname_size, char *abbrevname, ULONG abbrevname_buffer_size, ULONG *abbrevname_size) PURE; + STDMETHOD(GetNumberEvents)(THIS_ ULONG *events) PURE; + STDMETHOD(GetEventIndexDescription)(THIS_ ULONG index, ULONG which, char *buffer, ULONG buffer_size, + ULONG *desc_size) PURE; + STDMETHOD(GetCurrentEventIndex)(THIS_ ULONG *index) PURE; + STDMETHOD(SetNextEventIndex)(THIS_ ULONG relation, ULONG value, ULONG *next_index) PURE; +}; +#undef INTERFACE + +#define INTERFACE IDebugControl4 +DECLARE_INTERFACE_(IDebugControl4, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* IDebugControl */ + STDMETHOD(GetInterrupt)(THIS) PURE; + STDMETHOD(SetInterrupt)(THIS_ ULONG flags) PURE; + STDMETHOD(GetInterruptTimeout)(THIS_ ULONG *timeout) PURE; + STDMETHOD(SetInterruptTimeout)(THIS_ ULONG timeout) PURE; + STDMETHOD(GetLogFile)(THIS_ char *buffer, ULONG buffer_size, ULONG *file_size, BOOL *append) PURE; + STDMETHOD(OpenLogFile)(THIS_ const char *file, BOOL append) PURE; + STDMETHOD(CloseLogFile)(THIS) PURE; + STDMETHOD(GetLogMask)(THIS_ ULONG *mask) PURE; + STDMETHOD(SetLogMask)(THIS_ ULONG mask) PURE; + STDMETHOD(Input)(THIS_ char *buffer, ULONG buffer_size, ULONG *input_size) PURE; + STDMETHOD(ReturnInput)(THIS_ const char *buffer) PURE; + STDMETHODV(Output)(THIS_ ULONG mask, const char *format, ...) PURE; + STDMETHOD(OutputVaList)(THIS_ ULONG mask, const char *format, __ms_va_list args) PURE; + STDMETHODV(ControlledOutput)(THIS_ ULONG output_control, ULONG mask, const char *format, ...) PURE; + STDMETHOD(ControlledOutputVaList)(THIS_ ULONG output_control, ULONG mask, const char *format, + __ms_va_list args) PURE; + STDMETHODV(OutputPrompt)(THIS_ ULONG output_control, const char *format, ...) PURE; + STDMETHOD(OutputPromptVaList)(THIS_ ULONG output_control, const char *format, __ms_va_list args) PURE; + STDMETHOD(GetPromptText)(THIS_ char *buffer, ULONG buffer_size, ULONG *text_size) PURE; + STDMETHOD(OutputCurrentState)(THIS_ ULONG output_control, ULONG flags) PURE; + STDMETHOD(OutputVersionInformation)(THIS_ ULONG output_control) PURE; + STDMETHOD(GetNotifyEventHandle)(THIS_ ULONG64 *handle) PURE; + STDMETHOD(SetNotifyEventHandle)(THIS_ ULONG64 handle) PURE; + STDMETHOD(Assemble)(THIS_ ULONG64 offset, const char *code, ULONG64 *end_offset) PURE; + STDMETHOD(Disassemble)(THIS_ ULONG64 offset, ULONG flags, char *buffer, ULONG buffer_size, ULONG *disassm_size, + ULONG64 *end_offset) PURE; + STDMETHOD(GetDisassembleEffectiveOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(OutputDisassembly)(THIS_ ULONG output_control, ULONG64 offset, ULONG flags, ULONG64 *end_offset) PURE; + STDMETHOD(OutputDisassemblyLines)(THIS_ ULONG output_control, ULONG prev_lines, ULONG total_lines, ULONG64 offset, + ULONG flags, ULONG *offset_line, ULONG64 *start_offset, ULONG64 *end_offset, ULONG64 *line_offsets) PURE; + STDMETHOD(GetNearInstruction)(THIS_ ULONG64 offset, LONG delta, ULONG64 *instr_offset) PURE; + STDMETHOD(GetStackTrace)(THIS_ ULONG64 frame_offset, ULONG64 stack_offset, ULONG64 instr_offset, + DEBUG_STACK_FRAME *frames, ULONG frames_size, ULONG *frames_filled) PURE; + STDMETHOD(GetReturnOffset)(THIS_ ULONG64 *offset) PURE; + STDMETHOD(OutputStackTrace)(THIS_ ULONG output_control, DEBUG_STACK_FRAME *frames, ULONG frames_size, + ULONG flags) PURE; + STDMETHOD(GetDebuggeeType)(THIS_ ULONG *_class, ULONG *qualifier) PURE; + STDMETHOD(GetActualProcessorType)(THIS_ ULONG *type) PURE; + STDMETHOD(GetExecutingProcessorType)(THIS_ ULONG *type) PURE; + STDMETHOD(GetNumberPossibleExecutingProcessorTypes)(THIS_ ULONG *count) PURE; + STDMETHOD(GetPossibleExecutingProcessorTypes)(THIS_ ULONG start, ULONG count, ULONG *types) PURE; + STDMETHOD(GetNumberProcessors)(THIS_ ULONG *count) PURE; + STDMETHOD(GetSystemVersion)(THIS_ ULONG *platform_id, ULONG *major, ULONG *minor, char *sp_string, + ULONG sp_string_size, ULONG *sp_string_used, ULONG *sp_number, char *build_string, ULONG build_string_size, + ULONG *build_string_used) PURE; + STDMETHOD(GetPageSize)(THIS_ ULONG *size) PURE; + STDMETHOD(IsPointer64Bit)(THIS) PURE; + STDMETHOD(ReadBugCheckData)(THIS_ ULONG *code, ULONG64 *arg1, ULONG64 *arg2, ULONG64 *arg3, ULONG64 *arg4) PURE; + STDMETHOD(GetNumberSupportedProcessorTypes)(THIS_ ULONG *count) PURE; + STDMETHOD(GetSupportedProcessorTypes)(THIS_ ULONG start, ULONG count, ULONG *types) PURE; + STDMETHOD(GetProcessorTypeNames)(THIS_ ULONG type, char *full_name, ULONG full_name_buffer_size, + ULONG *full_name_size, char *abbrev_name, ULONG abbrev_name_buffer_size, ULONG *abbrev_name_size) PURE; + STDMETHOD(GetEffectiveProcessorType)(THIS_ ULONG *type) PURE; + STDMETHOD(SetEffectiveProcessorType)(THIS_ ULONG type) PURE; + STDMETHOD(GetExecutionStatus)(THIS_ ULONG *status) PURE; + STDMETHOD(SetExecutionStatus)(THIS_ ULONG status) PURE; + STDMETHOD(GetCodeLevel)(THIS_ ULONG *level) PURE; + STDMETHOD(SetCodeLevel)(THIS_ ULONG level) PURE; + STDMETHOD(GetEngineOptions)(THIS_ ULONG *options) PURE; + STDMETHOD(AddEngineOptions)(THIS_ ULONG options) PURE; + STDMETHOD(RemoveEngineOptions)(THIS_ ULONG options) PURE; + STDMETHOD(SetEngineOptions)(THIS_ ULONG options) PURE; + STDMETHOD(GetSystemErrorControl)(THIS_ ULONG *output_level, ULONG *break_level) PURE; + STDMETHOD(SetSystemErrorControl)(THIS_ ULONG output_level, ULONG break_level) PURE; + STDMETHOD(GetTextMacro)(THIS_ ULONG slot, char *buffer, ULONG buffer_size, ULONG *macro_size) PURE; + STDMETHOD(SetTextMacro)(THIS_ ULONG slot, const char *macro) PURE; + STDMETHOD(GetRadix)(THIS_ ULONG *radix) PURE; + STDMETHOD(SetRadix)(THIS_ ULONG radix) PURE; + STDMETHOD(Evaluate)(THIS_ const char *expression, ULONG desired_type, DEBUG_VALUE *value, + ULONG *remainder_index) PURE; + STDMETHOD(CoerceValue)(THIS_ DEBUG_VALUE input, ULONG output_type, DEBUG_VALUE *output) PURE; + STDMETHOD(CoerceValues)(THIS_ ULONG count, DEBUG_VALUE *input, ULONG *output_types, DEBUG_VALUE *output) PURE; + STDMETHOD(Execute)(THIS_ ULONG output_control, const char *command, ULONG flags) PURE; + STDMETHOD(ExecuteCommandFile)(THIS_ ULONG output_control, const char *command_file, ULONG flags) PURE; + STDMETHOD(GetNumberBreakpoints)(THIS_ ULONG *count) PURE; + STDMETHOD(GetBreakpointByIndex)(THIS_ ULONG index, IDebugBreakpoint **bp) PURE; + STDMETHOD(GetBreakpointById)(THIS_ ULONG id, IDebugBreakpoint **bp) PURE; + STDMETHOD(GetBreakpointParameters)(THIS_ ULONG count, ULONG *ids, ULONG start, + DEBUG_BREAKPOINT_PARAMETERS *parameters) PURE; + STDMETHOD(AddBreakpoint)(THIS_ ULONG type, ULONG desired_id, IDebugBreakpoint **bp) PURE; + STDMETHOD(RemoveBreakpoint)(THIS_ IDebugBreakpoint *bp) PURE; + STDMETHOD(AddExtension)(THIS_ const char *path, ULONG flags, ULONG64 *handle) PURE; + STDMETHOD(RemoveExtension)(THIS_ ULONG64 handle) PURE; + STDMETHOD(GetExtensionByPath)(THIS_ const char *path, ULONG64 *handle) PURE; + STDMETHOD(CallExtension)(THIS_ ULONG64 handle, const char *function, const char *args) PURE; + STDMETHOD(GetExtensionFunction)(THIS_ ULONG64 handle, const char *name, void *function) PURE; + STDMETHOD(GetWindbgExtensionApis32)(THIS_ PWINDBG_EXTENSION_APIS32 api) PURE; + STDMETHOD(GetWindbgExtensionApis64)(THIS_ PWINDBG_EXTENSION_APIS64 api) PURE; + STDMETHOD(GetNumberEventFilters)(THIS_ ULONG *specific_events, ULONG *specific_exceptions, + ULONG *arbitrary_exceptions) PURE; + STDMETHOD(GetEventFilterText)(THIS_ ULONG index, char *buffer, ULONG buffer_size, ULONG *text_size) PURE; + STDMETHOD(GetEventFilterCommand)(THIS_ ULONG index, char *buffer, ULONG buffer_size, ULONG *command_size) PURE; + STDMETHOD(SetEventFilterCommand)(THIS_ ULONG index, const char *command) PURE; + STDMETHOD(GetSpecificFilterParameters)(THIS_ ULONG start, ULONG count, + DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(SetSpecificFilterParameters)(THIS_ ULONG start, ULONG count, + DEBUG_SPECIFIC_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(GetSpecificFilterArgument)(THIS_ ULONG index, char *buffer, ULONG buffer_size, + ULONG *argument_size) PURE; + STDMETHOD(SetSpecificFilterArgument)(THIS_ ULONG index, const char *argument) PURE; + STDMETHOD(GetExceptionFilterParameters)(THIS_ ULONG count, ULONG *codes, ULONG start, + DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(SetExceptionFilterParameters)(THIS_ ULONG count, DEBUG_EXCEPTION_FILTER_PARAMETERS *parameters) PURE; + STDMETHOD(GetExceptionFilterSecondCommand)(THIS_ ULONG index, char *buffer, ULONG buffer_size, + ULONG *command_size) PURE; + STDMETHOD(SetExceptionFilterSecondCommand)(THIS_ ULONG index, const char *command) PURE; + STDMETHOD(WaitForEvent)(THIS_ ULONG flags, ULONG timeout) PURE; + STDMETHOD(GetLastEventInformation)(THIS_ ULONG *type, ULONG *pid, ULONG *tid, void *extra_info, + ULONG extra_info_size, ULONG *extra_info_used, char *description, ULONG desc_size, ULONG *desc_used) PURE; + /* IDebugControl2 */ + STDMETHOD(GetCurrentTimeDate)(THIS_ ULONG timedate) PURE; + STDMETHOD(GetCurrentSystemUpTime)(THIS_ ULONG uptime) PURE; + STDMETHOD(GetDumpFormatFlags)(THIS_ ULONG *flags) PURE; + STDMETHOD(GetNumberTextPlacements)(THIS_ ULONG *count) PURE; + STDMETHOD(GetNumberTextReplacement)(THIS_ const char *src_text, ULONG index, char *src_buffer, + ULONG src_buffer_size, ULONG *src_size, char *dst_buffer, ULONG dst_buffer_size, ULONG *dst_size) PURE; + STDMETHOD(SetTextReplacement)(THIS_ const char *src_text, const char *dst_text) PURE; + STDMETHOD(RemoveTextReplacements)(THIS) PURE; + STDMETHOD(OutputTextReplacements)(THIS_ ULONG output_control, ULONG flags) PURE; + /* IDebugControl3 */ + STDMETHOD(GetAssemblyOptions)(THIS_ ULONG *options) PURE; + STDMETHOD(AddAssemblyOptions)(THIS_ ULONG options) PURE; + STDMETHOD(RemoveAssemblyOptions)(THIS_ ULONG options) PURE; + STDMETHOD(SetAssemblyOptions)(THIS_ ULONG options) PURE; + STDMETHOD(GetExpressionSyntax)(THIS_ ULONG *flags) PURE; + STDMETHOD(SetExpressionSyntax)(THIS_ ULONG flags) PURE; + STDMETHOD(SetExpressionSyntaxByName)(THIS_ const char *name) PURE; + STDMETHOD(GetNumberExpressionSyntaxes)(THIS_ ULONG *number) PURE; + STDMETHOD(GetExpressionSyntaxNames)(THIS_ ULONG index, char *fullname, ULONG fullname_buffer_size, + ULONG *fullname_size, char *abbrevname, ULONG abbrevname_buffer_size, ULONG *abbrevname_size) PURE; + STDMETHOD(GetNumberEvents)(THIS_ ULONG *events) PURE; + STDMETHOD(GetEventIndexDescription)(THIS_ ULONG index, ULONG which, char *buffer, ULONG buffer_size, + ULONG *desc_size) PURE; + STDMETHOD(GetCurrentEventIndex)(THIS_ ULONG *index) PURE; + STDMETHOD(SetNextEventIndex)(THIS_ ULONG relation, ULONG value, ULONG *next_index) PURE; + /* IDebugControl4 */ + STDMETHOD(GetLogFileWide)(THIS_ WCHAR *buffer, ULONG buffer_size, ULONG *file_size, BOOL *append) PURE; + STDMETHOD(OpenLogFileWide)(THIS_ const WCHAR *filename, BOOL append) PURE; + STDMETHOD(InputWide)(THIS_ WCHAR *buffer, ULONG buffer_size, ULONG *input_size) PURE; + STDMETHOD(ReturnInputWide)(THIS_ const WCHAR *buffer) PURE; + STDMETHODV(OutputWide)(THIS_ ULONG mask, const WCHAR *format, ...) PURE; + STDMETHOD(OutputVaListWide)(THIS_ ULONG mask, const WCHAR *format, __ms_va_list args) PURE; + STDMETHODV(ControlledOutputWide)(THIS_ ULONG output_control, ULONG mask, const WCHAR *format, ...) PURE; + STDMETHOD(ControlledOutputVaListWide)(THIS_ ULONG output_control, ULONG mask, const WCHAR *format, __ms_va_list args) PURE; + STDMETHODV(OutputPromptWide)(THIS_ ULONG output_control, const WCHAR *format, ...) PURE; + STDMETHOD(OutputPromptVaListWide)(THIS_ ULONG output_control, const WCHAR *format, __ms_va_list args) PURE; + STDMETHOD(GetPromptTextWide)(THIS_ WCHAR *buffer, ULONG buffer_size, ULONG *text_size) PURE; + STDMETHOD(AssembleWide)(THIS_ ULONG64 offset, const WCHAR *instr, ULONG64 *end_offset) PURE; + STDMETHOD(DisassembleWide)(THIS_ ULONG64 offset, ULONG flags, WCHAR *buffer, ULONG buffer_size, ULONG *size, + ULONG64 *end_offset) PURE; + STDMETHOD(GetProcessorTypeNamesWide)(THIS_ ULONG type, WCHAR *fullename, ULONG fullname_buffer_size, + ULONG *fullname_size, WCHAR *abbrevname, ULONG abbrevname_buffer_size, ULONG *abbrevname_size) PURE; + STDMETHOD(GetTextMacroWide)(THIS_ ULONG slot, WCHAR *buffer, ULONG buffer_size, ULONG *macro_size) PURE; + STDMETHOD(SetTextMacroWide)(THIS_ ULONG slot, const WCHAR *macro) PURE; + STDMETHOD(EvaluateWide)(THIS_ const WCHAR *expression, ULONG desired_type, DEBUG_VALUE *value, ULONG *remainder_index) PURE; + STDMETHOD(ExecuteWide)(THIS_ ULONG output_control, const WCHAR *command, ULONG flags) PURE; + STDMETHOD(ExecuteCommandFileWide)(THIS_ ULONG output_control, const WCHAR *commandfile, ULONG flags) PURE; + STDMETHOD(GetBreakpointByIndex2)(THIS_ ULONG index, PDEBUG_BREAKPOINT2 *bp) PURE; + STDMETHOD(GetBreakpointById2)(THIS_ ULONG id, PDEBUG_BREAKPOINT2 *bp) PURE; + STDMETHOD(AddBreakpoint2)(THIS_ ULONG type, ULONG desired_id, PDEBUG_BREAKPOINT2 *bp) PURE; + STDMETHOD(RemoveBreakpoint2)(THIS_ PDEBUG_BREAKPOINT2 bp) PURE; + STDMETHOD(AddExtensionWide)(THIS_ const WCHAR *path, ULONG flags, ULONG64 *handle) PURE; + STDMETHOD(GetExtensionByPathWide)(THIS_ const WCHAR *path, ULONG64 *handle) PURE; + STDMETHOD(CallExtensionWide)(THIS_ ULONG64 handle, const WCHAR *function, const WCHAR *arguments) PURE; + STDMETHOD(GetExtensionFunctionWide)(THIS_ ULONG64 handle, const WCHAR *function, FARPROC *func) PURE; + STDMETHOD(GetEventFilterTextWide)(THIS_ ULONG index, WCHAR *buffer, ULONG buffer_size, ULONG *text_size) PURE; + STDMETHOD(GetEventFilterCommandWide)(THIS_ ULONG index, WCHAR *buffer, ULONG buffer_size, ULONG *command_size) PURE; + STDMETHOD(SetEventFilterCommandWide)(THIS_ ULONG index, const WCHAR *command) PURE; + STDMETHOD(GetSpecificFilterArgumentWide)(THIS_ ULONG index, WCHAR *buffer, ULONG buffer_size, ULONG *argument_size) PURE; + STDMETHOD(SetSpecificFilterArgumentWide)(THIS_ ULONG index, const WCHAR *argument) PURE; + STDMETHOD(GetSpecificFilterSecondCommandWide)(THIS_ ULONG index, WCHAR *buffer, ULONG buffer_size, ULONG *command_size) PURE; + STDMETHOD(SetSpecificFilterSecondCommandWide)(THIS_ ULONG index, const WCHAR *command) PURE; + STDMETHOD(GetLastEventInformationWide)(THIS_ ULONG *type, ULONG *processid, ULONG *threadid, void *extra_info, + ULONG extra_info_size, ULONG *extra_info_used, WCHAR *desc, ULONG desc_size, ULONG *desc_used) PURE; + STDMETHOD(GetTextReplacementWide)(THIS_ const WCHAR *src_text, ULONG index, WCHAR *src_buffer, ULONG src_buffer_size, + ULONG *src_size, WCHAR *dst_buffer, ULONG dest_buffer_size, ULONG *dst_size) PURE; + STDMETHOD(SetTextReplacementWide)(THIS_ const WCHAR *src_text, const WCHAR *dst_text) PURE; + STDMETHOD(SetExpressionSyntaxByNameWide)(THIS_ const WCHAR *abbrevname) PURE; + STDMETHOD(GetExpressionSyntaxNamesWide)(THIS_ ULONG index, WCHAR *fullname_buffer, ULONG fullname_buffer_size, + ULONG *fullname_size, WCHAR *abbrevname_buffer, ULONG abbrevname_buffer_size, ULONG *abbrev_size) PURE; + STDMETHOD(GetEventIndexDescriptionWide)(THIS_ ULONG index, ULONG which, WCHAR *buffer, ULONG buffer_size, + ULONG *desc_size) PURE; + STDMETHOD(GetLogFile2)(THIS_ char *buffer, ULONG buffer_size, ULONG *file_size, ULONG *flags) PURE; + STDMETHOD(OpenLogFile2)(THIS_ const char *filename, ULONG flags) PURE; + STDMETHOD(GetLogFile2Wide)(THIS_ WCHAR *buffer, ULONG buffer_size, ULONG *file_size, ULONG *flags) PURE; + STDMETHOD(OpenLogFile2Wide)(THIS_ const WCHAR *filename, ULONG flags) PURE; + STDMETHOD(GetSystemVersionValues)(THIS_ ULONG *platformid, ULONG *win32major, ULONG *win32minor, + ULONG *kdmajor, ULONG *kdminor) PURE; + STDMETHOD(GetSystemVersionString)(THIS_ ULONG which, char *buffer, ULONG buffer_size, ULONG *string_size) PURE; + STDMETHOD(GetSystemVersionStringWide)(THIS_ ULONG which, WCHAR *buffer, ULONG buffer_size, ULONG *string_size) PURE; + STDMETHOD(GetContextStackTrace)(THIS_ void *start_context, ULONG start_context_size, PDEBUG_STACK_FRAME frames, + ULONG frames_size, void *frame_contexts, ULONG frame_contexts_size, ULONG frame_contexts_entry_size, + ULONG *frames_filled) PURE; + STDMETHOD(OutputContextStackTrace)(THIS_ ULONG output_control, PDEBUG_STACK_FRAME frames, ULONG frames_size, + void *frame_contexts, ULONG frame_contexts_size, ULONG frame_contexts_entry_size, ULONG flags) PURE; + STDMETHOD(GetStoredEventInformation)(THIS_ ULONG *type, ULONG *processid, ULONG *threadid, void *context, + ULONG context_size, ULONG *context_used, void *extra_info, ULONG extra_info_size, ULONG *extra_info_used) PURE; + STDMETHOD(GetManagedStatus)(THIS_ ULONG *flags, ULONG which_string, char *string, ULONG string_size, ULONG string_needed) PURE; + STDMETHOD(GetManagedStatusWide)(THIS_ ULONG *flags, ULONG which_string, WCHAR *string, ULONG string_size, + ULONG string_needed) PURE; + STDMETHOD(ResetManagedStatus)(THIS_ ULONG flags) PURE; +}; +#undef INTERFACE + #define INTERFACE IDebugAdvanced DECLARE_INTERFACE_(IDebugAdvanced, IUnknown) { -- 2.35.1

1 3

[PATCH] uianimation: Use CRT allocation functions.
by Nikolay Sivov 04 Apr '22

04 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/uianimation/main.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index c338d836978..22bb58ddbe2 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -31,7 +31,6 @@ #include "initguid.h" #include "uianimation.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uianimation); @@ -151,7 +150,7 @@ static ULONG WINAPI animation_storyboard_Release( IUIAnimationStoryboard *iface TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -308,7 +307,7 @@ const struct IUIAnimationStoryboardVtbl animation_storyboard_vtbl = static HRESULT animation_storyboard_create( IUIAnimationStoryboard **obj ) { - struct animation_storyboard *This = heap_alloc( sizeof(*This) ); + struct animation_storyboard *This = malloc( sizeof(*This) ); if (!This) return E_OUTOFMEMORY; This->IUIAnimationStoryboard_iface.lpVtbl = &animation_storyboard_vtbl; @@ -371,7 +370,7 @@ static ULONG WINAPI animation_var_Release( IUIAnimationVariable *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -498,7 +497,7 @@ const struct IUIAnimationVariableVtbl animation_var_vtbl = static HRESULT animation_var_create(DOUBLE initial, IUIAnimationVariable **obj ) { - struct animation_var *This = heap_alloc( sizeof(*This) ); + struct animation_var *This = malloc( sizeof(*This) ); if (!This) return E_OUTOFMEMORY; This->IUIAnimationVariable_iface.lpVtbl = &animation_var_vtbl; @@ -561,7 +560,7 @@ static ULONG WINAPI manager_Release( IUIAnimationManager *iface ) if (!ref) { - heap_free( This ); + free( This ); } return ref; @@ -730,7 +729,7 @@ const struct IUIAnimationManagerVtbl manager_vtbl = static HRESULT manager_create( IUnknown *outer, REFIID iid, void **obj ) { - struct manager *This = heap_alloc( sizeof(*This) ); + struct manager *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -793,7 +792,7 @@ static ULONG WINAPI timer_Release( IUIAnimationTimer *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -866,7 +865,7 @@ const struct IUIAnimationTimerVtbl timer_vtbl = static HRESULT timer_create( IUnknown *outer, REFIID iid, void **obj ) { - struct timer *This = heap_alloc( sizeof(*This) ); + struct timer *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) @@ -930,7 +929,7 @@ static ULONG WINAPI tr_factory_Release( IUIAnimationTransitionFactory *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -953,7 +952,7 @@ const struct IUIAnimationTransitionFactoryVtbl tr_factory_vtbl = static HRESULT transition_create( IUnknown *outer, REFIID iid, void **obj ) { - struct tr_factory *This = heap_alloc( sizeof(*This) ); + struct tr_factory *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -1017,7 +1016,7 @@ static ULONG WINAPI tr_library_Release( IUIAnimationTransitionLibrary *iface ) TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) - heap_free( This ); + free( This ); return ref; } @@ -1141,7 +1140,7 @@ const struct IUIAnimationTransitionLibraryVtbl tr_library_vtbl = static HRESULT library_create( IUnknown *outer, REFIID iid, void **obj ) { - struct tr_library *This = heap_alloc( sizeof(*This) ); + struct tr_library *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; -- 2.35.1

1 0

[PATCH] explorerframe/tests: Use CRT memory allocation functions.
by Nikolay Sivov 04 Apr '22

04 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/explorerframe/tests/msg.h | 9 ++++----- dlls/explorerframe/tests/nstc.c | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/explorerframe/tests/msg.h b/dlls/explorerframe/tests/msg.h index 857278e4ef2..2a1752fda9f 100644 --- a/dlls/explorerframe/tests/msg.h +++ b/dlls/explorerframe/tests/msg.h @@ -20,7 +20,6 @@ #include <assert.h> #include <windows.h> -#include "wine/heap.h" #include "wine/test.h" /* undocumented SWP flags - from SDK 3.1 */ @@ -67,13 +66,13 @@ static void add_message(struct msg_sequence **seq, int sequence_index, if (!msg_seq->sequence) { msg_seq->size = 10; - msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (struct message)); + msg_seq->sequence = malloc(msg_seq->size * sizeof (struct message)); } if (msg_seq->count == msg_seq->size) { msg_seq->size *= 2; - msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); + msg_seq->sequence = realloc(msg_seq->sequence, msg_seq->size * sizeof (struct message)); } assert(msg_seq->sequence); @@ -90,7 +89,7 @@ static void add_message(struct msg_sequence **seq, int sequence_index, static void flush_sequence(struct msg_sequence **seg, int sequence_index) { struct msg_sequence *msg_seq = seg[sequence_index]; - heap_free(msg_seq->sequence); + free(msg_seq->sequence); msg_seq->sequence = NULL; msg_seq->count = msg_seq->size = 0; } @@ -110,5 +109,5 @@ static void init_msg_sequences(struct msg_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = heap_alloc_zero(sizeof(struct msg_sequence)); + seq[i] = calloc(1, sizeof(**seq)); } diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index f11ae0b1923..e8c771f7eec 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -364,7 +364,7 @@ static INameSpaceTreeControlEventsImpl *create_nstc_events(void) { INameSpaceTreeControlEventsImpl *This; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); This->INameSpaceTreeControlEvents_iface.lpVtbl = &vt_NSTCEvents; This->ref = 1; @@ -2351,8 +2351,8 @@ static void test_events(void) if(!res) { /* Freeing these prematurely causes a crash. */ - heap_free(pnstceimpl); - heap_free(pnstceimpl2); + free(pnstceimpl); + free(pnstceimpl2); } IShellItem_Release(psi); -- 2.35.1

1 0

[tools] testbot/web: Use SimpleCollectionPage for the VMs page.
by Francois Gouget 04 Apr '22

04 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/VMsList.pl | 49 ++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 18952253f..d957b4472 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -2,6 +2,7 @@ # VM list page # # Copyright 2009 Ge van Geldorp +# Copyright 2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,58 +20,62 @@ use strict; -package VMsListPage; +package VMsBlock; -use ObjectModel::CGI::CollectionPage; -our @ISA = qw(ObjectModel::CGI::CollectionPage); - -use WineTestBot::VMs; +use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -sub _initialize($$$) +sub Create($$) { - my ($self, $Request, $RequiredRole) = @_; + my ($Collection, $EnclosingPage) = @_; - $self->SUPER::_initialize($Request, $RequiredRole, CreateVMs()); + return VMsBlock->new($Collection, $EnclosingPage); } -sub DisplayProperty($$$) +sub DisplayProperty($$) { - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; + my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "Type" || $PropertyName eq "Role" || $PropertyName eq "Status" || $PropertyName eq "Description"; } -sub SortKeys($$$) +sub SortKeys($$) { - my ($self, $CollectionBlock, $Keys) = @_; + my ($self, $Keys) = @_; return $self->{Collection}->SortKeysBySortOrder($Keys); } -sub OnItemAction($$$$) +sub OnItemAction($$$) { - my ($self, $CollectionBlock, $VM, $Action) = @_; + my ($self, $VM, $Action) = @_; if ($Action eq "Delete") { $VM->Role("deleted"); - # Setting $self->{ErrField} is only useful on form pages - (my $_ErrProperty, $self->{ErrMessage}) = $VM->Save(); - return !defined $self->{ErrMessage}; + my ($_ErrProperty, $ErrMessage) = $VM->Save(); + if (defined $ErrMessage) + { + # Setting ErrField is only useful on form pages + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } + return 1; } - return $self->SUPER::OnItemAction($CollectionBlock, $VM, $Action); + return $self->SUPER::OnItemAction($VM, $Action); } package main; -my $Request = shift; +use ObjectModel::CGI::SimpleCollectionPage; +use WineTestBot::VMs; -my $VMsListPage = VMsListPage->new($Request, "admin"); -$VMsListPage->GeneratePage(); +my $Request = shift; +my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateVMs(), \&VMsBlock::Create); +$Page->GeneratePage(); -- 2.30.2

1 0

[tools] testbot/web: Use SimpleCollectionPage for the users page.
by Francois Gouget 04 Apr '22

04 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/UsersList.pl | 62 ++++++++++++++++------------------ 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index ae514e901..08ae5bffb 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -2,7 +2,7 @@ # User list page # # Copyright 2009 Ge van Geldorp -# Copyright 2013 Francois Gouget +# Copyright 2013, 2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,45 +20,35 @@ use strict; -package UsersListPage; +package UsersBlock; -use ObjectModel::CGI::CollectionPage; -our @ISA = qw(ObjectModel::CGI::CollectionPage); +use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); use URI::Escape; use WineTestBot::CGI::Sessions; use WineTestBot::Config; -use WineTestBot::Users; - - -sub _initialize($$$) -{ - my ($self, $Request, $RequiredRole) = @_; - $self->SUPER::_initialize($Request, $RequiredRole, CreateUsers()); -} -sub SortKeys($$$) +sub Create($$) { - my ($self, $CollectionBlock, $Keys) = @_; + my ($Collection, $EnclosingPage) = @_; - my @SortedKeys = sort { $a cmp $b } @$Keys; - return \@SortedKeys; + return UsersBlock->new($Collection, $EnclosingPage); } -sub DisplayProperty($$$) +sub DisplayProperty($$) { - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; + my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "EMail" || $PropertyName eq "Status" || $PropertyName eq "RealName"; } -sub GenerateDataCell($$$$$) +sub GenerateDataCell($$$$) { - my ($self, $CollectionBlock, $User, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $User, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") @@ -98,41 +88,47 @@ sub GenerateDataCell($$$$$) } else { - $self->SUPER::GenerateDataCell($CollectionBlock, $User, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($User, $PropertyDescriptor, $DetailsPage); } } -sub GetItemActions($$) +sub GetItemActions($) { - my ($self, $CollectionBlock) = @_; + my ($self) = @_; # LDAP accounts cannot be deleted return defined $LDAPServer ? [] : ["Delete"]; } -sub OnItemAction($$$$) +sub OnItemAction($$$) { - my ($self, $CollectionBlock, $User, $Action) = @_; + my ($self, $User, $Action) = @_; if ($Action eq "Delete") { $User->Status('deleted'); - # Setting $self->{ErrField} is only useful on form pages - (my $_ErrProperty, $self->{ErrMessage}) = $User->Save(); - return 0 if (defined $self->{ErrMessage}); + my ($_ErrProperty, $ErrMessage) = $User->Save(); + if (defined $ErrMessage) + { + # Setting ErrField is only useful on form pages + $self->{EnclosingPage}->SetError(undef, $ErrMessage); + return 0; + } # Forcefully log out that user by deleting the web sessions DeleteSessions($User); return 1; } - return $self->SUPER::OnItemAction($CollectionBlock, $User, $Action); + return $self->SUPER::OnItemAction($User, $Action); } package main; -my $Request = shift; +use ObjectModel::CGI::SimpleCollectionPage; +use WineTestBot::Users; -my $UsersListPage = UsersListPage->new($Request, "admin"); -$UsersListPage->GeneratePage(); +my $Request = shift; +my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateUsers(), \&UsersBlock::Create); +$Page->GeneratePage(); -- 2.30.2

1 0

[tools] testbot/cgi: Sessions does not need CGI::Cookie.
by Francois Gouget 04 Apr '22

04 Apr '22

Getting and setting cookies is done through the PageBase class. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/Sessions.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 4ca62ba76..39634e3ef 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -55,7 +55,6 @@ our @ISA = qw(WineTestBot::WineTestBotCollection); our @EXPORT = qw(CreateSessions DeleteSessions NewSession); use Bytes::Random::Secure; -use CGI::Cookie; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -- 2.30.2

1 0

[tools] testbot/cgi: PageBase does not need Apache2::ServerRec.
by Francois Gouget 04 Apr '22

04 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The commit 4852169f1 says this was added to "Fix problem for Paul". But I don't see any reference to the Apache2::ServerRec API in PageBase. So I'm in favor of removing the Apache2::ServerRec import and readding it with a proper comment if something breaks. In any case it still works without it here. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 4837b9f54..3073ac220 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -39,7 +39,6 @@ use Exporter 'import'; our @EXPORT = qw(CreatePageBase); use Apache2::Const -compile => qw(REDIRECT); -use Apache2::ServerRec; use CGI::Cookie; use URI::Escape; use WineTestBot::CGI::Sessions; -- 2.30.2

1 0

[tools] testbot: The last GetTaskURL() parameter is in fact a log name.
by Francois Gouget 04 Apr '22

04 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The TestBot has had multiple logs for a long time now so it cannot be a simple boolean. Also it's not used right now but it will be (for the failure blacklisting) so it cannot just be removed. Finally the log names are pretty clean so they could be used without escaping. However the policy is to escape all strings, in part to protect against future evolutions. --- testbot/lib/WineTestBot/Utils.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index d93a938d3..13529c323 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -34,6 +34,7 @@ our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString BatchQuote ShQuote ShArgv2Cmd); use Fcntl qw(O_CREAT O_EXCL O_WRONLY); +use URI::Escape; use WineTestBot::Config; @@ -84,11 +85,11 @@ sub MakeSecureURL($) sub GetTaskURL($$$;$$) { - my ($JobId, $StepNo, $TaskNo, $ShowScreenshot, $ShowLog) = @_; + my ($JobId, $StepNo, $TaskNo, $ShowScreenshot, $LogName) = @_; my $StepTask = 100 * $StepNo + $TaskNo; my $URL = "/JobDetails.pl?Key=$JobId"; $URL .= "&s$StepTask=1" if ($ShowScreenshot); - $URL .= "&f$StepTask=$ShowLog" if ($ShowLog); + $URL .= "&f$StepTask=". uri_escape($LogName) if ($LogName); return "$URL#k$StepTask"; } -- 2.30.2

1 0

[tools] testbot/cgi: Remove an incorrect cross-reference in the Perl POD documentation.
by Francois Gouget 04 Apr '22

04 Apr '22

PageBase is in fact in WineTestBot::CGI. However referencing WineTestBot from ObjectModel would be an abstraction level violation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 0879557ad..d7463b5a8 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -110,8 +110,6 @@ sub _initialize($$$) Sets the function to be used to instantiate a new PageBase object for this website. The resulting object can be accessed through GetPageBase(). -See also ObjectModel::CGI::PageBase. - =back =cut -- 2.30.2

1 0

[tools] testbot/web: Better document the job details page reloads.
by Francois Gouget 04 Apr '22

04 Apr '22

Also use $SCRIPT_NAME instead of hardcoding the script name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 7e1df1ffa..ccd40443a 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -256,7 +256,11 @@ sub OnCancel($) return !1; } - exit($self->{EnclosingPage}->Redirect("/JobDetails.pl?Key=$JobId")); + # Ideally this would use something like GetMoreInfoLink() to rebuild a Get + # URL to preserve which logs and screenshots have been expanded. But the + # anchor would likely be lost anyway. + # So just do a basic reload to refresh the tasks' status. + exit($self->{EnclosingPage}->Redirect($ENV{"SCRIPT_NAME"} ."?Key=$JobId")); } sub OnRestart($) @@ -278,7 +282,10 @@ sub OnRestart($) return !1; } - exit($self->{EnclosingPage}->Redirect("/JobDetails.pl?Key=$JobId")); + # Reload to refresh the tasks' status. Note that all logs and screenshots + # have been cleared so there is no point specifying which one to open or + # adding an anchor. + exit($self->{EnclosingPage}->Redirect($ENV{"SCRIPT_NAME"} ."?Key=$JobId")); } sub OnAction($$) -- 2.30.2

1 0

[PATCH v3 4/4] fonts: Add Segoe UI Symbol font replacement.
by Dmitry Timoshkov 04 Apr '22

04 Apr '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> --- dlls/dwrite/tests/layout.c | 4 +- fonts/Makefile.in | 1 + fonts/seguisym.sfd | 99 +++++++++++++++++++++++++++++++++++++ fonts/seguisym.ttf | Bin 0 -> 1688 bytes 4 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 fonts/seguisym.sfd create mode 100644 fonts/seguisym.ttf diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 756c8993373..6b93d268202 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6625,12 +6625,12 @@ static void test_SegoeUI_Symbol(void) ok(scale == 1.0f, "got %f\n", scale); get_font_name(font, name, ARRAY_SIZE(name)); -todo_wine_if(families[i] != NULL) +todo_wine_if(families[i] != NULL && *families[i]) 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_if(families[i] != NULL) +todo_wine_if(families[i] != NULL && *families[i]) ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); IDWriteFont_Release(font); 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 v3 3/4] dwrite: Add Segoe UI Symbol fallback range for the Geometric Shapes unicode block.
by Dmitry Timoshkov 04 Apr '22

04 Apr '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 c36f370d7da..756c8993373 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6619,19 +6619,18 @@ static void test_SegoeUI_Symbol(void) { 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

[PATCH v3 2/4] dwrite/tests: Add some tests for Segoe UI Symbol font family.
by Dmitry Timoshkov 04 Apr '22

04 Apr '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/tests/layout.c | 68 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 76f69892226..c36f370d7da 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6575,6 +6575,73 @@ static void test_SegoeUI(void) IDWriteFactory2_Release(factory); } +static void test_SegoeUI_Symbol(void) +{ + static const WCHAR * const families[] = { L"", L"Tahoma", L"Marlett", L"Symbol", L"Webdings", L"Wingdings", NULL }; + static const WCHAR text[] = { 0x25d4, 0 }; + HRESULT hr; + IDWriteFactory2 *factory; + IDWriteFontCollection *collection; + IDWriteFont *font; + IDWriteFontFallback *fallback; + UINT32 index, i, mappedlength; + WCHAR name[256]; + BOOL exists; + FLOAT scale; + + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory2, (IUnknown **)&factory); + if (hr != S_OK) + { + win_skip("IDWriteFactory2 is not supported\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontCollection_FindFamilyName(collection, L"Segoe UI Symbol", &index, &exists); + ok(hr == S_OK, "got %#x\n", hr); + if (!exists) + { + skip("Segoe UI Symbol is not installed\n"); + IDWriteFontCollection_Release(collection); + IDWriteFactory2_Release(factory); + return; + } + ok(index != UINT_MAX && exists, "Segoe UI Symbol was not found\n"); + + hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback); + ok(hr == S_OK, "got %#x\n", hr); + + g_source = text; + + for (i = 0; i < ARRAY_SIZE(families); i++) + { + 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 + 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 + ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + } + + IDWriteFontFallback_Release(fallback); + IDWriteFontCollection_Release(collection); + IDWriteFactory2_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -6631,6 +6698,7 @@ START_TEST(layout) test_layout_range_length(); test_HitTestTextRange(); test_SegoeUI(); + test_SegoeUI_Symbol(); IDWriteFactory_Release(factory); } -- 2.35.1

1 0

[PATCH v3 1/4] dwrite/tests: Add some tests for Segoe UI font family.
by Dmitry Timoshkov 04 Apr '22

04 Apr '22

v3: Separate test for Segoe UI Symbol so that it doesn't depend on presence of the Segoe UI font. This also makes it more clear which of the tests get fixed by adding Segoe UI Symbol to the Wine tree. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/tests/layout.c | 89 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77c6ff2034..76f69892226 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6487,6 +6487,94 @@ if (SUCCEEDED(hr)) IDWriteFactory_Release(factory); } +#define get_font_name(a, b, c) get_font_name_(a, b, c, __LINE__) +static void get_font_name_(IDWriteFont *font, WCHAR *name, UINT32 size, int line) +{ + HRESULT hr; + IDWriteFontFamily *family; + IDWriteLocalizedStrings *names; + UINT32 index; + BOOL exists; + + hr = IDWriteFont_GetFontFamily(font, &family); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + ok_(__FILE__, line)(index != UINT_MAX && exists, "name was not found\n"); + hr = IDWriteLocalizedStrings_GetString(names, index, name, size); + ok_(__FILE__, line)(hr == S_OK, "got %#x\n", hr); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); +} + +static void test_SegoeUI(void) +{ + HRESULT hr; + IDWriteFactory2 *factory; + IDWriteFontCollection *collection; + IDWriteFontFamily *family; + IDWriteFont *font; + UINT32 index, count, i; + WCHAR name[256]; + BOOL exists, found; + + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory2, (IUnknown **)&factory); + if (hr != S_OK) + { + win_skip("IDWriteFactory2 is not supported\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontCollection_FindFamilyName(collection, L"Segoe UI", &index, &exists); + ok(hr == S_OK, "got %#x\n", hr); + if (!exists) + { + skip("Segoe UI is not installed\n"); + IDWriteFontCollection_Release(collection); + IDWriteFactory2_Release(factory); + return; + } + ok(index != UINT_MAX && exists, "Segoe UI was not found\n"); + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); + ok(hr == S_OK, "got %#x\n", hr); + + count = IDWriteFontFamily_GetFontCount(family); + trace("family Segoe UI has %u fonts\n", count); + + found = FALSE; + + for (i = 0; i < count; i++) + { + hr = IDWriteFontFamily_GetFont(family, i, &font); + ok(hr == S_OK, "got %#x\n", hr); + + get_font_name(font, name, ARRAY_SIZE(name)); + if (!wcscmp(name, L"Segoe UI Symbol")) + found = TRUE; + + hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); + ok(hr == S_OK, "got %#x\n", hr); + ok(!exists, "%u: %s has character 0x25d4\n", i, wine_dbgstr_w(name)); + + IDWriteFont_Release(font); + } + + ok(!found, "Segoe UI Symbol should not be part of Segoe UI family\n"); + + IDWriteFontFamily_Release(family); + IDWriteFontCollection_Release(collection); + IDWriteFactory2_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -6542,6 +6630,7 @@ START_TEST(layout) test_text_format_axes(); test_layout_range_length(); test_HitTestTextRange(); + test_SegoeUI(); IDWriteFactory_Release(factory); } -- 2.35.1

1 0

[PATCH] wined3d: Spawn a separate thread to adjust the window state of windows belonging to other threads.
by Henri Verbeet 04 Apr '22

04 Apr '22

Sending messages to windows on other threads can deadlock if those threads aren't processing messages. The deeper issue is that we shouldn't be touching the window styles in the first place, but avoiding that may not be feasible without specific support from winex11/winemac. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 138 +++++++++++++++++++++++++++++---------- 1 file changed, 103 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 608a303c0f6..eef7d46ba39 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2178,12 +2178,43 @@ static LONG fullscreen_exstyle(LONG exstyle) return exstyle; } +struct wined3d_window_state +{ + HWND window; + HWND window_pos_after; + LONG style, exstyle; + int x, y, width, height; + uint32_t flags; + bool set_style; +}; + +static DWORD WINAPI wined3d_set_window_state(void *ctx) +{ + struct wined3d_window_state *s = ctx; + bool filter; + + filter = wined3d_filter_messages(s->window, TRUE); + + if (s->set_style) + { + SetWindowLongW(s->window, GWL_STYLE, s->style); + SetWindowLongW(s->window, GWL_EXSTYLE, s->exstyle); + } + SetWindowPos(s->window, s->window_pos_after, s->x, s->y, s->width, s->height, s->flags); + + wined3d_filter_messages(s->window, filter); + + heap_free(s); + + return 0; +} + HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, HWND window, int x, int y, int width, int height) { - unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_NOACTIVATE; - LONG style, exstyle; - BOOL filter; + struct wined3d_window_state *s; + DWORD window_tid, tid; + HANDLE thread; TRACE("Setting up window %p for fullscreen mode.\n", window); @@ -2193,33 +2224,50 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state return WINED3DERR_NOTAVAILABLE; } + if (!(s = heap_alloc(sizeof(*s)))) + return E_OUTOFMEMORY; + s->window = window; + s->window_pos_after = HWND_TOPMOST; + s->x = x; + s->y = y; + s->width = width; + s->height = height; + if (state->style || state->exstyle) { ERR("Changing the window style for window %p, but another style (%08x, %08x) is already stored.\n", window, state->style, state->exstyle); } + s->flags = SWP_FRAMECHANGED | SWP_NOACTIVATE; if (state->desc.flags & WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES) - window_pos_flags |= SWP_NOZORDER; + s->flags |= SWP_NOZORDER; else - window_pos_flags |= SWP_SHOWWINDOW; + s->flags |= SWP_SHOWWINDOW; state->style = GetWindowLongW(window, GWL_STYLE); state->exstyle = GetWindowLongW(window, GWL_EXSTYLE); - style = fullscreen_style(state->style); - exstyle = fullscreen_exstyle(state->exstyle); + s->style = fullscreen_style(state->style); + s->exstyle = fullscreen_exstyle(state->exstyle); + s->set_style = true; TRACE("Old style was %08x, %08x, setting to %08x, %08x.\n", - state->style, state->exstyle, style, exstyle); - - filter = wined3d_filter_messages(window, TRUE); - - SetWindowLongW(window, GWL_STYLE, style); - SetWindowLongW(window, GWL_EXSTYLE, exstyle); - SetWindowPos(window, HWND_TOPMOST, x, y, width, height, window_pos_flags); - - wined3d_filter_messages(window, filter); + state->style, state->exstyle, s->style, s->exstyle); + + window_tid = GetWindowThreadProcessId(window, NULL); + tid = GetCurrentThreadId(); + + TRACE("Window %p belongs to thread %#x.\n", window, window_tid); + /* If the window belongs to a different thread, modifying the style and/or + * position can potentially deadlock if that thread isn't processing + * messages. */ + if (window_tid == tid) + wined3d_set_window_state(s); + else if (!(thread = CreateThread(NULL, 0, wined3d_set_window_state, s, 0, NULL))) + ERR("Failed to create thread.\n"); + else + CloseHandle(thread); return WINED3D_OK; } @@ -2227,21 +2275,27 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) { - unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE; - HWND window_pos_after = NULL; + struct wined3d_window_state *s; + DWORD window_tid, tid; LONG style, exstyle; - RECT rect = {0}; - BOOL filter; + HANDLE thread; if (!state->style && !state->exstyle) return; + if (!(s = heap_alloc(sizeof(*s)))) + return; + + s->window = window; + s->window_pos_after = NULL; + s->flags = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE; + if ((state->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE) && !(state->desc.flags & WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES)) { - window_pos_after = (state->exstyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_NOTOPMOST; - window_pos_flags |= (state->style & WS_VISIBLE) ? SWP_SHOWWINDOW : SWP_HIDEWINDOW; - window_pos_flags &= ~SWP_NOZORDER; + s->window_pos_after = (state->exstyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_NOTOPMOST; + s->flags |= (state->style & WS_VISIBLE) ? SWP_SHOWWINDOW : SWP_HIDEWINDOW; + s->flags &= ~SWP_NOZORDER; } style = GetWindowLongW(window, GWL_STYLE); @@ -2259,26 +2313,40 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st TRACE("Restoring window style of window %p to %08x, %08x.\n", window, state->style, state->exstyle); - filter = wined3d_filter_messages(window, TRUE); - + s->style = state->style; + s->exstyle = state->exstyle; /* Only restore the style if the application didn't modify it during the * fullscreen phase. Some applications change it before calling Reset() * when switching between windowed and fullscreen modes (HL2), some * depend on the original style (Eve Online). */ - if (style == fullscreen_style(state->style) && exstyle == fullscreen_exstyle(state->exstyle)) - { - SetWindowLongW(window, GWL_STYLE, state->style); - SetWindowLongW(window, GWL_EXSTYLE, state->exstyle); - } + s->set_style = style == fullscreen_style(state->style) && exstyle == fullscreen_exstyle(state->exstyle); if (window_rect) - rect = *window_rect; + { + s->x = window_rect->left; + s->y = window_rect->top; + s->width = window_rect->right - window_rect->left; + s->height = window_rect->bottom - window_rect->top; + } else - window_pos_flags |= (SWP_NOMOVE | SWP_NOSIZE); - SetWindowPos(window, window_pos_after, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, window_pos_flags); + { + s->x = s->y = s->width = s->height = 0; + s->flags |= (SWP_NOMOVE | SWP_NOSIZE); + } - wined3d_filter_messages(window, filter); + window_tid = GetWindowThreadProcessId(window, NULL); + tid = GetCurrentThreadId(); + + TRACE("Window %p belongs to thread %#x.\n", window, window_tid); + /* If the window belongs to a different thread, modifying the style and/or + * position can potentially deadlock if that thread isn't processing + * messages. */ + if (window_tid == tid) + wined3d_set_window_state(s); + else if (!(thread = CreateThread(NULL, 0, wined3d_set_window_state, s, 0, NULL))) + ERR("Failed to create thread.\n"); + else + CloseHandle(thread); /* Delete the old values. */ state->style = 0; -- 2.30.2

1 0

[PATCH 1/3] include: Add defines for D2D1YCbCr effect.
by Ziqing Hui 04 Apr '22

04 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- include/Makefile.in | 1 + include/d2d1_2.idl | 1 + include/d2d1effects_1.idl | 50 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 include/d2d1effects_1.idl diff --git a/include/Makefile.in b/include/Makefile.in index 40d6c00fb7b..c69194ef127 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -104,6 +104,7 @@ SOURCES = \ d2d1_2.idl \ d2d1_3.idl \ d2d1effects.idl \ + d2d1effects_1.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1_2.idl b/include/d2d1_2.idl index 39e285dc221..1fc9111151c 100644 --- a/include/d2d1_2.idl +++ b/include/d2d1_2.idl @@ -17,6 +17,7 @@ */ import "d2d1_1.idl"; +import "d2d1effects_1.idl"; typedef enum D2D1_RENDERING_PRIORITY { diff --git a/include/d2d1effects_1.idl b/include/d2d1effects_1.idl new file mode 100644 index 00000000000..03616b770e6 --- /dev/null +++ b/include/d2d1effects_1.idl @@ -0,0 +1,50 @@ +/* + * Copyright 2022 Ziqing Hui 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 + */ + +import "d2d1effects.idl"; + +cpp_quote("DEFINE_GUID(CLSID_D2D1YCbCr, 0x99503cc1,0x66c7,0x45c9,0xa8,0x75,0x8a,0xd8,0xa7,0x91,0x44,0x01);") + +typedef enum D2D1_YCBCR_PROP +{ + D2D1_YCBCR_PROP_CHROMA_SUBSAMPLING = 0x0, + D2D1_YCBCR_PROP_TRANSFORM_MATRIX = 0x1, + D2D1_YCBCR_PROP_INTERPOLATION_MODE = 0x2, + D2D1_YCBCR_PROP_FORCE_DWORD = 0xffffffff +} D2D1_YCBCR_PROP; + +typedef enum D2D1_YCBCR_CHROMA_SUBSAMPLING +{ + D2D1_YCBCR_CHROMA_SUBSAMPLING_AUTO = 0x0, + D2D1_YCBCR_CHROMA_SUBSAMPLING_420 = 0x1, + D2D1_YCBCR_CHROMA_SUBSAMPLING_422 = 0x2, + D2D1_YCBCR_CHROMA_SUBSAMPLING_444 = 0x3, + D2D1_YCBCR_CHROMA_SUBSAMPLING_440 = 0x4, + D2D1_YCBCR_CHROMA_SUBSAMPLING_FORCE_DWORD = 0xffffffff +} D2D1_YCBCR_CHROMA_SUBSAMPLING; + +typedef enum D2D1_YCBCR_INTERPOLATION_MODE +{ + D2D1_YCBCR_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0x0, + D2D1_YCBCR_INTERPOLATION_MODE_LINEAR = 0x1, + D2D1_YCBCR_INTERPOLATION_MODE_CUBIC = 0x2, + D2D1_YCBCR_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = 0x3, + D2D1_YCBCR_INTERPOLATION_MODE_ANISOTROPIC = 0x4, + D2D1_YCBCR_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = 0x5, + D2D1_YCBCR_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff +} D2D1_YCBCR_INTERPOLATION_MODE; -- 2.25.1

2 5

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Allow mixing "in" and "out" with other modifiers.
by Zebediah Figura 04 Apr '22

04 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 76 +++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1ab56fba0..920bb520c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1513,6 +1513,16 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); + if (modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_modifiers_to_string(ctx, modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)))) + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers '%s' are not allowed on non-parameter variables.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + if (!(var = hlsl_new_var(ctx, v->name, type, v->loc, &v->semantic, modifiers, &v->reg_reservation))) { free_parse_variable_def(v); @@ -2413,8 +2423,6 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <if_body> if_body -%type <modifiers> input_mod -%type <modifiers> input_mods %type <modifiers> var_modifiers %type <name> any_identifier @@ -2791,54 +2799,21 @@ param_list: } parameter: - input_mods var_modifiers type any_identifier colon_attribute + var_modifiers type any_identifier colon_attribute { struct hlsl_type *type; - unsigned int modifiers = $2; + unsigned int modifiers = $1; - if (!(type = apply_type_modifiers(ctx, $3, &modifiers, @2))) + if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; - $$.modifiers = $1 ? $1 : HLSL_STORAGE_IN; - $$.modifiers |= modifiers; + $$.modifiers = modifiers; + if (!($$.modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT))) + $$.modifiers |= HLSL_STORAGE_IN; $$.type = type; - $$.name = $4; - $$.semantic = $5.semantic; - $$.reg_reservation = $5.reg_reservation; - } - -input_mods: - %empty - { - $$ = 0; - } - | input_mods input_mod - { - if ($1 & $2) - { - struct vkd3d_string_buffer *string; - - if ((string = hlsl_modifiers_to_string(ctx, $2))) - hlsl_error(ctx, &@2, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifier \"%s\" was already specified.", string->buffer); - hlsl_release_string_buffer(ctx, string); - YYABORT; - } - $$ = $1 | $2; - } - -input_mod: - KW_IN - { - $$ = HLSL_STORAGE_IN; - } - | KW_OUT - { - $$ = HLSL_STORAGE_OUT; - } - | KW_INOUT - { - $$ = HLSL_STORAGE_IN | HLSL_STORAGE_OUT; + $$.name = $3; + $$.semantic = $4.semantic; + $$.reg_reservation = $4.reg_reservation; } texture_type: @@ -3202,6 +3177,19 @@ var_modifiers: { $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_COLUMN_MAJOR, @1); } + | KW_IN var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_STORAGE_IN, @1); + } + | KW_OUT var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_STORAGE_OUT, @1); + } + | KW_INOUT var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_STORAGE_IN | HLSL_STORAGE_OUT, @1); + } + complex_initializer: initializer_expr -- 2.35.1

5 28

[PATCH vkd3d v2 1/3] vkd3d-shader/hlsl: Write SM4 bitwise OR instructions.
by Zebediah Figura 04 Apr '22

04 Apr '22

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Rebase; combine int and uint paths. libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index fa845dc46..567d311b9 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1632,6 +1632,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_AND, &expr->node, arg1, arg2); break; + case HLSL_OP2_BIT_OR: + assert(type_is_integer(dst_type)); + write_sm4_binary_op(buffer, VKD3D_SM4_OP_OR, &expr->node, arg1, arg2); + break; + case HLSL_OP2_DIV: switch (dst_type->base_type) { -- 2.35.1

5 14

[PATCH v3] winex11.drv: Use composition string from XIM on IME_SetResultString()
by Alex Kwak 04 Apr '22

04 Apr '22

IME_SetResultString() function overwrite composition string as empty. so, next composition may not appear on the displayed. but, still have an xim. Therefore, there was a string that seemed to have disappeared in the middle of the input. Therefore, change it as follows. When calling IME_SetResultString(), if in a Composition state, no longer generate WM_IME_ENDCOMPOSITION and Use CompositionString in XIM to match the current XIM status rather than overwriting Composition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52700 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: use updateCompStr instead IME_SetResultString. v3: Change the description and data type. --- dlls/winex11.drv/ime.c | 18 ++++++++++++++---- dlls/winex11.drv/x11drv.h | 3 ++- dlls/winex11.drv/xim.c | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..51ed452e3bf 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -1015,7 +1015,8 @@ BOOL IME_SetCompositionString(DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, lpRead, dwReadLen); } -void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) +void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen, + const WCHAR *compStr, DWORD dwCompStrLen) { HIMC imc; LPINPUTCONTEXT lpIMC; @@ -1028,7 +1029,7 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) if (lpIMC == NULL) return; - newCompStr = updateCompStr(lpIMC->hCompStr, NULL, 0); + newCompStr = updateCompStr(lpIMC->hCompStr, compStr, dwCompStrLen); ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = newCompStr; @@ -1046,12 +1047,21 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) GenerateIMEMessage(imc, WM_IME_STARTCOMPOSITION, 0, 0); } - GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_COMPSTR); GenerateIMEMessage(imc, WM_IME_COMPOSITION, lpResult[0], GCS_RESULTSTR|GCS_RESULTCLAUSE); - GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); + if (dwCompStrLen > 0) + { + GenerateIMEMessage(imc, WM_IME_COMPOSITION, compStr[0], GCS_COMPSTR); + } + else + { + GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_COMPSTR); + } if (!inComp) + { + GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); ImmSetOpenStatus(imc, FALSE); + } ImmUnlockIMC(imc); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f389f3e0836..e97df20e0d5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -290,7 +290,8 @@ extern void IME_UpdateAssociation(HWND focus) DECLSPEC_HIDDEN; extern BOOL IME_SetCompositionString(DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen) DECLSPEC_HIDDEN; -extern void IME_SetResultString(LPWSTR lpResult, DWORD dwResultlen) DECLSPEC_HIDDEN; +extern void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen, + const WCHAR *compStr, DWORD dwCompStrLen) DECLSPEC_HIDDEN; extern void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..7f2b6531e8a 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -115,7 +115,8 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) if ((focus = GetFocus())) IME_UpdateAssociation(focus); - IME_SetResultString(wcOutput, dwOutput); + IME_SetResultString(wcOutput, dwOutput, (WCHAR *) CompositionString, + dwCompStringLength / sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, wcOutput); } -- 2.32.0

2 1

[PATCH v3 1/5] mf/tests: Fix incorrect array index when formatting blob value.
by Rémi Bernon 04 Apr '22

04 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Fix now invalid nv12frame.bin fixup offsets. dlls/mf/tests/mf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0df524b4e16..b2d2880bea6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -147,7 +147,7 @@ static void check_attributes_(int line, IMFAttributes *attributes, const struct case VT_VECTOR | VT_UI1: buf += sprintf(buf, "size %lu, data {", value.caub.cElems); for (j = 0; j < 16 && j < value.caub.cElems; ++j) - buf += sprintf(buf, "0x%02x,", value.caub.pElems[i + j]); + buf += sprintf(buf, "0x%02x,", value.caub.pElems[j]); if (value.caub.cElems > 16) buf += sprintf(buf, "...}"); else -- 2.35.1

3 11

[PATCH v2 1/4] kernelbase: Use the same HLOCAL entry pointer alignment as native.
by Rémi Bernon 04 Apr '22

04 Apr '22

This changes the GlobalUnlock todo_wine as we previously considered the invalid mem handle as a valid pointer, and we now instead check handle validity. Returning TRUE in for an invalid handle doesn't seem very important, and a corner case, and it breaks compatibility and imm32 tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/heap.c | 10 ++++------ dlls/kernel32/tests/heap.c | 17 +---------------- dlls/kernelbase/memory.c | 10 ++++------ 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index dbb240d89fc..20505b673ec 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -147,8 +147,6 @@ BOOL WINAPI HeapDestroy( HANDLE heap /* [in] Handle of heap */ ) * Global/local heap functions, keep in sync with kernelbase/memory.c ***********************************************************************/ -#include "pshpack1.h" - struct mem_entry { union @@ -156,15 +154,15 @@ struct mem_entry struct { WORD magic; - void *ptr; BYTE flags; BYTE lock; }; void *next_free; }; + void *ptr; }; -#include "poppack.h" +C_ASSERT(sizeof(struct mem_entry) == 2 * sizeof(void *)); struct kernelbase_global_data *kernelbase_global_data; @@ -181,7 +179,7 @@ static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); struct kernelbase_global_data *data = kernelbase_global_data; - if (!((ULONG_PTR)handle & 2)) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL; if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL; if (mem->magic != MAGIC_LOCAL_USED) return NULL; return mem; @@ -189,7 +187,7 @@ static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) static inline void *unsafe_ptr_from_HLOCAL( HLOCAL handle ) { - if ((ULONG_PTR)handle & 2) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1))) return NULL; return handle; } diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 476be96cea8..5d6383a49e5 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -368,9 +368,7 @@ static void test_GlobalAlloc(void) mem = GlobalAlloc( GMEM_MOVEABLE, alloc_size ); ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); - todo_wine ok( ((UINT_PTR)mem & sizeof(void *)), "got unexpected entry align\n" ); - todo_wine ok( !((UINT_PTR)mem & (sizeof(void *) - 1)), "got unexpected entry align\n" ); entry = mem_entry_from_HANDLE( mem ); @@ -414,9 +412,7 @@ static void test_GlobalAlloc(void) ok( !tmp_mem, "GlobalFree failed, error %lu\n", GetLastError() ); ok( !!entry->flags, "got unexpected flags %#Ix\n", entry->flags ); ok( !((UINT_PTR)entry->flags & sizeof(void *)), "got unexpected ptr align\n" ); - todo_wine_if(sizeof(void *) == 4) ok( !((UINT_PTR)entry->flags & (sizeof(void *) - 1)), "got unexpected ptr align\n" ); - todo_wine ok( !entry->ptr, "got unexpected ptr %p\n", entry->ptr ); mem = GlobalAlloc( GMEM_MOVEABLE | GMEM_DISCARDABLE, 0 ); @@ -543,29 +539,24 @@ static void test_GlobalAlloc(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); flags = GlobalFlags( invalid_mem ); - todo_wine ok( flags == GMEM_INVALID_HANDLE, "GlobalFlags succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); size = GlobalSize( invalid_mem ); ok( size == 0, "GlobalSize succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ptr = GlobalLock( invalid_mem ); ok( !ptr, "GlobalLock succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = GlobalUnlock( invalid_mem ); - ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); todo_wine + ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); tmp_mem = GlobalReAlloc( invalid_mem, 0, GMEM_MOVEABLE ); ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); /* invalid pointers are caught */ @@ -889,29 +880,23 @@ static void test_LocalAlloc(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); flags = LocalFlags( invalid_mem ); - todo_wine ok( flags == LMEM_INVALID_HANDLE, "LocalFlags succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); size = LocalSize( invalid_mem ); ok( size == 0, "LocalSize succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ptr = LocalLock( invalid_mem ); ok( !ptr, "LocalLock succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = LocalUnlock( invalid_mem ); ok( !ret, "LocalUnlock succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); tmp_mem = LocalReAlloc( invalid_mem, 0, LMEM_MOVEABLE ); ok( !tmp_mem, "LocalReAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); /* invalid pointers are caught */ diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 5bdab31589d..086674ab41c 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -585,8 +585,6 @@ struct kernelbase_global_data struct mem_entry *mem_entries_end; }; -#include "pshpack1.h" - struct mem_entry { union @@ -594,15 +592,15 @@ struct mem_entry struct { WORD magic; - void *ptr; BYTE flags; BYTE lock; }; void *next_free; }; + void *ptr; }; -#include "poppack.h" +C_ASSERT(sizeof(struct mem_entry) == 2 * sizeof(void *)); #define MAX_MEM_HANDLES 0x10000 static struct mem_entry mem_entries[MAX_MEM_HANDLES]; @@ -626,7 +624,7 @@ static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); struct kernelbase_global_data *data = &kernelbase_global_data; - if (!((ULONG_PTR)handle & 2)) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL; if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL; if (mem->magic != MAGIC_LOCAL_USED) return NULL; return mem; @@ -639,7 +637,7 @@ static inline HLOCAL HLOCAL_from_mem( struct mem_entry *mem ) static inline void *unsafe_ptr_from_HLOCAL( HLOCAL handle ) { - if ((ULONG_PTR)handle & 2) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1))) return NULL; return handle; } -- 2.35.1

2 4

[PATCH][widl] Fix uninitialized read in write_union_tfs
by Raphael Isemann 04 Apr '22

04 Apr '22

The summary of how the bug happens is: 1. union_memsize gets called with a pointer to uninitialized `dummy`. ``` static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, type_t *type, unsigned int *tfsoff) { [...] unsigned int dummy; [...] size = union_memsize(fields, &dummy); ``` 2. `union_memsize` reads `pmaxa` (which points to dummy) to set the initial value of align. ``` static unsigned int union_memsize(const var_list_t *fields, unsigned int *pmaxa) { unsigned int size, maxs = 0; unsigned int align = *pmaxa; const var_t *v; if (fields) LIST_FOR_EACH_ENTRY( v, fields, const var_t, entry ) { /* we could have an empty default field with NULL type */ if (v->declspec.type) { size = type_memsize_and_alignment(v->declspec.type, &align); if (maxs < size) maxs = size; if (*pmaxa < align) *pmaxa = align; } } ``` `type_memsize_and_alignment` then descends down and passes along the uninitialized `align`. `type_memsize_and_alignment` will use this to find the required alignment for the type (and will round up the computed type size to the uninitialized alignment if necessary). This patch just initializes `dummy` to 0 (which means the 'real' alignment value) should set the value to a real alignment. --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b2d9ab5..eb0fa5e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3327,7 +3327,7 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, unsigned int nbranch = 0; type_t *deftype = NULL; short nodeftype = 0xffff; - unsigned int dummy; + unsigned int dummy = 0; var_t *f; if (processed(type) && -- 2.35.1

2 1

[PATCH 1/3] msvcr100: Add _StructuredTaskCollection::_Schedule stub.
by Torge Matthies 04 Apr '22

04 Apr '22

Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/concurrency.c | 12 ++++++++++++ 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 50db9348327..ab57c736672 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -596,7 +596,7 @@ @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 19b4cbe96d7..68a78a6aa16 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -364,7 +364,7 @@ @ stub -arch=win32 ?_RunAndWait@_TaskCollection@details@Concurrency@@QAG?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=win32 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=win32 ?_Schedule@_TaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z @ stub -arch=win64 ?_Schedule@_TaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z @ thiscall -arch=win32 ?_SetSpinCount@?$_SpinWait@$00@details@Concurrency@@QAEXI@Z(ptr long) SpinWait__SetSpinCount diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 23840f85eda..0f5eaf9ac51 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -616,7 +616,7 @@ @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64ddeed42f4..332a617932e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -598,7 +598,7 @@ @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05f408d6884..d70f1423f68 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -594,7 +594,7 @@ @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 54b2c49db99..fc754c69a2e 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -174,6 +174,11 @@ typedef struct cs_queue #endif } cs_queue; +typedef struct +{ + int dummy; +} structured_task_collection; + typedef struct { ULONG_PTR unk_thread_id; @@ -1706,6 +1711,13 @@ bool __thiscall SpinWait__SpinOnce(SpinWait *this) } } +/* ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z */ +DEFINE_THISCALL_WRAPPER(StructuredTaskCollection__Schedule, 8) +void __thiscall StructuredTaskCollection__Schedule(structured_task_collection *this, void *chore) +{ + FIXME("(%p %p): stub!\n", this, chore); +} + /* ??0critical_section@Concurrency@@QAE@XZ */ /* ??0critical_section@Concurrency@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4) -- 2.35.1

2 5

[PATCH rebase 1/2] winemenubuilder: Skip desktop integration for certain associations
by Alex Henrie 04 Apr '22

04 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41275 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- loader/wine.inf.in | 6 +++ programs/winemenubuilder/winemenubuilder.c | 43 +++++++++++++++++++--- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 46b2caf3647..ad9e1ac8c43 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -320,6 +320,12 @@ HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" HKCR,mailto\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" +HKCU,Software\Wine\FileOpenNoIntegration,"ieframe",,"ieframe.dll" +HKCU,Software\Wine\FileOpenNoIntegration,"iexplore",,"iexplore.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"notepad",,"notepad.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"winebrowser",,"winebrowser.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"wordpad",,"wordpad.exe" + [ContentIndex] HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}" HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,"" diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 1579ca8dafa..ef280954b67 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1974,6 +1974,35 @@ static BOOL is_extension_banned(LPCWSTR extension) return FALSE; } +static BOOL on_exclude_list(const WCHAR *command) +{ + static const WCHAR FileOpenNoIntegrationW[] = L"Software\\Wine\\FileOpenNoIntegration"; + HKEY key; + WCHAR program_name[MAX_PATH], *pattern_to_exclude; + DWORD len = ARRAY_SIZE(program_name); + DWORD i = 0; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, FileOpenNoIntegrationW, 0, KEY_QUERY_VALUE, &key) != ERROR_SUCCESS) + return FALSE; + + while (RegEnumValueW(key, i, program_name, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + pattern_to_exclude = reg_get_valW(HKEY_CURRENT_USER, FileOpenNoIntegrationW, program_name); + if (wcsstr(command, pattern_to_exclude)) + { + heap_free(pattern_to_exclude); + RegCloseKey(key); + return TRUE; + } + heap_free(pattern_to_exclude); + len = ARRAY_SIZE(program_name); + i++; + } + + RegCloseKey(key); + return FALSE; +} + static WCHAR *get_special_mime_type(LPCWSTR extension) { if (!wcsicmp(extension, L".lnk")) @@ -2054,6 +2083,15 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic WCHAR *mimeProgId = NULL; struct rb_string_entry *entry; + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); + if (commandW == NULL) + /* no command => no application is associated */ + goto end; + + if (on_exclude_list(commandW)) + /* command is on the exclude list => desktop integration is not desirable */ + goto end; + wcslwr(extensionW); friendlyDocNameW = assoc_query(ASSOCSTR_FRIENDLYDOCNAME, extensionW, NULL); @@ -2093,11 +2131,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic hasChanged = TRUE; } - commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); - if (commandW == NULL) - /* no command => no application is associated */ - goto end; - executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, L"open"); if (executableW) openWithIcon = compute_native_identifier(0, executableW, NULL); -- 2.35.1

1 1

[PATCH resend] mciwave: Fix bad free in MCI_SendCommandAsync (Coverity)
by Alex Henrie 04 Apr '22

04 Apr '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 3ca884ed6e0..b2582a56123 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -124,7 +124,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, async_cmd cmd, DWORD_PTR dwParam1 WARN("Couldn't allocate thread for async command handling, sending synchronously\n"); if (handles[1]) CloseHandle(handles[1]); sca->evt = NULL; - return MCI_SCAStarter(&sca); + return MCI_SCAStarter(sca); } SetThreadPriority(handles[0], THREAD_PRIORITY_TIME_CRITICAL); -- 2.35.1

1 0

[PATCH resend] shell32: Fix sizeof argument in DoPaste (Coverity)
by Alex Henrie 04 Apr '22

04 Apr '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/shlview_cmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 176ce6061e6..14cd9aeeebe 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1217,7 +1217,7 @@ static HRESULT DoPaste(ContextMenu *This) TRACE("CF_HDROP=%p\n", medium.u.hGlobal); count = DragQueryFileW(medium.u.hGlobal, -1, NULL, 0); - pidls = SHAlloc(count*sizeof(ITEMIDLIST**)); + pidls = SHAlloc(count*sizeof(ITEMIDLIST*)); if (pidls) { for (i = 0; i < count; i++) -- 2.35.1

1 0

[PATCH resend] cmd: Ensure new volume label is null-terminated (Coverity)
by Alex Henrie 04 Apr '22

04 Apr '22

The command `echo | wine cmd /k 'label c:'` causes WCMD_ReadFile to return the single character '\n' without a null terminator, which would then cause garbage to be written to ~/.wine/drive_c/.windows-label. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 963a9eaf361..dc7f0461433 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4718,8 +4718,8 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) if (set_label) { WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); + string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (count > 1) { - string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ } if (*path) { -- 2.35.1

1 0

[PATCH 1/2] hid: Implement HidD_GetMsGenreDescriptor.
by Mohamad Al-Jaf 04 Apr '22

04 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.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 67c4473129d..59d6317c666 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -7,7 +7,7 @@ @ stdcall HidD_GetIndexedString(ptr long ptr long) @ stdcall HidD_GetInputReport(long ptr long) @ stdcall HidD_GetManufacturerString(long ptr long) -@ stub HidD_GetMsGenreDescriptor +@ stdcall HidD_GetMsGenreDescriptor(long ptr long) @ stdcall HidD_GetNumInputBuffers(long ptr) @ stdcall HidD_GetPhysicalDescriptor(long ptr long) @ stdcall HidD_GetPreparsedData(ptr ptr) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index e01ab2a35e7..cf694644008 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -103,6 +103,12 @@ BOOLEAN WINAPI HidD_GetManufacturerString( HANDLE file, void *buffer, ULONG buff return sync_ioctl( file, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, buffer, buffer_len ); } +BOOLEAN WINAPI HidD_GetMsGenreDescriptor( 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_HID_GET_MS_GENRE_DESCRIPTOR, NULL, 0, buffer, buffer_len ); +} + BOOLEAN WINAPI HidD_GetNumInputBuffers( HANDLE file, ULONG *num_buffer ) { TRACE( "file %p, num_buffer %p.\n", file, num_buffer ); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 72470079a79..6f19ced3331 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -40,6 +40,7 @@ void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length); BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); +BOOLEAN WINAPI HidD_GetMsGenreDescriptor(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); -- 2.35.1

2 5

wine-6.0.4-rc1 Available
by Michael Stefaniuc 03 Apr '22

03 Apr '22

Hello guys, I have pushed wine-6.0.4-rc1 (6803e14775a16fec9d09e8cccaafaeee27c7a45c) to https://github.com/mstefani/wine-stable/tree/oldstable https://people.redhat.com/mstefani/wine/stable/ Commits from 6.21 up to 7.4. Last one for the 6.0.x series. What's new in this release (see below for details): - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 6.0.4 (total 42): 12732 Nota Bene crashes on install 26350 Dungeons demo (OGRE) fails to load its plugins (LoadLibraryEx with LOAD_WITH_ALTERED_SEARCH_PATH and relative path) 32183 Cannot open console device read only, then read from it to get input 39699 EDT for Windows installer crashes inside wine`s hhctrl.ocx 41098 Descent 3 (GOG version) has problem when running with OpenGL renderer (Nvidia proprietary drivers) 42030 winedbg: Internal crash at 0x9f58fd40 44202 undname.c fails to parse symbols with rvalue-reference semantics '&&' 47287 Accessible Event Watcher Tool 'accevent.exe' from Windows 10 SDK (10.0.17763.x) crashes on unimplemented function oleacc.dll.AccessibleObjectFromEvent 48631 Multiple games display text as squares (Death to Spies: Moment of Truth, Shadow Warrior, Resident Evil 4 HD) 48950 NVDA needs oleacc.AccessibleObjectFromPoint implementation for mouse tracking 50370 Gothic 1 doesn't start correctly when screen resolution of the game matches display resolution 50526 ConEmu wineconsole Ctrl+m has different behavior 50714 YooSee CMS client 10.0.0.53 crashes after login since Wine 5.12 (ntdll built as PE) 51163 WinOffice Pro 5.3 stops after splashscreen, needs WMI class SoftwareLicensingProduct 51195 Lara Croft and the Temple of Osiris doesn't launch 51220 version:info - In Wine the GetFileVersionInfoEx() checks fail in non-English locales 51396 cl.exe 64bit fails with internal compiler error, needs support for separated code segments in vcruntime140_1 51598 cmd.exe crashes on "if exist" without arguments 51821 EVE Online Client Crashes Due to differences in how Wine and Windows handle LdrGetDllPath with dwFlags 0x8 and relative path 51860 Missing include for uid_t on musl-based systems 51864 VeraCrypt Installer for 1.24-Update7 (Win8+) fails with HRESULT 0x800288BD 51911 vbscript does not handle strings in if clauses 51938 Safe Exam Browser needs "DNSDomain" from Win32_NetworkAdapterConfiguration 51959 Missing procedure GetDayLightFlag 51968 Winaero WEI Tool: Crash due to C:\windows\performance\winsat\datastore missing 51978 Autodesk Fusion 360 crashes on unimplemented function msvcp140.dll.?table@?$ctype@D@std@@QEBAPEBFXZ 51983 foobar2000 v1.5.1+ crashes on startup with Wine v6.6+ with Windows version set to "Windows 10" 52076 Wrong icons placement when using a theme 52082 Ace Ventura (CD-ROM) crashes on start 52102 outSPOKEN 3.0 demo crashes on unimplemented function krnl386.exe16.GetLPErrMode 52141 NetAPI detection in configure is broken 52173 Kodi crashes on unimplemented function wsdapi.dll.WSDCreateDiscoveryProvider 52200 Yamizome Liberator (demo): In-game video isn't played. 52220 TMIDI Player, Cherry: Playback with multiple MIDI ports is broken 52224 inetmib1:main test times out in linux 52298 Opening PPT with Freeoffice Presentations crashes on unimplemented function ole32.dll.OleConvertIStorageToOLESTREAMEx 52327 Wrong WM_CONTEXTMENU message default processing 52349 Vortex Mod Manager Starts but Infinitely Loads 52378 Python WMI module: AttributeError: wbemErrInvalidQuery 52494 shell32 progman_dde tests crash if run immediately after prefix creation 52583 ApiSetView does not display export ordinals correctly 52626 MahjongSoul needs unimplemented function combase.dll.RoSetErrorReportingFlags ---------------------------------------------------------------- Changes since 6.0.3: Akihiro Sagawa (1): quartz: Fix a race in IMediaFilter::Pause(). Alex Henrie (2): krnl386: Add GetLPErrMode stub. explorer: Only try to destroy the IShellWindows object if it exists. Alexandre Julliard (3): configure: Fix the netapi check. krnl386.exe: Page-align the GlobalAlloc() size when the selector limit is in pages. user.exe: Make sure that the thunk selector doesn't get freed. Bernhard Kölbl (1): oleaut32: Allow the registration of 64bit typelibs from a 32bit context. Bernhard Übelacker (2): hhctrl.ocx: Handle only the number of bytes given in html_fragment_len. inetmib1: Fix endianess issue with dwLocalAddr and dwLocalPort. Christian Costa (1): d3dx9: Also check for a valid alpha channel for TGA images. Connor McAdams (2): oleacc: Implement AccessibleObjectFromEvent. winex11.drv: Add mutable pixel format awareness. Derek Lesho (1): kernelbase: Fix parameter order of FindResourceExW call for non-localized path. Doug Lyons (1): msvcrt: Do not acquire fd lock in msvcrt_create_io_inherit_block. Eric Pouech (2): winedbg: Fix command line arguments parsing. cmd: Don't crash on 'if exist' without parameter. Gabriel Ivăncescu (3): comctl32: Redraw children when the combo box is dropped down. user32: Redraw children when the combo box is dropped down. ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES only if window is not in foreground. Gerald Pfeifer (1): configure: Diagnose if NetAPI is not present. Hugh McMaster (1): conhost: Process Ctrl-M key input. Huw D. M. Davies (1): user32: Set WM_CONTEXTMENU's wparam to the child window's handle. Ismael Luceno (1): server: Fix missing include for uid_t. Jacek Caban (1): ntdll: Fix handling \\.\CON path in RtlDosPathNameToNtPathName. Jacek Konieczny (1): winealsa.drv: Use separate port for each output device. Louis Lenders (5): wbemprox: Add empty DNSDomain to Win32_NetworkAdapterConfiguration. combase: Add stub for RoOriginateError. wsdapi: Add stub for WSDCreateDiscoveryProvider. wbemprox: Add some properties of SoftwareLicensingProduct class. ole32: Add stub for OleConvertIStorageToOLESTREAMEx. Loïc Rebmeister (1): loader: Create performance\winsat\datastore on prefix creation. Matteo Bruni (1): combase: Add RoSetErrorReportingFlags() stub. Nick Fox (2): kernel32: Add tests for LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH. ntdll: Fix LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH without a path. Nikolay Sivov (3): d3d11: Always initialize out view pointer in CreateRenderTargetView(). include: Add WbemErrorEnum error codes. comctl32/listview: Initialize subitem text buffer before drawing each subitem. Olivier F. R. Dierick (1): taskschd: Set count to zero in regtasks_get_Count stub. Piotr Caban (5): msvcp100: Export ctype<char>::table function. oleacc: Add AccessibleObjectFromPoint implementation. msvcrt: Don't use GetDaylightFlag function in _ftime64. vcruntime140_1: Add support for exception separated code segments. ucrtbase: Add support for r-value demangling in unDName. Robert Wilhelm (1): vbscript: Support VT_BSTR in stack_pop_bool. Rémi Bernon (1): ntdll: Use the unrolled memset from msvcrt. Thomas Faber (1): msvcrt/tests: Show that spawn does not require locking of fds. Zebediah Figura (1): ntdll/tests: Add more tests for RtlDosPathNameToNtPathName_U(). Zhiyi Zhang (1): comctl32/button: Support image list margin for buttons with BS_CENTER or BS_VCENTER. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH] msvcr100: Improve ThreadScheduler_ScheduleTask_loc stub.
by Piotr Caban 03 Apr '22

03 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45916 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)

1 0

[PATCH] include: Add some math declarations.
by Daniel Lehman 03 Apr '22

03 Apr '22

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- include/msvcrt/math.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index da07303bcd9..a9e6b563eac 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -69,12 +69,17 @@ _ACRTIMP double __cdecl fabs(double); _ACRTIMP double __cdecl ldexp(double, int); _ACRTIMP double __cdecl frexp(double, int*); _ACRTIMP double __cdecl modf(double, double*); +_ACRTIMP double __cdecl fdim(double, double); +_ACRTIMP double __cdecl fma(double, double, double); _ACRTIMP double __cdecl fmod(double, double); _ACRTIMP double __cdecl fmin(double, double); _ACRTIMP double __cdecl fmax(double, double); _ACRTIMP double __cdecl erf(double); +_ACRTIMP double __cdecl remainder(double, double); _ACRTIMP double __cdecl remquo(double, double, int*); _ACRTIMP float __cdecl remquof(float, float, int*); +_ACRTIMP double __cdecl lgamma(double); +_ACRTIMP double __cdecl tgamma(double); _ACRTIMP double __cdecl _hypot(double, double); _ACRTIMP double __cdecl _j0(double); @@ -86,18 +91,30 @@ _ACRTIMP double __cdecl _yn(int, double); _ACRTIMP double __cdecl cbrt(double); _ACRTIMP double __cdecl exp2(double); +_ACRTIMP double __cdecl expm1(double); +_ACRTIMP double __cdecl ilogb(double); +_ACRTIMP double __cdecl log1p(double); _ACRTIMP double __cdecl log2(double); +_ACRTIMP double __cdecl logb(double); _ACRTIMP double __cdecl rint(double); _ACRTIMP double __cdecl round(double); _ACRTIMP double __cdecl trunc(double); _ACRTIMP float __cdecl cbrtf(float); _ACRTIMP float __cdecl exp2f(float); +_ACRTIMP float __cdecl expm1f(float); +_ACRTIMP float __cdecl ilogbf(float); +_ACRTIMP float __cdecl log1pf(float); _ACRTIMP float __cdecl log2f(float); +_ACRTIMP float __cdecl logbf(float); _ACRTIMP float __cdecl rintf(float); _ACRTIMP float __cdecl roundf(float); _ACRTIMP float __cdecl truncf(float); +_ACRTIMP long long __cdecl llrint(double); +_ACRTIMP long long __cdecl llrintf(float); +_ACRTIMP long long __cdecl llround(double); +_ACRTIMP long long __cdecl llroundf(float); _ACRTIMP __msvcrt_long __cdecl lrint(double); _ACRTIMP __msvcrt_long __cdecl lrintf(float); _ACRTIMP __msvcrt_long __cdecl lround(double); @@ -105,6 +122,8 @@ _ACRTIMP __msvcrt_long __cdecl lroundf(float); _ACRTIMP double __cdecl scalbn(double,int); _ACRTIMP float __cdecl scalbnf(float,int); +_ACRTIMP double __cdecl scalbln(double,int); +_ACRTIMP float __cdecl scalblnf(float,int); _ACRTIMP double __cdecl _copysign (double, double); _ACRTIMP double __cdecl _chgsign (double); @@ -115,6 +134,8 @@ _ACRTIMP int __cdecl _finite(double); _ACRTIMP int __cdecl _isnan(double); _ACRTIMP int __cdecl _fpclass(double); +_ACRTIMP double __cdecl nextafter(double, double); + #ifndef __i386__ _ACRTIMP float __cdecl sinf(float); @@ -137,6 +158,7 @@ _ACRTIMP float __cdecl ceilf(float); _ACRTIMP float __cdecl floorf(float); _ACRTIMP float __cdecl frexpf(float, int*); _ACRTIMP float __cdecl modff(float, float*); +_ACRTIMP float __cdecl fmaf(float, float, float); _ACRTIMP float __cdecl fmodf(float, float); _ACRTIMP int __cdecl _finitef(float); @@ -164,6 +186,7 @@ static inline float ceilf(float x) { return ceil(x); } static inline float floorf(float x) { return floor(x); } static inline float frexpf(float x, int *y) { return frexp(x, y); } static inline float modff(float x, float *y) { double yd, ret = modf(x, &yd); *y = yd; return ret; } +static inline float fmaf(float x, float y, float z) { return fma(x, y, z); } static inline float fmodf(float x, float y) { return fmod(x, y); } static inline int _finitef(float x) { return _finite(x); } @@ -199,6 +222,14 @@ _ACRTIMP float __cdecl _logbf(float); _ACRTIMP float __cdecl acoshf(float); _ACRTIMP float __cdecl asinhf(float); _ACRTIMP float __cdecl atanhf(float); +_ACRTIMP float __cdecl erff(float); +_ACRTIMP float __cdecl fdimf(float, float); +_ACRTIMP float __cdecl fmaxf(float, float); +_ACRTIMP float __cdecl fminf(float, float); +_ACRTIMP float __cdecl lgammaf(float); +_ACRTIMP float __cdecl nextafterf(float, float); +_ACRTIMP float __cdecl remainderf(float, float); +_ACRTIMP float __cdecl tgammaf(float); #else @@ -208,6 +239,14 @@ static inline float _logbf(float x) { return _logb(x); } static inline float acoshf(float x) { return acosh(x); } static inline float asinhf(float x) { return asinh(x); } static inline float atanhf(float x) { return atanh(x); } +static inline float erff(float x) { return erf(x); } +static inline float fdimf(float x, float y) { return fdim(x, y); } +static inline float fmaxf(float x, float y) { return fmax(x, y); } +static inline float fminf(float x, float y) { return fmin(x, y); } +static inline float lgammaf(float x) { return lgamma(x); } +static inline float nextafterf(float x, float y) { return nextafter(x, y); } +static inline float remainderf(float x, float y) { return remainder(x, y); } +static inline float tgammaf(float x) { return tgamma(x); } #endif -- 2.25.1

2 2

[PATCH 1/3] ntdll/tests: Add some exception tests.
by Daniel Lehman 03 Apr '22

03 Apr '22

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/ntdll/tests/exception.c | 70 ++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index e01e280d741..98d185f5f07 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1211,7 +1211,7 @@ static void test_debugger(DWORD cont_status) if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } - else if (stage == 11 || stage == 12 || stage == 13) + else if (stage == 11 || stage == 12) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE, "unexpected exception code %08lx, expected %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode, @@ -1219,7 +1219,13 @@ static void test_debugger(DWORD cont_status) ok(de.u.Exception.ExceptionRecord.NumberParameters == 0, "unexpected number of parameters %ld, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); - if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + if (stage == 12) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } + else if (stage == 13) + { + todo_wine + ok(FALSE || broken(TRUE) /* < Win10 */, "should not throw exception\n"); + continuestatus = DBG_EXCEPTION_NOT_HANDLED; } else if (stage == 14 || stage == 15) { @@ -3905,7 +3911,7 @@ static void test_debugger(DWORD cont_status) "expected Rip = %p, got %p\n", (char *)code_mem_address + 2, (char *)ctx.Rip); if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } - else if (stage == 11 || stage == 12 || stage == 13) + else if (stage == 11 || stage == 12) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE, "unexpected exception code %08lx, expected %08lx\n", de.u.Exception.ExceptionRecord.ExceptionCode, @@ -3913,7 +3919,13 @@ static void test_debugger(DWORD cont_status) ok(de.u.Exception.ExceptionRecord.NumberParameters == 0, "unexpected number of parameters %ld, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); - if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + if (stage == 12) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } + else if (stage == 13) + { + todo_wine + ok(FALSE || broken(TRUE) /* < Win10 */, "should not throw exception\n"); + continuestatus = DBG_EXCEPTION_NOT_HANDLED; } else if (stage == 14 || stage == 15) { @@ -6603,7 +6615,7 @@ static void test_debugger(DWORD cont_status) "expected Pc = %p, got 0x%x\n", (char *)code_mem_address + 3, ctx.Pc); if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } - else if (stage == 11 || stage == 12 || stage == 13) + else if (stage == 11 || stage == 12) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE, "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode, @@ -6611,7 +6623,13 @@ static void test_debugger(DWORD cont_status) ok(de.u.Exception.ExceptionRecord.NumberParameters == 0, "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); - if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + if (stage == 12) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } + else if (stage == 13) + { + todo_wine + ok(FALSE || broken(TRUE) /* < Win10 */, "should not throw exception\n"); + continuestatus = DBG_EXCEPTION_NOT_HANDLED; } else ok(FALSE, "unexpected stage %x\n", stage); @@ -7851,7 +7869,7 @@ static void test_debugger(DWORD cont_status) "expected Pc = %p, got %p\n", (char *)code_mem_address + 4, (char *)ctx.Pc); if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } - else if (stage == 11 || stage == 12 || stage == 13) + else if (stage == 11 || stage == 12) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE, "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode, @@ -7859,7 +7877,13 @@ static void test_debugger(DWORD cont_status) ok(de.u.Exception.ExceptionRecord.NumberParameters == 0, "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); - if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + if (stage == 12) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } + else if (stage == 13) + { + todo_wine + ok(FALSE || broken(TRUE) /* < Win10 */, "should not throw exception\n"); + continuestatus = DBG_EXCEPTION_NOT_HANDLED; } else ok(FALSE, "unexpected stage %x\n", stage); @@ -8575,6 +8599,11 @@ static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *Excepti return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; } +static inline BOOL is_magic_handle(HANDLE handle) +{ + return HandleToLong(handle) >= ~5 && HandleToLong(handle) <= ~0; +} + static void test_closehandle(DWORD numexc, HANDLE handle) { PVOID vectored_handler; @@ -8590,13 +8619,17 @@ static void test_closehandle(DWORD numexc, HANDLE handle) invalid_handle_exceptions = 0; CloseHandle(handle); - ok(invalid_handle_exceptions == numexc, "CloseHandle generated %ld exceptions, expected %ld\n", - invalid_handle_exceptions, numexc); + todo_wine_if(is_magic_handle(handle)) + ok(invalid_handle_exceptions == numexc || broken(!numexc && is_magic_handle(handle)), /* < Win10 */ + "CloseHandle generated %ld exceptions, expected %ld for %p\n", + invalid_handle_exceptions, numexc, handle); invalid_handle_exceptions = 0; pNtClose(handle); - ok(invalid_handle_exceptions == numexc, "NtClose generated %ld exceptions, expected %ld\n", - invalid_handle_exceptions, numexc); + todo_wine_if(is_magic_handle(handle)) + ok(invalid_handle_exceptions == numexc || broken(!numexc && is_magic_handle(handle)), /* < Win10 */ + "CloseHandle generated %ld exceptions, expected %ld for %p\n", + invalid_handle_exceptions, numexc, handle); pRtlRemoveVectoredExceptionHandler(vectored_handler); } @@ -10676,10 +10709,19 @@ START_TEST(exception) test_breakpoint(1); test_stage = 11; test_closehandle(0, (HANDLE)0xdeadbeef); + test_closehandle(0, (HANDLE)0x7fffffff); test_stage = 12; test_closehandle(1, (HANDLE)0xdeadbeef); - test_stage = 13; - test_closehandle(0, 0); /* Special case. */ + test_closehandle(1, (HANDLE)~(ULONG_PTR)6); + test_stage = 13; /* special cases */ + test_closehandle(0, 0); + test_closehandle(0, INVALID_HANDLE_VALUE); + test_closehandle(0, GetCurrentProcess()); + test_closehandle(0, GetCurrentThread()); + test_closehandle(0, (HANDLE)~(ULONG_PTR)2); + test_closehandle(0, GetCurrentProcessToken()); + test_closehandle(0, GetCurrentThreadToken()); + test_closehandle(0, GetCurrentThreadEffectiveToken()); #if defined(__i386__) || defined(__x86_64__) test_stage = 14; test_debuggee_xstate(); -- 2.25.1

2 5

[PATCH v3 2/2] user32: use SWP_NOACTIVATE flag when resizing etched static control
by Rafał Harabień 02 Apr '22

02 Apr '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/static.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index e81e553f7d8..3c9b67b20ac 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -426,7 +426,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam rc.right = rc.left; AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); NtUserSetWindowPos( hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, - SWP_NOMOVE | SWP_NOZORDER ); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } switch (style) { -- 2.25.1

2 1

[PATCH v3 5/5] comctl32/tests: remove now unused TODO_COUNT in static control tests
by Rafał Harabień 02 Apr '22

02 Apr '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 42 +++++++++++++++--------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 278ce88b4a3..7413e194457 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -32,8 +32,6 @@ #include "v6util.h" -#define TODO_COUNT 1 - #define CTRL_ID 1995 static HWND hMainWnd; @@ -79,7 +77,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara return DefWindowProcA(hwnd, msg, wparam, lparam); } -static void test_updates(int style, int flags) +static void test_updates(int style) { HWND hStatic = create_static(style); RECT r1 = {5, 5, 30, 30}, rcClient; @@ -130,13 +128,7 @@ static void test_updates(int style, int flags) else exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */ - if (flags & TODO_COUNT) - todo_wine - ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); - else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) - ok(g_nReceivedColorStatic == exp, "Unexpected %u got %u\n", exp, g_nReceivedColorStatic); - else - ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + ok(g_nReceivedColorStatic == exp, "expected %u, got %u\n", exp, g_nReceivedColorStatic); DestroyWindow(hStatic); } @@ -422,21 +414,21 @@ START_TEST(static) GetModuleHandleA(NULL), NULL); ShowWindow(hMainWnd, SW_SHOW); - test_updates(0, 0); - test_updates(SS_ICON, 0); - test_updates(SS_BLACKRECT, 0); - test_updates(SS_WHITERECT, 0); - test_updates(SS_BLACKFRAME, 0); - test_updates(SS_WHITEFRAME, 0); - test_updates(SS_USERITEM, 0); - test_updates(SS_SIMPLE, 0); - test_updates(SS_OWNERDRAW, 0); - test_updates(SS_BITMAP, 0); - test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); - test_updates(SS_ETCHEDHORZ, 0); - test_updates(SS_ETCHEDVERT, 0); - test_updates(SS_ETCHEDFRAME, 0); - test_updates(SS_SUNKEN, 0); + test_updates(0); + test_updates(SS_ICON); + test_updates(SS_BLACKRECT); + test_updates(SS_WHITERECT); + test_updates(SS_BLACKFRAME); + test_updates(SS_WHITEFRAME); + test_updates(SS_USERITEM); + test_updates(SS_SIMPLE); + test_updates(SS_OWNERDRAW); + test_updates(SS_BITMAP); + test_updates(SS_BITMAP | SS_CENTERIMAGE); + test_updates(SS_ETCHEDHORZ); + test_updates(SS_ETCHEDVERT); + test_updates(SS_ETCHEDFRAME); + test_updates(SS_SUNKEN); test_set_text(); test_set_image(); test_STM_SETIMAGE(); -- 2.25.1

1 0

[PATCH v3 4/5] comctl32/tests: fix invalidation in static control tests
by Rafał Harabień 02 Apr '22

02 Apr '22

Rectangle used for invalidation was outside of windows rect of static controls with SS_ETCHEDHORZ/SS_ETCHEDVERT style because they resize after creation. Improve test by changing the invalidated rect and add more details in comment about SS_ETCHEDHORZ/SS_ETCHEDVERT styles. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 0e16755068f..278ce88b4a3 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -82,7 +82,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { HWND hStatic = create_static(style); - RECT r1 = {20, 20, 30, 30}, rcClient; + RECT r1 = {5, 5, 30, 30}, rcClient; int exp; LONG exstyle; @@ -128,7 +128,7 @@ static void test_updates(int style, int flags) if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) exp = 4; else - exp = 1; /* SS_ETCHED* seems to send WM_CTLCOLORSTATIC only sometimes */ + exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */ if (flags & TODO_COUNT) todo_wine -- 2.25.1

1 0

[PATCH v3 3/5] comctl32: send WM_CTLCOLORSTATIC for all static control types
by Rafał Harabień 02 Apr '22

02 Apr '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/static.c | 134 ++++++++++++++++------------------- dlls/comctl32/tests/misc.c | 4 +- dlls/comctl32/tests/static.c | 16 ++--- 3 files changed, 71 insertions(+), 83 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 0d50c2fe31c..3151cda6552 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -44,13 +44,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(static); -static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); +static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); struct static_extra_info { @@ -64,7 +64,7 @@ struct static_extra_info BOOL image_has_alpha; }; -typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); +typedef void (*pfPaint)( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = { @@ -371,6 +371,22 @@ static HICON STATIC_LoadIconW( HINSTANCE hInstance, LPCWSTR name, DWORD style ) return hicon; } +static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) +{ + HBRUSH hBrush; + HWND parent = GetParent(hwnd); + + if (!parent) parent = hwnd; + hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); + if (!hBrush) /* did the app forget to call DefWindowProc ? */ + { + /* FIXME: DefWindowProc should return different colors if a + manifest is present */ + hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); + } + return hBrush; +} + /*********************************************************************** * STATIC_TryPaintFcn * @@ -378,40 +394,26 @@ static HICON STATIC_LoadIconW( HINSTANCE hInstance, LPCWSTR name, DWORD style ) */ static VOID STATIC_TryPaintFcn(HWND hwnd, LONG full_style) { - LONG style = full_style & SS_TYPEMASK; - RECT rc; - - GetClientRect( hwnd, &rc ); - if (!IsRectEmpty(&rc) && IsWindowVisible(hwnd) && staticPaintFunc[style]) + if (IsWindowVisible(hwnd)) { + RECT rc; HDC hdc; HRGN hrgn; + HBRUSH hbrush; + LONG style = full_style & SS_TYPEMASK; + GetClientRect( hwnd, &rc ); hdc = GetDC( hwnd ); hrgn = set_control_clipping( hdc, &rc ); - (staticPaintFunc[style])( hwnd, hdc, full_style ); + hbrush = STATIC_SendWmCtlColorStatic( hwnd, hdc ); + if (staticPaintFunc[style]) + (staticPaintFunc[style])( hwnd, hdc, hbrush, full_style ); SelectClipRgn( hdc, hrgn ); if (hrgn) DeleteObject( hrgn ); ReleaseDC( hwnd, hdc ); } } -static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) -{ - HBRUSH hBrush; - HWND parent = GetParent(hwnd); - - if (!parent) parent = hwnd; - hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); - if (!hBrush) /* did the app forget to call DefWindowProc ? */ - { - /* FIXME: DefWindowProc should return different colors if a - manifest is present */ - hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); - } - return hBrush; -} - /*********************************************************************** * hasTextStyle * @@ -492,14 +494,16 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, PAINTSTRUCT ps; RECT rect; HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); + HRGN hrgn; + HBRUSH hbrush; + GetClientRect( hwnd, &rect ); + hrgn = set_control_clipping( hdc, &rect ); + hbrush = STATIC_SendWmCtlColorStatic( hwnd, hdc ); if (staticPaintFunc[style]) - { - HRGN hrgn = set_control_clipping( hdc, &rect ); - (staticPaintFunc[style])( hwnd, hdc, full_style ); - SelectClipRgn( hdc, hrgn ); - if (hrgn) DeleteObject( hrgn ); - } + (staticPaintFunc[style])( hwnd, hdc, hbrush, full_style ); + SelectClipRgn( hdc, hrgn ); + if (hrgn) DeleteObject( hrgn ); if (!wParam) EndPaint(hwnd, &ps); } break; @@ -653,7 +657,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, return lResult; } -static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { DRAWITEMSTRUCT dis; HFONT font, oldFont = NULL; @@ -671,15 +675,13 @@ static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) font = STATIC_GetFont( hwnd ); if (font) oldFont = SelectObject( hdc, font ); - SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); if (font) SelectObject( hdc, oldFont ); } -static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - HBRUSH hBrush; HFONT hFont, hOldFont = NULL; UINT format; INT len, buf_size; @@ -736,13 +738,9 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) if ((hFont = STATIC_GetFont( hwnd ))) hOldFont = SelectObject( hdc, hFont ); - /* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned - brush is not used */ - hBrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - if ((style & SS_TYPEMASK) != SS_SIMPLE) { - FillRect( hdc, &rc, hBrush ); + FillRect( hdc, &rc, hbrush ); if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); } @@ -779,56 +777,52 @@ no_TextOut: SelectObject( hdc, hOldFont ); } -static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - HBRUSH hBrush; GetClientRect( hwnd, &rc); - /* FIXME: send WM_CTLCOLORSTATIC */ switch (style & SS_TYPEMASK) { case SS_BLACKRECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); + FillRect( hdc, &rc, hbrush ); break; case SS_GRAYRECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dShadow); + FillRect( hdc, &rc, hbrush ); break; case SS_WHITERECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dHilight); + FillRect( hdc, &rc, hbrush ); break; case SS_BLACKFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); + FrameRect( hdc, &rc, hbrush ); break; case SS_GRAYFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dShadow); + FrameRect( hdc, &rc, hbrush ); break; case SS_WHITEFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dHilight); + FrameRect( hdc, &rc, hbrush ); break; default: return; } - DeleteObject( hBrush ); + DeleteObject( hbrush ); } -static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc, iconRect; - HBRUSH hbrush; HICON hIcon; SIZE size; GetClientRect( hwnd, &rc ); - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hIcon = STATIC_GetImage( hwnd, IMAGE_ICON, style ); if (!hIcon || !get_icon_size( hIcon, &size )) { @@ -851,13 +845,10 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { HDC hMemDC; HBITMAP hBitmap, oldbitmap; - HBRUSH hbrush; - - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); if ((hBitmap = STATIC_GetImage( hwnd, IMAGE_BITMAP, style )) && (GetObjectType(hBitmap) == OBJ_BITMAP) @@ -902,14 +893,12 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { HENHMETAFILE hEnhMetaFile; RECT rc; - HBRUSH hbrush; GetClientRect(hwnd, &rc); - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); FillRect(hdc, &rc, hbrush); if ((hEnhMetaFile = STATIC_GetImage( hwnd, IMAGE_ENHMETAFILE, style ))) { @@ -920,11 +909,10 @@ static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 75e2aa1862b..737778a836d 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -874,11 +874,11 @@ static void test_themed_background(void) {REBARCLASSNAMEA, 0, empty_seq}, {WC_STATICA, SS_LEFT, wm_ctlcolorstatic_seq}, {WC_STATICA, SS_ICON, wm_ctlcolorstatic_seq}, - {WC_STATICA, SS_BLACKRECT, wm_ctlcolorstatic_seq, TRUE}, + {WC_STATICA, SS_BLACKRECT, wm_ctlcolorstatic_seq}, {WC_STATICA, SS_OWNERDRAW, wm_ctlcolorstatic_seq}, {WC_STATICA, SS_BITMAP, wm_ctlcolorstatic_seq}, {WC_STATICA, SS_ENHMETAFILE, wm_ctlcolorstatic_seq}, - {WC_STATICA, SS_ETCHEDHORZ, wm_ctlcolorstatic_seq, TRUE}, + {WC_STATICA, SS_ETCHEDHORZ, wm_ctlcolorstatic_seq}, {STATUSCLASSNAMEA, 0, empty_seq}, {"SysLink", 0, wm_ctlcolorstatic_seq}, {WC_TABCONTROLA, 0, drawthemeparentbackground_seq}, diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 1c3ba2ad225..0e16755068f 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -424,18 +424,18 @@ START_TEST(static) test_updates(0, 0); test_updates(SS_ICON, 0); - test_updates(SS_BLACKRECT, TODO_COUNT); - test_updates(SS_WHITERECT, TODO_COUNT); - test_updates(SS_BLACKFRAME, TODO_COUNT); - test_updates(SS_WHITEFRAME, TODO_COUNT); - test_updates(SS_USERITEM, TODO_COUNT); + test_updates(SS_BLACKRECT, 0); + test_updates(SS_WHITERECT, 0); + test_updates(SS_BLACKFRAME, 0); + test_updates(SS_WHITEFRAME, 0); + test_updates(SS_USERITEM, 0); test_updates(SS_SIMPLE, 0); test_updates(SS_OWNERDRAW, 0); test_updates(SS_BITMAP, 0); test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); - test_updates(SS_ETCHEDHORZ, TODO_COUNT); - test_updates(SS_ETCHEDVERT, TODO_COUNT); - test_updates(SS_ETCHEDFRAME, TODO_COUNT); + test_updates(SS_ETCHEDHORZ, 0); + test_updates(SS_ETCHEDVERT, 0); + test_updates(SS_ETCHEDFRAME, 0); test_updates(SS_SUNKEN, 0); test_set_text(); test_set_image(); -- 2.25.1

1 0

[PATCH v3 2/5] comctl32: fix handling of SS_ETCHEDHORZ/SS_ETCHEDVERT static control styles
by Rafał Harabień 02 Apr '22

02 Apr '22

Instead of drawing the frame in WM_PAINT use WS_EX_STATICEDGE style that adds the frame outside of the client rect and change control size after creation to make it look like a line. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/static.c | 30 +++++++++++++++--------------- dlls/comctl32/tests/static.c | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 9b20e6a8b66..0d50c2fe31c 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -84,8 +84,8 @@ static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = STATIC_PaintOwnerDrawfn, /* SS_OWNERDRAW */ STATIC_PaintBitmapfn, /* SS_BITMAP */ STATIC_PaintEnhMetafn, /* SS_ENHMETAFILE */ - STATIC_PaintEtchedfn, /* SS_ETCHEDHORZ */ - STATIC_PaintEtchedfn, /* SS_ETCHEDVERT */ + NULL, /* SS_ETCHEDHORZ */ + NULL, /* SS_ETCHEDVERT */ STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ }; @@ -530,10 +530,21 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, { CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - if (full_style & SS_SUNKEN) + if (full_style & SS_SUNKEN || style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) SetWindowLongW( hwnd, GWL_EXSTYLE, GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); + if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) { + RECT rc; + GetClientRect(hwnd, &rc); + if (style == SS_ETCHEDHORZ) + rc.bottom = rc.top; + else + rc.right = rc.left; + AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); + SetWindowPos(hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + } + switch (style) { case SS_ICON: @@ -915,18 +926,7 @@ static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); - switch (style & SS_TYPEMASK) - { - case SS_ETCHEDHORZ: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_TOP | BF_BOTTOM); - break; - case SS_ETCHEDVERT: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_LEFT | BF_RIGHT); - break; - case SS_ETCHEDFRAME: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); - break; - } + DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); } void STATIC_Register(void) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index e676a35ede2..1c3ba2ad225 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -91,17 +91,17 @@ static void test_updates(int style, int flags) exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) - todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); else ok(exstyle == 0, "expected 0, got %d\n", exstyle); GetClientRect(hStatic, &rcClient); if (style == SS_ETCHEDVERT) - todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); else ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); if (style == SS_ETCHEDHORZ) - todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); else ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); -- 2.25.1

1 0

[PATCH v3 1/5] comctl32/tests: add more static control tests
by Rafał Harabień 02 Apr '22

02 Apr '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 7b6ac679c92..e676a35ede2 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -82,10 +82,29 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { HWND hStatic = create_static(style); - RECT r1 = {20, 20, 30, 30}; + RECT r1 = {20, 20, 30, 30}, rcClient; int exp; + LONG exstyle; flush_events(); + trace("Testing style 0x%x\n", style); + + exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); + if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) + todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + else + ok(exstyle == 0, "expected 0, got %d\n", exstyle); + + GetClientRect(hStatic, &rcClient); + if (style == SS_ETCHEDVERT) + todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + else + ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); + if (style == SS_ETCHEDHORZ) + todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + else + ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); + g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ InvalidateRect(hMainWnd, NULL, FALSE); @@ -404,14 +423,20 @@ START_TEST(static) ShowWindow(hMainWnd, SW_SHOW); test_updates(0, 0); - test_updates(SS_SIMPLE, 0); test_updates(SS_ICON, 0); - test_updates(SS_BITMAP, 0); - test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_BLACKRECT, TODO_COUNT); test_updates(SS_WHITERECT, TODO_COUNT); + test_updates(SS_BLACKFRAME, TODO_COUNT); + test_updates(SS_WHITEFRAME, TODO_COUNT); + test_updates(SS_USERITEM, TODO_COUNT); + test_updates(SS_SIMPLE, 0); + test_updates(SS_OWNERDRAW, 0); + test_updates(SS_BITMAP, 0); + test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); + test_updates(SS_ETCHEDFRAME, TODO_COUNT); + test_updates(SS_SUNKEN, 0); test_set_text(); test_set_image(); test_STM_SETIMAGE(); -- 2.25.1

1 0

[PATCH v3 1/2] user32/tests: remove redundant SS_*RECT static control tests
by Rafał Harabień 02 Apr '22

02 Apr '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/tests/static.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index a5af3315865..09e399990cd 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -344,8 +344,6 @@ START_TEST(static) test_updates(SS_OWNERDRAW); test_updates(SS_BITMAP); test_updates(SS_BITMAP | SS_CENTERIMAGE); - test_updates(SS_BLACKRECT); - test_updates(SS_WHITERECT); test_updates(SS_ETCHEDHORZ); test_updates(SS_ETCHEDVERT); test_updates(SS_ETCHEDFRAME); -- 2.25.1

1 0

[PATCH v2 5/7] comctl32: send WM_CTLCOLORSTATIC for all static control types
by Rafał Harabień 02 Apr '22

02 Apr '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/static.c | 134 ++++++++++++++++------------------- dlls/comctl32/tests/static.c | 16 ++--- 2 files changed, 69 insertions(+), 81 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 0d50c2fe31c..3151cda6552 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -44,13 +44,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(static); -static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); +static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); struct static_extra_info { @@ -64,7 +64,7 @@ struct static_extra_info BOOL image_has_alpha; }; -typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); +typedef void (*pfPaint)( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = { @@ -371,6 +371,22 @@ static HICON STATIC_LoadIconW( HINSTANCE hInstance, LPCWSTR name, DWORD style ) return hicon; } +static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) +{ + HBRUSH hBrush; + HWND parent = GetParent(hwnd); + + if (!parent) parent = hwnd; + hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); + if (!hBrush) /* did the app forget to call DefWindowProc ? */ + { + /* FIXME: DefWindowProc should return different colors if a + manifest is present */ + hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); + } + return hBrush; +} + /*********************************************************************** * STATIC_TryPaintFcn * @@ -378,40 +394,26 @@ static HICON STATIC_LoadIconW( HINSTANCE hInstance, LPCWSTR name, DWORD style ) */ static VOID STATIC_TryPaintFcn(HWND hwnd, LONG full_style) { - LONG style = full_style & SS_TYPEMASK; - RECT rc; - - GetClientRect( hwnd, &rc ); - if (!IsRectEmpty(&rc) && IsWindowVisible(hwnd) && staticPaintFunc[style]) + if (IsWindowVisible(hwnd)) { + RECT rc; HDC hdc; HRGN hrgn; + HBRUSH hbrush; + LONG style = full_style & SS_TYPEMASK; + GetClientRect( hwnd, &rc ); hdc = GetDC( hwnd ); hrgn = set_control_clipping( hdc, &rc ); - (staticPaintFunc[style])( hwnd, hdc, full_style ); + hbrush = STATIC_SendWmCtlColorStatic( hwnd, hdc ); + if (staticPaintFunc[style]) + (staticPaintFunc[style])( hwnd, hdc, hbrush, full_style ); SelectClipRgn( hdc, hrgn ); if (hrgn) DeleteObject( hrgn ); ReleaseDC( hwnd, hdc ); } } -static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) -{ - HBRUSH hBrush; - HWND parent = GetParent(hwnd); - - if (!parent) parent = hwnd; - hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); - if (!hBrush) /* did the app forget to call DefWindowProc ? */ - { - /* FIXME: DefWindowProc should return different colors if a - manifest is present */ - hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); - } - return hBrush; -} - /*********************************************************************** * hasTextStyle * @@ -492,14 +494,16 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, PAINTSTRUCT ps; RECT rect; HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); + HRGN hrgn; + HBRUSH hbrush; + GetClientRect( hwnd, &rect ); + hrgn = set_control_clipping( hdc, &rect ); + hbrush = STATIC_SendWmCtlColorStatic( hwnd, hdc ); if (staticPaintFunc[style]) - { - HRGN hrgn = set_control_clipping( hdc, &rect ); - (staticPaintFunc[style])( hwnd, hdc, full_style ); - SelectClipRgn( hdc, hrgn ); - if (hrgn) DeleteObject( hrgn ); - } + (staticPaintFunc[style])( hwnd, hdc, hbrush, full_style ); + SelectClipRgn( hdc, hrgn ); + if (hrgn) DeleteObject( hrgn ); if (!wParam) EndPaint(hwnd, &ps); } break; @@ -653,7 +657,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, return lResult; } -static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { DRAWITEMSTRUCT dis; HFONT font, oldFont = NULL; @@ -671,15 +675,13 @@ static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) font = STATIC_GetFont( hwnd ); if (font) oldFont = SelectObject( hdc, font ); - SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); if (font) SelectObject( hdc, oldFont ); } -static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - HBRUSH hBrush; HFONT hFont, hOldFont = NULL; UINT format; INT len, buf_size; @@ -736,13 +738,9 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) if ((hFont = STATIC_GetFont( hwnd ))) hOldFont = SelectObject( hdc, hFont ); - /* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned - brush is not used */ - hBrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - if ((style & SS_TYPEMASK) != SS_SIMPLE) { - FillRect( hdc, &rc, hBrush ); + FillRect( hdc, &rc, hbrush ); if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); } @@ -779,56 +777,52 @@ no_TextOut: SelectObject( hdc, hOldFont ); } -static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - HBRUSH hBrush; GetClientRect( hwnd, &rc); - /* FIXME: send WM_CTLCOLORSTATIC */ switch (style & SS_TYPEMASK) { case SS_BLACKRECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); + FillRect( hdc, &rc, hbrush ); break; case SS_GRAYRECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dShadow); + FillRect( hdc, &rc, hbrush ); break; case SS_WHITERECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dHilight); + FillRect( hdc, &rc, hbrush ); break; case SS_BLACKFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); + FrameRect( hdc, &rc, hbrush ); break; case SS_GRAYFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dShadow); + FrameRect( hdc, &rc, hbrush ); break; case SS_WHITEFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dHilight); + FrameRect( hdc, &rc, hbrush ); break; default: return; } - DeleteObject( hBrush ); + DeleteObject( hbrush ); } -static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc, iconRect; - HBRUSH hbrush; HICON hIcon; SIZE size; GetClientRect( hwnd, &rc ); - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hIcon = STATIC_GetImage( hwnd, IMAGE_ICON, style ); if (!hIcon || !get_icon_size( hIcon, &size )) { @@ -851,13 +845,10 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { HDC hMemDC; HBITMAP hBitmap, oldbitmap; - HBRUSH hbrush; - - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); if ((hBitmap = STATIC_GetImage( hwnd, IMAGE_BITMAP, style )) && (GetObjectType(hBitmap) == OBJ_BITMAP) @@ -902,14 +893,12 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { HENHMETAFILE hEnhMetaFile; RECT rc; - HBRUSH hbrush; GetClientRect(hwnd, &rc); - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); FillRect(hdc, &rc, hbrush); if ((hEnhMetaFile = STATIC_GetImage( hwnd, IMAGE_ENHMETAFILE, style ))) { @@ -920,11 +909,10 @@ static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); } diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 1c3ba2ad225..0e16755068f 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -424,18 +424,18 @@ START_TEST(static) test_updates(0, 0); test_updates(SS_ICON, 0); - test_updates(SS_BLACKRECT, TODO_COUNT); - test_updates(SS_WHITERECT, TODO_COUNT); - test_updates(SS_BLACKFRAME, TODO_COUNT); - test_updates(SS_WHITEFRAME, TODO_COUNT); - test_updates(SS_USERITEM, TODO_COUNT); + test_updates(SS_BLACKRECT, 0); + test_updates(SS_WHITERECT, 0); + test_updates(SS_BLACKFRAME, 0); + test_updates(SS_WHITEFRAME, 0); + test_updates(SS_USERITEM, 0); test_updates(SS_SIMPLE, 0); test_updates(SS_OWNERDRAW, 0); test_updates(SS_BITMAP, 0); test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); - test_updates(SS_ETCHEDHORZ, TODO_COUNT); - test_updates(SS_ETCHEDVERT, TODO_COUNT); - test_updates(SS_ETCHEDFRAME, TODO_COUNT); + test_updates(SS_ETCHEDHORZ, 0); + test_updates(SS_ETCHEDVERT, 0); + test_updates(SS_ETCHEDFRAME, 0); test_updates(SS_SUNKEN, 0); test_set_text(); test_set_image(); -- 2.25.1

2 1

[PATCH v2 2/7] user32: use SWP_NOACTIVATE flag when resizing etched static control
by Rafał Harabień 02 Apr '22

02 Apr '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/static.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index e81e553f7d8..3c9b67b20ac 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -426,7 +426,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam rc.right = rc.left; AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); NtUserSetWindowPos( hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, - SWP_NOMOVE | SWP_NOZORDER ); + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } switch (style) { -- 2.25.1

2 1

[PATCH v2 7/7] comctl32/tests: remove now unused TODO_COUNT in static control tests
by Rafał Harabień 02 Apr '22

02 Apr '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 42 +++++++++++++++--------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 278ce88b4a3..7413e194457 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -32,8 +32,6 @@ #include "v6util.h" -#define TODO_COUNT 1 - #define CTRL_ID 1995 static HWND hMainWnd; @@ -79,7 +77,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara return DefWindowProcA(hwnd, msg, wparam, lparam); } -static void test_updates(int style, int flags) +static void test_updates(int style) { HWND hStatic = create_static(style); RECT r1 = {5, 5, 30, 30}, rcClient; @@ -130,13 +128,7 @@ static void test_updates(int style, int flags) else exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */ - if (flags & TODO_COUNT) - todo_wine - ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); - else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) - ok(g_nReceivedColorStatic == exp, "Unexpected %u got %u\n", exp, g_nReceivedColorStatic); - else - ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + ok(g_nReceivedColorStatic == exp, "expected %u, got %u\n", exp, g_nReceivedColorStatic); DestroyWindow(hStatic); } @@ -422,21 +414,21 @@ START_TEST(static) GetModuleHandleA(NULL), NULL); ShowWindow(hMainWnd, SW_SHOW); - test_updates(0, 0); - test_updates(SS_ICON, 0); - test_updates(SS_BLACKRECT, 0); - test_updates(SS_WHITERECT, 0); - test_updates(SS_BLACKFRAME, 0); - test_updates(SS_WHITEFRAME, 0); - test_updates(SS_USERITEM, 0); - test_updates(SS_SIMPLE, 0); - test_updates(SS_OWNERDRAW, 0); - test_updates(SS_BITMAP, 0); - test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); - test_updates(SS_ETCHEDHORZ, 0); - test_updates(SS_ETCHEDVERT, 0); - test_updates(SS_ETCHEDFRAME, 0); - test_updates(SS_SUNKEN, 0); + test_updates(0); + test_updates(SS_ICON); + test_updates(SS_BLACKRECT); + test_updates(SS_WHITERECT); + test_updates(SS_BLACKFRAME); + test_updates(SS_WHITEFRAME); + test_updates(SS_USERITEM); + test_updates(SS_SIMPLE); + test_updates(SS_OWNERDRAW); + test_updates(SS_BITMAP); + test_updates(SS_BITMAP | SS_CENTERIMAGE); + test_updates(SS_ETCHEDHORZ); + test_updates(SS_ETCHEDVERT); + test_updates(SS_ETCHEDFRAME); + test_updates(SS_SUNKEN); test_set_text(); test_set_image(); test_STM_SETIMAGE(); -- 2.25.1

1 0

[PATCH v2 6/7] comctl32/tests: fix invalidation in static control tests
by Rafał Harabień 02 Apr '22

02 Apr '22

Rectangle used for invalidation was outside of windows rect of static controls with SS_ETCHEDHORZ/SS_ETCHEDVERT style because they resize after creation. Improve test by changing the invalidated rect and add more details in comment about SS_ETCHEDHORZ/SS_ETCHEDVERT styles. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 0e16755068f..278ce88b4a3 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -82,7 +82,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { HWND hStatic = create_static(style); - RECT r1 = {20, 20, 30, 30}, rcClient; + RECT r1 = {5, 5, 30, 30}, rcClient; int exp; LONG exstyle; @@ -128,7 +128,7 @@ static void test_updates(int style, int flags) if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) exp = 4; else - exp = 1; /* SS_ETCHED* seems to send WM_CTLCOLORSTATIC only sometimes */ + exp = 2; /* SS_ETCHEDHORZ/SS_ETCHEDVERT have empty client rect so WM_CTLCOLORSTATIC is sent only when parent window is invalidated */ if (flags & TODO_COUNT) todo_wine -- 2.25.1

1 0

[PATCH v2 4/7] comctl32: fix handling of SS_ETCHEDHORZ/SS_ETCHEDVERT static control styles
by Rafał Harabień 02 Apr '22

02 Apr '22

Instead of drawing the frame in WM_PAINT use WS_EX_STATICEDGE style that adds the frame outside of the client rect and change control size after creation to make it look like a line. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/static.c | 30 +++++++++++++++--------------- dlls/comctl32/tests/static.c | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 9b20e6a8b66..0d50c2fe31c 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -84,8 +84,8 @@ static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = STATIC_PaintOwnerDrawfn, /* SS_OWNERDRAW */ STATIC_PaintBitmapfn, /* SS_BITMAP */ STATIC_PaintEnhMetafn, /* SS_ENHMETAFILE */ - STATIC_PaintEtchedfn, /* SS_ETCHEDHORZ */ - STATIC_PaintEtchedfn, /* SS_ETCHEDVERT */ + NULL, /* SS_ETCHEDHORZ */ + NULL, /* SS_ETCHEDVERT */ STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ }; @@ -530,10 +530,21 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, { CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - if (full_style & SS_SUNKEN) + if (full_style & SS_SUNKEN || style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) SetWindowLongW( hwnd, GWL_EXSTYLE, GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); + if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) { + RECT rc; + GetClientRect(hwnd, &rc); + if (style == SS_ETCHEDHORZ) + rc.bottom = rc.top; + else + rc.right = rc.left; + AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); + SetWindowPos(hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + } + switch (style) { case SS_ICON: @@ -915,18 +926,7 @@ static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); - switch (style & SS_TYPEMASK) - { - case SS_ETCHEDHORZ: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_TOP | BF_BOTTOM); - break; - case SS_ETCHEDVERT: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_LEFT | BF_RIGHT); - break; - case SS_ETCHEDFRAME: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); - break; - } + DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); } void STATIC_Register(void) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index e676a35ede2..1c3ba2ad225 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -91,17 +91,17 @@ static void test_updates(int style, int flags) exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) - todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); else ok(exstyle == 0, "expected 0, got %d\n", exstyle); GetClientRect(hStatic, &rcClient); if (style == SS_ETCHEDVERT) - todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); else ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); if (style == SS_ETCHEDHORZ) - todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); else ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); -- 2.25.1

1 0

[PATCH v2 3/7] comctl32/tests: add more static control tests
by Rafał Harabień 02 Apr '22

02 Apr '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 7b6ac679c92..e676a35ede2 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -82,10 +82,29 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { HWND hStatic = create_static(style); - RECT r1 = {20, 20, 30, 30}; + RECT r1 = {20, 20, 30, 30}, rcClient; int exp; + LONG exstyle; flush_events(); + trace("Testing style 0x%x\n", style); + + exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); + if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) + todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + else + ok(exstyle == 0, "expected 0, got %d\n", exstyle); + + GetClientRect(hStatic, &rcClient); + if (style == SS_ETCHEDVERT) + todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + else + ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); + if (style == SS_ETCHEDHORZ) + todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + else + ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); + g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ InvalidateRect(hMainWnd, NULL, FALSE); @@ -404,14 +423,20 @@ START_TEST(static) ShowWindow(hMainWnd, SW_SHOW); test_updates(0, 0); - test_updates(SS_SIMPLE, 0); test_updates(SS_ICON, 0); - test_updates(SS_BITMAP, 0); - test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_BLACKRECT, TODO_COUNT); test_updates(SS_WHITERECT, TODO_COUNT); + test_updates(SS_BLACKFRAME, TODO_COUNT); + test_updates(SS_WHITEFRAME, TODO_COUNT); + test_updates(SS_USERITEM, TODO_COUNT); + test_updates(SS_SIMPLE, 0); + test_updates(SS_OWNERDRAW, 0); + test_updates(SS_BITMAP, 0); + test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); + test_updates(SS_ETCHEDFRAME, TODO_COUNT); + test_updates(SS_SUNKEN, 0); test_set_text(); test_set_image(); test_STM_SETIMAGE(); -- 2.25.1

1 0

[PATCH v2 1/7] user32/tests: remove redundant SS_*RECT static control tests
by Rafał Harabień 02 Apr '22

02 Apr '22

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/tests/static.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index a5af3315865..09e399990cd 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -344,8 +344,6 @@ START_TEST(static) test_updates(SS_OWNERDRAW); test_updates(SS_BITMAP); test_updates(SS_BITMAP | SS_CENTERIMAGE); - test_updates(SS_BLACKRECT); - test_updates(SS_WHITERECT); test_updates(SS_ETCHEDHORZ); test_updates(SS_ETCHEDVERT); test_updates(SS_ETCHEDFRAME); -- 2.25.1

1 0

[PATCH] mfplat/tests: Fix segfault while exiting
by Yuxuan Shui 02 Apr '22

02 Apr '22

A media source created in test_source_resolver is not shut down, causing the read_thread to read from freed memory while the program is exiting. Signed-off-by: Yuxuan Shui <yshuiv7(a)gmail.com> --- dlls/mfplat/tests/mfplat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 16d24bbff51..ff18bba57e3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -603,6 +603,8 @@ static HRESULT WINAPI test_create_from_file_handler_callback_Invoke(IMFAsyncCall hr = IMFAsyncResult_GetObject(result, &object2); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + if (obj_type == MF_OBJECT_MEDIASOURCE) + IMFMediaSource_Shutdown((void *)object); IUnknown_Release(object); } -- 2.35.1

1 0

[PATCH v3 1/3] msvcr100: Add _StructuredTaskCollection::_Schedule stub.
by Torge Matthies 02 Apr '22

02 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47375 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- v1 -> v2: Added wine bug link, renamed structured_task_collection to StructuredTaskCollection. v2 -> v3: Fix build error. dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/concurrency.c | 12 ++++++++++++ 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 50db9348327..ab57c736672 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -596,7 +596,7 @@ @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 19b4cbe96d7..68a78a6aa16 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -364,7 +364,7 @@ @ stub -arch=win32 ?_RunAndWait@_TaskCollection@details@Concurrency@@QAG?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=win32 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=win32 ?_Schedule@_TaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z @ stub -arch=win64 ?_Schedule@_TaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z @ thiscall -arch=win32 ?_SetSpinCount@?$_SpinWait@$00@details@Concurrency@@QAEXI@Z(ptr long) SpinWait__SetSpinCount diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 23840f85eda..0f5eaf9ac51 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -616,7 +616,7 @@ @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64ddeed42f4..332a617932e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -598,7 +598,7 @@ @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05f408d6884..ee2ee2c42a1 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -594,7 +594,7 @@ @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) msvcr120.?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 54b2c49db99..478fa54dc57 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -174,6 +174,11 @@ typedef struct cs_queue #endif } cs_queue; +typedef struct +{ + char dummy; +} StructuredTaskCollection; + typedef struct { ULONG_PTR unk_thread_id; @@ -1706,6 +1711,13 @@ bool __thiscall SpinWait__SpinOnce(SpinWait *this) } } +/* ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z */ +DEFINE_THISCALL_WRAPPER(StructuredTaskCollection__Schedule, 8) +void __thiscall StructuredTaskCollection__Schedule(StructuredTaskCollection *this, /*Concurrency::details::_UnrealizedChore*/void *chore) +{ + FIXME("(%p %p): stub!\n", this, chore); +} + /* ??0critical_section@Concurrency@@QAE@XZ */ /* ??0critical_section@Concurrency@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4) -- 2.35.1

2 3

[PATCH v2] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 02 Apr '22

02 Apr '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: When XmbResetIC is called and KeyEvent occurs, it is a problem with some IME (i.e., ibus-hangul). --- dlls/winex11.drv/ime.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..f44b50550ec 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -704,6 +704,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) { case CPS_COMPLETE: { + HWND hwnd; HIMCC newCompStr; DWORD cplen = 0; LPWSTR cpstr; @@ -753,6 +754,12 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + hwnd = GetActiveWindow(); + if (hwnd) + { + X11DRV_ForceXIMReset(hwnd); + } + bRet = TRUE; } break; -- 2.32.0

3 4

[PATCH v4 1/3] winex11.drv: introduce X11DRV_FindXIC() and update X11DRV_ForceXIMReset()
by Alex Kwak 02 Apr '22

02 Apr '22

HWND used in X11DRV_ForceXIMReset() is not the HWND in which the XIC is created, but the HWND belonging to the child. So, it doesn't work call this function. Therefore, introduce X11DRV_FindXIC() for finding nearest XIC. this function finds the already created XIC in itself and parents. Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xim.c | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f389f3e0836..1d181b76295 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -827,6 +827,7 @@ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; extern void X11DRV_SetupXIM(void) DECLSPEC_HIDDEN; extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDEN; +extern XIC X11DRV_FindXIC(HWND hwnd) DECLSPEC_HIDDEN; extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; extern void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..5dab82182d6 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -249,9 +249,32 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, TRACE("Finished\n"); } +/** + * X11DRV_FindXIC + * + * This function finds the already created XIC in itself and parents. + * If only the specified handle is get via X11DRV_get_ic, the XIC can be exists + * in the parents and cannot be get. + */ +XIC X11DRV_FindXIC(HWND hwnd) +{ + XIC ic = NULL; + + while (hwnd) + { + ic = get_win_data(hwnd)->xic; + if (ic) + break; + else + hwnd = GetParent(hwnd); + } + + return ic; +} + void X11DRV_ForceXIMReset(HWND hwnd) { - XIC ic = X11DRV_get_ic(hwnd); + XIC ic = X11DRV_FindXIC(hwnd); if (ic) { char* leftover; -- 2.32.0

1 2

[PATCH] ntdll: Optimize memcpy for x86-64.
by Elaine Lefler 02 Apr '22

02 Apr '22

Signed-off-by: Elaine Lefler <elaineclefler(a)gmail.com> --- New vectorized implementation improves performance up to 65%. --- dlls/ntdll/string.c | 162 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 159 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 0fa83821d21..443fc98418a 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -33,6 +33,16 @@ #include "winternl.h" #include "ntdll_misc.h" +#ifdef __x86_64__ + +#include <x86intrin.h> + +/* Enable vectorized memcpy implementation (all x86-64 CPUs have SSE2). + * TODO: This could be enabled for x86 with a cpuid check. */ +#define SSE2_MEMCPY + +#endif + /* same as wctypes except for TAB, which doesn't have C1_BLANK for some reason... */ static const unsigned short ctypes[257] = @@ -96,10 +106,154 @@ int __cdecl memcmp( const void *ptr1, const void *ptr2, size_t n ) /********************************************************************* * memcpy (NTDLL.@) - * - * NOTES - * Behaves like memmove. */ +#ifdef SSE2_MEMCPY + +#define declare_fastcpy(n) \ +static void fastcpy_ ## n \ +( uintptr_t as, const uintptr_t as_end, uintptr_t d ) \ +{ \ + __m128i x, y; \ + x = *(const __m128i*)as; \ + /* Read 32 bytes in, 16 bytes out. Shuffle variables when done so we don't + * re-read the first part. */ \ + while (as < as_end) \ + { \ + /* Prefetch hint improves performance by minimizing cache pollution */ \ + _mm_prefetch((const void*)(as + 16), _MM_HINT_NTA); \ + _mm_prefetch((const void*)d, _MM_HINT_NTA); \ + y = *(const __m128i*)(as + 16); \ + /* (n) is the number of bytes in *as that don't go to *d. Little endian + * means the first bytes appear on the right, so srl to remove them */ \ + x = _mm_srli_si128(x, (n)); \ + /* Take same number of bytes from *(as + 16) and push them to the upper + * part of the register */ \ + x = _mm_or_si128(x, _mm_slli_si128(y, 16 - (n))); \ + *(__m128i*)d = x; \ + d += 16; \ + as += 16; \ + x = y; \ + } \ +} + +declare_fastcpy(1) +declare_fastcpy(2) +declare_fastcpy(3) +declare_fastcpy(4) +declare_fastcpy(5) +declare_fastcpy(6) +declare_fastcpy(7) +declare_fastcpy(8) +declare_fastcpy(9) +declare_fastcpy(10) +declare_fastcpy(11) +declare_fastcpy(12) +declare_fastcpy(13) +declare_fastcpy(14) +declare_fastcpy(15) + +typedef void (*fastcpy_ptr) ( uintptr_t, const uintptr_t, uintptr_t ); + +static const fastcpy_ptr fastcpy_table[16] = { + NULL, /* special case, different code path */ + fastcpy_1, + fastcpy_2, + fastcpy_3, + fastcpy_4, + fastcpy_5, + fastcpy_6, + fastcpy_7, + fastcpy_8, + fastcpy_9, + fastcpy_10, + fastcpy_11, + fastcpy_12, + fastcpy_13, + fastcpy_14, + fastcpy_15 +}; + +void * __cdecl memcpy( void *dst, const void *src, size_t n ) +{ + uintptr_t s = (uintptr_t)src; + uintptr_t d = (uintptr_t)dst; + uintptr_t as; + + _mm_prefetch((const void*)s, _MM_HINT_NTA); + _mm_prefetch((const void*)d, _MM_HINT_NTA); + + /* Ensure aligned destination */ + while (d & 15) + { + if (n-- == 0) + return dst; + *(BYTE*)d++ = *(const BYTE*)s++; + } + + if (n < 16) + { + /* Too small to vectorize */ + while (n--) *(BYTE*)d++ = *(const BYTE*)s++; + return dst; + } + + as = s & ~15; + if (as == s) + { + /* Fastest path: both pointers aligned */ + while (n >= 16) + { + _mm_prefetch((const void*)s, _MM_HINT_NTA); + _mm_prefetch((const void*)d, _MM_HINT_NTA); + *(__m128i*)d = *(const __m128i*)s; + + d += 16; + s += 16; + n -= 16; + } + } + else + { + /* Read from aligned s by rounding down. If as < src, we need to slow + * copy another 16 bytes to avoid OOB reads. */ + ptrdiff_t shift = s - as; + uintptr_t as_end = ((s + n) & ~15) - 16; + + if (as < (uintptr_t)src) + { + uintptr_t target_n = n - 16; + while (n > target_n) + { + if (n-- == 0) + return dst; + *(BYTE*)d++ = *(const BYTE*)s++; + } + + as += 16; + } + + /* Copy 16-byte chunks if any are possible. Since s is misaligned, we + * need to read one chunk ahead of what we're writing, which means + * as_end must point to the _beginning_ of the last readable chunk. + * This also guarantees there is no overrun, since delta < n - 16. */ + if (as_end > as) + { + ptrdiff_t delta = as_end - as; + fastcpy_table[shift](as, as_end, d); + s += delta; + d += delta; + n -= delta; + } + } + + /* Slow copy anything that remains */ + while (n--) *(BYTE*)d++ = *(const BYTE*)s++; + return dst; +} + +#else /* defined(SSE2_MEMCPY) */ + +/* Note: Behaves like memmove */ void * __cdecl memcpy( void *dst, const void *src, size_t n ) { volatile unsigned char *d = dst; /* avoid gcc optimizations */ @@ -118,6 +272,8 @@ void * __cdecl memcpy( void *dst, const void *src, size_t n ) return dst; } +#endif /* !defined(SSE2_MEMCPY) */ + /********************************************************************* * memmove (NTDLL.@) -- 2.32.0 (Apple Git-132)

5 8

[PATCH] winetest: Create processes with DETACHED_PROCESS flag.
by Rémi Bernon 02 Apr '22

02 Apr '22

So that it doesn't automatically create a console window when there is not one already. Fixing a regression from f034084d49b354811096524d472ae5172ac1cebf. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Same as for the TestLauncher patch, I'm not completely sure what DETACHED_PROCESS does, but as it uses STARTF_USESTDHANDLES too I think the kernelbase create_process_params path taken should mostly be the same, except that it will never force CONSOLE_HANDLE_ALLOC. programs/winetest/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index eb86770afbf..4ff2995714f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -619,7 +619,7 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, BOOL nocritic { STARTUPINFOA si; PROCESS_INFORMATION pi; - DWORD wait, status, flags; + DWORD wait, status, flags = DETACHED_PROCESS; UINT old_errmode; /* Flush to disk so we know which test caused Windows to crash if it does */ @@ -635,10 +635,9 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, BOOL nocritic { old_errmode = SetErrorMode(0); SetErrorMode(old_errmode | SEM_FAILCRITICALERRORS); - flags = 0; } else - flags = CREATE_DEFAULT_ERROR_MODE; + flags |= CREATE_DEFAULT_ERROR_MODE; if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, flags, NULL, tempdir, &si, &pi)) -- 2.35.1

8 17

[PATCH 1/2] dlls/mciwave.c: correctly handle error return status from mmioRead
by Eric Pouech 01 Apr '22

01 Apr '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Supersedes 230982 --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 1d9abce84a3..3ca884ed6e0 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -291,7 +291,7 @@ 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)) { + if (r < 0 || r < sizeof(PCMWAVEFORMAT)) { HeapFree(GetProcessHeap(), 0, pwfx); return MCIERR_INVALID_FILE; }

2 3

[PATCH 1/6] include/winerror.h: Add missing WinRT HRESULT codes.
by Bernhard Kölbl 01 Apr '22

01 Apr '22

Taken from MSDN and original winerror.h. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/winerror.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index b63b74a5b18..d51d5648cdb 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2578,6 +2578,25 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define E_CHANGED_STATE _HRESULT_TYPEDEF_(0x8000000C) #define E_ILLEGAL_STATE_CHANGE _HRESULT_TYPEDEF_(0x8000000D) #define E_ILLEGAL_METHOD_CALL _HRESULT_TYPEDEF_(0x8000000E) +#define RO_E_METADATA_NAME_NOT_FOUND _HRESULT_TYPEDEF_(0x8000000F) +#define RO_E_METADATA_NAME_IS_NAMESPACE _HRESULT_TYPEDEF_(0x80000010) +#define RO_E_METADATA_INVALID_TYPE_FORMAT _HRESULT_TYPEDEF_(0x80000011) +#define RO_E_INVALID_METADATA_FILE _HRESULT_TYPEDEF_(0x80000012) +#define RO_E_CLOSED _HRESULT_TYPEDEF_(0x80000013) +#define RO_E_EXCLUSIVE_WRITE _HRESULT_TYPEDEF_(0x80000014) +#define RO_E_CHANGE_NOTIFICATION_IN_PROGRESS _HRESULT_TYPEDEF_(0x80000015) +#define RO_E_ERROR_STRING_NOT_FOUND _HRESULT_TYPEDEF_(0x80000016) +#define E_STRING_NOT_NULL_TERMINATED _HRESULT_TYPEDEF_(0x80000017) +#define E_ILLEGAL_DELEGATE_ASSIGNMENT _HRESULT_TYPEDEF_(0x80000018) +#define E_ASYNC_OPERATION_NOT_STARTED _HRESULT_TYPEDEF_(0x80000019) +#define E_APPLICATION_EXITING _HRESULT_TYPEDEF_(0x8000001A) +#define E_APPLICATION_VIEW_EXITING _HRESULT_TYPEDEF_(0x8000001B) +#define RO_E_MUST_BE_AGILE _HRESULT_TYPEDEF_(0x8000001C) +#define RO_E_UNSUPPORTED_FROM_MTA _HRESULT_TYPEDEF_(0x8000001D) +#define RO_E_COMMITTED _HRESULT_TYPEDEF_(0x8000001E) +#define RO_E_BLOCKED_CROSS_ASTA_CALL _HRESULT_TYPEDEF_(0x8000001F) +#define RO_E_CANNOT_ACTIVATE_FULL_TRUST_SERVER _HRESULT_TYPEDEF_(0x80000020) +#define RO_E_CANNOT_ACTIVATE_UNIVERSAL_APPLICATION_SERVER _HRESULT_TYPEDEF_(0x80000021) #define E_NOTIMPL _HRESULT_TYPEDEF_(0x80004001) #define E_NOINTERFACE _HRESULT_TYPEDEF_(0x80004002) -- 2.35.1

3 14

[PATCH 1/5] kernel32: Return TRUE from GlobalUnlock on invalid handle error.
by Rémi Bernon 01 Apr '22

01 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/heap.c | 4 +++- dlls/kernel32/tests/heap.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index dbb240d89fc..9cce4402aed 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -234,8 +234,10 @@ void *WINAPI GlobalLock( HGLOBAL handle ) */ BOOL WINAPI GlobalUnlock( HGLOBAL handle ) { + BOOL ret; if (unsafe_ptr_from_HLOCAL( handle )) return TRUE; - return LocalUnlock( handle ); + if ((ret = LocalUnlock( handle )) || !GetLastError()) return ret; + return GetLastError() != ERROR_NOT_LOCKED; } diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 476be96cea8..25f5e367e7c 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -524,7 +524,6 @@ static void test_GlobalAlloc(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = GlobalUnlock( mem ); - todo_wine ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); #if 0 /* corrupts Wine heap */ -- 2.35.1

2 5

[PATCH v2 1/3] msvcr100: Add _StructuredTaskCollection::_Schedule stub.
by Torge Matthies 01 Apr '22

01 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47375 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- v1 -> v2: Added wine bug link, renamed structured_task_collection to StructuredTaskCollection. dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/concurrency.c | 12 ++++++++++++ 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 50db9348327..ab57c736672 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -596,7 +596,7 @@ @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 19b4cbe96d7..68a78a6aa16 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -364,7 +364,7 @@ @ stub -arch=win32 ?_RunAndWait@_TaskCollection@details@Concurrency@@QAG?AW4_TaskCollectionStatus@23@PAV_UnrealizedChore@23@@Z @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=win32 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=win32 ?_Schedule@_TaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z @ stub -arch=win64 ?_Schedule@_TaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z @ thiscall -arch=win32 ?_SetSpinCount@?$_SpinWait@$00@details@Concurrency@@QAEXI@Z(ptr long) SpinWait__SetSpinCount diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 23840f85eda..0f5eaf9ac51 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -616,7 +616,7 @@ @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64ddeed42f4..332a617932e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -598,7 +598,7 @@ @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05f408d6884..d70f1423f68 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -594,7 +594,7 @@ @ stub -arch=win64 ?_RunAndWait@_TaskCollection@details@Concurrency@@QEAA?AW4_TaskCollectionStatus@23@PEAV_UnrealizedChore@23@@Z @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@@Z -@ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z +@ thiscall -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAAXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=i386 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QAEXPAV_UnrealizedChore@23@PAVlocation@3@@Z @ stub -arch=win64 ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@PEAVlocation@3@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 54b2c49db99..478fa54dc57 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -174,6 +174,11 @@ typedef struct cs_queue #endif } cs_queue; +typedef struct +{ + char dummy; +} StructuredTaskCollection; + typedef struct { ULONG_PTR unk_thread_id; @@ -1706,6 +1711,13 @@ bool __thiscall SpinWait__SpinOnce(SpinWait *this) } } +/* ?_Schedule@_StructuredTaskCollection@details@Concurrency@@QEAAXPEAV_UnrealizedChore@23@@Z */ +DEFINE_THISCALL_WRAPPER(StructuredTaskCollection__Schedule, 8) +void __thiscall StructuredTaskCollection__Schedule(StructuredTaskCollection *this, /*Concurrency::details::_UnrealizedChore*/void *chore) +{ + FIXME("(%p %p): stub!\n", this, chore); +} + /* ??0critical_section@Concurrency@@QAE@XZ */ /* ??0critical_section@Concurrency@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4) -- 2.35.1

2 6

[PATCH] wined3d: Reset and reuse Vulkan descriptor pools.
by Jan Sikorski 01 Apr '22

01 Apr '22

Creating and destroying them is fairly slow. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 104 +++++++++++++++++++++++---------- dlls/wined3d/view.c | 4 +- dlls/wined3d/wined3d_private.h | 9 ++- 3 files changed, 79 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 436973fe76f..9891bf0b541 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -685,17 +685,33 @@ void wined3d_context_vk_destroy_vk_framebuffer(struct wined3d_context_vk *contex o->command_buffer_id = command_buffer_id; } -static void wined3d_context_vk_destroy_vk_descriptor_pool(struct wined3d_context_vk *context_vk, - VkDescriptorPool vk_descriptor_pool, uint64_t command_buffer_id) +static void wined3d_context_vk_return_vk_descriptor_pool(struct wined3d_context_vk *context_vk, + VkDescriptorPool vk_descriptor_pool) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + if (!wined3d_array_reserve((void **)&context_vk->vk_descriptor_pools, &context_vk->vk_descriptor_pools_size, + context_vk->vk_descriptor_pool_count + 1, sizeof(*context_vk->vk_descriptor_pools))) + { + VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, vk_descriptor_pool, NULL)); + TRACE("Destroying descriptor pool 0x%s.\n", wine_dbgstr_longlong(vk_descriptor_pool)); + return; + } + + VK_CALL(vkResetDescriptorPool(device_vk->vk_device, vk_descriptor_pool, 0)); + context_vk->vk_descriptor_pools[context_vk->vk_descriptor_pool_count++] = vk_descriptor_pool; +} + +static void wined3d_context_vk_reset_vk_descriptor_pool(struct wined3d_context_vk *context_vk, + VkDescriptorPool vk_descriptor_pool, uint64_t command_buffer_id) +{ struct wined3d_retired_object_vk *o; if (context_vk->completed_command_buffer_id > command_buffer_id) { - VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, vk_descriptor_pool, NULL)); - TRACE("Destroyed descriptor pool 0x%s.\n", wine_dbgstr_longlong(vk_descriptor_pool)); + wined3d_context_vk_return_vk_descriptor_pool(context_vk, vk_descriptor_pool); + TRACE("Reset descriptor pool 0x%s.\n", wine_dbgstr_longlong(vk_descriptor_pool)); return; } @@ -1111,8 +1127,8 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont break; case WINED3D_RETIRED_DESCRIPTOR_POOL_VK: - VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, o->u.vk_descriptor_pool, NULL)); - TRACE("Destroyed descriptor pool 0x%s.\n", wine_dbgstr_longlong(o->u.vk_descriptor_pool)); + wined3d_context_vk_return_vk_descriptor_pool(context_vk, o->u.vk_descriptor_pool); + TRACE("Reset descriptor pool 0x%s.\n", wine_dbgstr_longlong(o->u.vk_descriptor_pool)); break; case WINED3D_RETIRED_MEMORY_VK: @@ -1581,6 +1597,7 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) struct wined3d_command_buffer_vk *buffer = &context_vk->current_command_buffer; struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; + unsigned int i; if (buffer->vk_command_buffer) { @@ -1594,8 +1611,9 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) heap_free(context_vk->compute.bindings.bindings); heap_free(context_vk->graphics.bindings.bindings); - if (context_vk->vk_descriptor_pool) - VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, context_vk->vk_descriptor_pool, NULL)); + for (i = 0; i < context_vk->vk_descriptor_pool_count; ++i) + VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, context_vk->vk_descriptor_pools[i], NULL)); + heap_free(context_vk->vk_descriptor_pools); if (context_vk->vk_framebuffer) VK_CALL(vkDestroyFramebuffer(device_vk->vk_device, context_vk->vk_framebuffer, NULL)); VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); @@ -2655,48 +2673,71 @@ static VkResult wined3d_context_vk_create_vk_descriptor_pool(struct wined3d_devi return vr; } -VkResult wined3d_context_vk_create_vk_descriptor_set(struct wined3d_context_vk *context_vk, - VkDescriptorSetLayout vk_set_layout, VkDescriptorSet *vk_descriptor_set) +VkDescriptorPool wined3d_context_vk_get_vk_descriptor_pool(struct wined3d_context_vk *context_vk) { - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - struct VkDescriptorSetAllocateInfo set_desc; VkResult vr; - if (!context_vk->vk_descriptor_pool && (vr = wined3d_context_vk_create_vk_descriptor_pool(device_vk, - vk_info, &context_vk->vk_descriptor_pool))) + if (context_vk->vk_descriptor_pool_count) + return context_vk->vk_descriptor_pools[0]; + + if (!wined3d_array_reserve((void **)&context_vk->vk_descriptor_pools, &context_vk->vk_descriptor_pools_size, + 1, sizeof(*context_vk->vk_descriptor_pools))) + { + ERR("Failed to allocate array.\n"); + return VK_NULL_HANDLE; + } + + if ((vr = wined3d_context_vk_create_vk_descriptor_pool(wined3d_device_vk(context_vk->c.device), + context_vk->vk_info, context_vk->vk_descriptor_pools))) { WARN("Failed to create descriptor pool, vr %s.\n", wined3d_debug_vkresult(vr)); - return vr; + return VK_NULL_HANDLE; } + context_vk->vk_descriptor_pool_count = 1; + return context_vk->vk_descriptor_pools[0]; +} + +VkDescriptorSet wined3d_context_vk_create_vk_descriptor_set(struct wined3d_context_vk *context_vk, + VkDescriptorSetLayout vk_set_layout) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct VkDescriptorSetAllocateInfo set_desc; + VkDescriptorPool vk_descriptor_pool; + VkDescriptorSet vk_descriptor_set; + VkResult vr; + + if (!(vk_descriptor_pool = wined3d_context_vk_get_vk_descriptor_pool(context_vk))) + return VK_NULL_HANDLE; + set_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; set_desc.pNext = NULL; - set_desc.descriptorPool = context_vk->vk_descriptor_pool; + set_desc.descriptorPool = vk_descriptor_pool; set_desc.descriptorSetCount = 1; set_desc.pSetLayouts = &vk_set_layout; - if ((vr = VK_CALL(vkAllocateDescriptorSets(device_vk->vk_device, &set_desc, vk_descriptor_set))) >= 0) - return vr; + if ((vr = VK_CALL(vkAllocateDescriptorSets(device_vk->vk_device, &set_desc, &vk_descriptor_set))) >= 0) + return vk_descriptor_set; if (vr == VK_ERROR_FRAGMENTED_POOL || vr == VK_ERROR_OUT_OF_POOL_MEMORY) { - wined3d_context_vk_destroy_vk_descriptor_pool(context_vk, - context_vk->vk_descriptor_pool, context_vk->current_command_buffer.id); - context_vk->vk_descriptor_pool = VK_NULL_HANDLE; - if ((vr = wined3d_context_vk_create_vk_descriptor_pool(device_vk, vk_info, &context_vk->vk_descriptor_pool))) + wined3d_context_vk_reset_vk_descriptor_pool(context_vk, + vk_descriptor_pool, context_vk->current_command_buffer.id); + context_vk->vk_descriptor_pools[0] = context_vk->vk_descriptor_pools[--context_vk->vk_descriptor_pool_count]; + if (!(vk_descriptor_pool = wined3d_context_vk_get_vk_descriptor_pool(context_vk))) { - WARN("Failed to create descriptor pool, vr %s.\n", wined3d_debug_vkresult(vr)); - return vr; + WARN("Failed to create descriptor pool.\n"); + return VK_NULL_HANDLE; } - set_desc.descriptorPool = context_vk->vk_descriptor_pool; - if ((vr = VK_CALL(vkAllocateDescriptorSets(device_vk->vk_device, &set_desc, vk_descriptor_set))) >= 0) - return vr; + set_desc.descriptorPool = vk_descriptor_pool; + if ((vr = VK_CALL(vkAllocateDescriptorSets(device_vk->vk_device, &set_desc, &vk_descriptor_set))) >= 0) + return vk_descriptor_set; } WARN("Failed to allocate descriptor set, vr %s.\n", wined3d_debug_vkresult(vr)); - return vr; + return VK_NULL_HANDLE; } static bool wined3d_shader_descriptor_writes_vk_add_write(struct wined3d_shader_descriptor_writes_vk *writes, @@ -2949,7 +2990,6 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con VkPipelineLayout vk_pipeline_layout; VkPipelineBindPoint vk_bind_point; VkDescriptorSet vk_descriptor_set; - VkResult vr; size_t i; switch (pipeline) @@ -2973,9 +3013,9 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; } - if ((vr = wined3d_context_vk_create_vk_descriptor_set(context_vk, vk_set_layout, &vk_descriptor_set))) + if (!(vk_descriptor_set = wined3d_context_vk_create_vk_descriptor_set(context_vk, vk_set_layout))) { - WARN("Failed to create descriptor set, vr %s.\n", wined3d_debug_vkresult(vr)); + WARN("Failed to create descriptor set.\n"); return false; } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 087aa21b75d..051da2891f3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1922,7 +1922,6 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view DWORD uav_location; unsigned int level; bool is_array; - VkResult vr; device_vk = wined3d_device_vk(device); state = &device_vk->uav_clear_state; @@ -2124,8 +2123,7 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view vk_info = context_vk->vk_info; - vr = wined3d_context_vk_create_vk_descriptor_set(context_vk, layout->vk_set_layout, &vk_writes[0].dstSet); - if (vr != VK_SUCCESS) + if (!(vk_writes[0].dstSet = wined3d_context_vk_create_vk_descriptor_set(context_vk, layout->vk_set_layout))) { ERR("Failed to create descriptor set.\n"); wined3d_context_vk_destroy_bo(context_vk, &constants_bo); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 574bcdaa26f..54bccb3db5e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2600,7 +2600,10 @@ struct wined3d_context_vk VkFramebuffer vk_framebuffer; VkRenderPass vk_render_pass; - VkDescriptorPool vk_descriptor_pool; + + SIZE_T vk_descriptor_pools_size; + SIZE_T vk_descriptor_pool_count; + VkDescriptorPool *vk_descriptor_pools; VkSampleCountFlagBits sample_count; unsigned int rt_count; @@ -2682,8 +2685,8 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context unsigned int wait_semaphore_count, const VkSemaphore *wait_semaphores, const VkPipelineStageFlags *wait_stages, unsigned int signal_semaphore_count, const VkSemaphore *signal_semaphores) DECLSPEC_HIDDEN; void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_vk, uint64_t id) DECLSPEC_HIDDEN; -VkResult wined3d_context_vk_create_vk_descriptor_set(struct wined3d_context_vk *context_vk, - VkDescriptorSetLayout vk_set_layout, VkDescriptorSet *vk_descriptor_set) DECLSPEC_HIDDEN; +VkDescriptorSet wined3d_context_vk_create_vk_descriptor_set(struct wined3d_context_vk *context_vk, + VkDescriptorSetLayout vk_set_layout) DECLSPEC_HIDDEN; typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); -- 2.32.0

3 2

[PATCH v2 1/3] include: Add defines for ID2D1DeviceContext2.
by Ziqing Hui 01 Apr '22

01 Apr '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Add missing CreateTransformedImageSource. include/d2d1_3.idl | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index d1030d19d9e..2eeda0dd616 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -53,6 +53,21 @@ typedef enum D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS_FORCE_DWORD = 0xffffffff } D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS; +typedef enum D2D1_IMAGE_SOURCE_LOADING_OPTIONS +{ + D2D1_IMAGE_SOURCE_LOADING_OPTIONS_NONE = 0x0, + D2D1_IMAGE_SOURCE_LOADING_OPTIONS_RELEASE_SOURCE = 0x1, + D2D1_IMAGE_SOURCE_LOADING_OPTIONS_CACHE_ON_DEMAND = 0x2, + D2D1_IMAGE_SOURCE_LOADING_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_IMAGE_SOURCE_LOADING_OPTIONS; + +typedef enum D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS +{ + D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS_NONE = 0x0, + D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS_LOW_QUALITY_PRIMARY_CONVERSION = 0x1, + D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS; + typedef struct D2D1_INK_POINT { float x; @@ -67,6 +82,12 @@ typedef struct D2D1_INK_BEZIER_SEGMENT D2D1_INK_POINT point3; } D2D1_INK_BEZIER_SEGMENT; +typedef struct D2D1_INK_STYLE_PROPERTIES +{ + D2D1_INK_NIB_SHAPE nibShape; + D2D1_MATRIX_3X2_F nibTransform; +} D2D1_INK_STYLE_PROPERTIES; + typedef struct D2D1_GRADIENT_MESH_PATCH { D2D1_POINT_2F point00; @@ -228,3 +249,77 @@ interface ID2D1TransformedImageSource : ID2D1Image [out] D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *out ); }; + +[ + object, + uuid(53dd9855-a3b0-4d5b-82e1-26e25c5e5797), + local, +] +interface ID2D1LookupTable3D : ID2D1Resource +{ +} + +[ + object, + uuid(394ea6a3-0c34-4321-950b-6ca20f0be6c7), + local, +] +interface ID2D1DeviceContext2 : ID2D1DeviceContext1 +{ + HRESULT CreateInk( + [in] const D2D1_INK_POINT *start_point, + [out] ID2D1Ink **ink + ); + HRESULT CreateInkStyle( + [in, optional] const D2D1_INK_STYLE_PROPERTIES *ink_style_properties, + [out] ID2D1InkStyle **ink_style + ); + HRESULT CreateGradientMesh( + [in] const D2D1_GRADIENT_MESH_PATCH *patches, + [in] UINT32 patches_count, + [out] ID2D1GradientMesh **gradient_mesh + ); + HRESULT CreateImageSourceFromWic( + [in] IWICBitmapSource *wic_bitmap_source, + [in] D2D1_IMAGE_SOURCE_LOADING_OPTIONS loading_options, + [in] D2D1_ALPHA_MODE alpha_mode, + [out] ID2D1ImageSourceFromWic **image_source + ); + HRESULT CreateLookupTable3D( + [in] D2D1_BUFFER_PRECISION precision, + [in] const UINT32 *extents, + [in] const BYTE *data, + [in] UINT32 data_count, + [in] const UINT32 *strides, + [out] ID2D1LookupTable3D **lookup_table + ); + HRESULT CreateImageSourceFromDxgi( + [in] IDXGISurface **surfaces, + [in] UINT32 surface_count, + [in] DXGI_COLOR_SPACE_TYPE color_space, + [in] D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS options, + [out] ID2D1ImageSource **image_source + ); + HRESULT GetGradientMeshWorldBounds( + [in] ID2D1GradientMesh *gradient_mesh, + [out] D2D1_RECT_F *bounds + ); + void DrawInk( + [in] ID2D1Ink *ink, + [in] ID2D1Brush *brush, + [in, optional] ID2D1InkStyle *ink_style + ); + void DrawGradientMesh( + [in] ID2D1GradientMesh *gradient_mesh + ); + void DrawGdiMetafile( + [in] ID2D1GdiMetafile *gdi_metafile, + [in, optional] const D2D1_RECT_F *dst_rect, + [in, optional] const D2D1_RECT_F *src_rect + ); + HRESULT CreateTransformedImageSource( + [in] ID2D1ImageSource *source, + [in] const D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *props, + [out] ID2D1TransformedImageSource **transformed + ); +} -- 2.25.1

2 5

[tools] testbot/web: Use SimpleCollectionPage for the branches page.
by Francois Gouget 01 Apr '22

01 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/BranchesList.pl | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/testbot/web/admin/BranchesList.pl b/testbot/web/admin/BranchesList.pl index a325818e5..037023762 100644 --- a/testbot/web/admin/BranchesList.pl +++ b/testbot/web/admin/BranchesList.pl @@ -2,6 +2,7 @@ # Branch list page # # Copyright 2009 Ge van Geldorp +# Copyright 2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,33 +20,11 @@ use strict; -package BranchesListPage; - -use ObjectModel::CGI::CollectionPage; -our @ISA = qw(ObjectModel::CGI::CollectionPage); +package main; +use ObjectModel::CGI::SimpleCollectionPage; use WineTestBot::Branches; - -sub _initialize($$$) -{ - my ($self, $Request, $RequiredRole) = @_; - - $self->SUPER::_initialize($Request, $RequiredRole, CreateBranches()); -} - -sub SortKeys($$$) -{ - my ($self, $CollectionBlock, $Keys) = @_; - - my @SortedKeys = sort { $a cmp $b } @$Keys; - return \@SortedKeys; -} - - -package main; - my $Request = shift; - -my $BranchesListPage = BranchesListPage->new($Request, "admin"); -$BranchesListPage->GeneratePage(); +my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateBranches()); +$Page->GeneratePage(); -- 2.30.2

1 0

[tools] testbot/cgi: Document CollectionBlock::new().
by Francois Gouget 01 Apr '22

01 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 200734a6a..cbe22f90f 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -74,6 +74,28 @@ use POSIX qw(strftime); use URI::Escape; +=pod +=over 12 + +=item C<new()> + +Creates a table showing the content of the specified Collection with +support for performing actions on selected rows, or performing global actions. + +Parameters: +=over +=Collection +The collection of objects to show in the table. + +=item EnclosingPage +The page the table will be inserted in. This page object must implement the +ObjectModel::CGI::Page interface. + +=back + +=back +=cut + sub new($$$@) { my $class = shift; -- 2.30.2

1 0

[tools] testbot/TestAgent: Update and fix the usage message.
by Francois Gouget 01 Apr '22

01 Apr '22

The upgrade and restart commands were each only half documented. The getversion command was misspelled. Better identify optional arguments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/TestAgent | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 10bdc63d1..ea18b85b7 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -323,15 +323,17 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [options] <hostname> sendfile <localpath> <serverpath>\n"; - print "or $name0 [options] <hostname> getfile <serverpath> <localpath>\n"; - print "or $name0 [options] <hostname> run <command> <arguments>\n"; + print "Usage: $name0 [options] <hostname> sendfile <localpath> [<serverpath>]\n"; + print "or $name0 [options] <hostname> getfile <serverpath> [<localpath>]\n"; + print "or $name0 [options] <hostname> run <command> [<arguments>]\n"; print "or $name0 [options] <hostname> wait <pid>\n"; print "or $name0 [options] <hostname> settime\n"; print "or $name0 [options] <hostname> rm <serverfiles>\n"; - print "or $name0 [options] <hostname> getproperty <name>\n"; + print "or $name0 [options] <hostname> getproperty [<name>]\n"; print "or $name0 [options] <hostname> setproperty <name> <value>\n"; - print "or $name0 [options] <hostname> [getcwd|ping|version]\n"; + print "or $name0 [options] <hostname> (getcwd|ping|getversion)\n"; + print "or $name0 [options] <hostname> upgrade <localexe>\n"; + print "or $name0 [options] <hostname> restart <serverexe> [<arg1>...]\n"; print "\n"; print "This is a testagentd client. It can be used to send/receive files and to run commands on the server.\n"; print "\n"; @@ -353,18 +355,21 @@ if (defined $Usage) print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; print " wait Waits for the specified child process on the server.\n"; print " settime Set the system time of the remote host.\n"; + print " getcwd Returns the server's current working directory.\n"; print " rm Deletes the specified files on the server.\n"; print " getversion Returns the protocol version.\n"; - print " getproperty <name> Retrieves and prints the specified server property, for\n"; + print " getproperty Retrieves and prints the <name> server property, for\n"; print " instance its architecture, 'server.arch'. One can print all the\n"; print " properties at once by omitting the name or setting it to '*'.\n"; - print " setproperty <name> <value> Sets the specified property.\n"; - print " getcwd Returns the server's current working directory.\n"; + print " setproperty Sets the <name> property to <value>.\n"; print " ping Makes sure the server is still alive.\n"; - print " upgrade Replaces the server executable with the specified file and\n"; - print " restarts it.\n"; - print " restart Replaces and restarts the server from the specified server file\n"; - print " and arguments or from the last command line if omitted.\n"; + print " upgrade Replaces the server executable with the <localexe> local file\n"; + print " and restarts it.\n"; + print " restart The first argument is mandatory and identifies the server file\n"; + print " the server executable should be replaced with. The arguments\n"; + print " that follow, if any, are passed to the server when it is\n"; + print " restarted. If omitted the current server's arguments are used\n"; + print " instead.\n"; print " <hostname> Is the hostname of the server.\n"; print " --port <port> Use the specified port number instead of the default one.\n"; print " --connect-one-timeout <time> Specifies the timeout for one connection\n"; -- 2.30.2

1 0

[tools] testbot/cgi: Remove a stray single quote from textarea fields.
by Francois Gouget 01 Apr '22

01 Apr '22

It would set the default value of textareas to a single quote. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This has been lurking from the start! The change from checking whether $Value is true to whether it is defined revealed this bug in the Register form which is the only one to both have a textarea field and to provide a default value, specifically an empty string (false). --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 9ce9fa93b..dfcd55e12 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -300,10 +300,7 @@ sub GenerateField($$$) print "50' rows='", int(($MaxLength + 49) / 50); } print "'>"; - if (defined $Value) - { - print $self->escapeHTML($Value), "'"; - } + print $self->escapeHTML($Value) if (defined $Value); print "</textarea>"; $self->GenerateRequired($PropertyDescriptor); } -- 2.30.2

1 0

[tools] testbot: Document SecureConnection() and MakeSecureURL().
by Francois Gouget 01 Apr '22

01 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 5315c75d4..d93a938d3 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -42,11 +42,38 @@ use WineTestBot::Config; # Web helpers # +=pod +=over 12 + +=item C<SecureConnection()> + +Returns true if the user accessed the website over a secure connection. + +This relies on the web server setting the $HTTPS environment variable. + +=back +=cut + sub SecureConnection() { return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; } +=pod +=over 12 + +=item C<MakeSecureURL()> + +Builds a URL that accesses this website using https if possible. +The parameter should be an absolute path that includes neither the protocol +nor the hostname. + +Note that this method uses $HTTP_HOST which may not match the official website +hostname. As such this should only be used for providing URLs back to the user +accessing the website, not for URLs sent to third-parties. + +=back +=cut sub MakeSecureURL($) { my ($URL) = @_; -- 2.30.2

1 0

[tools] testbot/TestAgent: Simplify the implementation for commands with no argument.
by Francois Gouget 01 Apr '22

01 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/TestAgent | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index ea18b85b7..a3d6e2625 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -210,15 +210,7 @@ while (@ARGV) @Rm = @ARGV; last; } - elsif ($arg eq "getcwd") - { - $Cmd = $arg; - } - elsif ($arg eq "getversion") - { - set_cmd($arg); - } - elsif ($arg eq "ping" or $arg eq "settime") + elsif ($arg =~ /^(?:getcwd|getversion|ping|settime)$/) { set_cmd($arg); } -- 2.30.2

1 0

[tools] testbot/TestAgent: Fix the spelling of a comment in the module.
by Francois Gouget 01 Apr '22

01 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 6457b4dd7..2d6002102 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1526,7 +1526,7 @@ sub Upgrade($$) my $rc = $self->_RecvList(''); # The server has quit and thus the connection is no longer usable. - # So disconnect now to force the next RPC to reconnect, instead or letting it + # So disconnect now to force the next RPC to reconnect instead of letting it # try to reuse the broken connection and fail. $self->Disconnect(); -- 2.30.2

1 0

[PATCH v2 6/6] win32u: Move NtUserSendInput implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

3 2

[PATCH 1/2] riched20/tests: Add tests for IRichEditOleCallback_QueryInsertObject.
by Jinoh Kang 01 Apr '22

01 Apr '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/tests/richole.c | 247 ++++++++++++++++++++++++++++++++-- 1 file changed, 236 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 24284a24484..bb99a9a7276 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -33,6 +33,169 @@ #include <tom.h> #include <wine/test.h> +#define EXPECT_TODO_WINE 0x80000000UL + +typedef struct IRichEditOleCallbackImpl { + IRichEditOleCallback IRichEditOleCallback_iface; + LONG ref; + int line; + + ULONG expect_queryinsertobject; + + const CLSID *lpclsid; + LPSTORAGE lpstg; + LONG cp; + HRESULT queryinsertobject_result; +}; + +static inline struct IRichEditOleCallbackImpl *impl_from_IRichEditOleCallback(IRichEditOleCallback *iface) +{ + return CONTAINING_RECORD(iface, struct IRichEditOleCallbackImpl, IRichEditOleCallback_iface); +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryInterface(IRichEditOleCallback *iface, REFIID riid, void **ppvObj) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IRichEditOleCallback)) { + IRichEditOleCallback_AddRef(iface); + *ppvObj = iface; + return S_OK; + } + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE RichEditOleCallbackImpl_AddRef(IRichEditOleCallback *iface) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedIncrement(&This->ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE RichEditOleCallbackImpl_Release(IRichEditOleCallback *iface) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedDecrement(&This->ref); + if (!ref) free(This); + return ref; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetNewStorage(IRichEditOleCallback *iface, LPSTORAGE *lplpstg) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetInPlaceContext(IRichEditOleCallback *iface, LPOLEINPLACEFRAME *lplpFrame, LPOLEINPLACEUIWINDOW *lplpDoc, LPOLEINPLACEFRAMEINFO lpFrameInfo) +{ + return E_INVALIDARG; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_ShowContainerUI(IRichEditOleCallback *iface, BOOL fShow) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryInsertObject(IRichEditOleCallback *iface, LPCLSID lpclsid, LPSTORAGE lpstg, LONG cp) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG expect = This->expect_queryinsertobject; + + todo_wine_if(expect & EXPECT_TODO_WINE) + ok_(__FILE__,This->line)( expect & ~EXPECT_TODO_WINE, "unexpected call to IRichEditOleCallback_QueryInsertObject\n"); + if (!(expect & ~EXPECT_TODO_WINE)) return S_OK; + This->expect_queryinsertobject--; + + if (This->lpclsid && lpclsid) + ok_(__FILE__,This->line)( IsEqualGUID(This->lpclsid, lpclsid), "QueryInsertObject lpclsid expected %s, got %s\n", wine_dbgstr_guid( This->lpclsid ), wine_dbgstr_guid( lpclsid )); + else + ok_(__FILE__,This->line)( This->lpclsid == lpclsid, "QueryInsertObject lpclsid expected %p, got %p\n", This->lpclsid, lpclsid ); + ok_(__FILE__,This->line)( This->lpstg == lpstg, "QueryInsertObject lpstg expected %p, got %p\n", This->lpstg, lpstg ); + ok_(__FILE__,This->line)( This->cp == cp, "QueryInsertObject cp expected %ld, got %ld\n", This->cp, cp ); + return This->queryinsertobject_result; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_DeleteObject(IRichEditOleCallback *iface, LPOLEOBJECT lpoleobj) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryAcceptData(IRichEditOleCallback *iface, LPDATAOBJECT lpdataobj, CLIPFORMAT *lpcfFormat, DWORD reco, BOOL fReally, HGLOBAL hMetaPict) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_ContextSensitiveHelp(IRichEditOleCallback *iface, BOOL fEnterMode) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetClipboardData(IRichEditOleCallback *iface, CHARRANGE *lpchrg, DWORD reco, LPDATAOBJECT *lplpdataobj) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetDragDropEffect(IRichEditOleCallback *iface, BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect) +{ + if (pdwEffect) *pdwEffect = DROPEFFECT_COPY; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetContextMenu(IRichEditOleCallback *iface, WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE *lpchrg, HMENU *lphmenu) +{ + return E_NOTIMPL; +} + +static const struct IRichEditOleCallbackVtbl RichEditOleCallbackImpl_Vtbl = { + RichEditOleCallbackImpl_QueryInterface, + RichEditOleCallbackImpl_AddRef, + RichEditOleCallbackImpl_Release, + RichEditOleCallbackImpl_GetNewStorage, + RichEditOleCallbackImpl_GetInPlaceContext, + RichEditOleCallbackImpl_ShowContainerUI, + RichEditOleCallbackImpl_QueryInsertObject, + RichEditOleCallbackImpl_DeleteObject, + RichEditOleCallbackImpl_QueryAcceptData, + RichEditOleCallbackImpl_ContextSensitiveHelp, + RichEditOleCallbackImpl_GetClipboardData, + RichEditOleCallbackImpl_GetDragDropEffect, + RichEditOleCallbackImpl_GetContextMenu, +}; + +static HRESULT RichEditOleCallbackImpl_Create(struct IRichEditOleCallbackImpl **objptr) +{ + struct IRichEditOleCallbackImpl *obj; + + obj = calloc(sizeof(struct IRichEditOleCallbackImpl), 1); + if (!obj) return E_OUTOFMEMORY; + + obj->IRichEditOleCallback_iface.lpVtbl = &RichEditOleCallbackImpl_Vtbl; + obj->ref = 1; + + *objptr = obj; + return S_OK; +} + +static void olecb_expect_QueryInsertObject(struct IRichEditOleCallbackImpl *This, int line, ULONG expect, const CLSID *lpclsid, LPSTORAGE lpstg, LONG cp, HRESULT result) +{ + if (!This) return; + + This->line = line; + This->expect_queryinsertobject = expect; + This->lpclsid = lpclsid; + This->lpstg = lpstg; + This->cp = cp; + This->queryinsertobject_result = result; +} + +static void olecb_check_QueryInsertObject(struct IRichEditOleCallbackImpl *This, int line) +{ + if (!This) return; + + todo_wine_if(This->expect_queryinsertobject & EXPECT_TODO_WINE) + ok(!(This->expect_queryinsertobject & ~EXPECT_TODO_WINE), "expected IRichEditOleCallback_QueryInsertObject to be called\n"); + + olecb_expect_QueryInsertObject(This, 0, 0, NULL, NULL, 0, S_OK); +} + static HMODULE hmoduleRichEdit; DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); @@ -3233,21 +3396,24 @@ static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, ok_(__FILE__,line)(reobj.dwUser == user, "got wrong user-defined value.\n"); } -#define INSERT_REOBJECT(reole,reobj,cp,user) \ - _insert_reobject(reole, reobj, cp, user, __LINE__) -static void _insert_reobject(IRichEditOle *reole, REOBJECT *reobj, LONG cp, DWORD user, int line) +#define INSERT_REOBJECT(callback,reole,reobj,cp,user) \ + _insert_reobject(callback, reole, reobj, cp, user, __LINE__) +static void _insert_reobject(struct IRichEditOleCallbackImpl *callback, IRichEditOle *reole, REOBJECT *reobj, LONG cp, DWORD user, int line) { IOleClientSite *clientsite; HRESULT hr; + + olecb_expect_QueryInsertObject(callback, line, EXPECT_TODO_WINE | 1, &CLSID_NULL, NULL, REO_CP_SELECTION /* cp overriden */, S_OK); hr = IRichEditOle_GetClientSite(reole, &clientsite); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); fill_reobject_struct(reobj, cp, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, user); hr = IRichEditOle_InsertObject(reole, reobj); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_InsertObject got hr %#lx.\n", hr); IOleClientSite_Release(clientsite); + olecb_check_QueryInsertObject(callback, line); } -static void test_InsertObject(void) +static void subtest_InsertObject(struct IRichEditOleCallbackImpl *callback) { static CHAR test_text1[] = "abcdefg"; IRichEditOle *reole = NULL; @@ -3271,6 +3437,12 @@ static void test_InsertObject(void) BSTR bstr; create_interfaces(&hwnd, &reole, &doc, &selection); + if (callback) + { + LRESULT sendres = SendMessageA(hwnd, EM_SETOLECALLBACK, 0, (LPARAM)&callback->IRichEditOleCallback_iface); + ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); + } + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); hr = IRichEditOle_InsertObject(reole, NULL); @@ -3278,22 +3450,47 @@ static void test_InsertObject(void) /* insert object1 in (0, 1)*/ SendMessageA(hwnd, EM_SETSEL, 0, 1); - INSERT_REOBJECT(reole, &reo1, REO_CP_SELECTION, 1); + INSERT_REOBJECT(callback, reole, &reo1, REO_CP_SELECTION, 1); count = IRichEditOle_GetObjectCount(reole); ok(count == 1, "got wrong object count: %ld\n", count); /* insert object2 in (2, 3)*/ SendMessageA(hwnd, EM_SETSEL, 2, 3); - INSERT_REOBJECT(reole, &reo2, REO_CP_SELECTION, 2); + INSERT_REOBJECT(callback, reole, &reo2, REO_CP_SELECTION, 2); count = IRichEditOle_GetObjectCount(reole); ok(count == 2, "got wrong object count: %ld\n", count); /* insert object3 in (1, 2)*/ SendMessageA(hwnd, EM_SETSEL, 1, 2); - INSERT_REOBJECT(reole, &reo3, REO_CP_SELECTION, 3); + INSERT_REOBJECT(callback, reole, &reo3, REO_CP_SELECTION, 3); count = IRichEditOle_GetObjectCount(reole); ok(count == 3, "got wrong object count: %ld\n", count); + if (callback) + { + IOleClientSite *clientsite; + REOBJECT reobj; + + /* (fail to) insert object1 in (3, 4)*/ + SendMessageA(hwnd, EM_SETSEL, 3, 4); + + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); + + olecb_expect_QueryInsertObject(callback, __LINE__, EXPECT_TODO_WINE | 1, &CLSID_NULL, NULL, REO_CP_SELECTION, S_FALSE); + fill_reobject_struct(&reobj, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 0); + hr = IRichEditOle_InsertObject(reole, &reobj); + todo_wine + ok(hr == S_FALSE, "IRichEditOle_InsertObject got hr %#lx.\n", hr); + olecb_check_QueryInsertObject(callback, __LINE__); + + IOleClientSite_Release(clientsite); + + count = IRichEditOle_GetObjectCount(reole); + todo_wine + ok(count == 3, "got wrong object count: %ld\n", count); + } + /* tests below show that order of rebject (from 0 to 2) is: reo1,reo3,reo2 */ CHECK_REOBJECT_STRUCT(reole, 0, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); CHECK_REOBJECT_STRUCT(reole, 1, REO_GETOBJ_ALL_INTERFACES, 0, 1, NULL, NULL, reo3.polesite, 3); @@ -3371,8 +3568,8 @@ static void test_InsertObject(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); /* "abc|d|efg" */ - INSERT_REOBJECT(reole, &reo1, 3, 1); - INSERT_REOBJECT(reole, &reo2, 5, 2); + INSERT_REOBJECT(callback, reole, &reo1, 3, 1); + INSERT_REOBJECT(callback, reole, &reo2, 5, 2); SendMessageW(hwnd, EM_SETSEL, 2, 3); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); @@ -3473,8 +3670,8 @@ static void test_InsertObject(void) ok(!result, "Got result %lx.\n", result); /* "abc|d|efg" */ SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); - INSERT_REOBJECT(reole, &reo1, 3, 1); - INSERT_REOBJECT(reole, &reo2, 5, 2); + INSERT_REOBJECT(callback, reole, &reo1, 3, 1); + INSERT_REOBJECT(callback, reole, &reo2, 5, 2); expected_string = L"abc d efg"; charrange.cpMin = 0; @@ -3551,9 +3748,37 @@ static void test_InsertObject(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); todo_wine ok(result == 0xfffc, "Got char: %lc\n", (WCHAR)result); + if (callback) + { + LRESULT sendres = SendMessageA(hwnd, EM_SETOLECALLBACK, 0, 0); + ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); + } + release_interfaces(&hwnd, &reole, &doc, &selection); } +static void test_InsertObject(void) +{ + struct IRichEditOleCallbackImpl *callback; + HRESULT hr; + ULONG ref; + + subtest_InsertObject(NULL); + + hr = RichEditOleCallbackImpl_Create(&callback); + ok(SUCCEEDED(hr), "RichEditOleCallbackImpl_Create returned %#lx\n", hr); + if (SUCCEEDED(hr)) + { + subtest_InsertObject(callback); + ref = IRichEditOleCallback_Release(&callback->IRichEditOleCallback_iface); + ok(ref == 0, "expected IRichEditOleCallback recount to be 0, got %lu\n", ref); + } + else + { + skip("cannot test InsertObject with callback\n"); + } +} + static void test_GetStoryLength(void) { static const CHAR test_text1[] = "TestSomeText"; -- 2.34.1

2 2

[PATCH v2] setupapi: Add SetupQueryInfVersionInformationA/W stub.
by Gijs Vermeulen 01 Apr '22

01 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52616 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/setupapi/query.c | 18 ++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index b25bd883cc64..e662b422a062 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -731,3 +731,21 @@ BOOL WINAPI SetupGetInfDriverStoreLocationW( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI SetupQueryInfVersionInformationA(SP_INF_INFORMATION *info, UINT index, const char *key, char *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_a(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SetupQueryInfVersionInformationW(SP_INF_INFORMATION *info, UINT index, const WCHAR *key, WCHAR *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_w(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 06d423373b8e..7578fb25c9c7 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -492,8 +492,8 @@ @ stdcall SetupQueryInfFileInformationW(ptr long wstr long ptr) @ stdcall SetupQueryInfOriginalFileInformationA(ptr long ptr ptr) @ stdcall SetupQueryInfOriginalFileInformationW(ptr long ptr ptr) -@ stub SetupQueryInfVersionInformationA -@ stub SetupQueryInfVersionInformationW +@ stdcall SetupQueryInfVersionInformationA(ptr long str ptr long ptr) +@ stdcall SetupQueryInfVersionInformationW(ptr long wstr ptr long ptr) @ stub SetupQuerySourceListA @ stub SetupQuerySourceListW @ stdcall SetupQuerySpaceRequiredOnDriveA(long str ptr ptr long) -- 2.35.1

1 0

[PATCH v2 5/6] win32u: Move __wine_send_input implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

3 2

[PATCH v2 4/6] win32u: Move send_internal_message_timeout implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Don't use user32 functions in win32u. dlls/user32/message.c | 43 +- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 5 +- dlls/win32u/hook.c | 14 +- dlls/win32u/message.c | 768 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/win32u_private.h | 3 + 7 files changed, 783 insertions(+), 55 deletions(-)

3 2

[PATCH v2 3/6] user32: Avoid internal structs in post_dde_message.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 53 ++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 28 deletions(-)

3 2

[PATCH v2 2/6] win32u: Move NtUserWaitForInputIdle implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 48 ++-------------------------- dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 61 ++++++++++++++++++++++++++++++------ dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++ 8 files changed, 63 insertions(+), 58 deletions(-)

3 2

[PATCH v2 1/6] win32u: Move NtUserMsgWaitForMultipleObjectsEx implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 66 ++---------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 23 +++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/wrappers.c | 7 ++++ include/ntuser.h | 2 ++ 8 files changed, 40 insertions(+), 65 deletions(-)

3 2

[v6 PATCH 1/2] propsys: Implement VariantToStringWithDefault.
by Nikolay Sivov 01 Apr '22

01 Apr '22

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v6: removed unrelated inline helper, this is guarded differently in SDK. dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 16 ++++++++++++++++ include/propvarutil.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..cd92912fde5 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,22 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, const WCHAR *default_value) +{ + TRACE("%s, %s.\n", debugstr_variant(pvar), debugstr_w(default_value)); + + if (V_VT(pvar) == (VT_BYREF | VT_VARIANT)) pvar = V_VARIANTREF(pvar); + if (V_VT(pvar) == (VT_BYREF | VT_BSTR) || V_VT(pvar) == VT_BSTR) + { + BSTR ret = V_ISBYREF(pvar) ? *V_BSTRREF(pvar) : V_BSTR(pvar); + return ret ? ret : L""; + } + + return default_value; +} /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..fcc532fd623 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); -- 2.35.1

1 1

[PATCH 6/6] win32u: Move NtUserSendInput implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

2 1

[PATCH 5/6] win32u: Move __wine_send_input implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

2 1

[PATCH 4/6] win32u: Move send_internal_message_timeout implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 43 +- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 5 +- dlls/win32u/hook.c | 14 +- dlls/win32u/message.c | 768 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/win32u_private.h | 3 + 7 files changed, 783 insertions(+), 55 deletions(-)

2 1

[PATCH 3/6] user32: Avoid internal structs in post_dde_message.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 53 ++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 28 deletions(-)

2 1

[PATCH 2/6] win32u: Move NtUserWaitForInputIdle implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 48 ++-------------------------- dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 61 ++++++++++++++++++++++++++++++------ dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++ 8 files changed, 63 insertions(+), 58 deletions(-)

2 1

[PATCH 1/6] win32u: Move NtUserMsgWaitForMultipleObjectsEx implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 66 ++---------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 23 +++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/wrappers.c | 7 ++++ include/ntuser.h | 2 ++ 8 files changed, 40 insertions(+), 65 deletions(-)

2 1

[PATCH] crypt32/tests: Add more OCSP response decoding tests.
by Hans Leidekker 01 Apr '22

01 Apr '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/tests/encode.c | 88 ++++++++++++++++++++++++++++++++++--- 1 file changed, 83 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index f25c779a9ce..8b1959fbef8 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8860,7 +8860,7 @@ static const BYTE ocsp_basic_signed_response[] = { 0x05, 0x51, 0x49, 0xac, 0x2f, 0xe8, 0x67, 0xcf, 0xa7 }; -static const BYTE ocsp_to_be_signed[] = { +static const BYTE ocsp_basic_response[] = { 0x30, 0x81, 0x9e, 0xa2, 0x16, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x31, @@ -8877,6 +8877,24 @@ static const BYTE ocsp_to_be_signed[] = { 0x33, 0x36, 0x30, 0x31, 0x5a }; +static const BYTE ocsp_basic_response_revoked[] = { + 0x30, 0x81, 0xb1, 0xa2, 0x16, 0x04, 0x14, 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, + 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, 0xdc, + 0xf5, 0x31, 0x7f, 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x33, + 0x31, 0x30, 0x31, 0x32, 0x35, 0x30, 0x35, 0x5a, 0x30, 0x81, 0x85, 0x30, + 0x81, 0x82, 0x30, 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, + 0x1a, 0x05, 0x00, 0x04, 0x14, 0x74, 0xb4, 0xe7, 0x23, 0x19, 0xc7, 0x65, + 0x92, 0x15, 0x40, 0x44, 0x7b, 0xc7, 0xce, 0x3e, 0x90, 0xc2, 0x18, 0x76, + 0xeb, 0x04, 0x14, 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, + 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, 0xdc, 0xf5, 0x31, 0x7f, 0x02, + 0x10, 0x0d, 0x2e, 0x67, 0xa2, 0x98, 0x85, 0x3b, 0x9a, 0x54, 0x52, 0xe3, + 0xa2, 0x85, 0xa4, 0x57, 0x2f, 0xa1, 0x11, 0x18, 0x0f, 0x32, 0x30, 0x32, + 0x31, 0x31, 0x30, 0x32, 0x37, 0x32, 0x31, 0x33, 0x38, 0x34, 0x38, 0x5a, + 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x33, 0x31, 0x30, 0x31, + 0x30, 0x39, 0x30, 0x31, 0x5a, 0xa0, 0x11, 0x18, 0x0f, 0x32, 0x30, 0x32, + 0x32, 0x30, 0x34, 0x30, 0x37, 0x30, 0x30, 0x32, 0x34, 0x30, 0x31, 0x5a +}; + static const BYTE ocsp_signature[] = { 0x6a, 0x4c, 0xfa, 0xe6, 0xe3, 0x48, 0xbb, 0xd6, 0x18, 0x33, 0x04, 0x9d, 0x6a, 0x92, 0x4d, 0x01, 0x74, 0x4f, 0x1a, 0x70, 0xfa, 0xf2, 0x8b, 0xba, @@ -8914,8 +8932,8 @@ static void test_decodeOCSPBasicSignedResponseInfo(DWORD dwEncoding) ok(ret, "got %08lx\n", GetLastError()); if (sizeof(void *) == 4) todo_wine ok(size == 496, "got %lu\n", size); else ok(size == 536, "got %lu\n", size); - ok(info->ToBeSigned.cbData == sizeof(ocsp_to_be_signed), "got %lu\n", info->ToBeSigned.cbData); - ok(!memcmp(info->ToBeSigned.pbData, ocsp_to_be_signed, sizeof(ocsp_to_be_signed)), "wrong data\n"); + ok(info->ToBeSigned.cbData == sizeof(ocsp_basic_response), "got %lu\n", info->ToBeSigned.cbData); + ok(!memcmp(info->ToBeSigned.pbData, ocsp_basic_response, sizeof(ocsp_basic_response)), "wrong data\n"); ok(!strcmp(info->SignatureInfo.SignatureAlgorithm.pszObjId, szOID_RSA_SHA256RSA), "got %s\n", info->SignatureInfo.SignatureAlgorithm.pszObjId); @@ -8941,22 +8959,35 @@ static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) static const BYTE resp_id[] = { 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE resp_id2[] = { + 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, + 0xdc, 0xf5, 0x31, 0x7f}; static const BYTE name_hash[] = { 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8}; + static const BYTE name_hash2[] = { + 0x74, 0xb4, 0xe7, 0x23, 0x19, 0xc7, 0x65, 0x92, 0x15, 0x40, 0x44, 0x7b, 0xc7, 0xce, 0x3e, 0x90, + 0xc2, 0x18, 0x76, 0xeb}; static const BYTE key_hash[] = { 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE key_hash2[] = { + 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, + 0xdc, 0xf5, 0x31, 0x7f}; static const BYTE serial[] = { 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + static const BYTE serial2[] = { + 0x2f, 0x57, 0xa4, 0x85, 0xa2, 0xe3, 0x52, 0x54, 0x9a, 0x3b, 0x85, 0x98, 0xa2, 0x67, 0x2e, 0x0d}; OCSP_BASIC_RESPONSE_INFO *info; OCSP_BASIC_RESPONSE_ENTRY *entry; + OCSP_BASIC_REVOKED_INFO *revoked; DWORD size; BOOL ret; + /* good cert */ size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_to_be_signed, - sizeof(ocsp_to_be_signed), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response, + sizeof(ocsp_basic_response), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "got %08lx\n", GetLastError()); ok(!info->dwVersion, "got %lu\n", info->dwVersion); @@ -8991,6 +9022,53 @@ static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) ok(!info->cExtension, "got %lu\n", info->cExtension); ok(info->rgExtension == NULL, "got %p\n", info->rgExtension); LocalFree(info); + + /* revoked cert */ + size = 0; + ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response_revoked, + sizeof(ocsp_basic_response_revoked), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + todo_wine ok(ret, "got %08lx\n", GetLastError()); + + if (ret) { + ok(!info->dwVersion, "got %lu\n", info->dwVersion); + ok(info->dwResponderIdChoice == 2, "got %lu\n", info->dwResponderIdChoice); + ok(info->ByKeyResponderId.cbData == sizeof(resp_id), "got %lu\n", info->ByKeyResponderId.cbData); + ok(!memcmp(info->ByKeyResponderId.pbData, resp_id2, sizeof(resp_id2)), "wrong data\n"); + ok(info->ProducedAt.dwLowDateTime == 647048832, "got %lu\n", info->ProducedAt.dwLowDateTime); + ok(info->ProducedAt.dwHighDateTime == 30950558, "got %lu\n", info->ProducedAt.dwHighDateTime); + ok(info->cResponseEntry == 1, "got %lu\n", info->cResponseEntry); + ok(info->rgResponseEntry != NULL, "got %p\n", info->rgResponseEntry); + + entry = info->rgResponseEntry; + ok(!strcmp(entry->CertId.HashAlgorithm.pszObjId, szOID_OIWSEC_sha1), "got '%s'\n", entry->CertId.HashAlgorithm.pszObjId); + ok(entry->CertId.HashAlgorithm.Parameters.cbData == 2, "got %lu\n", entry->CertId.HashAlgorithm.Parameters.cbData); + ok(entry->CertId.HashAlgorithm.Parameters.pbData[0] == 5, "got 0x%02x\n", entry->CertId.HashAlgorithm.Parameters.pbData[0]); + ok(!entry->CertId.HashAlgorithm.Parameters.pbData[1], "got 0x%02x\n", entry->CertId.HashAlgorithm.Parameters.pbData[1]); + ok(entry->CertId.IssuerNameHash.cbData == 20, "got %lu\n", entry->CertId.IssuerNameHash.cbData); + ok(!memcmp(entry->CertId.IssuerNameHash.pbData, name_hash2, sizeof(name_hash2)), "wrong data\n"); + ok(entry->CertId.IssuerKeyHash.cbData == 20, "got %lu\n", entry->CertId.IssuerKeyHash.cbData); + ok(!memcmp(entry->CertId.IssuerKeyHash.pbData, key_hash2, sizeof(key_hash2)), "wrong data\n"); + ok(entry->CertId.SerialNumber.cbData == 16, "got %lu\n", entry->CertId.SerialNumber.cbData); + ok(!memcmp(entry->CertId.SerialNumber.pbData, serial2, sizeof(serial2)), "wrong data\n"); + ok(entry->dwCertStatus == 1, "got %lu\n", entry->dwCertStatus); + ok(entry->pRevokedInfo != NULL, "got NULL\n"); + + revoked = entry->pRevokedInfo; + ok(revoked->RevocationDate.dwLowDateTime == 107865088, "got %lu\n", revoked->RevocationDate.dwLowDateTime); + ok(revoked->RevocationDate.dwHighDateTime == 30919547, "got %lu\n", revoked->RevocationDate.dwHighDateTime); + ok(!revoked->dwCrlReasonCode, "got %lu\n", revoked->dwCrlReasonCode); + + ok(entry->ThisUpdate.dwLowDateTime == 3891950720, "got %lu\n", entry->ThisUpdate.dwLowDateTime); + ok(entry->ThisUpdate.dwHighDateTime == 30950555, "got %lu\n", entry->ThisUpdate.dwHighDateTime); + ok(entry->NextUpdate.dwLowDateTime == 3347801728, "got %lu\n", entry->NextUpdate.dwLowDateTime); + ok(entry->NextUpdate.dwHighDateTime == 30951957, "got %lu\n", entry->NextUpdate.dwHighDateTime); + ok(!entry->cExtension, "got %lu\n", entry->cExtension); + ok(entry->rgExtension == NULL, "got %p\n", entry->rgExtension); + + ok(!info->cExtension, "got %lu\n", info->cExtension); + ok(info->rgExtension == NULL, "got %p\n", info->rgExtension); + } + LocalFree(info); } START_TEST(encode) -- 2.30.2

1 0

[PATCH] directmanipulation: Use CRT memory allocation functions.
by Nikolay Sivov 01 Apr '22

01 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/directmanipulation/directmanipulation.c | 21 ++++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index b20c41331e5..e72ffec3ddb 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -23,7 +23,6 @@ #include "winbase.h" #include "oleidl.h" #include "rpcproxy.h" -#include "wine/heap.h" #include "wine/debug.h" #include "directmanipulation.h" @@ -89,7 +88,7 @@ ULONG WINAPI update_manager_Release(IDirectManipulationUpdateManager *iface) if (!ref) { - heap_free(This); + free(This); } return ref; } @@ -130,7 +129,7 @@ static HRESULT create_update_manager(IDirectManipulationUpdateManager **obj) { struct directupdatemanager *object; - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if(!object) return E_OUTOFMEMORY; @@ -201,7 +200,7 @@ static ULONG WINAPI primary_Release(IDirectManipulationPrimaryContent *iface) if (!ref) { - heap_free(This); + free(This); } return ref; } @@ -433,7 +432,7 @@ static ULONG WINAPI viewport_Release(IDirectManipulationViewport2 *iface) if (!ref) { - heap_free(This); + free(This); } return ref; } @@ -540,7 +539,7 @@ static HRESULT WINAPI viewport_GetPrimaryContent(IDirectManipulationViewport2 *i { struct primarycontext *primary; TRACE("IDirectManipulationPrimaryContent\n"); - primary = heap_alloc( sizeof(*primary)); + primary = malloc( sizeof(*primary)); if(!primary) return E_OUTOFMEMORY; @@ -719,7 +718,7 @@ static HRESULT create_viewport(IDirectManipulationViewport2 **obj) { struct directviewport *object; - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if(!object) return E_OUTOFMEMORY; @@ -766,7 +765,7 @@ static ULONG WINAPI direct_manip_Release(IDirectManipulationManager2 *iface) { if(This->updatemanager) IDirectManipulationUpdateManager_Release(This->updatemanager); - heap_free(This); + free(This); } return ref; } @@ -887,7 +886,7 @@ static HRESULT WINAPI DirectManipulation_CreateInstance(IClassFactory *iface, IU *ppv = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -962,7 +961,7 @@ static ULONG WINAPI compositor_Release(IDirectManipulationCompositor2 *iface) { if(This->manager) IDirectManipulationUpdateManager_Release(This->manager); - heap_free(This); + free(This); } return ref; } @@ -1065,7 +1064,7 @@ static HRESULT WINAPI DirectCompositor_CreateInstance(IClassFactory *iface, IUnk *ppv = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; -- 2.35.1

1 0

[PATCH] msxml3/tests: Use CRT memory allocation functions.
by Nikolay Sivov 01 Apr '22

01 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 5 ++--- dlls/msxml3/tests/httpreq.c | 5 ++--- dlls/msxml3/tests/saxreader.c | 17 ++++++++--------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c6eeb012b68..0643ea5350f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -43,7 +43,6 @@ #include "asptlb.h" #include "shlwapi.h" -#include "wine/heap.h" #include "wine/test.h" #define XML_E_UNEXPECTED_ATTRIBUTE 0xC00CE56C @@ -193,7 +192,7 @@ static ULONG WINAPI dispevent_Release(IDispatch *iface) ULONG ref = InterlockedDecrement( &This->ref ); if (ref == 0) - heap_free(This); + free(This); return ref; } @@ -253,7 +252,7 @@ static const IDispatchVtbl dispeventVtbl = static IDispatch* create_dispevent(void) { - dispevent *event = heap_alloc(sizeof(*event)); + dispevent *event = malloc(sizeof(*event)); event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index bf52e71a6e7..bccfbaf582a 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -35,7 +35,6 @@ #include "objsafe.h" #include "mshtml.h" -#include "wine/heap.h" #include "wine/test.h" #define EXPECT_REF(node,ref) _expect_ref((IUnknown*)node, ref, __LINE__) @@ -1250,7 +1249,7 @@ static ULONG WINAPI dispevent_Release(IDispatch *iface) ULONG ref = InterlockedDecrement( &This->ref ); if (ref == 0) - heap_free(This); + free(This); return ref; } @@ -1326,7 +1325,7 @@ static const IDispatchVtbl dispeventVtbl = static IDispatch* create_dispevent(void) { - dispevent *event = heap_alloc(sizeof(*event)); + dispevent *event = malloc(sizeof(*event)); event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index d8101c4ce94..e123d4eba5a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -33,7 +33,6 @@ #include "ocidl.h" #include "dispex.h" -#include "wine/heap.h" #include "wine/test.h" #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) @@ -268,13 +267,13 @@ static void add_call(struct call_sequence **seq, int sequence_index, if (!call_seq->sequence) { call_seq->size = 10; - call_seq->sequence = heap_alloc(call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = malloc(call_seq->size * sizeof (struct call_entry)); } if (call_seq->count == call_seq->size) { call_seq->size *= 2; - call_seq->sequence = heap_realloc(call_seq->sequence, call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = realloc(call_seq->sequence, call_seq->size * sizeof (struct call_entry)); } assert(call_seq->sequence); @@ -309,7 +308,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index SysFreeString(call_seq->sequence[i].attributes[j].qnameW); SysFreeString(call_seq->sequence[i].attributes[j].valueW); } - heap_free(call_seq->sequence[i].attributes); + free(call_seq->sequence[i].attributes); call_seq->sequence[i].attr_count = 0; SysFreeString(call_seq->sequence[i].arg1W); @@ -317,7 +316,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index SysFreeString(call_seq->sequence[i].arg3W); } - heap_free(call_seq->sequence); + free(call_seq->sequence); call_seq->sequence = NULL; call_seq->count = call_seq->size = 0; } @@ -544,7 +543,7 @@ static void init_call_sequences(struct call_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = heap_alloc_zero(sizeof(struct call_sequence)); + seq[i] = calloc(1, sizeof(**seq)); } static const WCHAR szSimpleXML[] = @@ -1235,7 +1234,7 @@ static HRESULT WINAPI contentHandler_startElement( int i; struct attribute_entry *attr; - attr = heap_alloc_zero(len * sizeof(*attr)); + attr = calloc(len, sizeof(*attr)); v = VARIANT_TRUE; hr = ISAXXMLReader_getFeature(g_reader, _bstr_("http://xml.org/sax/features/namespaces"), &v); @@ -3374,7 +3373,7 @@ static void test_mxwriter_flush(void) ok(pos2.QuadPart == 0, "expected stream beginning\n"); len = 2048; - buff = heap_alloc(len + 1); + buff = malloc(len + 1); memset(buff, 'A', len); buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); @@ -3457,7 +3456,7 @@ static void test_mxwriter_flush(void) ok(SysStringLen(V_BSTR(&dest)) == len, "got len=%d, expected %d\n", SysStringLen(V_BSTR(&dest)), len); VariantClear(&dest); - heap_free(buff); + free(buff); ISAXContentHandler_Release(content); IStream_Release(stream); IMXWriter_Release(writer); -- 2.35.1

1 0

[PATCH] sxs/tests: Use CRT memory allocation functions.
by Nikolay Sivov 01 Apr '22

01 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/sxs/tests/sxs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c index 589d713e08b..0c367f7c6d5 100644 --- a/dlls/sxs/tests/sxs.c +++ b/dlls/sxs/tests/sxs.c @@ -26,7 +26,6 @@ #include "shlwapi.h" #include "wine/test.h" -#include "wine/heap.h" #include "initguid.h" #include "interfaces.h" @@ -108,7 +107,7 @@ static void run_test(void) ok(ret == FALSE, "Got %d\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %ld\n", GetLastError()); - info = heap_alloc(buffer_size); + info = malloc(buffer_size); SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, info, buffer_size, &buffer_size); ok(ret == TRUE, "Got %d\n", ret); @@ -121,14 +120,14 @@ static void run_test(void) ok(!lstrcmpW(info->pcwszRuntimeVersion, L"v4.0.0.0"), "Unexpected runtime version %s.\n", wine_dbgstr_w(info->pcwszRuntimeVersion)); - heap_free(info); + free(info); SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %ld\n", GetLastError()); - info = heap_alloc(buffer_size); + info = malloc(buffer_size); SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, info, buffer_size, &buffer_size); @@ -142,7 +141,7 @@ static void run_test(void) ok(!lstrcmpW(info->pcwszRuntimeVersion, L"v4.0.0.1"), "Unexpected runtime version %s.\n", wine_dbgstr_w(info->pcwszRuntimeVersion)); - heap_free(info); + free(info); SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); -- 2.35.1

1 0

[PATCH] mfmediaengine/tests: Remove unused header include.
by Nikolay Sivov 01 Apr '22

01 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index ea2f570d721..008ee58849c 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -32,7 +32,6 @@ #include "mmdeviceapi.h" #include "audiosessiontypes.h" -#include "wine/heap.h" #include "wine/test.h" static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); -- 2.35.1

1 0

[PATCH] dxva2: Use CRT memory allocation functions.
by Nikolay Sivov 01 Apr '22

01 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index b262990e0f7..c5ca3439a68 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -30,7 +30,6 @@ #include "dxva2api.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dxva2); @@ -98,7 +97,7 @@ static BOOL dxva_array_reserve(void **elements, size_t *capacity, size_t count, if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!(new_elements = realloc(*elements, new_capacity * size))) return FALSE; *elements = new_elements; @@ -178,7 +177,7 @@ static ULONG WINAPI video_processor_Release(IDirectXVideoProcessor *iface) if (!refcount) { IDirectXVideoProcessorService_Release(processor->service); - heap_free(processor); + free(processor); } return refcount; @@ -613,7 +612,7 @@ static HRESULT WINAPI device_manager_processor_service_CreateVideoProcessor(IDir return E_INVALIDARG; } - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirectXVideoProcessor_iface.lpVtbl = &video_processor_vtbl; @@ -776,8 +775,8 @@ static ULONG WINAPI device_manager_Release(IDirect3DDeviceManager9 *iface) if (manager->handles[i].state_block) IDirect3DStateBlock9_Release(manager->handles[i].state_block); } - heap_free(manager->handles); - heap_free(manager); + free(manager->handles); + free(manager); } return refcount; @@ -1051,7 +1050,7 @@ HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *token, IDirect3DDeviceMan *manager = NULL; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DDeviceManager9_iface.lpVtbl = &device_manager_vtbl; -- 2.35.1

1 0

[PATCH v5 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf 01 Apr '22

01 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Support byref BSTR. - Support nested VARIANT including byref BSTR. v3: - Consolidate code. v4: - Retrieve string as BSTR. v5: - Remove unnecessary variable. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 20 ++++++++++++++++++++ include/propvarutil.h | 6 ++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..61b1b4313ef 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,26 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + if (V_VT(pvar) == (VT_BYREF | VT_VARIANT)) pvar = V_VARIANTREF(pvar); + if (V_VT(pvar) == (VT_BYREF | VT_BSTR) || V_VT(pvar) == VT_BSTR) + { + BSTR ret; + ret = V_ISBYREF(pvar) ? *V_BSTRREF(pvar) : V_BSTR(pvar); + + if (!ret) return L""; + return ret; + } + + return pszDefault; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..2515d71b3b6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *pvar) +{ + return (VariantToStringWithDefault(pvar, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

1 1

[PATCH v4 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf 01 Apr '22

01 Apr '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Support byref BSTR. - Support nested VARIANT including byref BSTR. v3: - Consolidate code. v4: - Retrieve string as BSTR. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 22 ++++++++++++++++++++++ include/propvarutil.h | 6 ++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..046063dd183 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,28 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + VARIANT var = *pvar; + + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + if (V_VT(&var) == (VT_BYREF | VT_VARIANT)) var = *V_VARIANTREF(pvar); + if (V_VT(&var) == (VT_BYREF | VT_BSTR) || V_VT(&var) == VT_BSTR) + { + BSTR ret; + ret = V_ISBYREF(&var) ? *V_BSTRREF(&var) : V_BSTR(&var); + + if (!ret) return L""; + return ret; + } + + return pszDefault; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..2515d71b3b6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *pvar) +{ + return (VariantToStringWithDefault(pvar, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

1 1

[PATCH vkd3d v7 1/8] vkd3d-shader/hlsl: Avoid leaks on memory allocation failures when parsing initializers.
by Matteo Bruni 31 Mar '22

31 Mar '22

From: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v7: Catch another case. libs/vkd3d-shader/hlsl.y | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1ab56fba..0fc8fa29 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3208,7 +3208,10 @@ complex_initializer: { $$.args_count = 1; if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) + { + destroy_instr_list($1); YYABORT; + } $$.args[0] = node_from_list($1); $$.instrs = $1; } @@ -3229,15 +3232,25 @@ initializer_expr_list: { $$.args_count = 1; if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) + { + destroy_instr_list($1); YYABORT; + } $$.args[0] = node_from_list($1); $$.instrs = $1; } | initializer_expr_list ',' initializer_expr { + struct hlsl_ir_node **new_args; + $$ = $1; - if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + destroy_instr_list($3); YYABORT; + } + $$.args = new_args; $$.args[$$.args_count++] = node_from_list($3); list_move_tail($$.instrs, $3); vkd3d_free($3); -- 2.34.1

4 17

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

31 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comsvcs/main.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index b34c7d21309..43803f60632 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -19,7 +19,6 @@ */ #include "comsvcs_private.h" -#include "wine/heap.h" #include "wine/debug.h" #include "initguid.h" #include "comsvcs_classes.h" @@ -109,7 +108,7 @@ static ULONG WINAPI holder_Release(IHolder *iface) if (!ref) { - heap_free(This); + free(This); } return ref; @@ -221,7 +220,7 @@ static HRESULT create_holder(IDispenserDriver *driver, IHolder **object) TRACE("(%p)\n", object); - hold = heap_alloc(sizeof(*hold)); + hold = malloc(sizeof(*hold)); if (!hold) { *object = NULL; @@ -277,7 +276,7 @@ static ULONG WINAPI dismanager_Release(IDispenserManager *iface) { if (This->mta_cookie) CoDecrementMTAUsage(This->mta_cookie); - heap_free(This); + free(This); } return ref; @@ -330,7 +329,7 @@ static HRESULT WINAPI dispenser_manager_cf_CreateInstance(IClassFactory *iface, TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), object); - dismanager = heap_alloc_zero(sizeof(*dismanager)); + dismanager = calloc(1, sizeof(*dismanager)); if (!dismanager) { *object = NULL; @@ -443,8 +442,8 @@ static ULONG WINAPI new_moniker_Release(IMoniker* iface) if (!refcount) { - heap_free(moniker->progid); - heap_free(moniker); + free(moniker->progid); + free(moniker); } return refcount; @@ -488,7 +487,7 @@ static HRESULT WINAPI new_moniker_Load(IMoniker *iface, IStream *stream) if (SUCCEEDED(hr) && progid_len) { - if (!(progid = heap_alloc(progid_len))) + if (!(progid = malloc(progid_len))) return E_OUTOFMEMORY; hr = IStream_Read(stream, progid, progid_len, &len); } @@ -500,12 +499,12 @@ static HRESULT WINAPI new_moniker_Load(IMoniker *iface, IStream *stream) if (SUCCEEDED(hr) && pad == 0) { moniker->clsid = clsid; - heap_free(moniker->progid); + free(moniker->progid); moniker->progid = progid; progid = NULL; } - heap_free(progid); + free(progid); return hr; } @@ -871,7 +870,7 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG progid = str; } - moniker = heap_alloc_zero(sizeof(*moniker)); + moniker = calloc(1, sizeof(*moniker)); if (!moniker) return E_OUTOFMEMORY; @@ -881,12 +880,11 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG moniker->clsid = guid; if (progid) { - if (!(moniker->progid = heap_alloc((lstrlenW(progid) + 1) * sizeof(WCHAR)))) + if (!(moniker->progid = wcsdup(progid))) { IMoniker_Release(&moniker->IMoniker_iface); return E_OUTOFMEMORY; } - lstrcpyW(moniker->progid, progid); } *ret = &moniker->IMoniker_iface; -- 2.35.1

1 0

[RFC PATCH] riched20: Draw OLE objects with IViewObject implementation.
by Jinoh Kang 31 Mar '22

31 Mar '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52752 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/richole.c | 64 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index a23f4c82730..3cbd2ddf4af 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5652,6 +5652,7 @@ static void convert_sizel(const ME_Context *c, const SIZEL* szl, SIZE* sz) void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) { IDataObject* ido; + IViewObject* ivo; FORMATETC fmt; STGMEDIUM stgm; DIBSECTION dibsect; @@ -5677,6 +5678,29 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) return; } + if (SUCCEEDED(IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IViewObject, (void**)&ivo))) + { + HRESULT hr; + SIZEL sizel; + + hr = IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, &sizel); + if (FAILED(hr)) + { + WARN("failed to get extent: %#08lx\n", hr); + sizel.cx = sizel.cy = 0; + } + + convert_sizel(c, &sizel, pSize); + if (c->editor->nZoomNumerator != 0) + { + pSize->cx = MulDiv(pSize->cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + pSize->cy = MulDiv(pSize->cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } + + IViewObject_Release(ivo); + return; + } + if (IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IDataObject, (void**)&ido) != S_OK) { FIXME("Query Interface IID_IDataObject failed!\n"); @@ -5729,6 +5753,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) { IDataObject* ido; + IViewObject* ivo; FORMATETC fmt; STGMEDIUM stgm; DIBSECTION dibsect; @@ -5741,6 +5766,45 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); + + if (SUCCEEDED(IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IViewObject, (void**)&ivo))) + { + HRESULT hr; + SIZEL sizel = run->reobj->obj.sizel; + + if (sizel.cx == 0 && sizel.cy == 0) + { + hr = IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, &sizel); + if (FAILED(hr)) + { + WARN("failed to get extent: %#08lx\n", hr); + IViewObject_Release(ivo); + return; + } + } + + convert_sizel(c, &sizel, &sz); + if (c->editor->nZoomNumerator != 0) + { + sz.cx = MulDiv(sz.cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } + + rc.left = x; + rc.top = y - sz.cy; + rc.right = x + sz.cx; + rc.bottom = y; + + hr = IViewObject_Draw(ivo, DVASPECT_CONTENT, -1, 0, 0, 0, c->hDC, (RECTL*)&rc, NULL, NULL, 0); + if (FAILED(hr)) + { + WARN("failed to draw object: %#08lx\n", hr); + } + + IViewObject_Release(ivo); + return; + } + if (IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IDataObject, (void**)&ido) != S_OK) { FIXME("Couldn't get interface\n"); -- 2.34.1

1 0

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

31 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/instr.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 8f1aa4d45a3..0aba2413ab1 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -496,9 +496,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); #define SIB_INDEX( sib, rex ) (((sib) >> 3) & 7) | (((rex) & REX_X) ? 8 : 0) #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; +/* keep in sync with dlls/ntdll/thread.c:thread_init. + * + * Both the data and the pointers need to be volatile, as GCC 11 + * considers that a fixed value pointer is an empty array, and will + * emit warnings when dereferencing it otherwise. + */ +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 ) { @@ -516,7 +521,7 @@ static inline int get_op_size( int long_op, int rex ) } /* store an operand into a register */ -static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op, int rex, +static void store_reg_word( CONTEXT *context, BYTE regmodrm, const volatile BYTE *addr, int long_op, int rex, enum instr_op op ) { int index = REGMODRM_REG( regmodrm, rex ); @@ -527,7 +532,7 @@ static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, i switch (op) { case INSTR_OP_MOV: - memcpy( reg, addr, op_size ); + memcpy( reg, (BYTE *)addr, op_size ); break; case INSTR_OP_OR: for (i = 0; i < op_size; ++i) @@ -541,7 +546,7 @@ static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, i } /* store an operand into a byte register */ -static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int rex, enum instr_op op ) +static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const volatile BYTE *addr, int rex, enum instr_op op ) { int index = REGMODRM_REG( regmodrm, rex ); BYTE *reg = (BYTE *)get_int_reg( context, index ); @@ -843,7 +848,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; @@ -902,7 +907,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 1

[PATCH v3 6/6] win32u: Move NtUserGetMessage implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 527 +---------------------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 103 ++++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 1 + 7 files changed, 112 insertions(+), 529 deletions(-)

3 2

[PATCH v3 5/6] win32u: Move NtUserPeekMessage implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

3 2

[tools 1/3] testbot/cgi: Add SimpleCollectionPage.
by Francois Gouget 31 Mar '22

31 Mar '22

SimpleCollectionPage embeds a single collection block. But unlike CollectionPage it is only a Page subclass instead of implementing both the Page and CollectionBlock interfaces. Customizing the collection block is done by creating a CollectionBlock subclass and passing the appropriate creator function to the page constructor. This better separates the page customization aspects (implement a SimpleCollectionPage subclass) from the collection block ones (implement a CollectionBlock subclass). Most of the time only the collection block needs to be customized and SimpleCollectionPage can be used as is. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 5 + .../ObjectModel/CGI/SimpleCollectionPage.pm | 138 ++++++++++++++++++ 2 files changed, 143 insertions(+) create mode 100644 testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 9a52f11bc..200734a6a 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -91,6 +91,11 @@ sub _initialize($$$) #my ($self, $Collection, $EnclosingPage) = @_; } +sub Create($$@) +{ + return ObjectModel::CGI::CollectionBlock->new(@_); +} + sub CallGetDetailsPage($) { my ($self) = @_; diff --git a/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm b/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm new file mode 100644 index 000000000..76e4d5195 --- /dev/null +++ b/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm @@ -0,0 +1,138 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Base class for list pages +# +# Copyright 2009 Ge van Geldorp +# Copyright 2014, 2017-2018, 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package ObjectModel::CGI::SimpleCollectionPage; + +=head1 NAME + +ObjectModel::CGI::SimpleCollectionPage - Base class for list pages + +A page containing a single collection block. + +The SimpleCollectionPage instances have the following properties: +=over +=item Collection +The collection containing the items to be shown in the CollectionBlock widget. + +=item CollectionBlock +The widget showing the items in the specified collection. + +=item ActionPerformed +Set to true if an action was specified and succeeded. +=back + +=cut + +use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); + +# Use require to avoid overriding Page::new() +require ObjectModel::CGI::CollectionBlock; + + +=pod +=over 12 + +=item C<_initialize()> + +Sets up the new page object. + +Parameters: +=over + +=item Request +=item RequiredRole +See Page::new(). + +=item Collection +This is the collection of items that should be shown in the CollectionBlock +widget. + +=item BlockCreator +If undefined the page will create an instance of the CollectionBlock class. +Otherwise it will use this function to create the CollectionBlock widget, thus +enabling use of a CollectionBlock subclass. + +=back + +=back +=cut + +sub _initialize($$$$;$) +{ + my ($self, $Request, $RequiredRole, $Collection, $BlockCreator) = @_; + + $self->{Collection} = $Collection; + $BlockCreator ||= \&ObjectModel::CGI::CollectionBlock::Create; + $self->{CollectionBlock} = &$BlockCreator($Collection, $self); + $self->SUPER::_initialize($Request, $RequiredRole); +} + + +# +# HTML page generation +# + +sub GetTitle($) +{ + my ($self) = @_; + + my $Title = ucfirst($self->{Collection}->GetCollectionName()); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return $Title; +} + +sub GenerateTitle($) +{ + my ($self) = @_; + + my $Title = $self->GetTitle(); + if ($Title) + { + print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; + } +} + +sub GenerateBody($) +{ + my ($self) = @_; + + print "<div class='CollectionPageBody'>\n"; + $self->GenerateTitle(); + print "<div class='Content'>\n"; + $self->{CollectionBlock}->GenerateList(); + print "</div>\n"; + print "</div>\n"; +} + +sub GeneratePage($) +{ + my ($self) = @_; + + if ($self->GetParam("Action")) + { + $self->{ActionPerformed} = $self->{CollectionBlock}->OnAction($self->GetParam("Action")); + } + $self->SUPER::GeneratePage(); +} + +1; -- 2.30.2

1 2

[tools] testbot: Fix the spelling of a couple of Perl POD entries.
by Francois Gouget 31 Mar '22

31 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 58ece69f3..9a52f11bc 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -37,7 +37,7 @@ Also, because this is only one part of a web page, some methods, such as those dealing with errors, are delegated to the EnclosingPage object which must implement the ObjectModel::CGI::Page interface. -Other methods are designed so they can be overriden by the enclosing page as +Other methods are designed so they can be overridden by the enclosing page as a way to allow it to modify how the collection block looks or behaves. These methods can be identified by their CallXxx() trampoline. The override mechanism works as follows: diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index a79155950..0879557ad 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -360,7 +360,7 @@ sub GetPageTitle($) =head1 C<GetTitle()> This returns the title for the current web page or email section. -Note that this may not be valid HTML and thus my need escaping. +Note that this may not be valid HTML and thus may need escaping. =back =cut -- 2.30.2

1 0

[PATCH v3 4/6] win32u: Move process_sent_messages implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v3: Removed unused functions. dlls/user32/message.c | 11 +- dlls/user32/user_main.c | 3 + dlls/user32/user_private.h | 6 +- dlls/user32/winproc.c | 6 + dlls/win32u/message.c | 392 ++++++++++++++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 6 + dlls/win32u/sysparams.c | 10 + dlls/win32u/win32u_private.h | 2 + include/ntuser.h | 12 ++ 9 files changed, 440 insertions(+), 8 deletions(-)

3 2

[PATCH v3 3/6] user32: Move unpack_message call to User32CallWindowProc.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 412 +++-------------------------------- dlls/user32/winproc.c | 486 +++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + include/ntuser.h | 1 + 4 files changed, 511 insertions(+), 390 deletions(-)

3 2

[tools] testbot/web: Standardize the page creation.
by Francois Gouget 31 Mar '22

31 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 5 ++--- testbot/web/Feedback.pl | 5 ++--- testbot/web/ForgotPassword.pl | 5 ++--- testbot/web/JobDetails.pl | 5 ++--- testbot/web/Login.pl | 5 ++--- testbot/web/Logout.pl | 5 ++--- testbot/web/Register.pl | 5 ++--- testbot/web/ResetPassword.pl | 5 ++--- testbot/web/Stats.pl | 5 ++--- testbot/web/Submit.pl | 5 ++--- testbot/web/admin/BranchDetails.pl | 5 ++--- testbot/web/admin/Log.pl | 5 ++--- testbot/web/admin/SpecialJobs.pl | 5 ++--- testbot/web/admin/UserDetails.pl | 5 ++--- testbot/web/admin/VMDetails.pl | 5 ++--- testbot/web/index.pl | 5 ++--- 16 files changed, 32 insertions(+), 48 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 1771e7ca3..5a5a37505 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -318,6 +318,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $ActivityPage = ActivityPage->new($Request, "wine-devel"); -$ActivityPage->GeneratePage(); +my $Page = ActivityPage->new($Request, "wine-devel"); +$Page->GeneratePage(); diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index ca1ee5ed7..6185d26d2 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -137,6 +137,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $FeedbackPage = FeedbackPage->new($Request, ""); -$FeedbackPage->GeneratePage(); +my $Page = FeedbackPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index cc0cd455d..190985264 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -131,6 +131,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $ForgotPasswordPage = ForgotPasswordPage->new($Request, ""); -$ForgotPasswordPage->GeneratePage(); +my $Page = ForgotPasswordPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c4d6b1a1b..7e1df1ffa 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -741,6 +741,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $JobDetailsPage = JobDetailsPage->new($Request, ""); -$JobDetailsPage->GeneratePage(); +my $Page = JobDetailsPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index ac64fc28e..b1f82a94b 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -154,6 +154,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $LoginPage = LoginPage->new($Request, ""); -$LoginPage->GeneratePage(); +my $Page = LoginPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index b0fd5cdc1..35f5c487c 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -76,6 +76,5 @@ sub GeneratePage($) package main; my $Request = shift; - -my $LogoutPage = LogoutPage->new($Request, ""); -$LogoutPage->GeneratePage(); +my $Page = LogoutPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 4cfef79fc..bbea0eb12 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -183,6 +183,5 @@ EOF package main; my $Request = shift; - -my $RegisterPage = RegisterPage->new($Request, ""); -$RegisterPage->GeneratePage(); +my $Page = RegisterPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 81655e0c4..4f672ea94 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -184,6 +184,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $ResetPasswordPage = ResetPasswordPage->new($Request, ""); -$ResetPasswordPage->GeneratePage(); +my $Page = ResetPasswordPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 39c28789c..7ef65b3bf 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -397,6 +397,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $StatsPage = StatsPage->new($Request, "wine-devel"); -$StatsPage->GeneratePage(); +my $Page = StatsPage->new($Request, "wine-devel"); +$Page->GeneratePage(); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index aba2b6dc5..8323b9ab7 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1376,6 +1376,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $SubmitPage = SubmitPage->new($Request, "wine-devel"); -$SubmitPage->GeneratePage(); +my $Page = SubmitPage->new($Request, "wine-devel"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/BranchDetails.pl b/testbot/web/admin/BranchDetails.pl index fe3ebd118..1373e20fe 100644 --- a/testbot/web/admin/BranchDetails.pl +++ b/testbot/web/admin/BranchDetails.pl @@ -38,6 +38,5 @@ sub _initialize($$$) package main; my $Request = shift; - -my $BranchDetailsPage = BranchDetailsPage->new($Request, "admin"); -$BranchDetailsPage->GeneratePage(); +my $Page = BranchDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 8d3a8ce8b..9c18c375e 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -97,6 +97,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $LogPage = LogPage->new($Request, "admin"); -$LogPage->GeneratePage(); +my $Page = LogPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 49f80a0f9..e267cc7d5 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -256,6 +256,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $SubmitPage = SpecialJobsPage->new($Request, "admin"); -$SubmitPage->GeneratePage(); +my $Page = SpecialJobsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 7f7c710e1..f11d127ad 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -126,6 +126,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $UserDetailsPage = UserDetailsPage->new($Request, "admin"); -$UserDetailsPage->GeneratePage(); +my $Page = UserDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index f39b0d674..35b26811a 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -89,6 +89,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $VMDetailsPage = VMDetailsPage->new($Request, "admin"); -$VMDetailsPage->GeneratePage(); +my $Page = VMDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 94421536d..d2dd2b49d 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -394,6 +394,5 @@ EOF package main; my $Request = shift; - -my $StatusPage = StatusPage->new($Request, ""); -$StatusPage->GeneratePage(); +my $Page = StatusPage->new($Request, ""); +$Page->GeneratePage(); -- 2.30.2

1 0

[PATCH v3 2/6] win32u: Move reply_message_result implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 181 +----------------------- dlls/win32u/message.c | 264 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 9 ++ dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 153 ++++++++++++++++++++ 6 files changed, 431 insertions(+), 179 deletions(-)

3 2

[tools] testbot: Remove an unneeded Fcntl import in VM::Run().
by Francois Gouget 31 Mar '22

31 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index f850daaf3..65f633354 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -446,7 +446,6 @@ sub Run($$$$$$) # So set ChildPid in the parent and synchronize with the child so it only # execs once this is done. - use Fcntl; my ($fd_read, $fd_write); pipe($fd_read, $fd_write); # For synchronization -- 2.30.2

1 0

[tools] testbot/cgi: ItemPage does not need URI::Escape.
by Francois Gouget 31 Mar '22

31 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 567a489fc..b88e27394 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -31,7 +31,6 @@ ObjectModel::CGI::ItemPage - Base class for bound web forms use ObjectModel::CGI::FormPage; our @ISA = qw(ObjectModel::CGI::FormPage); -use URI::Escape; sub _initialize($$$$) { -- 2.30.2

1 0

[tools] testbot/CheckForWinetestUpdate: HTTP::Response is not needed.
by Francois Gouget 31 Mar '22

31 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 94d975071..c7aecce1e 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -46,7 +46,6 @@ use File::Compare; use File::Copy; use LWP::UserAgent; use HTTP::Request; -use HTTP::Response; use HTTP::Status; use WineTestBot::Config; -- 2.30.2

1 0

[tools] testbot/web: Remove unneeded imports from the Submit page.
by Francois Gouget 31 Mar '22

31 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3d49aaeaa..aba2b6dc5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -26,9 +26,7 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use Fcntl qw(O_RDONLY); -use IO::Handle; use POSIX qw(:fcntl_h); # For SEEK_XXX -use File::Basename; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; -- 2.30.2

1 0

[PATCH v3 1/6] user32: Introduce reply_message_result helper.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-)

3 2

[PATCH v2 4/6] win32u: Move process_sent_messages implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

3 3

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

31 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/explorerframe/nstc.c | 15 +++++++-------- dlls/explorerframe/taskbarlist.c | 5 ++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 315316f7e7a..3b56d33367a 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -33,7 +33,6 @@ #include "wine/list.h" #include "wine/debug.h" -#include "wine/heap.h" #include "explorerframe_main.h" @@ -852,7 +851,7 @@ static ULONG WINAPI NSTC2_fnRelease(INameSpaceTreeControl2* iface) if(!ref) { TRACE("Freeing.\n"); - heap_free(This); + free(This); EFRAME_UnlockModule(); } @@ -989,7 +988,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, TRACE("%p, %d, %p, %lx, %lx, %p\n", This, iIndex, psiRoot, grfEnumFlags, grfRootStyle, pif); - new_root = heap_alloc(sizeof(*new_root)); + new_root = malloc(sizeof(*new_root)); if(!new_root) return E_OUTOFMEMORY; @@ -1013,7 +1012,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface, if(!new_root->htreeitem) { WARN("Failed to add the root.\n"); - heap_free(new_root); + free(new_root); return E_FAIL; } @@ -1081,7 +1080,7 @@ static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, events_OnItemDeleted(This, root->psi, TRUE); SendMessageW(This->hwnd_tv, TVM_DELETEITEM, 0, (LPARAM)root->htreeitem); list_remove(&root->entry); - heap_free(root); + free(root); return S_OK; } else @@ -1123,7 +1122,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, if(!count) return E_INVALIDARG; - array = heap_alloc(sizeof(LPITEMIDLIST)*count); + array = malloc(sizeof(LPITEMIDLIST)*count); i = 0; LIST_FOR_EACH_ENTRY(root, &This->roots, nstc_root, entry) @@ -1137,7 +1136,7 @@ static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, for(i = 0; i < count; i++) ILFree(array[i]); - heap_free(array); + free(array); return hr; } @@ -1598,7 +1597,7 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void EFRAME_LockModule(); - nstc = heap_alloc_zero(sizeof(*nstc)); + nstc = calloc(1, sizeof(*nstc)); if (!nstc) return E_OUTOFMEMORY; diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index b4bc104cd6b..dd61cc62ae4 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -21,7 +21,6 @@ #include "explorerframe_main.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); @@ -81,7 +80,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList4 *iface) if (!refcount) { - heap_free(This); + free(This); EFRAME_UnlockModule(); } @@ -309,7 +308,7 @@ HRESULT TaskbarList_Constructor(IUnknown *outer, REFIID riid, void **taskbar_lis return CLASS_E_NOAGGREGATION; } - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if (!object) { ERR("Failed to allocate taskbar list object memory\n"); -- 2.35.1

1 0

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

31 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/appwiz.cpl/appwiz.c | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 593c8644b7e..012bc054129 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -106,19 +106,19 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, */ static void FreeAppInfo(APPINFO *info) { - HeapFree(GetProcessHeap(), 0, info->title); - HeapFree(GetProcessHeap(), 0, info->path); - HeapFree(GetProcessHeap(), 0, info->path_modify); - HeapFree(GetProcessHeap(), 0, info->icon); - HeapFree(GetProcessHeap(), 0, info->publisher); - HeapFree(GetProcessHeap(), 0, info->version); - HeapFree(GetProcessHeap(), 0, info->contact); - HeapFree(GetProcessHeap(), 0, info->helplink); - HeapFree(GetProcessHeap(), 0, info->helptelephone); - HeapFree(GetProcessHeap(), 0, info->readme); - HeapFree(GetProcessHeap(), 0, info->urlupdateinfo); - HeapFree(GetProcessHeap(), 0, info->comments); - HeapFree(GetProcessHeap(), 0, info); + free(info->title); + free(info->path); + free(info->path_modify); + free(info->icon); + free(info->publisher); + free(info->version); + free(info->contact); + free(info->helplink); + free(info->helptelephone); + free(info->readme); + free(info->urlupdateinfo); + free(info->comments); + free(info); } static WCHAR *get_reg_str(HKEY hkey, const WCHAR *value) @@ -127,7 +127,7 @@ static WCHAR *get_reg_str(HKEY hkey, const WCHAR *value) WCHAR *ret = NULL; if (!RegQueryValueExW(hkey, value, NULL, &type, NULL, &len) && type == REG_SZ) { - if (!(ret = HeapAlloc(GetProcessHeap(), 0, len))) return NULL; + if (!(ret = malloc(len))) return NULL; RegQueryValueExW(hkey, value, 0, 0, (BYTE *)ret, &len); } return ret; @@ -176,12 +176,12 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) { int len = lstrlenW(L"msiexec /x%s") + lstrlenW(subKeyName); - if (!(command = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) goto err; + if (!(command = malloc(len * sizeof(WCHAR)))) goto err; wsprintfW(command, L"msiexec /x%s", subKeyName); } else if (!RegQueryValueExW(hkeyApp, L"UninstallString", 0, 0, NULL, &uninstlen)) { - if (!(command = HeapAlloc(GetProcessHeap(), 0, uninstlen))) goto err; + if (!(command = malloc(uninstlen))) goto err; RegQueryValueExW(hkeyApp, L"UninstallString", 0, 0, (BYTE *)command, &uninstlen); } else @@ -191,10 +191,10 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) continue; } - info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct APPINFO)); + info = calloc(1, sizeof(*info)); if (!info) goto err; - info->title = HeapAlloc(GetProcessHeap(), 0, displen); + info->title = malloc(displen); if (!info->title) goto err; @@ -209,7 +209,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) info->icon = 0; else { - info->icon = HeapAlloc(GetProcessHeap(), 0, displen); + info->icon = malloc(displen); if (!info->icon) goto err; @@ -259,12 +259,12 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) { int len = lstrlenW(L"msiexec /i%s") + lstrlenW(subKeyName); - if (!(info->path_modify = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) goto err; + if (!(info->path_modify = malloc(len * sizeof(WCHAR)))) goto err; wsprintfW(info->path_modify, L"msiexec /i%s", subKeyName); } else if (!RegQueryValueExW(hkeyApp, L"ModifyPath", 0, 0, NULL, &displen)) { - if (!(info->path_modify = HeapAlloc(GetProcessHeap(), 0, displen))) goto err; + if (!(info->path_modify = malloc(displen))) goto err; RegQueryValueExW(hkeyApp, L"ModifyPath", 0, 0, (BYTE *)info->path_modify, &displen); } } @@ -286,7 +286,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) err: RegCloseKey(hkeyApp); if (info) FreeAppInfo(info); - HeapFree(GetProcessHeap(), 0, command); + free(command); return FALSE; } -- 2.35.1

1 0

[PATCH] atl: Use CRT allocation functions.
by Nikolay Sivov 31 Mar '22

31 Mar '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/atl/atl.c | 11 +++++------ dlls/atl/atl30.c | 2 +- dlls/atl/atl_ax.c | 24 +++++++++++------------ dlls/atl/registrar.c | 45 ++++++++++++++++++++++---------------------- 4 files changed, 40 insertions(+), 42 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index ed6afe4ea2e..87a24e33ed7 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -23,7 +23,6 @@ #include "atlcom.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(atl); @@ -294,7 +293,7 @@ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD TRACE("version %04x (%p %p %Id)\n", _ATL_VER, pM, pFunc, dw); if (_ATL_VER > _ATL_VER_30 || pM->cbSize > ATLVer1Size) { - termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); + termfunc_elem = malloc(sizeof(*termfunc_elem)); termfunc_elem->pFunc = pFunc; termfunc_elem->dw = dw; termfunc_elem->pNext = pM->m_pTermFuncs; @@ -320,7 +319,7 @@ void WINAPI AtlCallTermFunc(_ATL_MODULE *pM) iter->pFunc(iter->dw); tmp = iter; iter = iter->pNext; - HeapFree(GetProcessHeap(), 0, tmp); + free(tmp); } pM->m_pTermFuncs = NULL; @@ -342,13 +341,13 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, TRACE("(%p %s %p %p)\n", inst, debugstr_w(lpszIndex), pbstrPath, ppTypeLib); index_len = lpszIndex ? lstrlenW(lpszIndex) : 0; - path = heap_alloc((MAX_PATH+index_len)*sizeof(WCHAR) + sizeof(L".tlb")); + path = malloc((MAX_PATH+index_len)*sizeof(WCHAR) + sizeof(L".tlb")); if(!path) return E_OUTOFMEMORY; path_len = GetModuleFileNameW(inst, path, MAX_PATH); if(!path_len) { - heap_free(path); + free(path); return HRESULT_FROM_WIN32(GetLastError()); } @@ -374,7 +373,7 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, } } - heap_free(path); + free(path); if(FAILED(hres)) return hres; diff --git a/dlls/atl/atl30.c b/dlls/atl/atl30.c index e84656998b8..d7d130c2a03 100644 --- a/dlls/atl/atl30.c +++ b/dlls/atl/atl30.c @@ -121,7 +121,7 @@ HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM) iter->pFunc(iter->dw); tmp = iter; iter = iter->pNext; - HeapFree(GetProcessHeap(), 0, tmp); + free(tmp); } } diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 04b0afdb759..4ff0a796d3b 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -63,12 +63,12 @@ static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, L if ( wMsg == WM_CREATE ) { DWORD len = GetWindowTextLengthW( hWnd ) + 1; - WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + WCHAR *ptr = malloc( len*sizeof(WCHAR) ); if (!ptr) return 1; GetWindowTextW( hWnd, ptr, len ); AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, ptr ); + free( ptr ); return 0; } return DefWindowProcW( hWnd, wMsg, wParam, lParam ); @@ -225,7 +225,7 @@ static ULONG WINAPI OleClientSite_Release(IOleClientSite *iface) if (!ref) { IOCS_Detach( This ); - HeapFree( GetProcessHeap(), 0, This ); + free( This ); } return ref; @@ -945,7 +945,7 @@ static HRESULT IOCS_Create( HWND hWnd, IUnknown *pUnkControl, IUnknown **contain return S_OK; *container = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(IOCS)); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -969,7 +969,7 @@ static HRESULT IOCS_Create( HWND hWnd, IUnknown *pUnkControl, IUnknown **contain else { IOCS_Detach( This ); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return hr; @@ -1160,7 +1160,7 @@ static inline BOOL advance_array(WORD **pptr, DWORD *palloc, DWORD *pfilled, con if ( (*pfilled + size) > *palloc ) { *palloc = ((*pfilled+size) + 0xFF) & ~0xFF; - *pptr = HeapReAlloc( GetProcessHeap(), 0, *pptr, *palloc * sizeof(WORD) ); + *pptr = realloc( *pptr, *palloc * sizeof(WORD) ); if (!*pptr) return FALSE; } @@ -1186,7 +1186,7 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) DWORD style; filled = 0; allocated = 256; - output = HeapAlloc( GetProcessHeap(), 0, allocated * sizeof(WORD) ); + output = malloc( allocated * sizeof(WORD) ); if (!output) return NULL; @@ -1307,12 +1307,12 @@ HWND WINAPI AtlAxCreateDialogA(HINSTANCE hInst, LPCSTR name, HWND owner, DLGPROC return AtlAxCreateDialogW( hInst, (LPCWSTR) name, owner, dlgProc, param ); length = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); - nameW = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); + nameW = malloc( length * sizeof(WCHAR) ); if (nameW) { MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, length ); res = AtlAxCreateDialogW( hInst, nameW, owner, dlgProc, param ); - HeapFree( GetProcessHeap(), 0, nameW ); + free( nameW ); } return res; } @@ -1348,8 +1348,8 @@ HWND WINAPI AtlAxCreateDialogW(HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPRO newptr = AX_ConvertDialogTemplate( ptr ); if ( newptr ) { - res = CreateDialogIndirectParamW( hInst, newptr, owner, dlgProc, param ); - HeapFree( GetProcessHeap(), 0, newptr ); + res = CreateDialogIndirectParamW( hInst, newptr, owner, dlgProc, param ); + free( newptr ); } else res = NULL; FreeResource ( hrsrc ); @@ -1425,7 +1425,7 @@ INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE instance, const WCHAR *name, return 0; ret = DialogBoxIndirectParamW(instance, template, owner, proc, param); - HeapFree(GetProcessHeap(), 0, template); + free(template); return ret; } diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 061483f6513..5a3eef7dd4f 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -74,7 +74,7 @@ static inline Registrar *impl_from_IRegistrar(IRegistrar *iface) static void strbuf_init(strbuf *buf) { - buf->str = HeapAlloc(GetProcessHeap(), 0, 128*sizeof(WCHAR)); + buf->str = malloc(128*sizeof(WCHAR)); buf->alloc = 128; buf->len = 0; } @@ -85,7 +85,7 @@ static void strbuf_write(LPCOLESTR str, strbuf *buf, int len) len = lstrlenW(str); if(buf->len+len+1 >= buf->alloc) { buf->alloc = (buf->len+len)<<1; - buf->str = HeapReAlloc(GetProcessHeap(), 0, buf->str, buf->alloc*sizeof(WCHAR)); + buf->str = realloc(buf->str, buf->alloc*sizeof(WCHAR)); } memcpy(buf->str+buf->len, str, len*sizeof(OLECHAR)); buf->len += len; @@ -292,7 +292,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO if(FAILED(hres)) break; count = (lstrlenW(buf->str) + 1) / 2; - bytes = HeapAlloc(GetProcessHeap(), 0, count); + bytes = malloc(count); if(bytes == NULL) { hres = E_OUTOFMEMORY; break; @@ -313,7 +313,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO hres = HRESULT_FROM_WIN32(lres); } } - HeapFree(GetProcessHeap(), 0, bytes); + free(bytes); break; } default: @@ -360,7 +360,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO break; } - HeapFree(GetProcessHeap(), 0, name.str); + free(name.str); if(hkey && key_type != IS_VAL) RegCloseKey(hkey); *pstr = iter; @@ -411,7 +411,7 @@ static HRESULT do_process_root_key(LPCOLESTR data, BOOL do_register) if(FAILED(hres)) break; } - HeapFree(GetProcessHeap(), 0, buf.str); + free(buf.str); return hres; } @@ -426,7 +426,7 @@ static HRESULT string_register(Registrar *This, LPCOLESTR data, BOOL do_register hres = do_preprocess(This, data, &buf); if(FAILED(hres)) { WARN("preprocessing failed!\n"); - HeapFree(GetProcessHeap(), 0, buf.str); + free(buf.str); return hres; } @@ -434,7 +434,7 @@ static HRESULT string_register(Registrar *This, LPCOLESTR data, BOOL do_register if(FAILED(hres) && do_register) do_process_root_key(buf.str, FALSE); - HeapFree(GetProcessHeap(), 0, buf.str); + free(buf.str); return hres; } @@ -456,13 +456,13 @@ static HRESULT resource_register(Registrar *This, LPCOLESTR resFileName, reslen = SizeofResource(hins, src); if(regstra) { len = MultiByteToWideChar(CP_ACP, 0, regstra, reslen, NULL, 0)+1; - regstrw = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR)); + regstrw = calloc(len, sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, regstra, reslen, regstrw, len); regstrw[len-1] = '\0'; hres = string_register(This, regstrw, do_register); - HeapFree(GetProcessHeap(), 0, regstrw); + free(regstrw); }else { WARN("could not load resource\n"); hres = HRESULT_FROM_WIN32(GetLastError()); @@ -491,21 +491,21 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist file = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if(file != INVALID_HANDLE_VALUE) { filelen = GetFileSize(file, NULL); - regstra = HeapAlloc(GetProcessHeap(), 0, filelen); + regstra = malloc(filelen); if(ReadFile(file, regstra, filelen, NULL, NULL)) { len = MultiByteToWideChar(CP_ACP, 0, regstra, filelen, NULL, 0)+1; - regstrw = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR)); + regstrw = calloc(len, sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, regstra, filelen, regstrw, len); regstrw[len-1] = '\0'; hres = string_register(This, regstrw, do_register); - HeapFree(GetProcessHeap(), 0, regstrw); + free(regstrw); }else { WARN("Failed to read file %s\n", debugstr_w(fileName)); hres = HRESULT_FROM_WIN32(GetLastError()); } - HeapFree(GetProcessHeap(), 0, regstra); + free(regstra); CloseHandle(file); }else { WARN("Could not open file %s\n", debugstr_w(fileName)); @@ -545,7 +545,7 @@ static ULONG WINAPI Registrar_Release(IRegistrar *iface) TRACE("(%p) ->%ld\n", This, ref); if(!ref) { IRegistrar_ClearReplacements(iface); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; } @@ -558,14 +558,14 @@ static HRESULT WINAPI Registrar_AddReplacement(IRegistrar *iface, LPCOLESTR Key, TRACE("(%p)->(%s %s)\n", This, debugstr_w(Key), debugstr_w(item)); - new_rep = HeapAlloc(GetProcessHeap(), 0, sizeof(rep_list)); + new_rep = malloc(sizeof(*new_rep)); new_rep->key_len = lstrlenW(Key); - new_rep->key = HeapAlloc(GetProcessHeap(), 0, (new_rep->key_len + 1) * sizeof(OLECHAR)); + new_rep->key = malloc((new_rep->key_len + 1) * sizeof(OLECHAR)); memcpy(new_rep->key, Key, (new_rep->key_len+1)*sizeof(OLECHAR)); len = lstrlenW(item)+1; - new_rep->item = HeapAlloc(GetProcessHeap(), 0, len*sizeof(OLECHAR)); + new_rep->item = malloc(len*sizeof(OLECHAR)); memcpy(new_rep->item, item, len*sizeof(OLECHAR)); new_rep->next = This->rep; @@ -587,9 +587,9 @@ static HRESULT WINAPI Registrar_ClearReplacements(IRegistrar *iface) iter = This->rep; while(iter) { iter2 = iter->next; - HeapFree(GetProcessHeap(), 0, iter->key); - HeapFree(GetProcessHeap(), 0, iter->item); - HeapFree(GetProcessHeap(), 0, iter); + free(iter->key); + free(iter->item); + free(iter); iter = iter2; } @@ -680,13 +680,12 @@ HRESULT WINAPI AtlCreateRegistrar(IRegistrar **ret) { Registrar *registrar; - registrar = HeapAlloc(GetProcessHeap(), 0, sizeof(*registrar)); + registrar = calloc(1, sizeof(*registrar)); if(!registrar) return E_OUTOFMEMORY; registrar->IRegistrar_iface.lpVtbl = &RegistrarVtbl; registrar->ref = 1; - registrar->rep = NULL; *ret = &registrar->IRegistrar_iface; return S_OK; -- 2.35.1

1 0

[PATCH] crypt32/tests: Use wide character string literals.
by Hans Leidekker 31 Mar '22

31 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/tests/cert.c | 52 +++---- dlls/crypt32/tests/chain.c | 59 +++----- dlls/crypt32/tests/encode.c | 88 +++++------ dlls/crypt32/tests/main.c | 16 +- dlls/crypt32/tests/object.c | 54 ++----- dlls/crypt32/tests/oid.c | 65 ++++---- dlls/crypt32/tests/protectdata.c | 13 +- dlls/crypt32/tests/sip.c | 35 ++--- dlls/crypt32/tests/store.c | 222 ++++++++++----------------- dlls/crypt32/tests/str.c | 249 +++++++++---------------------- 10 files changed, 294 insertions(+), 559 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 608d2c8c1b7..e781045b2c4 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -348,7 +348,6 @@ static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, } static const CHAR cspNameA[] = "WineCryptTemp"; -static WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e','m','p',0 }; static const BYTE v1CertWithPubKey[] = { 0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, 0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, @@ -1135,9 +1134,6 @@ static void testFindCert(void) CRYPT_HASH_BLOB blob; BYTE otherSerialNumber[] = { 2 }; DWORD count; - static const WCHAR juan[] = { 'j','u','a','n',0 }; - static const WCHAR lang[] = { 'L','A','N','G',0 }; - static const WCHAR malcolm[] = { 'm','a','l','c','o','l','m',0 }; store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -1272,7 +1268,7 @@ static void testFindCert(void) context = NULL; do { context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, - CERT_FIND_ISSUER_STR, juan, context); + CERT_FIND_ISSUER_STR, L"juan", context); if (context) count++; } while (context); @@ -1281,14 +1277,14 @@ static void testFindCert(void) context = NULL; do { context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, - CERT_FIND_ISSUER_STR, lang, context); + CERT_FIND_ISSUER_STR, L"LANG", context); if (context) count++; } while (context); ok(count == 3, "expected 3 contexts\n"); SetLastError(0xdeadbeef); context = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, - CERT_FIND_ISSUER_STR, malcolm, NULL); + CERT_FIND_ISSUER_STR, L"malcolm", NULL); ok(!context, "expected no certs\n"); ok(GetLastError() == CRYPT_E_NOT_FOUND, "expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); @@ -1564,8 +1560,6 @@ static void testGetIssuerCert(void) DWORD flags = 0xffffffff, size; CERT_NAME_BLOB certsubject; BYTE *certencoded; - WCHAR rootW[] = {'R', 'O', 'O', 'T', '\0'}, - certname[] = {'C', 'N', '=', 'd', 'u', 'm', 'm', 'y', ',', ' ', 'T', '=', 'T', 'e', 's', 't', '\0'}; HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -1707,10 +1701,10 @@ static void testGetIssuerCert(void) /* Self-sign a certificate, add to the store and test getting the issuer */ size = 0; - ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, NULL, &size, NULL), + ok(CertStrToNameW(X509_ASN_ENCODING, L"CN=dummy, T=Test", CERT_X500_NAME_STR, NULL, NULL, &size, NULL), "CertStrToName should have worked\n"); certencoded = HeapAlloc(GetProcessHeap(), 0, size); - ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, certencoded, &size, NULL), + ok(CertStrToNameW(X509_ASN_ENCODING, L"CN=dummy, T=Test", CERT_X500_NAME_STR, NULL, certencoded, &size, NULL), "CertStrToName should have worked\n"); certsubject.pbData = certencoded; certsubject.cbData = size; @@ -1735,7 +1729,7 @@ static void testGetIssuerCert(void) HeapFree(GetProcessHeap(), 0, certencoded); /* Test root storage self-signed certificate */ - store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, rootW); + store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, L"ROOT"); ok(store != NULL, "CertOpenStore failed: %08lx\n", GetLastError()); flags = 0; cert1 = CertEnumCertificatesInStore(store, NULL); @@ -1796,10 +1790,6 @@ static void testCryptHashCert2(void) BOOL ret; BYTE hash[20]; DWORD hashLen; - const WCHAR SHA1[] = { 'S', 'H', 'A', '1', '\0' }; - const WCHAR invalidAlgorithm[] = { '_', 'S', 'H', 'O', 'U', 'L', 'D', - 'N', 'O', 'T', - 'E', 'X', 'I', 'S', 'T', '_', '\0' }; if (!pCryptHashCertificate2) { @@ -1809,21 +1799,21 @@ static void testCryptHashCert2(void) /* Test empty hash */ hashLen = sizeof(hash); - ret = pCryptHashCertificate2(SHA1, 0, NULL, NULL, 0, hash, &hashLen); + ret = pCryptHashCertificate2(L"SHA1", 0, NULL, NULL, 0, hash, &hashLen); ok(ret, "CryptHashCertificate2 failed: %08lx\n", GetLastError()); ok(hashLen == sizeof(hash), "Got unexpected size of hash %ld\n", hashLen); ok(!memcmp(hash, emptyHash, sizeof(emptyHash)), "Unexpected hash of nothing\n"); /* Test known hash */ hashLen = sizeof(hash); - ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), hash, &hashLen); ok(ret, "CryptHashCertificate2 failed: %08lx\n", GetLastError()); ok(hashLen == sizeof(hash), "Got unexpected size of hash %ld\n", hashLen); ok(!memcmp(hash, knownHash, sizeof(knownHash)), "Unexpected hash\n"); /* Test null hash size pointer just sets hash size */ hashLen = 0; - ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), NULL, &hashLen); + ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), NULL, &hashLen); ok(ret, "CryptHashCertificate2 failed: %08lx\n", GetLastError()); ok(hashLen == sizeof(hash), "Hash size not set correctly (%ld)\n", hashLen); @@ -1837,24 +1827,24 @@ static void testCryptHashCert2(void) /* Test invalid algorithm */ hashLen = sizeof(hash); SetLastError(0xdeadbeef); - ret = pCryptHashCertificate2(invalidAlgorithm, 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ret = pCryptHashCertificate2(L"_SHOULDNOTEXIST_", 0, NULL, toHash, sizeof(toHash), hash, &hashLen); ok(!ret && GetLastError() == STATUS_NOT_FOUND, "Expected STATUS_NOT_FOUND (0x%08lx), got 0x%08lx\n", STATUS_NOT_FOUND, GetLastError()); /* Test hash buffer too small */ hashLen = sizeof(hash) / 2; SetLastError(0xdeadbeef); - ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), hash, &hashLen); + ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), hash, &hashLen); ok(!ret && GetLastError() == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA (%d), got %ld\n", ERROR_MORE_DATA, GetLastError()); /* Null hash length crashes Windows implementations */ if (0) { /* Test hashLen null with hash */ - ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), hash, NULL); + ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), hash, NULL); /* Test hashLen null with no hash */ - ret = pCryptHashCertificate2(SHA1, 0, NULL, toHash, sizeof(toHash), NULL, NULL); + ret = pCryptHashCertificate2(L"SHA1", 0, NULL, toHash, sizeof(toHash), NULL, NULL); } } @@ -2311,7 +2301,7 @@ static void testCreateSelfSignCert(void) if (ret) { /* Sanity-check the key provider */ - ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), + ok(!lstrcmpW(pInfo->pwszContainerName, L"WineCryptTemp"), "Unexpected key container\n"); ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); @@ -2346,7 +2336,7 @@ static void testCreateSelfSignCert(void) info.dwProvType = PROV_RSA_FULL; info.dwKeySpec = AT_KEYEXCHANGE; info.pwszProvName = (LPWSTR) MS_DEF_PROV_W; - info.pwszContainerName = cspNameW; + info.pwszContainerName = (WCHAR *)L"WineCryptTemp"; /* This should fail because the CSP doesn't have the specified key. */ SetLastError(0xdeadbeef); context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, @@ -2385,7 +2375,7 @@ static void testCreateSelfSignCert(void) if (ret) { /* Sanity-check the key provider */ - ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), + ok(!lstrcmpW(pInfo->pwszContainerName, L"WineCryptTemp"), "Unexpected key container\n"); ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); @@ -2432,7 +2422,7 @@ static void testCreateSelfSignCert(void) if (ret) { /* Sanity-check the key provider */ - ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), + ok(!lstrcmpW(pInfo->pwszContainerName, L"WineCryptTemp"), "Unexpected key container\n"); ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); @@ -2468,7 +2458,7 @@ static void testCreateSelfSignCert(void) info.dwProvType = PROV_RSA_FULL; info.dwKeySpec = AT_SIGNATURE; info.pwszProvName = (LPWSTR) MS_DEF_PROV_W; - info.pwszContainerName = cspNameW; + info.pwszContainerName = (WCHAR *)L"WineCryptTemp"; /* This should fail because the CSP doesn't have the specified key. */ SetLastError(0xdeadbeef); context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, @@ -2509,7 +2499,7 @@ static void testCreateSelfSignCert(void) if (ret) { /* Sanity-check the key provider */ - ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), + ok(!lstrcmpW(pInfo->pwszContainerName, L"WineCryptTemp"), "Unexpected key container\n"); ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); @@ -3112,7 +3102,7 @@ static void testIsRDNAttrsInCertificateName(void) static char juan_with_intermediate_space[] = "Juan Lang"; static char juan_with_trailing_space[] = "Juan Lang "; static char juan_lower_case[] = "juan lang"; - static WCHAR juanW[] = { 'J','u','a','n',' ','L','a','n','g',0 }; + static WCHAR juanW[] = L"Juan Lang"; static char the_wine_project[] = "The Wine Project"; BOOL ret; CERT_NAME_BLOB name; @@ -3852,7 +3842,7 @@ static void testAcquireCertPrivateKey(void) lstrcpyW(ms_def_prov_w, MS_DEF_PROV_W); - keyProvInfo.pwszContainerName = cspNameW; + keyProvInfo.pwszContainerName = (WCHAR *)L"WineCryptTemp"; keyProvInfo.pwszProvName = ms_def_prov_w; keyProvInfo.dwProvType = PROV_RSA_FULL; keyProvInfo.dwFlags = 0; diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 9165e87249f..bcf51c6c811 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -5140,31 +5140,6 @@ static void check_ssl_policy(void) { CERT_CHAIN_POLICY_PARA policyPara = { 0 }; SSL_EXTRA_CERT_CHAIN_POLICY_PARA sslPolicyPara = { { 0 } }; - WCHAR winehq[] = { 'w','i','n','e','h','q','.','o','r','g',0 }; - WCHAR google_dot_com[] = { 'w','w','w','.','g','o','o','g','l','e','.', - 'c','o','m',0 }; - WCHAR battle_dot_net[] = { 'w','w','w','.','b','a','t','t','l','e','.', - 'n','e','t',0 }; - WCHAR a_dot_openssl_dot_org[] = { 'a','.','o','p','e','n','s','s','l','.', - 'o','r','g',0 }; - WCHAR openssl_dot_org[] = { 'o','p','e','n','s','s','l','.','o','r','g',0 }; - WCHAR fopenssl_dot_org[] = { 'f','o','p','e','n','s','s','l','.', - 'o','r','g',0 }; - WCHAR a_dot_b_dot_openssl_dot_org[] = { 'a','.','b','.', - 'o','p','e','n','s','s','l','.','o','r','g',0 }; - WCHAR cs_dot_stanford_dot_edu[] = { 'c','s','.', - 's','t','a','n','f','o','r','d','.','e','d','u',0 }; - WCHAR www_dot_cs_dot_stanford_dot_edu[] = { 'w','w','w','.','c','s','.', - 's','t','a','n','f','o','r','d','.','e','d','u',0 }; - WCHAR a_dot_cs_dot_stanford_dot_edu[] = { 'a','.','c','s','.', - 's','t','a','n','f','o','r','d','.','e','d','u',0 }; - WCHAR test_dot_winehq_dot_org[] = { 't','e','s','t','.', - 'w','i','n','e','h','q','.','o','r','g',0 }; - WCHAR a_dot_b_dot_winehq_dot_org[] = { 'a','.','b','.', - 'w','i','n','e','h','q','.','o','r','g',0 }; - WCHAR foo_dot_com[] = { 'f','o','o','.','c','o','m',0 }; - WCHAR afoo_dot_com[] = { 'a','f','o','o','.','c','o','m',0 }; - WCHAR a_dot_foo_dot_com[] = { 'a','.','f','o','o','.','c','o','m',0 }; HCERTSTORE testRoot; CERT_CHAIN_ENGINE_CONFIG engineConfig = { sizeof(engineConfig), 0 }; HCERTCHAINENGINE engine; @@ -5199,7 +5174,7 @@ static void check_ssl_policy(void) /* One more time authenticating a client, but specify winehq.org as the * server name. */ - sslPolicyPara.pwszServerName = winehq; + sslPolicyPara.pwszServerName = (WCHAR *)L"winehq.org"; CHECK_CHAIN_POLICY_STATUS_ARRAY(CERT_CHAIN_POLICY_SSL, NULL, sslPolicyCheck, &oct2007, &policyPara); /* And again authenticating a server, still specifying winehq.org as the @@ -5226,7 +5201,7 @@ static void check_ssl_policy(void) CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); /* And again, but checking the Google chain at a bad date */ - sslPolicyPara.pwszServerName = google_dot_com; + sslPolicyPara.pwszServerName = (WCHAR *)L"www.google.com"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, googlePolicyCheckWithMatchingNameExpired, &oct2007, &policyPara); policyPara.dwFlags = 0; @@ -5239,7 +5214,7 @@ static void check_ssl_policy(void) googlePolicyCheckWithMatchingName, &oct2007, &policyPara); /* And again, but checking the Google chain at a good date */ sslPolicyPara.fdwChecks = SECURITY_FLAG_IGNORE_UNKNOWN_CA; - sslPolicyPara.pwszServerName = google_dot_com; + sslPolicyPara.pwszServerName = (WCHAR *)L"www.google.com"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, googlePolicyCheckWithMatchingName, &nov2016, &policyPara); sslPolicyPara.fdwChecks = 0; @@ -5248,34 +5223,34 @@ static void check_ssl_policy(void) * with various combinations of matching and non-matching names. * With "a.openssl.org": match */ - sslPolicyPara.pwszServerName = a_dot_openssl_dot_org; + sslPolicyPara.pwszServerName = (WCHAR *)L"a.openssl.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, opensslPolicyCheckWithMatchingName, &oct2009, &policyPara); /* With "openssl.org": no match */ - sslPolicyPara.pwszServerName = openssl_dot_org; + sslPolicyPara.pwszServerName = (WCHAR *)L"openssl.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, opensslPolicyCheckWithoutMatchingName, &oct2009, &policyPara); /* With "fopenssl.org": no match */ - sslPolicyPara.pwszServerName = fopenssl_dot_org; + sslPolicyPara.pwszServerName = (WCHAR *)L"fopenssl.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, opensslPolicyCheckWithoutMatchingName, &oct2009, &policyPara); /* with "a.b.openssl.org": no match */ - sslPolicyPara.pwszServerName = a_dot_b_dot_openssl_dot_org; + sslPolicyPara.pwszServerName = (WCHAR *)L"a.b.openssl.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, opensslPolicyCheckWithoutMatchingName, &oct2009, &policyPara); /* Check again with the cs.stanford.edu, which has both cs.stanford.edu * and www.cs.stanford.edu in its subject alternative name. * With "cs.stanford.edu": match */ - sslPolicyPara.pwszServerName = cs_dot_stanford_dot_edu; + sslPolicyPara.pwszServerName = (WCHAR *)L"cs.stanford.edu"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, stanfordPolicyCheckWithMatchingName, &nov2016, &policyPara); /* With "www.cs.stanford.edu": match */ - sslPolicyPara.pwszServerName = www_dot_cs_dot_stanford_dot_edu; + sslPolicyPara.pwszServerName = (WCHAR *)L"www.cs.stanford.edu"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, stanfordPolicyCheckWithMatchingName, &nov2016, &policyPara); /* With "a.cs.stanford.edu": no match */ - sslPolicyPara.pwszServerName = a_dot_cs_dot_stanford_dot_edu; + sslPolicyPara.pwszServerName = (WCHAR *)L"a.cs.stanford.edu"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, stanfordPolicyCheckWithoutMatchingName, &nov2016, &policyPara); /* Check chain29, which has a wildcard in its subject alternative name, @@ -5293,15 +5268,15 @@ static void check_ssl_policy(void) return; } /* With "winehq.org": no match */ - sslPolicyPara.pwszServerName = winehq; + sslPolicyPara.pwszServerName = (WCHAR *)L"winehq.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, engine, winehqPolicyCheckWithoutMatchingName, &oct2007, &policyPara); /* With "test.winehq.org": match */ - sslPolicyPara.pwszServerName = test_dot_winehq_dot_org; + sslPolicyPara.pwszServerName = (WCHAR *)L"test.winehq.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, engine, winehqPolicyCheckWithMatchingName, &oct2007, &policyPara); /* With "a.b.winehq.org": no match */ - sslPolicyPara.pwszServerName = a_dot_b_dot_winehq_dot_org; + sslPolicyPara.pwszServerName = (WCHAR *)L"a.b.winehq.org"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, engine, winehqPolicyCheckWithoutMatchingName, &oct2007, &policyPara); /* When specifying to ignore name mismatch: match */ @@ -5320,20 +5295,20 @@ static void check_ssl_policy(void) /* Test chain31, which has two CNs, "*.foo.com" and "foo.com", against * some names that match one of the CNs: */ - sslPolicyPara.pwszServerName = foo_dot_com; + sslPolicyPara.pwszServerName = (WCHAR *)L"foo.com"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, fooPolicyCheckWithMatchingName, &oct2007, &policyPara); - sslPolicyPara.pwszServerName = a_dot_foo_dot_com; + sslPolicyPara.pwszServerName = (WCHAR *)L"a.foo.com"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, fooPolicyCheckWithMatchingName, &oct2007, &policyPara); /* and against a name that doesn't match either CN: */ - sslPolicyPara.pwszServerName = afoo_dot_com; + sslPolicyPara.pwszServerName = (WCHAR *)L"afoo.com"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, fooPolicyCheckWithoutMatchingName, &oct2007, &policyPara); /* The Battle.Net chain checks a certificate with a domain component * containing a terminating NULL. */ - sslPolicyPara.pwszServerName = battle_dot_net; + sslPolicyPara.pwszServerName = (WCHAR *)L"www.battle.net"; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, nullTerminatedDomainComponentPolicyCheck, &oct2010, &policyPara); } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index b6325efd518..f25c779a9ce 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -886,9 +886,6 @@ static void test_encodeName(DWORD dwEncoding) } } -static WCHAR commonNameW[] = { 'J','u','a','n',' ','L','a','n','g',0 }; -static WCHAR surNameW[] = { 'L','a','n','g',0 }; - static const BYTE twoRDNsNoNull[] = { 0x30,0x21,0x31,0x1f,0x30,0x0b,0x06,0x03,0x55,0x04,0x04,0x13,0x04,0x4c,0x61, 0x6e,0x67,0x30,0x10,0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x4a,0x75,0x61,0x6e, @@ -935,8 +932,8 @@ static void test_encodeUnicodeName(DWORD dwEncoding) */ attrs[0].pszObjId = oid_common_name; attrs[0].dwValueType = CERT_RDN_PRINTABLE_STRING; - attrs[0].Value.cbData = sizeof(commonNameW); - attrs[0].Value.pbData = (BYTE *)commonNameW; + attrs[0].Value.cbData = sizeof(L"Juan Lang"); + attrs[0].Value.pbData = (BYTE *)L"Juan Lang"; rdn.cRDNAttr = 1; rdn.rgRDNAttr = attrs; info.cRDN = 1; @@ -952,11 +949,11 @@ static void test_encodeUnicodeName(DWORD dwEncoding) attrs[0].pszObjId = oid_common_name; attrs[0].dwValueType = CERT_RDN_PRINTABLE_STRING; attrs[0].Value.cbData = 0; - attrs[0].Value.pbData = (BYTE *)commonNameW; + attrs[0].Value.pbData = (BYTE *)L"Juan Lang"; attrs[1].pszObjId = oid_sur_name; attrs[1].dwValueType = CERT_RDN_PRINTABLE_STRING; attrs[1].Value.cbData = 0; - attrs[1].Value.pbData = (BYTE *)surNameW; + attrs[1].Value.pbData = (BYTE *)L"Lang"; rdn.cRDNAttr = 2; rdn.rgRDNAttr = attrs; info.cRDN = 1; @@ -1226,9 +1223,9 @@ static void test_decodeUnicodeName(DWORD dwEncoding) CERT_RDN_ATTR attrs[] = { { oid_sur_name, CERT_RDN_PRINTABLE_STRING, - { lstrlenW(surNameW) * sizeof(WCHAR), (BYTE *)surNameW } }, + { lstrlenW(L"Lang") * sizeof(WCHAR), (BYTE *)L"Lang" } }, { oid_common_name, CERT_RDN_PRINTABLE_STRING, - { lstrlenW(commonNameW) * sizeof(WCHAR), (BYTE *)commonNameW } }, + { lstrlenW(L"Juan Lang") * sizeof(WCHAR), (BYTE *)L"Juan Lang" } }, }; rdn.cRDNAttr = ARRAY_SIZE(attrs); @@ -1297,9 +1294,9 @@ static struct EncodedNameValue nameValues[] = { visibleCommonNameValue, sizeof(visibleCommonNameValue) }, { { CERT_RDN_GENERAL_STRING, { sizeof(commonName), (BYTE *)commonName } }, generalCommonNameValue, sizeof(generalCommonNameValue) }, - { { CERT_RDN_BMP_STRING, { sizeof(commonNameW), (BYTE *)commonNameW } }, + { { CERT_RDN_BMP_STRING, { sizeof(L"Juan Lang"), (BYTE *)L"Juan Lang" } }, bmpCommonNameValue, sizeof(bmpCommonNameValue) }, - { { CERT_RDN_UTF8_STRING, { sizeof(commonNameW), (BYTE *)commonNameW } }, + { { CERT_RDN_UTF8_STRING, { sizeof(L"Juan Lang"), (BYTE *)L"Juan Lang" } }, utf8CommonNameValue, sizeof(utf8CommonNameValue) }, /* The following tests succeed under Windows, but really should fail, * they contain characters that are illegal for the encoding. I'm @@ -1437,14 +1434,11 @@ static void test_decodeNameValue(DWORD dwEncoding) static const BYTE emptyURL[] = { 0x30, 0x02, 0x86, 0x00 }; static const BYTE emptyURLExtraBytes[] = { 0x30, 0x02, 0x86, 0x00, 0, 0, 0 }; -static const WCHAR url[] = { 'h','t','t','p',':','/','/','w','i','n','e', - 'h','q','.','o','r','g',0 }; +static const WCHAR url[] = L"http://winehq.org"; static const BYTE encodedURL[] = { 0x30, 0x13, 0x86, 0x11, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x69, 0x6e, 0x65, 0x68, 0x71, 0x2e, 0x6f, 0x72, 0x67 }; -static const WCHAR nihongoURL[] = { 'h','t','t','p',':','/','/',0x226f, - 0x575b, 0 }; -static const WCHAR dnsName[] = { 'w','i','n','e','h','q','.','o','r','g',0 }; +static const WCHAR dnsName[] = L"winehq.org"; static const BYTE encodedDnsName[] = { 0x30, 0x0c, 0x82, 0x0a, 0x77, 0x69, 0x6e, 0x65, 0x68, 0x71, 0x2e, 0x6f, 0x72, 0x67 }; static const BYTE localhost[] = { 127, 0, 0, 1 }; @@ -1503,7 +1497,7 @@ static void test_encodeAltName(DWORD dwEncoding) LocalFree(buf); } /* Now with the URL containing an invalid IA5 char */ - U(entry).pwszURL = (LPWSTR)nihongoURL; + U(entry).pwszURL = (WCHAR *)L"http://\x226f\x575b"; ret = pCryptEncodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_INVALID_IA5_STRING, @@ -1764,17 +1758,13 @@ struct UnicodeExpectedError DWORD error; }; -static const WCHAR oneW[] = { '1',0 }; -static const WCHAR aW[] = { 'a',0 }; -static const WCHAR quoteW[] = { '"', 0 }; - static struct UnicodeExpectedError unicodeErrors[] = { - { CERT_RDN_ANY_TYPE, oneW, 0, CRYPT_E_NOT_CHAR_STRING }, - { CERT_RDN_ENCODED_BLOB, oneW, 0, CRYPT_E_NOT_CHAR_STRING }, - { CERT_RDN_OCTET_STRING, oneW, 0, CRYPT_E_NOT_CHAR_STRING }, - { CERT_RDN_NUMERIC_STRING, aW, 0, CRYPT_E_INVALID_NUMERIC_STRING }, - { CERT_RDN_PRINTABLE_STRING, quoteW, 0, CRYPT_E_INVALID_PRINTABLE_STRING }, - { CERT_RDN_IA5_STRING, nihongoURL, 7, CRYPT_E_INVALID_IA5_STRING }, + { CERT_RDN_ANY_TYPE, L"1", 0, CRYPT_E_NOT_CHAR_STRING }, + { CERT_RDN_ENCODED_BLOB, L"1", 0, CRYPT_E_NOT_CHAR_STRING }, + { CERT_RDN_OCTET_STRING, L"1", 0, CRYPT_E_NOT_CHAR_STRING }, + { CERT_RDN_NUMERIC_STRING, L"a", 0, CRYPT_E_INVALID_NUMERIC_STRING }, + { CERT_RDN_PRINTABLE_STRING, L"\"", 0, CRYPT_E_INVALID_PRINTABLE_STRING }, + { CERT_RDN_IA5_STRING, L"http://\x226f\x575b", 7, CRYPT_E_INVALID_IA5_STRING }, }; struct UnicodeExpectedResult @@ -1805,24 +1795,24 @@ static BYTE nihongoUTF8[] = { 0x0c,0x0d,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f, 0xe2,0x89,0xaf,0xe5,0x9d,0x9b }; static struct UnicodeExpectedResult unicodeResults[] = { - { CERT_RDN_NUMERIC_STRING, oneW, { sizeof(oneNumeric), oneNumeric } }, - { CERT_RDN_PRINTABLE_STRING, oneW, { sizeof(onePrintable), onePrintable } }, - { CERT_RDN_TELETEX_STRING, oneW, { sizeof(oneTeletex), oneTeletex } }, - { CERT_RDN_VIDEOTEX_STRING, oneW, { sizeof(oneVideotex), oneVideotex } }, - { CERT_RDN_IA5_STRING, oneW, { sizeof(oneIA5), oneIA5 } }, - { CERT_RDN_GRAPHIC_STRING, oneW, { sizeof(oneGraphic), oneGraphic } }, - { CERT_RDN_VISIBLE_STRING, oneW, { sizeof(oneVisible), oneVisible } }, - { CERT_RDN_UNIVERSAL_STRING, oneW, { sizeof(oneUniversal), oneUniversal } }, - { CERT_RDN_GENERAL_STRING, oneW, { sizeof(oneGeneral), oneGeneral } }, - { CERT_RDN_BMP_STRING, oneW, { sizeof(oneBMP), oneBMP } }, - { CERT_RDN_UTF8_STRING, oneW, { sizeof(oneUTF8), oneUTF8 } }, - { CERT_RDN_BMP_STRING, nihongoURL, { sizeof(nihongoBMP), nihongoBMP } }, - { CERT_RDN_UTF8_STRING, nihongoURL, { sizeof(nihongoUTF8), nihongoUTF8 } }, + { CERT_RDN_NUMERIC_STRING, L"1", { sizeof(oneNumeric), oneNumeric } }, + { CERT_RDN_PRINTABLE_STRING, L"1", { sizeof(onePrintable), onePrintable } }, + { CERT_RDN_TELETEX_STRING, L"1", { sizeof(oneTeletex), oneTeletex } }, + { CERT_RDN_VIDEOTEX_STRING, L"1", { sizeof(oneVideotex), oneVideotex } }, + { CERT_RDN_IA5_STRING, L"1", { sizeof(oneIA5), oneIA5 } }, + { CERT_RDN_GRAPHIC_STRING, L"1", { sizeof(oneGraphic), oneGraphic } }, + { CERT_RDN_VISIBLE_STRING, L"1", { sizeof(oneVisible), oneVisible } }, + { CERT_RDN_UNIVERSAL_STRING, L"1", { sizeof(oneUniversal), oneUniversal } }, + { CERT_RDN_GENERAL_STRING, L"1", { sizeof(oneGeneral), oneGeneral } }, + { CERT_RDN_BMP_STRING, L"1", { sizeof(oneBMP), oneBMP } }, + { CERT_RDN_UTF8_STRING, L"1", { sizeof(oneUTF8), oneUTF8 } }, + { CERT_RDN_BMP_STRING, L"http://\x226f\x575b", { sizeof(nihongoBMP), nihongoBMP } }, + { CERT_RDN_UTF8_STRING, L"http://\x226f\x575b", { sizeof(nihongoUTF8), nihongoUTF8 } }, }; static struct UnicodeExpectedResult unicodeWeirdness[] = { - { CERT_RDN_TELETEX_STRING, nihongoURL, { sizeof(nihongoT61), nihongoT61 } }, - { CERT_RDN_GENERAL_STRING, nihongoURL, { sizeof(nihongoGeneral), nihongoGeneral } }, + { CERT_RDN_TELETEX_STRING, L"http://\x226f\x575b", { sizeof(nihongoT61), nihongoT61 } }, + { CERT_RDN_GENERAL_STRING, L"http://\x226f\x575b", { sizeof(nihongoGeneral), nihongoGeneral } }, }; static void test_encodeUnicodeNameValue(DWORD dwEncoding) @@ -1854,12 +1844,12 @@ static void test_encodeUnicodeNameValue(DWORD dwEncoding) ok(!ret && GetLastError() == CRYPT_E_NOT_CHAR_STRING, "Expected CRYPT_E_NOT_CHAR_STRING, got %08lx\n", GetLastError()); value.dwValueType = CERT_RDN_ANY_TYPE; - value.Value.pbData = (LPBYTE)oneW; + value.Value.pbData = (LPBYTE)L"1"; ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_NOT_CHAR_STRING, "Expected CRYPT_E_NOT_CHAR_STRING, got %08lx\n", GetLastError()); - value.Value.cbData = sizeof(oneW); + value.Value.cbData = sizeof(L"1"); ret = pCryptEncodeObjectEx(dwEncoding, X509_UNICODE_NAME_VALUE, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == CRYPT_E_NOT_CHAR_STRING, @@ -3699,7 +3689,7 @@ static void test_encodeCRLDistPoints(DWORD dwEncoding) /* A dist point with an invalid name */ point.DistPointName.dwDistPointNameChoice = CRL_DIST_POINT_FULL_NAME; entry.dwAltNameChoice = CERT_ALT_NAME_URL; - U(entry).pwszURL = (LPWSTR)nihongoURL; + U(entry).pwszURL = (WCHAR *)L"http://\x226f\x575b"; U(point.DistPointName).FullName.cAltEntry = 1; U(point.DistPointName).FullName.rgAltEntry = &entry; ret = pCryptEncodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, &info, @@ -7567,8 +7557,6 @@ static void test_decodeNameConstraints(DWORD dwEncoding) } } -static WCHAR noticeText[] = { 'T','h','i','s',' ','i','s',' ','a',' ', - 'n','o','t','i','c','e',0 }; static const BYTE noticeWithDisplayText[] = { 0x30,0x22,0x1e,0x20,0x00,0x54,0x00,0x68,0x00,0x69,0x00,0x73,0x00,0x20,0x00, 0x69,0x00,0x73,0x00,0x20,0x00,0x61,0x00,0x20,0x00,0x6e,0x00,0x6f,0x00,0x74, @@ -7607,7 +7595,7 @@ static void test_encodePolicyQualifierUserNotice(DWORD dwEncoding) ok(!memcmp(buf, emptySequence, size), "unexpected value\n"); LocalFree(buf); } - notice.pszDisplayText = noticeText; + notice.pszDisplayText = (WCHAR *)L"This is a notice"; ret = pCryptEncodeObjectEx(dwEncoding, X509_PKIX_POLICY_QUALIFIER_USERNOTICE, &notice, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); @@ -7663,7 +7651,7 @@ static void test_decodePolicyQualifierUserNotice(DWORD dwEncoding) ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(!lstrcmpW(notice->pszDisplayText, noticeText), + ok(!lstrcmpW(notice->pszDisplayText, L"This is a notice"), "unexpected display text\n"); ok(notice->pNoticeReference == NULL, "unexpected notice reference\n"); LocalFree(notice); @@ -7675,7 +7663,7 @@ static void test_decodePolicyQualifierUserNotice(DWORD dwEncoding) ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(!lstrcmpW(notice->pszDisplayText, noticeText), + ok(!lstrcmpW(notice->pszDisplayText, L"This is a notice"), "unexpected display text\n"); ok(notice->pNoticeReference != NULL, "expected a notice reference\n"); if (notice->pNoticeReference) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 640a50399e5..19dde3fb28f 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -272,31 +272,23 @@ static void test_readTrustedPublisherDWORD(void) pReadDWORD = (void *)GetProcAddress(hCrypt, "I_CryptReadTrustedPublisherDWORDValueFromRegistry"); if (pReadDWORD) { - static const WCHAR safer[] = { - 'S','o','f','t','w','a','r','e','\\', - 'P','o','l','i','c','i','e','s','\\', - 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m', - 'C','e','r','t','i','f','i','c','a','t','e','s','\\', - 'T','r','u','s','t','e','d','P','u','b','l','i','s','h','e','r', - '\\','S','a','f','e','r',0 }; - static const WCHAR authenticodeFlags[] = { 'A','u','t','h','e','n', - 't','i','c','o','d','e','F','l','a','g','s',0 }; BOOL ret, exists = FALSE; DWORD size, readFlags = 0, returnedFlags; HKEY key; LONG rc; - rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, safer, &key); + rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, + L"Software\\Policies\\Microsoft\\SystemCertificates\\TrustedPublisher\\Safer", &key); if (rc == ERROR_SUCCESS) { size = sizeof(readFlags); - rc = RegQueryValueExW(key, authenticodeFlags, NULL, NULL, + rc = RegQueryValueExW(key, L"AuthenticodeFlags", NULL, NULL, (LPBYTE)&readFlags, &size); if (rc == ERROR_SUCCESS) exists = TRUE; } returnedFlags = 0xdeadbeef; - ret = pReadDWORD(authenticodeFlags, &returnedFlags); + ret = pReadDWORD(L"AuthenticodeFlags", &returnedFlags); ok(ret == exists, "Unexpected return value\n"); ok(readFlags == returnedFlags, "Expected flags %08lx, got %08lx\n", readFlags, returnedFlags); diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index 8e77709b970..8fbba2cd83c 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -45,18 +45,10 @@ static char bigCertBase64[] = "MHoCAQEwAgYAMBUxEzARBgNVBAMTCkp1YW4gTGFuZwAwIhgPMTYwMTAxMDEwMDAw\n" "MDBaGA8xNjAxMDEwMTAwMDAwMFowFTETMBEGA1UEAxMKSnVhbiBMYW5nADAHMAIG\n" "AAMBAKMWMBQwEgYDVR0TAQH/BAgwBgEB/wIBAQ==\n"; -static WCHAR bigCertBase64W[] = { -'M','H','o','C','A','Q','E','w','A','g','Y','A','M','B','U','x','E','z','A', -'R','B','g','N','V','B','A','M','T','C','k','p','1','Y','W','4','g','T','G', -'F','u','Z','w','A','w','I','h','g','P','M','T','Y','w','M','T','A','x','M', -'D','E','w',',','D','A','w','\n', -'M','D','B','a','G','A','8','x','N','j','A','x','M','D','E','w','M','T','A', -'w','M','D','A','w','M','F','o','w','F','T','E','T','M','B','E','G','A','1', -'U','E','A','x','M','K','S','n','V','h','b','i','B','M','Y','W','5','n','A', -'D','A','H','M','A','I','G','\n', -'A','A','M','B','A','K','M','W','M','B','Q','w','E','g','Y','D','V','R','0', -'T','A','Q','H','/','B','A','g','w','B','g','E','B','/','w','I','B','A','Q', -'=','=','\n',0 }; +static WCHAR bigCertBase64W[] = +L"MHoCAQEwAgYAMBUxEzARBgNVBAMTCkp1YW4gTGFuZwAwIhgPMTYwMTAxMDEw,DAw\n" +"MDBaGA8xNjAxMDEwMTAwMDAwMFowFTETMBEGA1UEAxMKSnVhbiBMYW5nADAHMAIG\n" +"AAMBAKMWMBQwEgYDVR0TAQH/BAgwBgEB/wIBAQ==\n"; static BYTE signedWithCertWithValidPubKeyContent[] = { 0x30,0x82,0x01,0x89,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02, 0xa0,0x82,0x01,0x7a,0x30,0x82,0x01,0x76,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c, @@ -95,34 +87,16 @@ static char signedWithCertWithValidPubKeyContentBase64[] = "EzARBgNVBAMTCkp1YW4gTGFuZwACAQEwDAYIKoZIhvcNAgUFADAEBgAFAARAgaZw" "s+9Z0WbRm8CatppebW9tDVmpqm7pLKAe7sJgvFm+P2MGjckRHSNkku8u/FcppK/g" "7pMZOVHkRLgLKPSoDQ=="; -static WCHAR signedWithCertWithValidPubKeyContentBase64W[] = { -'M','I','I','B','i','Q','Y','J','K','o','Z','I','h','v','c','N','A','Q','c','C', -'o','I','I','B','e','j','C','C','A','X','Y','C','A','Q','E','x','D','j','A','M', -'B','g','g','q','h','k','i','G','9','w','0','C','B','Q','U','A','M','B','M','G', -'C','S','q','G','S','I','b','3','D','Q','E','H','A','a','A','G','B','A','Q','B', -'A','g','M','E','o','I','H','S','M','I','H','P','A','g','E','B','M','A','I','G', -'A','D','A','V','M','R','M','w','E','Q','Y','D','V','Q','Q','D','E','w','p','K', -'d','W','F','u','I','E','x','h','b','m','c','A','M','C','I','Y','D','z','E','2', -'M','D','E','w','M','T','A','x','M','D','A','w','M','D','A','w','W','h','g','P', -'M','T','Y','w','M','T','A','x','M','D','E','w','M','D','A','w','M','D','B','a', -'M','B','U','x','E','z','A','R','B','g','N','V','B','A','M','T','C','k','p','1', -'Y','W','4','g','T','G','F','u','Z','w','A','w','X','D','A','N','B','g','k','q', -'h','k','i','G','9','w','0','B','A','Q','E','F','A','A','N','L','A','D','B','I', -'A','k','E','A','4','l','Q','6','p','4','O','x','J','x','Q','+','W','b','u','0', -'U','+','Y','f','5','1','3','x','I','W','i','t','h','V','P','b','a','x','7','r', -'Z','Z','c','D','h','m','D','e','8','2','w','4','d','e','B','M','Y','b','u','8', -'Y','h','e','p','z','X','k','/','I','U','6','W','y','w','7','c','Y','Z','Q','w', -'G','B','B','r','0','B','w','Q','e','Q','I','D','A','Q','A','B','o','x','Y','w', -'F','D','A','S','B','g','N','V','H','R','M','B','A','f','8','E','C','D','A','G', -'A','Q','H','/','A','g','E','B','M','X','c','w','d','Q','I','B','A','T','A','a', -'M','B','U','x','E','z','A','R','B','g','N','V','B','A','M','T','C','k','p','1', -'Y','W','4','g','T','G','F','u','Z','w','A','C','A','Q','E','w','D','A','Y','I', -'K','o','Z','I','h','v','c','N','A','g','U','F','A','D','A','E','B','g','A','F', -'A','A','R','A','g','a','Z','w','s','+','9','Z','0','W','b','R','m','8','C','a', -'t','p','p','e','b','W','9','t','D','V','m','p','q','m','7','p','L','K','A','e', -'7','s','J','g','v','F','m','+','P','2','M','G','j','c','k','R','H','S','N','k', -'k','u','8','u','/','F','c','p','p','K','/','g','7','p','M','Z','O','V','H','k', -'R','L','g','L','K','P','S','o','D','Q','=','=',0 }; +static WCHAR signedWithCertWithValidPubKeyContentBase64W[] = +L"MIIBiQYJKoZIhvcNAQcCoIIBejCCAXYCAQExDjAMBggqhkiG9w0CBQUAMBMGCSqG" +"SIb3DQEHAaAGBAQBAgMEoIHSMIHPAgEBMAIGADAVMRMwEQYDVQQDEwpKdWFuIExh" +"bmcAMCIYDzE2MDEwMTAxMDAwMDAwWhgPMTYwMTAxMDEwMDAwMDBaMBUxEzARBgNV" +"BAMTCkp1YW4gTGFuZwAwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA4lQ6p4OxJxQ+" +"Wbu0U+Yf513xIWithVPbax7rZZcDhmDe82w4deBMYbu8YhepzXk/IU6Wyw7cYZQw" +"GBBr0BwQeQIDAQABoxYwFDASBgNVHRMBAf8ECDAGAQH/AgEBMXcwdQIBATAaMBUx" +"EzARBgNVBAMTCkp1YW4gTGFuZwACAQEwDAYIKoZIhvcNAgUFADAEBgAFAARAgaZw" +"s+9Z0WbRm8CatppebW9tDVmpqm7pLKAe7sJgvFm+P2MGjckRHSNkku8u/FcppK/g" +"7pMZOVHkRLgLKPSoDQ=="; static void test_query_object(void) { diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 7ba68b6cceb..291636be388 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -95,9 +95,6 @@ static const struct OIDToAlgID algIDToOID[] = { { szOID_OIWSEC_sha1, NULL, CALG_SHA }, }; -static const WCHAR bogusDll[] = { 'b','o','g','u','s','.','d','l','l',0 }; -static const WCHAR bogus2Dll[] = { 'b','o','g','u','s','2','.','d','l','l',0 }; - static void testOIDToAlgID(void) { int i; @@ -298,12 +295,12 @@ static void test_registerOIDFunction(void) * omitted. This may be a side effect of the registry code, I don't know. * I don't check it because I doubt anyone would depend on it. ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, NULL, - "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + "1.2.3.4.5.6.7.8.9.10", L"bogus.dll", NULL); */ /* On windows XP, GetLastError is incorrectly being set with an HRESULT, * E_INVALIDARG */ - ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "foo", NULL, bogusDll, + ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "foo", NULL, L"bogus.dll", NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG: %ld\n", GetLastError()); @@ -313,7 +310,7 @@ static void test_registerOIDFunction(void) ok(ret, "Expected pseudo-success, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "CryptDllEncodeObject", - "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + "1.2.3.4.5.6.7.8.9.10", L"bogus.dll", NULL); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) { skip("Need admin rights\n"); @@ -324,7 +321,7 @@ static void test_registerOIDFunction(void) "1.2.3.4.5.6.7.8.9.10"); ok(ret, "CryptUnregisterOIDFunction failed: %ld\n", GetLastError()); ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "bogus", - "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + "1.2.3.4.5.6.7.8.9.10", L"bogus.dll", NULL); ok(ret, "CryptRegisterOIDFunction failed: %ld\n", GetLastError()); ret = CryptUnregisterOIDFunction(X509_ASN_ENCODING, "bogus", "1.2.3.4.5.6.7.8.9.10"); @@ -335,14 +332,14 @@ static void test_registerOIDFunction(void) "Could not delete bogus key\n"); /* Shouldn't have effect but registry keys are created */ ret = CryptRegisterOIDFunction(PKCS_7_ASN_ENCODING, "CryptDllEncodeObject", - "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + "1.2.3.4.5.6.7.8.9.10", L"bogus.dll", NULL); ok(ret, "CryptRegisterOIDFunction failed: %ld\n", GetLastError()); ret = CryptUnregisterOIDFunction(PKCS_7_ASN_ENCODING, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10"); ok(ret, "CryptUnregisterOIDFunction failed: %ld\n", GetLastError()); /* Check with bogus encoding type. Registry keys are still created */ ret = CryptRegisterOIDFunction(0, "CryptDllEncodeObject", - "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + "1.2.3.4.5.6.7.8.9.10", L"bogus.dll", NULL); ok(ret, "CryptRegisterOIDFunction failed: %ld\n", GetLastError()); ret = CryptUnregisterOIDFunction(0, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10"); @@ -357,7 +354,7 @@ static void test_registerOIDFunction(void) * (for now) treated as a mask. Registry keys are created. */ ret = CryptRegisterOIDFunction(3, "CryptDllEncodeObject", - "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); + "1.2.3.4.5.6.7.8.9.10", L"bogus.dll", NULL); ok(ret, "CryptRegisterOIDFunction failed: %ld\n", GetLastError()); ret = CryptUnregisterOIDFunction(3, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10"); @@ -387,12 +384,12 @@ static void test_registerDefaultOIDFunction(void) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* This succeeds on WinXP, although the bogus entry is unusable. - ret = CryptRegisterDefaultOIDFunction(0, NULL, 0, bogusDll); + ret = CryptRegisterDefaultOIDFunction(0, NULL, 0, L"bogus.dll"); */ /* Register one at index 0 */ SetLastError(0xdeadbeef); ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, - bogusDll); + L"bogus.dll"); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) { skip("Need admin rights\n"); @@ -401,66 +398,63 @@ static void test_registerDefaultOIDFunction(void) ok(ret, "CryptRegisterDefaultOIDFunction failed: %08lx\n", GetLastError()); /* Reregistering should fail */ ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, - bogusDll); + L"bogus.dll"); ok(!ret && GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %08lx\n", GetLastError()); /* Registering the same one at index 1 should also fail */ ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 1, - bogusDll); + L"bogus.dll"); ok(!ret && GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %08lx\n", GetLastError()); /* Registering a different one at index 1 succeeds */ ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 1, - bogus2Dll); + L"bogus2.dll"); ok(ret, "CryptRegisterDefaultOIDFunction failed: %08lx\n", GetLastError()); sprintf(buf, fmt, 0, func); rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, buf, &key); ok(rc == 0, "Expected key to exist, RegOpenKeyA failed: %ld\n", rc); if (rc == 0) { - static const CHAR dllA[] = "Dll"; - static const CHAR bogusDll_A[] = "bogus.dll"; - static const CHAR bogus2Dll_A[] = "bogus2.dll"; CHAR dllBuf[MAX_PATH]; DWORD type, size; LPSTR ptr; size = ARRAY_SIZE(dllBuf); - rc = RegQueryValueExA(key, dllA, NULL, &type, (LPBYTE)dllBuf, &size); + rc = RegQueryValueExA(key, "Dll", NULL, &type, (LPBYTE)dllBuf, &size); ok(rc == 0, "Expected Dll value to exist, RegQueryValueExA failed: %ld\n", rc); ok(type == REG_MULTI_SZ, "Expected type REG_MULTI_SZ, got %ld\n", type); - /* bogusDll was registered first, so that should be first */ + /* bogus.dll was registered first, so that should be first */ ptr = dllBuf; - ok(!lstrcmpiA(ptr, bogusDll_A), "Unexpected dll\n"); + ok(!lstrcmpiA(ptr, "bogus.dll"), "Unexpected dll\n"); ptr += lstrlenA(ptr) + 1; - ok(!lstrcmpiA(ptr, bogus2Dll_A), "Unexpected dll\n"); + ok(!lstrcmpiA(ptr, "bogus2.dll"), "Unexpected dll\n"); RegCloseKey(key); } /* Unregister both of them */ ret = CryptUnregisterDefaultOIDFunction(0, "CertDllOpenStoreProv", - bogusDll); + L"bogus.dll"); ok(ret, "CryptUnregisterDefaultOIDFunction failed: %08lx\n", GetLastError()); ret = CryptUnregisterDefaultOIDFunction(0, "CertDllOpenStoreProv", - bogus2Dll); + L"bogus2.dll"); ok(ret, "CryptUnregisterDefaultOIDFunction failed: %08lx\n", GetLastError()); /* Now that they're both unregistered, unregistering should fail */ ret = CryptUnregisterDefaultOIDFunction(0, "CertDllOpenStoreProv", - bogusDll); + L"bogus.dll"); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", GetLastError()); /* Repeat a few tests on the normal encoding type */ ret = CryptRegisterDefaultOIDFunction(X509_ASN_ENCODING, - "CertDllOpenStoreProv", 0, bogusDll); + "CertDllOpenStoreProv", 0, L"bogus.dll"); ok(ret, "CryptRegisterDefaultOIDFunction failed\n"); ret = CryptUnregisterDefaultOIDFunction(X509_ASN_ENCODING, - "CertDllOpenStoreProv", bogusDll); + "CertDllOpenStoreProv", L"bogus.dll"); ok(ret, "CryptUnregisterDefaultOIDFunction failed\n"); ret = CryptUnregisterDefaultOIDFunction(X509_ASN_ENCODING, - "CertDllOpenStoreProv", bogusDll); + "CertDllOpenStoreProv", L"bogus.dll"); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); } @@ -498,7 +492,7 @@ static void test_getDefaultOIDFunctionAddress(void) /* Even with a registered dll, this fails (since the dll doesn't exist) */ SetLastError(0xdeadbeef); ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, - bogusDll); + L"bogus.dll"); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) skip("Need admin rights\n"); else @@ -507,7 +501,7 @@ static void test_getDefaultOIDFunctionAddress(void) &hFuncAddr); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", GetLastError()); - CryptUnregisterDefaultOIDFunction(0, "CertDllOpenStoreProv", bogusDll); + CryptUnregisterDefaultOIDFunction(0, "CertDllOpenStoreProv", L"bogus.dll"); } static BOOL WINAPI countOidInfo(PCCRYPT_OID_INFO pInfo, void *pvArg) @@ -545,8 +539,6 @@ static void test_enumOIDInfo(void) static void test_findOIDInfo(void) { - static WCHAR sha256ECDSA[] = { 's','h','a','2','5','6','E','C','D','S','A',0 }; - static WCHAR sha1[] = { 's','h','a','1',0 }; static CHAR oid_rsa_md5[] = szOID_RSA_MD5, oid_sha256[] = szOID_NIST_sha256; static CHAR oid_ecdsa_sha256[] = szOID_ECDSA_SHA256; ALG_ID alg = CALG_SHA1; @@ -561,7 +553,7 @@ static void test_findOIDInfo(void) } oid_test_info [] = { { CRYPT_OID_INFO_OID_KEY, oid_rsa_md5, szOID_RSA_MD5, CALG_MD5 }, - { CRYPT_OID_INFO_NAME_KEY, sha1, szOID_OIWSEC_sha1, CALG_SHA1 }, + { CRYPT_OID_INFO_NAME_KEY, (void *)L"sha1", szOID_OIWSEC_sha1, CALG_SHA1 }, { CRYPT_OID_INFO_ALGID_KEY, &alg, szOID_OIWSEC_sha1, CALG_SHA1 }, { CRYPT_OID_INFO_SIGN_KEY, algs, szOID_RSA_MD5RSA, CALG_MD5 }, { CRYPT_OID_INFO_OID_KEY, oid_sha256, szOID_NIST_sha256, CALG_SHA_256, -1 }, @@ -593,8 +585,8 @@ static void test_findOIDInfo(void) ok(info->cbSize == sizeof(*info), "Unexpected structure size %ld.\n", info->cbSize); ok(!strcmp(info->pszOID, oid_ecdsa_sha256), "Expected %s, got %s\n", oid_ecdsa_sha256, info->pszOID); - ok(!lstrcmpW(info->pwszName, sha256ECDSA), "Expected %s, got %s\n", - wine_dbgstr_w(sha256ECDSA), wine_dbgstr_w(info->pwszName)); + ok(!lstrcmpW(info->pwszName, L"sha256ECDSA"), "Expected %s, got %s\n", + wine_dbgstr_w(L"sha256ECDSA"), wine_dbgstr_w(info->pwszName)); ok(info->dwGroupId == CRYPT_SIGN_ALG_OID_GROUP_ID, "Expected CRYPT_SIGN_ALG_OID_GROUP_ID, got %lu\n", info->dwGroupId); ok(U(*info).Algid == CALG_OID_INFO_CNG_ONLY, @@ -617,7 +609,6 @@ static void test_findOIDInfo(void) static void test_registerOIDInfo(void) { - static const WCHAR winetestW[] = { 'w','i','n','e','t','e','s','t',0 }; static char test_oid[] = "1.2.3.4.5.6.7.8.9.10"; CRYPT_OID_INFO info1; const CRYPT_OID_INFO *info2; @@ -665,7 +656,7 @@ static void test_registerOIDInfo(void) info2 = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, (void *)test_oid, 0); ok(!info2, "should fail\n"); - info1.pwszName = winetestW; + info1.pwszName = L"winetest"; info1.dwGroupId = CRYPT_HASH_ALG_OID_GROUP_ID; SetLastError(0xdeadbeef); ret = CryptRegisterOIDInfo(&info1, CRYPT_INSTALL_OID_INFO_BEFORE_FLAG); diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index c4dfcd19a39..162dab090e2 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -33,7 +33,6 @@ static BOOL (WINAPI *pCryptUnprotectData)(DATA_BLOB*,LPWSTR*,DATA_BLOB*,PVOID,CR static char secret[] = "I am a super secret string that no one can see!"; static char secret2[] = "I am a super secret string indescribable string"; static char key[] = "Wibble wibble wibble"; -static const WCHAR desc[] = {'U','l','t','r','a',' ','s','e','c','r','e','t',' ','t','e','s','t',' ','m','e','s','s','a','g','e',0}; static BOOL protected = FALSE; /* if true, the unprotect tests can run */ static DATA_BLOB cipher; static DATA_BLOB cipher_entropy; @@ -52,13 +51,13 @@ static void test_cryptprotectdata(void) entropy.cbData=strlen(key)+1; SetLastError(0xDEADBEEF); - protected = pCryptProtectData(NULL,desc,NULL,NULL,NULL,0,&cipher); + protected = pCryptProtectData(NULL, L"Ultra secret test message", NULL, NULL, NULL, 0, &cipher); ok(!protected, "Encrypting without plain data source.\n"); r = GetLastError(); ok(r == ERROR_INVALID_PARAMETER, "Wrong (%lu) GetLastError seen\n",r); SetLastError(0xDEADBEEF); - protected = pCryptProtectData(&plain,desc,NULL,NULL,NULL,0,NULL); + protected = pCryptProtectData(&plain, L"Ultra secret test message", NULL, NULL, NULL, 0, NULL); ok(!protected, "Encrypting without cipher destination.\n"); r = GetLastError(); ok(r == ERROR_INVALID_PARAMETER, "Wrong (%lu) GetLastError seen\n",r); @@ -68,7 +67,7 @@ static void test_cryptprotectdata(void) /* without entropy */ SetLastError(0xDEADBEEF); - protected = pCryptProtectData(&plain,desc,NULL,NULL,NULL,0,&cipher); + protected = pCryptProtectData(&plain, L"Ultra secret test message", NULL, NULL, NULL, 0, &cipher); ok(protected || broken(!protected), /* Win9x/NT4 */ "Encrypting without entropy.\n"); @@ -85,7 +84,7 @@ static void test_cryptprotectdata(void) /* with entropy */ SetLastError(0xDEADBEEF); - protected = pCryptProtectData(&plain,desc,&entropy,NULL,NULL,0,&cipher_entropy); + protected = pCryptProtectData(&plain, L"Ultra secret test message", &entropy, NULL, NULL, 0, &cipher_entropy); ok(protected || broken(!protected), /* Win9x/NT4 */ "Encrypting with entropy.\n"); @@ -161,7 +160,7 @@ static void test_cryptunprotectdata(void) ok(plain.cbData==strlen(secret)+1,"Plain DATA_BLOB wrong length\n"); ok(!strcmp((const char*)plain.pbData,secret),"Plain does not match secret\n"); ok(data_desc!=NULL,"Description not allocated\n"); - ok(!lstrcmpW(data_desc,desc),"Description does not match\n"); + ok(!lstrcmpW(data_desc, L"Ultra secret test message"),"Description does not match\n"); LocalFree(plain.pbData); LocalFree(data_desc); @@ -186,7 +185,7 @@ static void test_cryptunprotectdata(void) ok(plain.cbData==strlen(secret)+1,"Plain DATA_BLOB wrong length\n"); ok(!strcmp((const char*)plain.pbData,secret),"Plain does not match secret\n"); ok(data_desc!=NULL,"Description not allocated\n"); - ok(!lstrcmpW(data_desc,desc),"Description does not match\n"); + ok(!lstrcmpW(data_desc, L"Ultra secret test message"),"Description does not match\n"); LocalFree(plain.pbData); LocalFree(data_desc); diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 5728065127b..4a89393484e 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -41,8 +41,6 @@ static void test_AddRemoveProvider(void) BOOL ret; SIP_ADD_NEWPROVIDER newprov; GUID actionid = { 0xdeadbe, 0xefde, 0xadbe, { 0xef,0xde,0xad,0xbe,0xef,0xde,0xad,0xbe }}; - static WCHAR dummydll[] = {'d','e','a','d','b','e','e','f','.','d','l','l',0 }; - static WCHAR dummyfunction[] = {'d','u','m','m','y','f','u','n','c','t','i','o','n',0 }; /* NULL check */ SetLastError(0xdeadbeef); @@ -77,12 +75,12 @@ static void test_AddRemoveProvider(void) memset(&newprov, 0, sizeof(SIP_ADD_NEWPROVIDER)); newprov.cbStruct = sizeof(SIP_ADD_NEWPROVIDER); newprov.pgSubject = &actionid; - newprov.pwszDLLFileName = dummydll; - newprov.pwszGetFuncName = dummyfunction; - newprov.pwszPutFuncName = dummyfunction; - newprov.pwszCreateFuncName = dummyfunction; - newprov.pwszVerifyFuncName = dummyfunction; - newprov.pwszRemoveFuncName = dummyfunction; + newprov.pwszDLLFileName = (WCHAR *)L"deadbeef.dll"; + newprov.pwszGetFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszPutFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszCreateFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszVerifyFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszRemoveFuncName = (WCHAR *)L"dummyfunction"; SetLastError(0xdeadbeef); ret = CryptSIPAddProvider(&newprov); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) @@ -111,16 +109,16 @@ static void test_AddRemoveProvider(void) memset(&newprov, 0, sizeof(SIP_ADD_NEWPROVIDER)); newprov.cbStruct = sizeof(SIP_ADD_NEWPROVIDER); newprov.pgSubject = &actionid; - newprov.pwszDLLFileName = dummydll; - newprov.pwszGetFuncName = dummyfunction; - newprov.pwszPutFuncName = dummyfunction; - newprov.pwszCreateFuncName = dummyfunction; - newprov.pwszVerifyFuncName = dummyfunction; - newprov.pwszRemoveFuncName = dummyfunction; - newprov.pwszIsFunctionNameFmt2 = dummyfunction; - newprov.pwszIsFunctionName = dummyfunction; + newprov.pwszDLLFileName = (WCHAR *)L"deadbeef.dll"; + newprov.pwszGetFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszPutFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszCreateFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszVerifyFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszRemoveFuncName = (WCHAR *)L"dummyfunction"; + newprov.pwszIsFunctionNameFmt2 = (WCHAR *)L"dummyfunction"; + newprov.pwszIsFunctionName = (WCHAR *)L"dummyfunction"; /* If GetCapFuncName set to NULL, then CryptSIPRemoveProvider fails on win 8 */ - newprov.pwszGetCapFuncName = dummyfunction; + newprov.pwszGetCapFuncName = (WCHAR *)L"dummyfunction"; SetLastError(0xdeadbeef); ret = CryptSIPAddProvider(&newprov); @@ -148,7 +146,6 @@ static void test_SIPRetrieveSubjectGUID(void) static const CHAR windir[] = "windir"; static const CHAR regeditExe[] = "regedit.exe"; static const GUID nullSubject = { 0x0, 0x0, 0x0, { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 }}; - static const WCHAR deadbeef[] = { 'c',':','\\','d','e','a','d','b','e','e','f','.','d','b','f',0 }; /* Couldn't find a name for this GUID, it's the one used for 95% of the files */ static const GUID unknownGUID = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; static const GUID cabGUID = { 0xc689aaba, 0x8e78, 0x11d0, {0x8c,0x47,0x00,0xc0,0x4f,0xc2,0x95,0xee }}; @@ -170,7 +167,7 @@ static void test_SIPRetrieveSubjectGUID(void) SetLastError(0xdeadbeef); /* Set subject to something other than zeros */ memset(&subject, 1, sizeof(GUID)); - ret = CryptSIPRetrieveSubjectGuid(deadbeef, NULL, &subject); + ret = CryptSIPRetrieveSubjectGuid(L"c:\\deadbeef.dbf", NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); ok (GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_PATH_NOT_FOUND, diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index d8669995d68..f1124459d6a 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -366,16 +366,6 @@ static const struct */ static void testRegStoreSavedCerts(void) { - static const WCHAR fmt[] = - { '%','s','\\','%','s','\\','%','s','\\','%','s',0}, - ms_certs[] = - { 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s',0}, - certs[] = - {'C','e','r','t','i','f','i','c','a','t','e','s',0}, - bigCert_hash[] = { - '6','E','3','0','9','0','7','1','5','F','D','9','2','3', - '5','6','E','B','A','E','2','5','4','0','E','6','2','2', - 'D','A','1','9','2','6','0','2','A','6','0','8',0}; PCCERT_CONTEXT cert1, cert2; HCERTSTORE store; HANDLE cert_file; @@ -415,8 +405,8 @@ static void testRegStoreSavedCerts(void) CertFreeCertificateContext(cert1); CertCloseStore(store, 0); - wsprintfW(key_name, fmt, reg_store_saved_certs[i].base_reg_path, - reg_store_saved_certs[i].store_name, certs, bigCert_hash); + wsprintfW(key_name, L"%s\\%s\\%s\\%s", reg_store_saved_certs[i].base_reg_path, + reg_store_saved_certs[i].store_name, L"Certificates", L"6E3090715FD92356EBAE2540E622DA192602A608"); if (!reg_store_saved_certs[i].appdata_file) { @@ -430,10 +420,10 @@ static void testRegStoreSavedCerts(void) "Failed to get app data path at %ld (%lx)\n", pathres, GetLastError()); if (pathres == S_OK) { - PathAppendW(appdata_path, ms_certs); + PathAppendW(appdata_path, L"Microsoft\\SystemCertificates"); PathAppendW(appdata_path, reg_store_saved_certs[i].store_name); - PathAppendW(appdata_path, certs); - PathAppendW(appdata_path, bigCert_hash); + PathAppendW(appdata_path, L"Certificates"); + PathAppendW(appdata_path, L"6E3090715FD92356EBAE2540E622DA192602A608"); cert_file = CreateFileW(appdata_path, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -486,9 +476,6 @@ static void testStoresInCollection(void) { PCCERT_CONTEXT cert1, cert2, tcert1; HCERTSTORE collection, ro_store, rw_store, rw_store_2, tstore; - static const WCHAR WineTestRO_W[] = { 'W','i','n','e','T','e','s','t','_','R','O',0 }, - WineTestRW_W[] = { 'W','i','n','e','T','e','s','t','_','R','W',0 }, - WineTestRW2_W[]= { 'W','i','n','e','T','e','s','t','_','R','W','2',0 }; BOOL ret; collection = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, @@ -496,7 +483,7 @@ static void testStoresInCollection(void) ok(collection != NULL, "Failed to init collection store, last error %lx\n", GetLastError()); /* Add read-only store to collection with very high priority*/ ro_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, WineTestRO_W); + CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RO"); ok(ro_store != NULL, "Failed to init ro store %lx\n", GetLastError()); ret = CertAddStoreToCollection(collection, ro_store, 0, 1000); @@ -509,7 +496,7 @@ static void testStoresInCollection(void) /* Add read-write store to collection with the lowest priority*/ rw_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, WineTestRW_W); + CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RW"); ok (rw_store != NULL, "Failed to open rw store %lx\n", GetLastError()); ret = CertAddStoreToCollection(collection, rw_store, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); ok (ret, "Failed to add rw store to collection %lx\n", GetLastError()); @@ -533,7 +520,7 @@ static void testStoresInCollection(void) /** adding one more rw store with higher priority*/ rw_store_2 = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, WineTestRW2_W); + CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RW2"); ok (rw_store_2 != NULL, "Failed to init second rw store %lx\n", GetLastError()); ret = CertAddStoreToCollection(collection, rw_store_2, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 50); ok (ret, "Failed to add rw_store_2 to collection %lx\n",GetLastError()); @@ -568,8 +555,8 @@ static void testStoresInCollection(void) ok (tcert1==NULL,"Unexpected cert in the collection %p %lx\n",tcert1, GetLastError()); /* checking whether certs had been saved */ - tstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, WineTestRW_W); + tstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, L"WineTest_RW"); ok (tstore!=NULL, "Failed to open existing rw store\n"); tcert1 = CertEnumCertificatesInStore(tstore, NULL); todo_wine @@ -577,8 +564,8 @@ static void testStoresInCollection(void) CertFreeCertificateContext(tcert1); CertCloseStore(tstore,0); - tstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, WineTestRW2_W); + tstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, L"WineTest_RW2"); ok (tstore!=NULL, "Failed to open existing rw2 store\n"); tcert1 = CertEnumCertificatesInStore(tstore, NULL); todo_wine @@ -592,16 +579,16 @@ static void testStoresInCollection(void) CertCloseStore(rw_store_2,0); /* reopening registry stores to check whether certs had been saved */ - rw_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_SYSTEM_STORE_CURRENT_USER, WineTestRW_W); + rw_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RW"); tcert1 = CertEnumCertificatesInStore(rw_store, NULL); ok (tcert1 && tcert1->cbCertEncoded == cert1->cbCertEncoded, "Unexpected cert in store %p\n", tcert1); CertFreeCertificateContext(tcert1); CertCloseStore(rw_store,0); - rw_store_2 = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_SYSTEM_STORE_CURRENT_USER, WineTestRW2_W); + rw_store_2 = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RW2"); tcert1 = CertEnumCertificatesInStore(rw_store_2, NULL); ok (tcert1 && tcert1->cbCertEncoded == cert2->cbCertEncoded, "Unexpected cert in store %p\n", tcert1); @@ -610,12 +597,12 @@ static void testStoresInCollection(void) CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); - CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_STORE_DELETE_FLAG|CERT_SYSTEM_STORE_CURRENT_USER,WineTestRO_W); - CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_STORE_DELETE_FLAG|CERT_SYSTEM_STORE_CURRENT_USER,WineTestRW_W); - CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,0,0, - CERT_STORE_DELETE_FLAG|CERT_SYSTEM_STORE_CURRENT_USER,WineTestRW2_W); + CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_STORE_DELETE_FLAG|CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RO"); + CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_STORE_DELETE_FLAG|CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RW"); + CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_STORE_DELETE_FLAG|CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest_RW2"); } @@ -624,8 +611,6 @@ static void testCollectionStore(void) HCERTSTORE store1, store2, collection, collection2; PCCERT_CONTEXT context; BOOL ret; - static const WCHAR szPrefix[] = { 'c','e','r',0 }; - static const WCHAR szDot[] = { '.',0 }; WCHAR filename[MAX_PATH]; HANDLE file; @@ -949,7 +934,7 @@ static void testCollectionStore(void) /* Test adding a cert to a collection with a file store, committing the * change to the collection, and comparing the resulting file. */ - if (!GetTempFileNameW(szDot, szPrefix, 0, filename)) + if (!GetTempFileNameW(L".", L"cer", 0, filename)) return; DeleteFileW(filename); @@ -1281,20 +1266,13 @@ static void testRegStore(void) } } -static const char MyA[] = { 'M','y',0,0 }; -static const WCHAR MyW[] = { 'M','y',0 }; -static const WCHAR BogusW[] = { 'B','o','g','u','s',0 }; -static const WCHAR BogusPathW[] = { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m','C','e','r', - 't','i','f','i','c','a','t','e','s','\\','B','o','g','u','s',0 }; - static void testSystemRegStore(void) { HCERTSTORE store, memStore; /* Check with a UNICODE name */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, MyW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, L"My"); /* Not all OSes support CERT_STORE_PROV_SYSTEM_REGISTRY, so don't continue * testing if they don't. */ @@ -1314,41 +1292,40 @@ static void testSystemRegStore(void) /* Check opening a bogus store */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, BogusW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, L"Bogus"); ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, BogusW); + CERT_SYSTEM_STORE_CURRENT_USER, L"Bogus"); ok(store != 0, "CertOpenStore failed: %08lx\n", GetLastError()); if (store) CertCloseStore(store, 0); /* Now check whether deleting is allowed */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, BogusW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, L"Bogus"); ok(!store, "CertOpenStore failed: %08lx\n", GetLastError()); - RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); + RegDeleteKeyW(HKEY_CURRENT_USER, L"Software\\Microsoft\\SystemCertificates\\Bogus"); store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, 0, NULL); ok(!store && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, MyA); + CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, "My"); ok(!store && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, MyW); + CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, L"My"); ok(!store && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* The name is expected to be UNICODE, check with an ASCII name */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, MyA); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, "My"); ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); } static void testSystemStore(void) { - static const WCHAR baskslashW[] = { '\\',0 }; HCERTSTORE store; WCHAR keyName[MAX_PATH]; HKEY key; @@ -1358,22 +1335,21 @@ static void testSystemStore(void) ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, MyA); + CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, "My"); ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, MyW); + CERT_SYSTEM_STORE_LOCAL_MACHINE | CERT_SYSTEM_STORE_CURRENT_USER, L"My"); ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); /* The name is expected to be UNICODE, first check with an ASCII name */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, MyA); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, "My"); ok(!store && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); /* Create the expected key */ lstrcpyW(keyName, CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH); - lstrcatW(keyName, baskslashW); - lstrcatW(keyName, MyW); + lstrcatW(keyName, L"\\My"); rc = RegCreateKeyExW(HKEY_CURRENT_USER, keyName, 0, NULL, 0, KEY_READ, NULL, &key, NULL); ok(!rc, "RegCreateKeyEx failed: %ld\n", rc); @@ -1381,12 +1357,12 @@ static void testSystemStore(void) RegCloseKey(key); /* Check opening with a UNICODE name, specifying the create new flag */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_CREATE_NEW_FLAG, MyW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_CREATE_NEW_FLAG, L"My"); ok(!store && GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %08lx\n", GetLastError()); /* Now check opening with a UNICODE name, this time opening existing */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, MyW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, L"My"); ok(store != 0, "CertOpenStore failed: %08lx\n", GetLastError()); if (store) { @@ -1405,18 +1381,18 @@ static void testSystemStore(void) /* Check opening a bogus store */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, BogusW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, L"Bogus"); ok(!store, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, BogusW); + CERT_SYSTEM_STORE_CURRENT_USER, L"Bogus"); ok(store != 0, "CertOpenStore failed: %08lx\n", GetLastError()); if (store) CertCloseStore(store, 0); /* Now check whether deleting is allowed */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, BogusW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, L"Bogus"); ok(!store, "Didn't expect a store to be returned when deleting\n"); - RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); + RegDeleteKeyW(HKEY_CURRENT_USER, L"Software\\Microsoft\\SystemCertificates\\Bogus"); } static const BYTE serializedStoreWithCertAndCRL[] = { @@ -1439,8 +1415,6 @@ static const BYTE serializedStoreWithCertAndCRL[] = { static void testFileStore(void) { - static const WCHAR szPrefix[] = { 'c','e','r',0 }; - static const WCHAR szDot[] = { '.',0 }; WCHAR filename[MAX_PATH]; HCERTSTORE store; BOOL ret; @@ -1451,7 +1425,7 @@ static void testFileStore(void) ok(!store && GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %08lx\n", GetLastError()); - if (!GetTempFileNameW(szDot, szPrefix, 0, filename)) + if (!GetTempFileNameW(L".", L"cer", 0, filename)) return; DeleteFileW(filename); @@ -1597,57 +1571,22 @@ static const BYTE base64SPC[] = "G6U1ipFe/q8byWD/9JpiBKMGPi9YlUTgXHfS9d4S/QWO1h9Z7KeipBYhoslQpHXu" "y9bUr8Adqi6SzgHpCnMu53dxgxUD1r4xAA=="; /* Same as base64SPC, but as a wide-char string */ -static const WCHAR utf16Base64SPC[] = { -'M','I','I','C','J','Q','Y','J','K','o','Z','I','h','v','c','N','A', -'Q','c','C','o','I','I','C','F','j','C','C','A','h','I','C','A','Q', -'E','x','A','D','A','L','B','g','k','q','h','k','i','G','9','w','0', -'B','B','w','G','g','g','g','H','6','M','I','I','B','9','j','C','C', -'A','V','+','g','A','w','I','B','A','g','I','Q','n','P','8','+','E', -'F','4','o','p','r','9','O','x','H','7','h','4','u','B','P','W','T', -'A','N','B','g','k','q','h','k','i','G','9','w','0','B','A','Q','Q', -'F','A','D','A','U','M','R','I','w','E','A','Y','D','V','Q','Q','D', -'E','w','l','K','d','W','F','u','I','E','x','h','b','m','c','w','H', -'h','c','N','M','D','g','x','M','j','E','y','M','T','c','x','M','D', -'E','0','W','h','c','N','M','z','k','x','M','j','M','x','M','j','M', -'1','O','T','U','5','W','j','A','U','M','R','I','w','E','A','Y','D', -'V','Q','Q','D','E','w','l','K','d','W','F','u','I','E','x','h','b', -'m','c','w','g','Z','8','w','D','Q','Y','J','K','o','Z','I','h','v', -'c','N','A','Q','E','B','B','Q','A','D','g','Y','0','A','M','I','G', -'J','A','o','G','B','A','L','C','g','N','j','y','N','v','O','i','c', -'0','F','O','f','j','x','v','i','4','3','H','b','M','+','D','5','j', -'o','D','k','h','i','G','S','X','e','+','g','b','Z','l','f','8','f', -'1','6','k','0','7','k','k','O','b','F','E','u','n','z','m','d','B', -'5','c','o','s','c','m','A','7','g','y','q','i','W','N','N','4','Z', -'U','y','r','2','c','A','3','l','C','b','n','p','G','P','A','/','0', -'I','b','l','y','y','O','c','u','G','I','F','m','m','C','z','e','Z', -'a','V','a','5','Z','G','6','x','Z','P','K','7','L','7','o','+','7', -'3','Q','o','6','j','X','V','b','G','h','B','G','n','M','Z','7','Q', -'9','s','A','n','6','s','2','9','3','3','o','l','n','S','t','n','e', -'j','n','q','w','V','0','N','A','g','M','B','A','A','G','j','S','T', -'B','H','M','E','U','G','A','1','U','d','A','Q','Q','+','M','D','y', -'A','E','F','K','b','K','E','d','X','Y','y','x','+','C','W','K','c', -'V','6','v','x','M','6','S','h','F','j','A','U','M','R','I','w','E', -'A','Y','D','V','Q','Q','D','E','w','l','K','d','W','F','u','I','E', -'x','h','b','m','e','C','E','J','z','/','P','h','B','e','K','K','a', -'/','T','s','R','+','4','e','L','g','T','1','k','w','D','Q','Y','J', -'K','o','Z','I','h','v','c','N','A','Q','E','E','B','Q','A','D','g', -'Y','E','A','L','p','k','g','L','g','W','3','m','E','a','K','i','d', -'P','Q','3','i','P','J','Y','L','G','0','U','b','1','w','r','a','q', -'E','l','9','b','d','4','2','h','r','h','z','I','d','c','D','z','l', -'Q','g','x','n','m','8','/','5','c','H','Y','V','x','I','F','/','C', -'2','0','x','/','H','J','p','l','b','1','R','G','6','U','1','i','p', -'F','e','/','q','8','b','y','W','D','/','9','J','p','i','B','K','M', -'G','P','i','9','Y','l','U','T','g','X','H','f','S','9','d','4','S', -'/','Q','W','O','1','h','9','Z','7','K','e','i','p','B','Y','h','o', -'s','l','Q','p','H','X','u','y','9','b','U','r','8','A','d','q','i', -'6','S','z','g','H','p','C','n','M','u','5','3','d','x','g','x','U', -'D','1','r','4','x','A','A','=','=',0 }; +static const WCHAR utf16Base64SPC[] = +L"MIICJQYJKoZIhvcNAQcCoIICFjCCAhICAQExADALBgkqhkiG9w0BBwGgggH6MIIB" +"9jCCAV+gAwIBAgIQnP8+EF4opr9OxH7h4uBPWTANBgkqhkiG9w0BAQQFADAUMRIw" +"EAYDVQQDEwlKdWFuIExhbmcwHhcNMDgxMjEyMTcxMDE0WhcNMzkxMjMxMjM1OTU5" +"WjAUMRIwEAYDVQQDEwlKdWFuIExhbmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ" +"AoGBALCgNjyNvOic0FOfjxvi43HbM+D5joDkhiGSXe+gbZlf8f16k07kkObFEunz" +"mdB5coscmA7gyqiWNN4ZUyr2cA3lCbnpGPA/0IblyyOcuGIFmmCzeZaVa5ZG6xZP" +"K7L7o+73Qo6jXVbGhBGnMZ7Q9sAn6s2933olnStnejnqwV0NAgMBAAGjSTBHMEUG" +"A1UdAQQ+MDyAEFKbKEdXYyx+CWKcV6vxM6ShFjAUMRIwEAYDVQQDEwlKdWFuIExh" +"bmeCEJz/PhBeKKa/TsR+4eLgT1kwDQYJKoZIhvcNAQEEBQADgYEALpkgLgW3mEaK" +"idPQ3iPJYLG0Ub1wraqEl9bd42hrhzIdcDzlQgxnm8/5cHYVxIF/C20x/HJplb1R" +"G6U1ipFe/q8byWD/9JpiBKMGPi9YlUTgXHfS9d4S/QWO1h9Z7KeipBYhoslQpHXu" +"y9bUr8Adqi6SzgHpCnMu53dxgxUD1r4xAA=="; static void testFileNameStore(void) { - static const WCHAR szPrefix[] = { 'c','e','r',0 }; - static const WCHAR spcPrefix[] = { 's','p','c',0 }; - static const WCHAR szDot[] = { '.',0 }; WCHAR filename[MAX_PATH]; HCERTSTORE store; BOOL ret; @@ -1659,7 +1598,7 @@ static void testFileNameStore(void) "Expected ERROR_PATH_NOT_FOUND or ERROR_INVALID_PARAMETER, got %08lx\n", GLE); - if (!GetTempFileNameW(szDot, szPrefix, 0, filename)) + if (!GetTempFileNameW(L".", L"cer", 0, filename)) return; DeleteFileW(filename); @@ -1769,7 +1708,7 @@ static void testFileNameStore(void) } DeleteFileW(filename); - if (!GetTempFileNameW(szDot, spcPrefix, 0, filename)) + if (!GetTempFileNameW(L".", L"spc", 0, filename)) return; DeleteFileW(filename); @@ -2047,14 +1986,14 @@ static void testCertOpenSystemStore(void) /* This succeeds, and on WinXP at least, the Bogus key is created under * HKCU (but not under HKLM, even when run as an administrator.) */ - store = CertOpenSystemStoreW(0, BogusW); + store = CertOpenSystemStoreW(0, L"Bogus"); ok(store != 0, "CertOpenSystemStore failed: %08lx\n", GetLastError()); if (store) CertCloseStore(store, 0); /* Delete it so other tests succeed next time around */ CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, BogusW); - RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_DELETE_FLAG, L"Bogus"); + RegDeleteKeyW(HKEY_CURRENT_USER, L"Software\\Microsoft\\SystemCertificates\\Bogus"); } static const struct @@ -2077,13 +2016,12 @@ static void testCertRegisterSystemStore(void) BOOL ret, cur_flag; DWORD err = 0; HCERTSTORE hstore; - static const WCHAR WineTestW[] = {'W','i','n','e','T','e','s','t',0}; const CERT_CONTEXT *cert, *cert2; unsigned int i; for (i = 0; i < ARRAY_SIZE(reg_system_store_test_data); i++) { cur_flag = reg_system_store_test_data[i].cert_store; - ret = CertRegisterSystemStore(WineTestW, cur_flag, NULL, NULL); + ret = CertRegisterSystemStore(L"WineTest", cur_flag, NULL, NULL); if (!ret) { err = GetLastError(); @@ -2102,7 +2040,7 @@ static void testCertRegisterSystemStore(void) continue; } - hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_STORE_OPEN_EXISTING_FLAG | cur_flag, WineTestW); + hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_STORE_OPEN_EXISTING_FLAG | cur_flag, L"WineTest"); ok (hstore != NULL, "Opening just registered store at %08x failed, last error %lx\n", cur_flag, GetLastError()); cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); @@ -2125,7 +2063,7 @@ static void testCertRegisterSystemStore(void) ret = CertCloseStore(hstore, 0); ok (ret, "CertCloseStore failed at %08x, last error %lx\n", cur_flag, GetLastError()); - ret = CertUnregisterSystemStore(WineTestW, cur_flag ); + ret = CertUnregisterSystemStore(L"WineTest", cur_flag ); todo_wine_if (reg_system_store_test_data[i].todo) ok( ret == reg_system_store_test_data[i].expected, "Unregistering failed at %08x, last error %ld\n", cur_flag, GetLastError()); @@ -2238,7 +2176,7 @@ static void testStoreProperty(void) CertCloseStore(store, 0); /* Recheck on the My store.. */ - store = CertOpenSystemStoreW(0, MyW); + store = CertOpenSystemStoreW(0, L"My"); size = sizeof(state); ret = CertGetStoreProperty(store, CERT_ACCESS_STATE_PROP_ID, &state, &size); ok(ret, "CertGetStoreProperty failed for CERT_ACCESS_STATE_PROP_ID: %08lx\n", @@ -2452,16 +2390,13 @@ static const BYTE serializedStoreWithCertAndHash[] = { static void delete_test_key(void) { HKEY root_key, test_key; - static const WCHAR SysCertW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s',0}; - static const WCHAR WineTestW[] = {'W','i','n','e','T','e','s','t',0}; WCHAR subkey_name[32]; DWORD num_subkeys, subkey_name_len; int idx; - if (RegOpenKeyExW(HKEY_CURRENT_USER, SysCertW, 0, KEY_READ, &root_key)) + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\SystemCertificates", 0, KEY_READ, &root_key)) return; - if (RegOpenKeyExW(root_key, WineTestW, 0, KEY_READ, &test_key)) + if (RegOpenKeyExW(root_key, L"WineTest", 0, KEY_READ, &test_key)) { RegCloseKey(root_key); return; @@ -2474,7 +2409,7 @@ static void delete_test_key(void) RegDeleteKeyW(test_key, subkey_name); } RegCloseKey(test_key); - RegDeleteKeyW(root_key, WineTestW); + RegDeleteKeyW(root_key, L"WineTest"); RegCloseKey(root_key); } @@ -2486,9 +2421,6 @@ static void testAddCertificateLink(void) DWORD size; LPBYTE buf; CERT_NAME_BLOB blob; - static const WCHAR szPrefix[] = { 'c','e','r',0 }; - static const WCHAR szDot[] = { '.',0 }; - static const WCHAR WineTestW[] = { 'W','i','n','e','T','e','s','t',0 }; WCHAR filename1[MAX_PATH], filename2[MAX_PATH]; HANDLE file; @@ -2550,8 +2482,8 @@ static void testAddCertificateLink(void) HeapFree(GetProcessHeap(), 0, buf); } /* Set a friendly name on the source certificate... */ - blob.pbData = (LPBYTE)WineTestW; - blob.cbData = sizeof(WineTestW); + blob.pbData = (LPBYTE)L"WineTest"; + blob.cbData = sizeof(L"WineTest"); ret = CertSetCertificateContextProperty(source, CERT_FRIENDLY_NAME_PROP_ID, 0, &blob); ok(ret, "CertSetCertificateContextProperty failed: %08lx\n", @@ -2568,7 +2500,7 @@ static void testAddCertificateLink(void) CERT_FRIENDLY_NAME_PROP_ID, buf, &size); ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); - ok(!lstrcmpW((LPCWSTR)buf, WineTestW), + ok(!lstrcmpW((LPCWSTR)buf, L"WineTest"), "unexpected friendly name\n"); HeapFree(GetProcessHeap(), 0, buf); } @@ -2580,7 +2512,7 @@ static void testAddCertificateLink(void) /* Test adding a cert to a file store, committing the change to the store, * and creating a link to the resulting cert. */ - if (!GetTempFileNameW(szDot, szPrefix, 0, filename1)) + if (!GetTempFileNameW(L".", L"cer", 0, filename1)) return; DeleteFileW(filename1); @@ -2625,8 +2557,8 @@ static void testAddCertificateLink(void) HeapFree(GetProcessHeap(), 0, buf); } /* Set a friendly name on the source certificate... */ - blob.pbData = (LPBYTE)WineTestW; - blob.cbData = sizeof(WineTestW); + blob.pbData = (LPBYTE)L"WineTest"; + blob.cbData = sizeof(L"WineTest"); ret = CertSetCertificateContextProperty(source, CERT_FRIENDLY_NAME_PROP_ID, 0, &blob); ok(ret, "CertSetCertificateContextProperty failed: %08lx\n", @@ -2642,7 +2574,7 @@ static void testAddCertificateLink(void) ret = CertGetCertificateContextProperty(linked, CERT_FRIENDLY_NAME_PROP_ID, buf, &size); ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", GetLastError()); - ok(!lstrcmpW((LPCWSTR)buf, WineTestW), + ok(!lstrcmpW((LPCWSTR)buf, L"WineTest"), "unexpected friendly name\n"); HeapFree(GetProcessHeap(), 0, buf); } @@ -2650,7 +2582,7 @@ static void testAddCertificateLink(void) } CertCloseStore(store2, 0); - if (!GetTempFileNameW(szDot, szPrefix, 0, filename2)) + if (!GetTempFileNameW(L".", L"cer", 0, filename2)) return; DeleteFileW(filename2); @@ -2719,7 +2651,7 @@ static void testAddCertificateLink(void) bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &source); ok(ret, "CertAddEncodedCertificateToStore failed: %08lx\n", GetLastError()); - if (!GetTempFileNameW(szDot, szPrefix, 0, filename1)) + if (!GetTempFileNameW(L".", L"cer", 0, filename1)) return; DeleteFileW(filename1); @@ -2754,7 +2686,7 @@ static void testAddCertificateLink(void) * in a system store. */ store2 = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, - CERT_SYSTEM_STORE_CURRENT_USER, WineTestW); + CERT_SYSTEM_STORE_CURRENT_USER, L"WineTest"); ok(store2 != NULL, "CertOpenStore failed: %08lx\n", GetLastError()); ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index c99b5e35a91..6a19d264c14 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -129,61 +129,6 @@ static char subjectStrCRLF[] = "2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=Wine Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers.com"; static char x500SubjectStr[] = "C=US, S=Minnesota, L=Minneapolis, O=CodeWeavers, OU=Wine Development, CN=localhost, E=aric(a)codeweavers.com"; static char x500SubjectStrSemicolonReverse[] = "E=aric(a)codeweavers.com; CN=localhost; OU=Wine Development; O=CodeWeavers; L=Minneapolis; S=Minnesota; C=US"; -static WCHAR issuerStrW[] = { - 'U','S',',',' ','M','i','n','n','e','s','o','t','a',',',' ','M','i','n','n', - 'e','a','p','o','l','i','s',',',' ','C','o','d','e','W','e','a','v','e','r', - 's',',',' ','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t', - ',',' ','l','o','c','a','l','h','o','s','t',',',' ','a','r','i','c','@','c', - 'o','d','e','w','e','a','v','e','r','s','.','c','o','m',0 }; -static WCHAR issuerStrSemicolonW[] = { - 'U','S',';',' ','M','i','n','n','e','s','o','t','a',';',' ','M','i','n','n', - 'e','a','p','o','l','i','s',';',' ','C','o','d','e','W','e','a','v','e','r', - 's',';',' ','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t', - ';',' ','l','o','c','a','l','h','o','s','t',';',' ','a','r','i','c','@','c', - 'o','d','e','w','e','a','v','e','r','s','.','c','o','m',0 }; -static WCHAR issuerStrCRLFW[] = { - 'U','S','\r','\n','M','i','n','n','e','s','o','t','a','\r','\n','M','i','n', - 'n','e','a','p','o','l','i','s','\r','\n','C','o','d','e','W','e','a','v','e', - 'r','s','\r','\n','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n', - 't','\r','\n','l','o','c','a','l','h','o','s','t','\r','\n','a','r','i','c', - '@','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0 }; -static WCHAR subjectStrW[] = { - '2','.','5','.','4','.','6','=','U','S',',',' ','2','.','5','.','4','.','8', - '=','M','i','n','n','e','s','o','t','a',',',' ','2','.','5','.','4','.','7', - '=','M','i','n','n','e','a','p','o','l','i','s',',',' ','2','.','5','.','4', - '.','1','0','=','C','o','d','e','W','e','a','v','e','r','s',',',' ','2','.', - '5','.','4','.','1','1','=','W','i','n','e',' ','D','e','v','e','l','o','p', - 'm','e','n','t',',',' ','2','.','5','.','4','.','3','=','l','o','c','a','l', - 'h','o','s','t',',',' ','1','.','2','.','8','4','0','.','1','1','3','5','4', - '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; -static WCHAR subjectStrSemicolonW[] = { - '2','.','5','.','4','.','6','=','U','S',';',' ','2','.','5','.','4','.','8', - '=','M','i','n','n','e','s','o','t','a',';',' ','2','.','5','.','4','.','7', - '=','M','i','n','n','e','a','p','o','l','i','s',';',' ','2','.','5','.','4', - '.','1','0','=','C','o','d','e','W','e','a','v','e','r','s',';',' ','2','.', - '5','.','4','.','1','1','=','W','i','n','e',' ','D','e','v','e','l','o','p', - 'm','e','n','t',';',' ','2','.','5','.','4','.','3','=','l','o','c','a','l', - 'h','o','s','t',';',' ','1','.','2','.','8','4','0','.','1','1','3','5','4', - '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; -static WCHAR subjectStrCRLFW[] = { - '2','.','5','.','4','.','6','=','U','S','\r','\n','2','.','5','.','4','.','8', - '=','M','i','n','n','e','s','o','t','a','\r','\n','2','.','5','.','4','.','7', - '=','M','i','n','n','e','a','p','o','l','i','s','\r','\n','2','.','5','.','4', - '.','1','0','=','C','o','d','e','W','e','a','v','e','r','s','\r','\n','2','.', - '5','.','4','.','1','1','=','W','i','n','e',' ','D','e','v','e','l','o','p', - 'm','e','n','t','\r','\n','2','.','5','.','4','.','3','=','l','o','c','a','l', - 'h','o','s','t','\r','\n','1','.','2','.','8','4','0','.','1','1','3','5','4', - '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; -static WCHAR x500SubjectStrSemicolonReverseW[] = { - 'E','=','a','r','i','c','@','c','o','d','e','w','e','a','v','e','r','s','.','c', - 'o','m',';',' ','C','N','=','l','o','c','a','l','h','o','s','t',';',' ','O','U', - '=','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t',';',' ','O', - '=','C','o','d','e','W','e','a','v','e','r','s',';',' ','L','=','M','i','n','n', - 'e','a','p','o','l','i','s',';',' ','S','=','M','i','n','n','e','s','o','t','a', - ';',' ','C','=','U','S',0 }; static HMODULE dll; static DWORD (WINAPI *pCertNameToStrA)(DWORD,LPVOID,DWORD,LPSTR,DWORD); @@ -274,55 +219,34 @@ static void test_CertRDNValueToStrA(void) static void test_CertRDNValueToStrW(void) { - static const WCHAR usW[] = { 'U','S',0 }; - static const WCHAR minnesotaW[] = { 'M','i','n','n','e','s','o','t','a',0 }; - static const WCHAR minneapolisW[] = { 'M','i','n','n','e','a','p','o','l', - 'i','s',0 }; - static const WCHAR codeweaversW[] = { 'C','o','d','e','W','e','a','v','e', - 'r','s',0 }; - static const WCHAR wineDevW[] = { 'W','i','n','e',' ','D','e','v','e','l', - 'o','p','m','e','n','t',0 }; - static const WCHAR localhostW[] = { 'l','o','c','a','l','h','o','s','t',0 }; - static const WCHAR aricW[] = { 'a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; - static const WCHAR ePKIW[] = { 'e','P','K','I',' ','R','o','o','t',' ', - 'C','e','r','t','i','f','i','c','a','t','i','o','n',' ','A','u','t','h', - 'o','r','i','t','y',0 }; - static const WCHAR embeddedDoubleQuoteW[] = { 'a','b','c','"','d','e','f', - 0 }; - static const WCHAR embeddedSingleQuoteW[] = { 'a','b','c','\'','d','e','f', - 0 }; - static const WCHAR embeddedCommaW[] = { 'a','b','c',',',' ','d','e','f',0 }; - static const WCHAR trailingAndEndingSpaceW[] = { ' ','a','b','c',' ',0 }; - static const WCHAR enclosingQuotesW[] = { '"','d','e','f','"',0 }; - static const WCHAR embeddedSemiW[] = { '1',';','3',0 }; + static const WCHAR ePKIW[] = L"ePKI Root Certification Authority"; CertRDNAttrEncodingW attrs[] = { { "2.5.4.6", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin1), bin1 }, usW, FALSE }, + { sizeof(bin1), bin1 }, L"US", FALSE }, { "2.5.4.8", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin2), bin2 }, minnesotaW, FALSE }, + { sizeof(bin2), bin2 }, L"Minnesota", FALSE }, { "2.5.4.7", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin3), bin3 }, minneapolisW, FALSE }, + { sizeof(bin3), bin3 }, L"Minneapolis", FALSE }, { "2.5.4.10", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin4), bin4 }, codeweaversW, FALSE }, + { sizeof(bin4), bin4 }, L"CodeWeavers", FALSE }, { "2.5.4.11", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin5), bin5 }, wineDevW, FALSE }, + { sizeof(bin5), bin5 }, L"Wine Development", FALSE }, { "2.5.4.3", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin6), bin6 }, localhostW, FALSE }, + { sizeof(bin6), bin6 }, L"localhost", FALSE }, { "1.2.840.113549.1.9.1", CERT_RDN_IA5_STRING, - { sizeof(bin7), bin7 }, aricW, FALSE }, + { sizeof(bin7), bin7 }, L"aric(a)codeweavers.com", FALSE }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin9), bin9 }, embeddedDoubleQuoteW, FALSE }, + { sizeof(bin9), bin9 }, L"abc\"def", FALSE }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin10), bin10 }, embeddedSingleQuoteW, FALSE }, + { sizeof(bin10), bin10 }, L"abc'def", FALSE }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin11), bin11 }, embeddedCommaW, FALSE }, + { sizeof(bin11), bin11 }, L"abc, def", FALSE }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin12), bin12 }, trailingAndEndingSpaceW, FALSE }, + { sizeof(bin12), bin12 }, L" abc ", FALSE }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin13), bin13 }, enclosingQuotesW, FALSE }, + { sizeof(bin13), bin13 }, L"\"def\"", FALSE }, { "0", CERT_RDN_PRINTABLE_STRING, - { sizeof(bin14), bin14 }, embeddedSemiW, FALSE }, + { sizeof(bin14), bin14 }, L"1;3", FALSE }, }; DWORD i, ret; WCHAR buffer[2000]; @@ -557,30 +481,6 @@ static void test_NameToStrConversionW(PCERT_NAME_BLOB pName, DWORD dwStrType, wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); } -static const WCHAR simpleCN_W[] = { 'C','N','=','1',0 }; -static const WCHAR singledQuotedCN_W[] = { 'C','N','=','\'','1','\'',0 }; -static const WCHAR simpleSingleQuotedCN_W[] = { '\'','1','\'',0 }; -static const WCHAR spacedCN_W[] = { 'C','N','=','"',' ','1',' ','"',0 }; -static const WCHAR simpleSpacedCN_W[] = { '"',' ','1',' ','"',0 }; -static const WCHAR quotedCN_W[] = { 'C','N','=','"','"','"','1','"','"','"',0 }; -static const WCHAR simpleQuotedCN_W[] = { '"','"','"','1','"','"','"',0 }; -static const WCHAR multipleAttrCN_W[] = { 'C','N','=','"','1','+','2','"',0 }; -static const WCHAR simpleMultipleAttrCN_W[] = { '"','1','+','2','"',0 }; -static const WCHAR commaCN_W[] = { 'C','N','=','"','a',',','b','"',0 }; -static const WCHAR simpleCommaCN_W[] = { '"','a',',','b','"',0 }; -static const WCHAR equalCN_W[] = { 'C','N','=','"','a','=','b','"',0 }; -static const WCHAR simpleEqualCN_W[] = { '"','a','=','b','"',0 }; -static const WCHAR lessThanCN_W[] = { 'C','N','=','"','<','"',0 }; -static const WCHAR simpleLessThanCN_W[] = { '"','<','"',0 }; -static const WCHAR greaterThanCN_W[] = { 'C','N','=','"','>','"',0 }; -static const WCHAR simpleGreaterThanCN_W[] = { '"','>','"',0 }; -static const WCHAR hashCN_W[] = { 'C','N','=','"','#','"',0 }; -static const WCHAR simpleHashCN_W[] = { '"','#','"',0 }; -static const WCHAR semiCN_W[] = { 'C','N','=','"',';','"',0 }; -static const WCHAR simpleSemiCN_W[] = { '"',';','"',0 }; -static const WCHAR newlineCN_W[] = { 'C','N','=','"','a','\n','b','"',0 }; -static const WCHAR simpleNewlineCN_W[] = { '"','a','\n','b','"',0 }; - static void test_CertNameToStrW(void) { PCCERT_CONTEXT context; @@ -617,88 +517,95 @@ static void test_CertNameToStrW(void) ret, GetLastError()); test_NameToStrConversionW(&context->pCertInfo->Issuer, - CERT_SIMPLE_NAME_STR, issuerStrW, FALSE); + CERT_SIMPLE_NAME_STR, + L"US, Minnesota, Minneapolis, CodeWeavers, Wine Development, localhost, aric(a)codeweavers.com", FALSE); test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG, - issuerStrSemicolonW, FALSE); + L"US; Minnesota; Minneapolis; CodeWeavers; Wine Development; localhost; aric(a)codeweavers.com", FALSE); test_NameToStrConversionW(&context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR | CERT_NAME_STR_CRLF_FLAG, - issuerStrCRLFW, FALSE); + L"US\r\nMinnesota\r\nMinneapolis\r\nCodeWeavers\r\nWine Development\r\nlocalhost\r\naric(a)codeweavers.com", + FALSE); test_NameToStrConversionW(&context->pCertInfo->Subject, - CERT_OID_NAME_STR, subjectStrW, FALSE); + CERT_OID_NAME_STR, + L"2.5.4.6=US, 2.5.4.8=Minnesota, 2.5.4.7=Minneapolis, 2.5.4.10=CodeWeavers, 2.5.4.11=Wine Development," + " 2.5.4.3=localhost, 1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG, - subjectStrSemicolonW, FALSE); + L"2.5.4.6=US; 2.5.4.8=Minnesota; 2.5.4.7=Minneapolis; 2.5.4.10=CodeWeavers; 2.5.4.11=Wine Development;" + " 2.5.4.3=localhost; 1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_CRLF_FLAG, - subjectStrCRLFW, FALSE); + L"2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=Wine " + "Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers.com", FALSE); test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_X500_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG | CERT_NAME_STR_REVERSE_FLAG, - x500SubjectStrSemicolonReverseW, FALSE); + L"E=aric(a)codeweavers.com; CN=localhost; OU=Wine Development; O=CodeWeavers; L=Minneapolis; S=Minnesota; " + "C=US", FALSE); CertFreeCertificateContext(context); } blob.pbData = encodedSimpleCN; blob.cbData = sizeof(encodedSimpleCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, simpleCN_W, FALSE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=1", FALSE); blob.pbData = encodedSingleQuotedCN; blob.cbData = sizeof(encodedSingleQuotedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, singledQuotedCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN='1'", FALSE); test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - simpleSingleQuotedCN_W, FALSE); + L"'1'", FALSE); blob.pbData = encodedSpacedCN; blob.cbData = sizeof(encodedSpacedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, spacedCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleSpacedCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\" 1 \"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\" 1 \"", FALSE); blob.pbData = encodedQuotedCN; blob.cbData = sizeof(encodedQuotedCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, quotedCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"\"\"1\"\"\"", FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleQuotedCN_W, + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"\"\"1\"\"\"", FALSE); blob.pbData = encodedMultipleAttrCN; blob.cbData = sizeof(encodedMultipleAttrCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, multipleAttrCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"1+2\"", FALSE); test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - simpleMultipleAttrCN_W, FALSE); + L"\"1+2\"", FALSE); blob.pbData = encodedCommaCN; blob.cbData = sizeof(encodedCommaCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, commaCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleCommaCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a,b\"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a,b\"", FALSE); blob.pbData = encodedEqualCN; blob.cbData = sizeof(encodedEqualCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, equalCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleEqualCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a=b\"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a=b\"", FALSE); blob.pbData = encodedLessThanCN; blob.cbData = sizeof(encodedLessThanCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, lessThanCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleLessThanCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"<\"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"<\"", FALSE); blob.pbData = encodedGreaterThanCN; blob.cbData = sizeof(encodedGreaterThanCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, greaterThanCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\">\"", FALSE); test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, - simpleGreaterThanCN_W, FALSE); + L"\">\"", FALSE); blob.pbData = encodedHashCN; blob.cbData = sizeof(encodedHashCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, hashCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleHashCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"#\"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"#\"", FALSE); blob.pbData = encodedSemiCN; blob.cbData = sizeof(encodedSemiCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, semiCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleSemiCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\";\"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\";\"", FALSE); blob.pbData = encodedNewlineCN; blob.cbData = sizeof(encodedNewlineCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, newlineCN_W, FALSE); - test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, simpleNewlineCN_W, + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, L"CN=\"a\nb\"", FALSE); + test_NameToStrConversionW(&blob, CERT_SIMPLE_NAME_STR, L"\"a\nb\"", FALSE); } @@ -814,40 +721,30 @@ struct StrToNameW const BYTE *encoded; }; -static const WCHAR badlyQuotedCN_W[] = { 'C','N','=','"','"','1','"','"',0 }; -static const WCHAR simpleCN2_W[] = { 'C','N','=','"','1','"',0 }; -static const WCHAR simpleCN3_W[] = { 'C','N',' ','=',' ','"','1','"',0 }; -static const WCHAR japaneseCN_W[] = { 'C','N','=',0x226f,0x575b,0 }; -static const WCHAR dummyCN_W[] = { 'C','N','=','d','u','m','m','y',',','T','=','t','e','s','t',0 }; -static const WCHAR encodedFields_W[] = { ' ','C','N',' ','=',' ',' ',' ','W','i','n','e',' ','T', - 'e','s','t',',','T',' ','=',' ','1','2','3',',',' ','C', - ' ','=',' ','B','R',0 }; static const BYTE encodedJapaneseCN[] = { 0x30,0x0f,0x31,0x0d,0x30,0x0b,0x06, 0x03,0x55,0x04,0x03,0x1e,0x04,0x22,0x6f,0x57,0x5b }; static const struct StrToNameW namesW[] = { - { simpleCN_W, sizeof(encodedSimpleCN), encodedSimpleCN }, - { simpleCN2_W, sizeof(encodedSimpleCN), encodedSimpleCN }, - { simpleCN3_W, sizeof(encodedSimpleCN), encodedSimpleCN }, - { singledQuotedCN_W, sizeof(encodedSingleQuotedCN), encodedSingleQuotedCN }, - { spacedCN_W, sizeof(encodedSpacedCN), encodedSpacedCN }, - { quotedCN_W, sizeof(encodedQuotedCN), encodedQuotedCN }, - { multipleAttrCN_W, sizeof(encodedMultipleAttrCN), encodedMultipleAttrCN }, - { japaneseCN_W, sizeof(encodedJapaneseCN), encodedJapaneseCN }, - { commaCN_W, sizeof(encodedCommaCN), encodedCommaCN }, - { equalCN_W, sizeof(encodedEqualCN), encodedEqualCN }, - { lessThanCN_W, sizeof(encodedLessThanCN), encodedLessThanCN }, - { greaterThanCN_W, sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, - { hashCN_W, sizeof(encodedHashCN), encodedHashCN }, - { semiCN_W, sizeof(encodedSemiCN), encodedSemiCN }, - { dummyCN_W, sizeof(encodedDummyCN), encodedDummyCN }, - { encodedFields_W, sizeof(encodedFields), encodedFields }, + { L"CN=1", sizeof(encodedSimpleCN), encodedSimpleCN }, + { L"CN=\"1\"", sizeof(encodedSimpleCN), encodedSimpleCN }, + { L"CN = \"1\"", sizeof(encodedSimpleCN), encodedSimpleCN }, + { L"CN='1'", sizeof(encodedSingleQuotedCN), encodedSingleQuotedCN }, + { L"CN=\" 1 \"", sizeof(encodedSpacedCN), encodedSpacedCN }, + { L"CN=\"\"\"1\"\"\"", sizeof(encodedQuotedCN), encodedQuotedCN }, + { L"CN=\"1+2\"", sizeof(encodedMultipleAttrCN), encodedMultipleAttrCN }, + { L"CN=\x226f\x575b", sizeof(encodedJapaneseCN), encodedJapaneseCN }, + { L"CN=\"a,b\"", sizeof(encodedCommaCN), encodedCommaCN }, + { L"CN=\"a=b\"", sizeof(encodedEqualCN), encodedEqualCN }, + { L"CN=\"<\"", sizeof(encodedLessThanCN), encodedLessThanCN }, + { L"CN=\">\"", sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, + { L"CN=\"#\"", sizeof(encodedHashCN), encodedHashCN }, + { L"CN=\";\"", sizeof(encodedSemiCN), encodedSemiCN }, + { L"CN=dummy,T=test", sizeof(encodedDummyCN), encodedDummyCN }, + { L" CN = Wine Test,T = 123, C = BR", sizeof(encodedFields), encodedFields }, }; static void test_CertStrToNameW(void) { - static const WCHAR bogusW[] = { 'b','o','g','u','s',0 }; - static const WCHAR fooW[] = { 'f','o','o','=','1',0 }; BOOL ret; DWORD size, i; LPCWSTR errorPtr; @@ -864,24 +761,24 @@ static void test_CertStrToNameW(void) */ ret = pCertStrToNameW(0, NULL, 0, NULL, NULL, &size, NULL); ok(!ret, "Expected failure\n"); - ret = pCertStrToNameW(0, bogusW, 0, NULL, NULL, &size, NULL); + ret = pCertStrToNameW(0, L"bogus", 0, NULL, NULL, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameW(0, fooW, 0, NULL, NULL, &size, NULL); + ret = pCertStrToNameW(0, L"foo=1", 0, NULL, NULL, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameW(0, simpleCN_W, 0, NULL, NULL, &size, NULL); + ret = pCertStrToNameW(0, L"CN=1", 0, NULL, NULL, &size, NULL); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08lx\n", GetLastError()); - ret = pCertStrToNameW(X509_ASN_ENCODING, simpleCN_W, 0, NULL, NULL, &size, + ret = pCertStrToNameW(X509_ASN_ENCODING, L"CN=1", 0, NULL, NULL, &size, NULL); ok(ret, "CertStrToNameW failed: %08lx\n", GetLastError()); size = sizeof(buf); - ret = pCertStrToNameW(X509_ASN_ENCODING, badlyQuotedCN_W, 0, NULL, buf, + ret = pCertStrToNameW(X509_ASN_ENCODING, L"CN=\"\"1\"\"", 0, NULL, buf, &size, NULL); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); - ret = pCertStrToNameW(X509_ASN_ENCODING, badlyQuotedCN_W, 0, NULL, buf, + ret = pCertStrToNameW(X509_ASN_ENCODING, L"CN=\"\"1\"\"", 0, NULL, buf, &size, &errorPtr); ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08lx\n", GetLastError()); -- 2.30.2

2 1

[PATCH 1/2] winemenubuilder: Search for an executable file when no file extension is provided.
by Sven Baars 31 Mar '22

31 Mar '22

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- This fixes icon extraction for the Scrivener programs menu item which uses C:\\Program Files\\Scrivener\\Scrivener as executable path. programs/winemenubuilder/winemenubuilder.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index ab8798a88b5..a2aa5eef0e4 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -802,16 +802,25 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre GRPICONDIR *pIconDir; ENUMRESSTRUCT sEnumRes; HRESULT hr = E_FAIL; + WCHAR fullPathW[MAX_PATH]; + DWORD len; + + len = SearchPathW(NULL, szFileName, L".exe", MAX_PATH, fullPathW, NULL); + if (len == 0 || len > MAX_PATH) + { + WINE_WARN("SearchPath failed\n"); + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + } - hModule = LoadLibraryExW(szFileName, 0, LOAD_LIBRARY_AS_DATAFILE); + hModule = LoadLibraryExW(fullPathW, 0, LOAD_LIBRARY_AS_DATAFILE); if (!hModule) { if (GetLastError() == ERROR_BAD_EXE_FORMAT) - return open_module16_icon(szFileName, nIndex, ppStream); + return open_module16_icon(fullPathW, nIndex, ppStream); else { WINE_WARN("LoadLibraryExW (%s) failed, error %ld\n", - wine_dbgstr_w(szFileName), GetLastError()); + wine_dbgstr_w(fullPathW), GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } } @@ -820,7 +829,7 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre { hResInfo = FindResourceW(hModule, MAKEINTRESOURCEW(-nIndex), (LPCWSTR)RT_GROUP_ICON); WINE_TRACE("FindResourceW (%s) called, return %p, error %ld\n", - wine_dbgstr_w(szFileName), hResInfo, GetLastError()); + wine_dbgstr_w(fullPathW), hResInfo, GetLastError()); } else { -- 2.30.0.335.ge6362826a0

1 1

[PATCH v2 6/6] win32u: Move NtUserGetMessage implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 527 +---------------------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 103 ++++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 1 + 7 files changed, 112 insertions(+), 529 deletions(-)

2 1

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

31 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/memory.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 3cb596e5814..655778fe79f 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -598,9 +598,12 @@ 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 (!((ULONG_PTR)handle & 2)) return NULL; + if (mem->magic != MAGIC_LOCAL_USED) return NULL; + return mem; } static inline HLOCAL HLOCAL_from_mem( struct mem_entry *mem ) @@ -709,8 +712,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 +747,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 +770,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 +828,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 +844,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 +886,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 +898,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 +912,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

2 5

[PATCH v2 5/6] win32u: Move NtUserPeekMessage implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

2 1

[PATCH v2 3/6] user32: Move unpack_message call to User32CallWindowProc.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Move even more logic to winproc.c. While this requires exposing more details to PE side (all those packed_* structs), it should make 32on64 easier later. It also fixes WM_COPYDATA (unrelated to above). dlls/user32/message.c | 412 +++-------------------------------- dlls/user32/winproc.c | 486 +++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + include/ntuser.h | 1 + 4 files changed, 511 insertions(+), 390 deletions(-)

2 1

[PATCH v2 2/6] win32u: Move reply_message_result implementation from user32.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 181 +----------------------- dlls/win32u/message.c | 264 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 9 ++ dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 153 ++++++++++++++++++++ 6 files changed, 431 insertions(+), 179 deletions(-)

2 1

[PATCH v2 1/6] user32: Introduce reply_message_result helper.
by Jacek Caban 31 Mar '22

31 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-)

2 1

[PATCH 5/5] wineoss: Move get_endpoint_ids to the unixlib.
by Huw Davies 31 Mar '22

31 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 251 ++++++++++-------------------------- dlls/wineoss.drv/oss.c | 206 +++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 19 +++ 3 files changed, 293 insertions(+), 183 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e5206627528..fd35a439c5a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -53,6 +53,7 @@ #include "wine/debug.h" #include "wine/list.h" +#include "wine/unicode.h" #include "wine/unixlib.h" #include "unixlib.h" @@ -147,11 +148,10 @@ typedef struct _SessionMgr { } SessionMgr; typedef struct _OSSDevice { + struct list entry; EDataFlow flow; - char devnode[OSS_DEVNODE_SIZE]; GUID guid; - - struct list entry; + char devnode[0]; } OSSDevice; static struct list g_devices = LIST_INIT(g_devices); @@ -346,25 +346,6 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -/* dst must be large enough to hold devnode */ -static void oss_clean_devnode(char *dest, const char *devnode) -{ - const char *dot, *slash; - size_t len; - - strcpy(dest, devnode); - dot = strrchr(dest, '.'); - if(!dot) - return; - - slash = strrchr(dest, '/'); - if(slash && dot < slash) - return; - - len = dot - dest; - dest[len] = '\0'; -} - static int open_device(const char *device, EDataFlow flow) { int flags = ((flow == eRender) ? O_WRONLY : O_RDONLY) | O_NONBLOCK; @@ -372,44 +353,6 @@ static int open_device(const char *device, EDataFlow flow) return open(device, flags, 0); } -static UINT get_default_index(EDataFlow flow) -{ - int fd = -1, err; - UINT i; - oss_audioinfo ai; - char devnode[OSS_DEVNODE_SIZE]; - OSSDevice *dev_item; - - fd = open_device("/dev/dsp", flow); - if(fd < 0){ - WARN("Couldn't open default device!\n"); - return 0; - } - - ai.dev = -1; - if((err = ioctl(fd, SNDCTL_ENGINEINFO, &ai)) < 0){ - WARN("SNDCTL_ENGINEINFO failed: %d (%s)\n", err, strerror(errno)); - close(fd); - return 0; - } - - close(fd); - - TRACE("Default devnode: %s\n", ai.devnode); - oss_clean_devnode(devnode, ai.devnode); - i = 0; - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ - if(dev_item->flow == flow){ - if(!strcmp(devnode, dev_item->devnode)) - return i; - ++i; - } - } - - WARN("Couldn't find default device! Choosing first.\n"); - return 0; -} - static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) { OSSDevice *dev_item; @@ -419,138 +362,80 @@ static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) return NULL; } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, - UINT *num, UINT *def_index) +static void device_add(OSSDevice *oss_dev) { - int i, mixer_fd; - oss_sysinfo sysinfo; - static int print_once = 0; + if(get_ossdevice_from_guid(&oss_dev->guid)) /* already in list */ + HeapFree(GetProcessHeap(), 0, oss_dev); + else + list_add_tail(&g_devices, &oss_dev->entry); +} - static const WCHAR outW[] = {'O','u','t',':',' ',0}; - static const WCHAR inW[] = {'I','n',':',' ',0}; +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, + UINT *num, UINT *def_index) +{ + struct get_endpoint_ids_params params; + GUID *guids = NULL; + WCHAR **ids = NULL; + unsigned int i; TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); - mixer_fd = open("/dev/mixer", O_RDONLY, 0); - if(mixer_fd < 0){ - ERR("OSS /dev/mixer doesn't seem to exist\n"); - return AUDCLNT_E_SERVICE_NOT_RUNNING; - } - - if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ - close(mixer_fd); - - if(errno == EINVAL){ - ERR("OSS version too old, need at least OSSv4\n"); - return AUDCLNT_E_SERVICE_NOT_RUNNING; - } - - ERR("Error getting SNDCTL_SYSINFO: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; - } - - if(!print_once){ - TRACE("OSS sysinfo:\n"); - TRACE("product: %s\n", sysinfo.product); - TRACE("version: %s\n", sysinfo.version); - TRACE("versionnum: %x\n", sysinfo.versionnum); - TRACE("numaudios: %d\n", sysinfo.numaudios); - TRACE("nummixers: %d\n", sysinfo.nummixers); - TRACE("numcards: %d\n", sysinfo.numcards); - TRACE("numaudioengines: %d\n", sysinfo.numaudioengines); - print_once = 1; - } - - if(sysinfo.numaudios <= 0){ - WARN("No audio devices!\n"); - close(mixer_fd); - return AUDCLNT_E_SERVICE_NOT_RUNNING; - } - - *ids = HeapAlloc(GetProcessHeap(), 0, sysinfo.numaudios * sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, sysinfo.numaudios * sizeof(GUID)); - - *num = 0; - for(i = 0; i < sysinfo.numaudios; ++i){ - oss_audioinfo ai = {0}; - char devnode[OSS_DEVNODE_SIZE]; - OSSDevice *dev_item; - int fd; - - ai.dev = i; - if(ioctl(mixer_fd, SNDCTL_AUDIOINFO, &ai) < 0){ - WARN("Error getting AUDIOINFO for dev %d: %d (%s)\n", i, errno, - strerror(errno)); - continue; - } - - oss_clean_devnode(devnode, ai.devnode); - - /* check for duplicates */ - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry){ - if(dev_item->flow == flow && !strcmp(devnode, dev_item->devnode)) - break; + params.flow = flow; + params.size = 1000; + params.endpoints = NULL; + do{ + HeapFree(GetProcessHeap(), 0, params.endpoints); + params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); + OSS_CALL(get_endpoint_ids, &params); + }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if(FAILED(params.result)) goto end; + + ids = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if(!ids || !guids){ + params.result = E_OUTOFMEMORY; + goto end; + } + + for(i = 0; i < params.num; i++){ + unsigned int name_size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + unsigned int dev_size = strlen(params.endpoints[i].device) + 1; + OSSDevice *oss_dev; + + ids[i] = HeapAlloc(GetProcessHeap(), 0, name_size); + oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size])); + if(!ids[i] || !oss_dev){ + HeapFree(GetProcessHeap, 0, oss_dev); + params.result = E_OUTOFMEMORY; + goto end; } - if(&dev_item->entry != &g_devices) - continue; - - fd = open_device(devnode, flow); - if(fd < 0){ - WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", - devnode, errno, strerror(errno)); - continue; - } - close(fd); - - if((flow == eCapture && (ai.caps & PCM_CAP_INPUT)) || - (flow == eRender && (ai.caps & PCM_CAP_OUTPUT))){ - size_t len, prefix_len; - const WCHAR *prefix; - - dev_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*dev_item)); - - dev_item->flow = flow; - get_device_guid(flow, devnode, &dev_item->guid); - strcpy(dev_item->devnode, devnode); - - (*guids)[*num] = dev_item->guid; - - len = MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, NULL, 0); - if(flow == eRender){ - prefix = outW; - prefix_len = ARRAY_SIZE(outW) - 1; - len += prefix_len; - }else{ - prefix = inW; - prefix_len = ARRAY_SIZE(inW) - 1; - len += prefix_len; - } - (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, - len * sizeof(WCHAR)); - if(!(*ids)[*num]){ - for(i = 0; i < *num; ++i) - HeapFree(GetProcessHeap(), 0, (*ids)[i]); - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, *guids); - HeapFree(GetProcessHeap(), 0, dev_item); - close(mixer_fd); - return E_OUTOFMEMORY; - } - memcpy((*ids)[*num], prefix, prefix_len * sizeof(WCHAR)); - MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, - (*ids)[*num] + prefix_len, len - prefix_len); - - list_add_tail(&g_devices, &dev_item->entry); - - (*num)++; + memcpy(ids[i], params.endpoints[i].name, name_size); + get_device_guid(flow, params.endpoints[i].device, guids + i); + + oss_dev->flow = flow; + oss_dev->guid = guids[i]; + memcpy(oss_dev->devnode, params.endpoints[i].device, dev_size); + device_add(oss_dev); + } + *def_index = params.default_idx; + +end: + HeapFree(GetProcessHeap(), 0, params.endpoints); + if(FAILED(params.result)){ + HeapFree(GetProcessHeap(), 0, guids); + if(ids){ + for(i = 0; i < params.num; i++) + HeapFree(GetProcessHeap(), 0, ids[i]); + HeapFree(GetProcessHeap(), 0, ids); } + }else{ + *ids_out = ids; + *guids_out = guids; + *num = params.num; } - close(mixer_fd); - - *def_index = get_default_index(flow); - - return S_OK; + return params.result; } HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 9c1de25acb5..ae4e4981d2d 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -29,11 +29,13 @@ #include <sys/ioctl.h> #include <fcntl.h> #include <unistd.h> +#include <errno.h> #include <sys/soundcard.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" +#include "audioclient.h" #include "wine/debug.h" #include "wine/unixlib.h" @@ -88,7 +90,211 @@ static NTSTATUS test_connect(void *args) return STATUS_SUCCESS; } +/* dst must be large enough to hold devnode */ +static void oss_clean_devnode(char *dest, const char *devnode) +{ + const char *dot, *slash; + size_t len; + + strcpy(dest, devnode); + dot = strrchr(dest, '.'); + if(!dot) + return; + + slash = strrchr(dest, '/'); + if(slash && dot < slash) + return; + + len = dot - dest; + dest[len] = '\0'; +} + +static int open_device(const char *device, EDataFlow flow) +{ + int flags = ((flow == eRender) ? O_WRONLY : O_RDONLY) | O_NONBLOCK; + + return open(device, flags, 0); +} + +static void get_default_device(EDataFlow flow, char device[OSS_DEVNODE_SIZE]) +{ + int fd, err; + oss_audioinfo ai; + + device[0] = '\0'; + fd = open_device("/dev/dsp", flow); + if(fd < 0){ + WARN("Couldn't open default device!\n"); + return; + } + + ai.dev = -1; + if((err = ioctl(fd, SNDCTL_ENGINEINFO, &ai)) < 0){ + WARN("SNDCTL_ENGINEINFO failed: %d (%s)\n", err, strerror(errno)); + close(fd); + return; + } + close(fd); + + TRACE("Default devnode: %s\n", ai.devnode); + oss_clean_devnode(device, ai.devnode); + return; +} + +static NTSTATUS get_endpoint_ids(void *args) +{ + struct get_endpoint_ids_params *params = args; + oss_sysinfo sysinfo; + static int print_once = 0; + static const WCHAR outW[] = {'O','u','t',':',' ',0}; + static const WCHAR inW[] = {'I','n',':',' ',0}; + struct endpoint_info + { + WCHAR name[OSS_DEVNAME_SIZE + ARRAY_SIZE(outW)]; + char device[OSS_DEVNODE_SIZE]; + } *info; + unsigned int i, j, num, needed, name_len, device_len, default_idx = 0; + char default_device[OSS_DEVNODE_SIZE]; + struct endpoint *endpoint; + int mixer_fd; + char *ptr; + + mixer_fd = open("/dev/mixer", O_RDONLY, 0); + if(mixer_fd < 0){ + ERR("OSS /dev/mixer doesn't seem to exist\n"); + params->result = AUDCLNT_E_SERVICE_NOT_RUNNING; + return STATUS_SUCCESS; + } + + if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){ + close(mixer_fd); + if(errno == EINVAL){ + ERR("OSS version too old, need at least OSSv4\n"); + params->result = AUDCLNT_E_SERVICE_NOT_RUNNING; + return STATUS_SUCCESS; + } + + ERR("Error getting SNDCTL_SYSINFO: %d (%s)\n", errno, strerror(errno)); + params->result = E_FAIL; + return STATUS_SUCCESS; + } + + if(!print_once){ + TRACE("OSS sysinfo:\n"); + TRACE("product: %s\n", sysinfo.product); + TRACE("version: %s\n", sysinfo.version); + TRACE("versionnum: %x\n", sysinfo.versionnum); + TRACE("numaudios: %d\n", sysinfo.numaudios); + TRACE("nummixers: %d\n", sysinfo.nummixers); + TRACE("numcards: %d\n", sysinfo.numcards); + TRACE("numaudioengines: %d\n", sysinfo.numaudioengines); + print_once = 1; + } + + if(sysinfo.numaudios <= 0){ + WARN("No audio devices!\n"); + close(mixer_fd); + params->result = AUDCLNT_E_SERVICE_NOT_RUNNING; + return STATUS_SUCCESS; + } + + info = malloc(sysinfo.numaudios * sizeof(*info)); + if(!info){ + close(mixer_fd); + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + get_default_device(params->flow, default_device); + + num = 0; + for(i = 0; i < sysinfo.numaudios; ++i){ + oss_audioinfo ai = {0}; + char devnode[OSS_DEVNODE_SIZE]; + int fd, prefix_len; + const WCHAR *prefix; + + ai.dev = i; + if(ioctl(mixer_fd, SNDCTL_AUDIOINFO, &ai) < 0){ + WARN("Error getting AUDIOINFO for dev %d: %d (%s)\n", i, errno, + strerror(errno)); + continue; + } + + oss_clean_devnode(devnode, ai.devnode); + + /* check for duplicates */ + for(j = 0; j < num; j++) + if(!strcmp(devnode, info[j].device)) + break; + if(j < num) + continue; + + fd = open_device(devnode, params->flow); + if(fd < 0){ + WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", + devnode, errno, strerror(errno)); + continue; + } + close(fd); + + if((params->flow == eCapture && !(ai.caps & PCM_CAP_INPUT)) || + (params->flow == eRender && !(ai.caps & PCM_CAP_OUTPUT))) + continue; + + strcpy(info[num].device, devnode); + + if(params->flow == eRender){ + prefix = outW; + prefix_len = ARRAY_SIZE(outW) - 1; + }else{ + prefix = inW; + prefix_len = ARRAY_SIZE(inW) - 1; + } + memcpy(info[num].name, prefix, prefix_len * sizeof(WCHAR)); + ntdll_umbstowcs(ai.name, strlen(ai.name) + 1, info[num].name + prefix_len, + ARRAY_SIZE(info[num].name) - prefix_len); + if(!strcmp(default_device, info[num].device)) + default_idx = num; + num++; + } + close(mixer_fd); + + needed = num * sizeof(*params->endpoints); + endpoint = params->endpoints; + ptr = (char *)(endpoint + num); + + for(i = 0; i < num; i++){ + name_len = wcslen(info[i].name) + 1; + device_len = strlen(info[i].device) + 1; + needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); + + if(needed <= params->size){ + endpoint->name = (WCHAR *)ptr; + memcpy(endpoint->name, info[i].name, name_len * sizeof(WCHAR)); + ptr += name_len * sizeof(WCHAR); + endpoint->device = ptr; + memcpy(endpoint->device, info[i].device, device_len); + ptr += (device_len + 1) & ~1; + endpoint++; + } + } + free(info); + + params->num = num; + params->default_idx = default_idx; + + if(needed > params->size){ + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } else + params->result = S_OK; + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, + get_endpoint_ids, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index d4fb5db3102..1a80794f150 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mmdeviceapi.h" + /* From <dlls/mmdevapi/mmdevapi.h> */ enum DriverPriority { @@ -30,9 +32,26 @@ struct test_connect_params enum DriverPriority priority; }; +struct endpoint +{ + WCHAR *name; + char *device; +}; + +struct get_endpoint_ids_params +{ + EDataFlow flow; + struct endpoint *endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; +}; + enum oss_funcs { oss_test_connect, + oss_get_endpoint_ids, }; extern unixlib_handle_t oss_handle; -- 2.25.1

1 1

[PATCH v9 1/7] include: Add wdscore.h file.
by Mohamad Al-Jaf 31 Mar '22

31 Mar '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- The functions CurrentIP and ConstructPartialMsgV[A/W] are used by other Windows libraries including kernelbase. --- include/Makefile.in | 1 + include/wdscore.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 include/wdscore.h diff --git a/include/Makefile.in b/include/Makefile.in index 189b4676091..5b77d5b47c5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -755,6 +755,7 @@ SOURCES = \ wbemdisp.idl \ wbemprov.idl \ wct.h \ + wdscore.h \ weakreference.idl \ webservices.h \ werapi.h \ diff --git a/include/wdscore.h b/include/wdscore.h new file mode 100644 index 00000000000..8888247e347 --- /dev/null +++ b/include/wdscore.h @@ -0,0 +1,32 @@ +/* + * 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 + */ + +#ifndef __WDSCORE__ +#define __WDSCORE__ + +#ifdef __cplusplus +extern "C" { +#endif + +LPVOID CurrentIP(void); + +#ifdef __cplusplus +} +#endif + +#endif /* __WDSCORE__ */ -- 2.35.1

1 7

[PATCH v3] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 31 Mar '22

31 Mar '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: When XmbResetIC is called and KeyEvent occurs, it is a problem with some IME (i.e., ibus-hangul). v3: implement X11DRV_FindXIC(..) for getting exists XIC. --- dlls/winex11.drv/ime.c | 2 ++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xim.c | 31 +++++++++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..2fe78234671 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -753,6 +753,8 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + X11DRV_ForceXIMReset(lpIMC->hWnd); + bRet = TRUE; } break; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f389f3e0836..de882a532f3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -827,6 +827,7 @@ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; extern void X11DRV_SetupXIM(void) DECLSPEC_HIDDEN; extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDEN; +XIC X11DRV_FindXIC(HWND hwnd) DECLSPEC_HIDDEN; extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; extern void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..7a4ec432bbf 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -249,9 +249,36 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, TRACE("Finished\n"); } +/** + * X11DRV_FindXIC + * + * This function finds the already created XIC in itself and parents. + * If only the specified handle is get via X11DRV_get_ic, the XIC can be exists + * in the parents and cannot be get. + */ +XIC X11DRV_FindXIC(HWND hwnd) +{ + HWND hwndParent = hwnd; + XIC ic; + if (!hwndParent) + return NULL; + for (;;) + { + ic = get_win_data( hwndParent )->xic; + if (ic) + break; + else + hwndParent = GetParent(hwnd); + + if (!hwndParent) + return NULL; + } + return ic; +} + void X11DRV_ForceXIMReset(HWND hwnd) { - XIC ic = X11DRV_get_ic(hwnd); + XIC ic = X11DRV_FindXIC(hwnd); if (ic) { char* leftover; @@ -267,7 +294,7 @@ void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) XIMPreeditState state; XVaNestedList attr; - ic = X11DRV_get_ic(hwnd); + ic = X11DRV_FindXIC(hwnd); if (!ic) return; -- 2.32.0

1 0

[PATCH v2] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 31 Mar '22

31 Mar '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: When XmbResetIC is called and KeyEvent occurs, it is a problem with some IME (i.e., ibus-hangul). --- dlls/winex11.drv/ime.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..f44b50550ec 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -704,6 +704,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) { case CPS_COMPLETE: { + HWND hwnd; HIMCC newCompStr; DWORD cplen = 0; LPWSTR cpstr; @@ -753,6 +754,12 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + hwnd = GetActiveWindow(); + if (hwnd) + { + X11DRV_ForceXIMReset(hwnd); + } + bRet = TRUE; } break; -- 2.32.0

1 0

[PATCH v2] riched20: Send CPS_COMPLETE from mouse click event.
by Alex Kwak 31 Mar '22

31 Mar '22

When IME is in the Composition state and trying to move cursor, the composition string in the IME is inserted wrong places in next keyboard event. so, notify IME that composition has been completed and handle events related to click buttons after completing IME operations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: Initialize imeStartIndex with -1 on ME_MakeEditor. --- dlls/riched20/editor.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..ff6edfc145f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -243,6 +243,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int nChars); +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor); HINSTANCE dll_instance = NULL; BOOL me_debug = FALSE; @@ -3045,6 +3046,8 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->back_style = TXTBACK_OPAQUE; ITextHost_TxGetBackStyle( ed->texthost, &ed->back_style ); + ed->imeStartIndex = -1; + list_init( &ed->reobj_list ); OleInitialize(NULL); @@ -3888,6 +3891,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_LBUTTONDOWN: { ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); ITextHost_TxSetFocus(editor->texthost); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), ME_CalculateClickCount(editor, msg, wParam, lParam)); @@ -3918,6 +3922,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); link_notify( editor, msg, wParam, lParam ); goto do_default; case WM_CONTEXTMENU: @@ -4549,3 +4554,20 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int } while (nChars > 0); return modified; } + +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor) +{ + if (editor->imeStartIndex >= 0) + { + HIMC hIMC = ITextHost_TxImmGetContext(editor->texthost); + if (hIMC) + { + ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); + ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ITextHost_TxImmReleaseContext(editor->texthost, hIMC); + return TRUE; + } + } + return FALSE; +} -- 2.32.0

1 0

[PATCH] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 31 Mar '22

31 Mar '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. When XmbResetIC is performed in the composition state, a KeyEvent is generated to empty the existing buffer. However, Wine directly manages the Composition state, so the following strings are unnecessary. so, ignore it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- dlls/winex11.drv/ime.c | 1 + dlls/winex11.drv/xim.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..69ab2e4e850 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -752,6 +752,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + X11DRV_ForceXIMReset(lpIMC->hWnd); bRet = TRUE; } diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..098a520e629 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -44,6 +44,7 @@ BOOL ximInComposeMode=FALSE; static DWORD dwCompStringLength = 0; static LPBYTE CompositionString = NULL; static DWORD dwCompStringSize = 0; +static BOOL ignoreNextLookupChars = FALSE; #define STYLE_OFFTHESPOT (XIMPreeditArea | XIMStatusArea) #define STYLE_OVERTHESPOT (XIMPreeditPosition | XIMStatusNothing) @@ -106,6 +107,12 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) TRACE("%p %u\n", str, count); + if (ignoreNextLookupChars) + { + ignoreNextLookupChars = FALSE; + return; + } + dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, str, count, NULL, 0); wcOutput = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * dwOutput); if (wcOutput == NULL) @@ -255,8 +262,20 @@ void X11DRV_ForceXIMReset(HWND hwnd) if (ic) { char* leftover; + BOOL bInCompose = ximInComposeMode; + TRACE("Forcing Reset %p\n",ic); leftover = XmbResetIC(ic); + + /* + * When Reset is performed in the composition state, a KeyEvent is + * generated to empty the existing buffer. + * + * However, Wine directly manages the Composition state, so the + * following strings are unnecessary. + */ + ignoreNextLookupChars = bInCompose && leftover; + XFree(leftover); } } -- 2.32.0

1 0

[PATCH] riched20: Send CPS_COMPLETE from mouse click event.
by Alex Kwak 31 Mar '22

31 Mar '22

When IME is in the Composition state and trying to move cursor, the composition string in the IME is inserted wrong places in next keyboard event. so, notify IME that composition has been completed and handle events related to click buttons after completing IME operations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- dlls/riched20/editor.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..f8b28bfaef0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -243,6 +243,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int nChars); +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor); HINSTANCE dll_instance = NULL; BOOL me_debug = FALSE; @@ -3888,6 +3889,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_LBUTTONDOWN: { ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); ITextHost_TxSetFocus(editor->texthost); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), ME_CalculateClickCount(editor, msg, wParam, lParam)); @@ -3918,6 +3920,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); link_notify( editor, msg, wParam, lParam ); goto do_default; case WM_CONTEXTMENU: @@ -4549,3 +4552,20 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int } while (nChars > 0); return modified; } + +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor) +{ + if (editor->imeStartIndex >= 0) + { + HIMC hIMC = ITextHost_TxImmGetContext(editor->texthost); + if (hIMC) + { + ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); + ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ITextHost_TxImmReleaseContext(editor->texthost, hIMC); + return TRUE; + } + } + return FALSE; +} -- 2.32.0

2 1

[PATCH] include: Add more URL_* flags.
by Zebediah Figura 30 Mar '22

30 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/shlwapi.h | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index a282ae6d993..6149c7081a3 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -648,28 +648,34 @@ typedef enum { /* The following are used by UrlEscape..., UrlUnEscape..., * UrlCanonicalize..., and UrlCombine... routines */ -#define URL_WININET_COMPATIBILITY 0x80000000 -#define URL_PLUGGABLE_PROTOCOL 0x40000000 -#define URL_ESCAPE_UNSAFE 0x20000000 -#define URL_UNESCAPE 0x10000000 +#define URL_WININET_COMPATIBILITY 0x80000000 +#define URL_PLUGGABLE_PROTOCOL 0x40000000 +#define URL_ESCAPE_UNSAFE 0x20000000 +#define URL_UNESCAPE 0x10000000 -#define URL_DONT_SIMPLIFY 0x08000000 -#define URL_NO_META URL_DONT_SIMPLIFY -#define URL_ESCAPE_SPACES_ONLY 0x04000000 -#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000 -#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO -#define URL_BROWSER_MODE URL_DONT_ESCAPE_EXTRA_INFO +#define URL_DONT_SIMPLIFY 0x08000000 +#define URL_ESCAPE_SPACES_ONLY 0x04000000 +#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000 -#define URL_INTERNAL_PATH 0x00800000 /* Will escape #'s in paths */ -#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000 -#define URL_CONVERT_IF_DOSPATH 0x00200000 -#define URL_UNESCAPE_INPLACE 0x00100000 +#define URL_INTERNAL_PATH 0x00800000 +#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000 +#define URL_CONVERT_IF_DOSPATH 0x00200000 +#define URL_UNESCAPE_INPLACE 0x00100000 -#define URL_FILE_USE_PATHURL 0x00010000 -#define URL_ESCAPE_AS_UTF8 0x00040000 +#define URL_ESCAPE_ASCII_URI_COMPONENT 0x00080000 +#define URL_ESCAPE_AS_UTF8 0x00040000 +#define URL_DONT_UNESCAPE 0x00020000 +#define URL_FILE_USE_PATHURL 0x00010000 -#define URL_ESCAPE_SEGMENT_ONLY 0x00002000 -#define URL_ESCAPE_PERCENT 0x00001000 +#define URL_ESCAPE_SEGMENT_ONLY 0x00002000 +#define URL_ESCAPE_PERCENT 0x00001000 + +#define URL_BROWSER_MODE URL_DONT_ESCAPE_EXTRA_INFO +#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO +#define URL_ESCAPE_URI_COMPONENT (URL_ESCAPE_ASCII_URI_COMPONENT | URL_ESCAPE_AS_UTF8) +#define URL_NO_META URL_DONT_SIMPLIFY +#define URL_UNESCAPE_AS_UTF8 URL_ESCAPE_AS_UTF8 +#define URL_UNESCAPE_URI_COMPONENT URL_UNESCAPE_AS_UTF8 HRESULT WINAPI UrlApplySchemeA(LPCSTR,LPSTR,LPDWORD,DWORD); HRESULT WINAPI UrlApplySchemeW(LPCWSTR,LPWSTR,LPDWORD,DWORD); -- 2.34.1

1 0

[PATCH v2 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> --- v2: Add C asserts for flexible arrays. --- 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..e552779937b 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: + free(session); + 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 9

[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

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