April 2022 - Wine-Devel - list.winehq.org

[tools] testbot/cgi: Let CollectionBlock operate in read-only mode.
by Francois Gouget April 6, 2022

April 6, 2022

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 April 6, 2022

April 6, 2022

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 April 6, 2022

April 6, 2022

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 April 6, 2022

April 6, 2022

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 April 6, 2022

April 6, 2022

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 April 6, 2022

April 6, 2022

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 April 6, 2022

April 6, 2022

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 April 6, 2022

April 6, 2022

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 April 6, 2022

April 6, 2022

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 April 6, 2022

April 6, 2022

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