January 2022 - Wine-commits

Paul Gofman : winhttp: Append mask to output frame even if buffer length is zero.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 67252dec2234d4ab380ef3b727b9503ae1f4d3d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67252dec2234d4ab380ef3b7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 27 02:03:05 2022 +0300 winhttp: Append mask to output frame even if buffer length is zero. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index cbfe2b21bd0..0a5362d3c16 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3174,8 +3174,7 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR offset += 8; } - buffer_size = len + offset; - if (len) buffer_size += 4; + buffer_size = len + offset + 4; assert( buffer_size - len < MAX_FRAME_BUFFER_SIZE ); if (ovr && buffer_size > MAX_FRAME_BUFFER_SIZE) return WSAEWOULDBLOCK; if (buffer_size > socket->send_frame_buffer_size && socket->send_frame_buffer_size < MAX_FRAME_BUFFER_SIZE) @@ -3196,13 +3195,11 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR memcpy(ptr, hdr, offset); ptr += offset; - if (len) - { - mask = &hdr[offset]; - RtlGenRandom( mask, 4 ); - memcpy( ptr, mask, 4 ); - ptr += 4; - } + + mask = &hdr[offset]; + RtlGenRandom( mask, 4 ); + memcpy( ptr, mask, 4 ); + ptr += 4; if (opcode == SOCKET_OPCODE_CLOSE) /* prepend status code */ {

1 0

Paul Gofman : winhttp: Attemp sync websocket send even if data doesn't fit SSL buffer.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: a0e5fcdc001cb5ed3d109d7f39a44bcfbff707b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0e5fcdc001cb5ed3d109d7f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 27 02:03:06 2022 +0300 winhttp: Attemp sync websocket send even if data doesn't fit SSL buffer. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 15 +++++-- dlls/winhttp/request.c | 35 ++++++++++++---- dlls/winhttp/tests/notification.c | 86 ++++++++++++++++++++++++++++----------- dlls/winhttp/winhttp_private.h | 1 + 4 files changed, 101 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0e5fcdc001cb5ed3d10…

1 0

Paul Gofman : winhttp: Attemp sync websocket send even if data doesn't fit frame buffer.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 9861b6796f0edc781584072c3d4d192e9c2784a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9861b6796f0edc781584072c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jan 27 02:03:07 2022 +0300 winhttp: Attemp sync websocket send even if data doesn't fit frame buffer. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 56 ++++++++++++++++++++++++++++-------------- dlls/winhttp/winhttp_private.h | 4 +++ 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e8576256fe7..a5bd828c9b7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3145,10 +3145,10 @@ static DWORD send_bytes( struct socket *socket, char *bytes, int len, int *sent, static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHORT status, const char *buf, DWORD buflen, BOOL final, WSAOVERLAPPED *ovr ) { - DWORD i = 0, j, offset = 2, len = buflen; - DWORD buffer_size, ret = 0, send_size; - char hdr[14], *mask = NULL; + DWORD i, offset = 2, len = buflen; + DWORD buffer_size, ret = 0; int sent_size; + char hdr[14]; char *ptr; TRACE( "sending %02x frame, len %u.\n", opcode, len ); @@ -3179,7 +3179,6 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR buffer_size = len + offset + 4; assert( buffer_size - len < MAX_FRAME_BUFFER_SIZE ); - if (ovr && buffer_size > MAX_FRAME_BUFFER_SIZE) return WSAEWOULDBLOCK; if (buffer_size > socket->send_frame_buffer_size && socket->send_frame_buffer_size < MAX_FRAME_BUFFER_SIZE) { DWORD new_size; @@ -3199,27 +3198,32 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR memcpy(ptr, hdr, offset); ptr += offset; - mask = &hdr[offset]; - RtlGenRandom( mask, 4 ); - memcpy( ptr, mask, 4 ); + RtlGenRandom( socket->mask, 4 ); + memcpy( ptr, socket->mask, 4 ); ptr += 4; + socket->mask_index = 0; if (opcode == SOCKET_OPCODE_CLOSE) /* prepend status code */ { - *ptr++ = (status >> 8) ^ mask[i++ % 4]; - *ptr++ = (status & 0xff) ^ mask[i++ % 4]; + *ptr++ = (status >> 8) ^ socket->mask[socket->mask_index++ % 4]; + *ptr++ = (status & 0xff) ^ socket->mask[socket->mask_index++ % 4]; } offset = ptr - socket->send_frame_buffer; - send_size = offset + buflen; - while (1) + socket->send_remaining_size = offset + buflen; + socket->client_buffer_offset = 0; + while (socket->send_remaining_size) { - j = 0; - while (j < buflen && offset < MAX_FRAME_BUFFER_SIZE) - socket->send_frame_buffer[offset++] = buf[j++] ^ mask[i++ % 4]; + len = min( buflen, MAX_FRAME_BUFFER_SIZE - offset ); + for (i = 0; i < len; ++i) + { + socket->send_frame_buffer[offset++] = buf[socket->client_buffer_offset++] + ^ socket->mask[socket->mask_index++ % 4]; + } sent_size = 0; ret = send_bytes( socket, socket->send_frame_buffer, offset, &sent_size, ovr ); + socket->send_remaining_size -= sent_size; if (ret) { if (ovr && ret == WSA_IO_PENDING) @@ -3229,17 +3233,16 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR } return ret; } - if (!(send_size -= offset)) break; + assert( sent_size == offset ); offset = 0; - buf += j; - buflen -= j; + buflen -= len; } return ERROR_SUCCESS; } static DWORD complete_send_frame( struct socket *socket, WSAOVERLAPPED *ovr, const char *buf ) { - DWORD ret, retflags, len; + DWORD ret, retflags, len, i; if (!WSAGetOverlappedResult( socket->request->netconn->socket, ovr, &len, TRUE, &retflags )) return WSAGetLastError(); @@ -3249,6 +3252,22 @@ static DWORD complete_send_frame( struct socket *socket, WSAOVERLAPPED *ovr, con ret = send_bytes( socket, socket->send_frame_buffer, socket->bytes_in_send_frame_buffer, NULL, NULL ); if (ret) return ret; } + + assert( socket->bytes_in_send_frame_buffer <= socket->send_remaining_size ); + socket->send_remaining_size -= socket->bytes_in_send_frame_buffer; + + while (socket->send_remaining_size) + { + len = min( socket->send_remaining_size, MAX_FRAME_BUFFER_SIZE ); + for (i = 0; i < len; ++i) + { + socket->send_frame_buffer[i] = buf[socket->client_buffer_offset++] + ^ socket->mask[socket->mask_index++ % 4]; + } + ret = send_bytes( socket, socket->send_frame_buffer, len, NULL, NULL ); + if (ret) return ret; + socket->send_remaining_size -= len; + } return ERROR_SUCCESS; } @@ -3371,7 +3390,6 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ async_send = TRUE; complete_async = TRUE; } - else if (ret == WSAEWOULDBLOCK) async_send = TRUE; } if (async_send) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 639c97b126e..b41eb0ee676 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -247,6 +247,8 @@ struct socket struct queue recv_q; enum socket_opcode opcode; DWORD read_size; + char mask[4]; + unsigned int mask_index; BOOL close_frame_received; DWORD close_frame_receive_err; USHORT status; @@ -254,7 +256,9 @@ struct socket DWORD reason_len; char *send_frame_buffer; unsigned int send_frame_buffer_size; + unsigned int send_remaining_size; unsigned int bytes_in_send_frame_buffer; + unsigned int client_buffer_offset; }; struct send_request

1 0

Francois Gouget : testbot/SetWinLocale: Better identify the User Profile locale key.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: tools Branch: master Commit: f4d4490321f30b8963899c4ac81becffd194dcff URL: https://source.winehq.org/git/tools.git/?a=commit;h=f4d4490321f30b8963899c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 27 13:55:23 2022 +0100 testbot/SetWinLocale: Better identify the User Profile locale key. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 42a106b..654ec46 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -170,6 +170,7 @@ my %Countries = ( "ZA" => 209, # South Africa ); +# Map the locale identifier to the Windows keyboard id my %Keyboards = ( "af-ZA" => ["0436:00000409"], # Afrikaans - South Africa "ar-EG" => ["0c01:00000401"], # Arabic - Egypt @@ -253,6 +254,13 @@ my %Keyboards = ( "zh-TW" => ["0404:00000404"], # Chinese - Taiwan ); +# Some Windows locale names are different and do not match the usual format +my %LocaleInfoKeys = ( + "mn-CN" => "mn-Mong", + "mn-MN" => "mn-Mong-MN", + "zh-CN" => "zh-Hans-CN", +); + # # Command line processing @@ -642,15 +650,17 @@ sub GetWinKeyboardIds($) { my ($Locale) = @_; - # Look for that locale's keyboard id. - # Its first component is the locale's LCID. - my $Values = RegGetValues("$HKCU_USER_PROFILE\\$Locale", "*:*"); + # The locale information is sometimes stored in a key with a non-standard + # name, despite the standard locale name being used everywhere else! + my $Key = $LocaleInfoKeys{$Locale} || $Locale; + my $Values = RegGetValues("$HKCU_USER_PROFILE\\$Key", "*:*"); if (!%$Values) { - my $Lang = $Locale; - $Lang =~ s/-.*$//; - $Values = RegGetValues("$HKCU_USER_PROFILE\\$Lang", "*:*"); + $Key =~ s/-.*$//; + $Values = RegGetValues("$HKCU_USER_PROFILE\\$Key", "*:*"); } + + # Look for the locale's keyboard id(s). foreach my $VName (keys %$Values) { next if ($VName !~ /^[0-9A-F]{4}:/); @@ -663,6 +673,7 @@ sub GetWinKeyboardIds($) FatalError("could not find the $Locale LCID and keyboard ids. Maybe the locale is not installed?\n"); } + # The first component of the keyboard id is the locale's LCID. my $WinLCID = uc($WinKeyboardIds{$Locale}->[0]); $WinLCID =~ s/:.*$//; $WinLCIDs{$Locale} = $WinLCID;

1 0

Francois Gouget : testbot/SetWinLocale: Take keyboard layouts preference order into account.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: tools Branch: master Commit: 5b2476cdd90aa396a195bfe67cefbe82ab8e1a26 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5b2476cdd90aa396a195bfe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 27 13:55:26 2022 +0100 testbot/SetWinLocale: Take keyboard layouts preference order into account. See for instance the Armenian locale (hy). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 654ec46..f725e30 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -661,13 +661,17 @@ sub GetWinKeyboardIds($) } # Look for the locale's keyboard id(s). + my %WinLayouts; foreach my $VName (keys %$Values) { - next if ($VName !~ /^[0-9A-F]{4}:/); - $WinKeyboardIds{$Locale} = [$VName]; - last; + # The value is the keyboard layout's preference order + $WinLayouts{hex($Values->{$VName})} = $VName if ($VName =~ /^[0-9A-F]{4}:/); + } + $WinKeyboardIds{$Locale} = %WinLayouts ? [] : $Keyboards{$Locale}; + foreach my $Index (sort { $a cmp $b } keys %WinLayouts) + { + push @{$WinKeyboardIds{$Locale}}, $WinLayouts{$Index}; } - $WinKeyboardIds{$Locale} ||= $Keyboards{$Locale}; if (!$WinKeyboardIds{$Locale}) { FatalError("could not find the $Locale LCID and keyboard ids. Maybe the locale is not installed?\n");

1 0

Francois Gouget : testbot/SetWinLocale: Use Powershell to collect all the locales at once.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: tools Branch: master Commit: a2ff99d93ce9db0de769860b6bce2c86c46a9aa7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a2ff99d93ce9db0de769860… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 27 14:58:44 2022 +0100 testbot/SetWinLocale: Use Powershell to collect all the locales at once. The new Powershell script can also be used independently on Windows. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 103 +++++++++++++++++++++++----------------- testbot/bin/SetWinLocale.ps1 | 110 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 42 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index f725e30..61befff 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -3,7 +3,7 @@ # # Sets the locale of the specified Windows machine. # -# Copyright 2018, 2021 Francois Gouget +# Copyright 2018, 2021-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 @@ -41,12 +41,7 @@ use WineTestBot::Log; use WineTestBot::TestAgent; use WineTestBot::Utils; -my $HKCU_INTERNATIONAL = "HKCU\\Control Panel\\International"; -my $HKCU_GEO = "HKCU\\Control Panel\\International\\Geo"; my $HKCU_USER_PROFILE = "HKCU\\Control Panel\\International\\User Profile"; -my $HKCU_DESKTOP = "HKCU\\Control Panel\\Desktop"; -my $HKLM_LANGUAGE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Language"; -my $HKLM_LOCALE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Locale"; my $HKLM_CODE_PAGE = "HKLM\\System\\CurrentControlSet\\Control\\Nls\\CodePage"; @@ -74,11 +69,26 @@ sub Debug(@) print STDERR @_ if ($Debug); } +my $TA; +sub Cleanup() +{ + return if (!$TA); + if ($Debug) + { + Debug("Not deleting the $name0* files for debugging\n"); + } + else + { + $TA->Rm("$name0.out", "$name0.ps1"); + } +} + my $Start = Time(); sub FatalError(@) { - Error( @_); + Error(@_); Debug(Elapsed($Start), " Aborting\n"); + Cleanup(); exit(1); } @@ -495,7 +505,7 @@ if (defined $Usage) exit 0; } -my $TA = TestAgent->new($OptHostName, $AgentPort); +$TA = TestAgent->new($OptHostName, $AgentPort); # @@ -566,42 +576,44 @@ sub RegSetValue($$$$) # Show the host's locale settings # -sub GetWinSettings($) +if (open(my $fh, "<", "$0.ps1")) { - my ($All) = @_; - my $Settings; + my $Script = join("", <$fh>); + close($fh); - if ($OptLocale or $All) - { - my $Values = RegGetValues($HKCU_INTERNATIONAL, "Locale*"); - map { $Settings->{$_} = $Values->{$_} } ("Locale", "LocaleName"); - } - if ($OptCountry or $All) - { - my $Values = RegGetValues($HKCU_GEO, "N*"); - $Settings->{Country} = $Values->{Nation}; - $Settings->{CountryName} = $Values->{Name}; - } - if (($OptKeyboard || $OptDefault) or $All) - { - my $Values = RegGetValues($HKCU_USER_PROFILE, "*"); - $Settings->{InputMethod} = $Values->{InputMethodOverride}; - $Settings->{Languages} = $Values->{Languages}; - } - if ($OptMUI or $All) - { - my $Values = RegGetValues($HKCU_DESKTOP, "*PreferredUILanguages*"); - map { $Settings->{$_} = $Values->{$_} } ("PreferredUILanguages", "PreferredUILanguagesPending", "PreviousPreferredUILanguages"); - } - if ($OptSystem or $All) + $Script =~ s~\n~\r\n~g; + if (!$TA->SendFileFromString($Script, "$name0.ps1", 0)) { - $Settings->{SysLanguage} = RegGetValue($HKLM_LANGUAGE, "Default"); - $Settings->{SysLocale} = RegGetValue($HKLM_LOCALE, "(Default)"); + FatalError("could not send the batch file:", $TA->GetLastError(), "\n"); } - if ($OptUTF8 or $All) +} +else +{ + FatalError("could not open '$0.ps1' for reading: $!\n"); +} + +sub GetWinSettings() +{ + my $Cmd = ["powershell.exe", "-ExecutionPolicy", "ByPass", "-File", + "$name0.ps1", "settings"]; + my $Ret = $TA->RunAndWait($Cmd, 0, 30, undef, "$name0.out", "$name0.out"); + FatalError("failed to run @$Cmd: ", $TA->GetLastError(), "\n") if ($Ret < 0); + my $Out = $TA->GetFileToString("$name0.out") if (!$Ret); + + my ($Settings, $Key); + foreach my $Line (split /\n/, $Out || "") { - my $Values = RegGetValues($HKLM_CODE_PAGE, "*CP"); - map { $Settings->{$_} = $Values->{$_} } ("ACP", "MACCP", "OEMCP"); + $Line =~ s/\r$//; + if ($Line =~ /^([a-zA-Z]+)=\[(.*)\]$/) + { + my ($Name, $Value) = ($1, $2); + $Settings->{$Name} = [split /, /, $Value]; + } + elsif ($Line =~ /^([a-zA-Z]+)=(.*)$/) + { + my ($Name, $Value) = ($1, $2); + $Settings->{$Name} = $Value eq "<undef>" ? undef : $Value; + } } return $Settings; } @@ -617,6 +629,8 @@ sub Value2Str($) sub ShowWinSettings($) { my ($Settings) = @_; + + print "Current account:\n"; print "Locale (--locale) = ", Value2Str($Settings->{Locale}), "\n"; print "LocaleName (--locale) = ", Value2Str($Settings->{LocaleName}), "\n"; print "Geo:Nation (--country) = ", Value2Str($Settings->{Country}), "\n"; @@ -626,6 +640,9 @@ sub ShowWinSettings($) print "PreferredUILanguages (--mui) = ", Value2Str($Settings->{PreferredUILanguages}), "\n"; print " ...Pending (--mui) = ", Value2Str($Settings->{PreferredUILanguagesPending}), "\n"; print " Previous... (--mui) = ", Value2Str($Settings->{PreviousPreferredUILanguages}), "\n"; + + print "\n"; + print "System settings:\n"; print "Nls:Language (--system) = ", Value2Str($Settings->{SysLanguage}), "\n"; print "Nls:Locale (--system) = ", Value2Str($Settings->{SysLocale}), "\n"; print "ACP (--utf8) = ", Value2Str($Settings->{ACP}), "\n"; @@ -635,7 +652,8 @@ sub ShowWinSettings($) if ($OptShow) { - ShowWinSettings(GetWinSettings("all")); + ShowWinSettings(GetWinSettings()); + Cleanup(); exit(0); } @@ -871,7 +889,7 @@ sub CheckSetting($$$$;$) my ($Settings, $VName, $Expected, $For, $IgnoreCase) = @_; my $Value = $Settings->{$VName}; - if (defined $Value) + if (defined $Value and $Value !~ /^<.+>$/) { if ((!$IgnoreCase and $Value ne $Expected) or ($IgnoreCase and uc($Value) ne uc($Expected))) @@ -883,7 +901,7 @@ sub CheckSetting($$$$;$) } Debug(Elapsed($Start), " Checking the new locale settings\n"); -my $Settings = GetWinSettings($Debug); +my $Settings = GetWinSettings(); ShowWinSettings($Settings) if ($Debug); if ($OptLocale) { @@ -916,6 +934,7 @@ if ($KeyboardIds) CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); } +Cleanup(); exit(1) if (!$Success); Debug(Elapsed($Start), " All done!\n"); exit(0); diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 new file mode 100644 index 0000000..8d6b3a9 --- /dev/null +++ b/testbot/bin/SetWinLocale.ps1 @@ -0,0 +1,110 @@ +# Shows the Windows locale settings +# +# Copyright 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +$Name0 = (Get-Item $MyInvocation.InvocationName).Basename + + +# +# Dump the Windows locales settings +# + +$HKCU_INTERNATIONAL = "HKCU:\Control Panel\International" +$HKCU_GEO = "HKCU:\Control Panel\International\Geo" +$HKCU_USER_PROFILE = "HKCU:\Control Panel\International\User Profile" +$HKCU_DESKTOP = "HKCU:\Control Panel\Desktop" +$HKLM_LANGUAGE = "HKLM:\SYSTEM\CurrentControlSet\Control\Nls\Language" +$HKLM_LOCALE = "HKLM:\SYSTEM\CurrentControlSet\Control\Nls\Locale" +$HKLM_CODE_PAGE = "HKLM:\System\CurrentControlSet\Control\Nls\CodePage" +$CODE_PAGES = "ACP", "MACCP", "OEMCP" + + +function ShowSetting([string]$Key, [string]$VName, [string]$SName) +{ + if ($SName -eq "") { $SName = $VName } + # Don't use Get-ItemPropertyValue because it ignores -ErrorAction and is + # not available on Windows 7. + $Value = Get-ItemProperty -Path $Key -Name $VName -ErrorAction SilentlyContinue + $Value = if ($Value -eq $null) { "<undef>" } else { $Value.$($VName) } + if ($Value.GetType().Name -eq "Object[]") + { + $Value = "[" + ($Value -join ", ") + "]" + } + Write-Output "$SName=$Value" +} + +function ShowSettings() +{ + Write-Output "Current account:" + ShowSetting $HKCU_INTERNATIONAL "Locale" + ShowSetting $HKCU_INTERNATIONAL "LocaleName" + ShowSetting $HKCU_GEO "Nation" "Country" + ShowSetting $HKCU_GEO "Name" "CountryName" + ShowSetting $HKCU_USER_PROFILE "InputMethodOverride" "InputMethod" + ShowSetting $HKCU_USER_PROFILE "Languages" + ShowSetting $HKCU_DESKTOP "PreferredUILanguages" + ShowSetting $HKCU_DESKTOP "PreferredUILanguagesPending" + ShowSetting $HKCU_DESKTOP "PreviousPreferredUILanguages" + + Write-Output "" + Write-Output "System settings:" + ShowSetting $HKLM_LANGUAGE "Default" "SysLanguage" + try + { + ShowSetting $HKLM_LOCALE "(Default)" "SysLocale" + } + catch + { + # On Windows 7 Get-ItemProperty confuses the key's default value + # with the value called "(Default)"! + Write-Output "SysLocale=<cannot-get-on-windows-7>" + } + foreach ($CodePage in $CODE_PAGES) + { + ShowSetting $HKLM_CODE_PAGE $CodePage + } + + exit 0 +} + + +# +# Main +# + +function ShowUsage() +{ + Write-Output "Usage: $Name0 settings" + Write-Output "or $Name0 -?" + Write-Output "" + Write-Output "Shows the Windows locales." + Write-Output "" + Write-Output "Where:" + Write-Output " settings Show the current Windows locale settings." + Write-Output " -? Shows this help message." +} + +$Action = $args[0] +if ($Action -eq "settings") { ShowSettings } +$Rc = 0 +if ($Action -and $Action -ne "-?" -and $Action -ne "-h" -and $Action -ne "help") +{ + echo "$Name0:error: unknown action $Action" + $Rc = 2 +} +ShowUsage +exit $Rc

1 0

Francois Gouget : testbot/SetWinLocale: Show more locale settings.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: tools Branch: master Commit: 2784b9ee342504bdc6675583c934ff6ab82d1838 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2784b9ee342504bdc667558… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 27 14:58:47 2022 +0100 testbot/SetWinLocale: Show more locale settings. In particular show how the system account (System/LocalSystem) settings are affected by SetWinLocale. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 22 ++++++++++++++++++++-- testbot/bin/SetWinLocale.ps1 | 22 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 61befff..fa5f90c 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -635,19 +635,37 @@ sub ShowWinSettings($) print "LocaleName (--locale) = ", Value2Str($Settings->{LocaleName}), "\n"; print "Geo:Nation (--country) = ", Value2Str($Settings->{Country}), "\n"; print "Geo:Name (--country) = ", Value2Str($Settings->{CountryName}), "\n"; - print "InputMethod (--keyboard) = ", Value2Str($Settings->{InputMethod}), "\n"; print "Languages = ", Value2Str($Settings->{Languages}), "\n"; print "PreferredUILanguages (--mui) = ", Value2Str($Settings->{PreferredUILanguages}), "\n"; print " ...Pending (--mui) = ", Value2Str($Settings->{PreferredUILanguagesPending}), "\n"; - print " Previous... (--mui) = ", Value2Str($Settings->{PreviousPreferredUILanguages}), "\n"; + print " Previous... = ", Value2Str($Settings->{PreviousPreferredUILanguages}), "\n"; + print "WindowsOverride (--mui) = ", Value2Str($Settings->{WindowsOverride}), "\n"; + print "InputMethod (--keyboard) = ", Value2Str($Settings->{InputMethod}), "\n"; print "\n"; print "System settings:\n"; print "Nls:Language (--system) = ", Value2Str($Settings->{SysLanguage}), "\n"; + print "Nls:InstallLang (--system) = ", Value2Str($Settings->{SysInstallLang}), "\n"; print "Nls:Locale (--system) = ", Value2Str($Settings->{SysLocale}), "\n"; print "ACP (--utf8) = ", Value2Str($Settings->{ACP}), "\n"; print "MACCP (--utf8) = ", Value2Str($Settings->{MACCP}), "\n"; print "OEMCP (--utf8) = ", Value2Str($Settings->{OEMCP}), "\n"; + + print "\n"; + print ".DEFAULT account:\n"; + # Locale used for the date and time in the logon screen + print "Locale (--locale) = ", Value2Str($Settings->{DefLocale}), "\n"; + print "LocaleName (--locale) = ", Value2Str($Settings->{DefLocaleName}), "\n"; + print "Geo:Nation (--country) = ", Value2Str($Settings->{DefCountry}), "\n"; + print "Geo:Name (--country) = ", Value2Str($Settings->{DefCountryName}), "\n"; + # Language of the 'Welcome' message + print "PreferredUILanguages = ", Value2Str($Settings->{DefPreferredUILanguages}), "\n"; + print " ...Pending = ", Value2Str($Settings->{DefPreferredUILanguagesPending}), "\n"; + print " Previous... = ", Value2Str($Settings->{DefPreviousPreferredUILanguages}), "\n"; + # Language of the 'Password' text in the password field + print "MachinePrefUILanguages(--mui)= ", Value2Str($Settings->{DefMachinePreferredUILanguages}), "\n"; + # Keyboard layout for the password field + print "InputMethod (--keyboard) = ", Value2Str($Settings->{DefInputMethod}), "\n"; } if ($OptShow) diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 index 8d6b3a9..702b330 100644 --- a/testbot/bin/SetWinLocale.ps1 +++ b/testbot/bin/SetWinLocale.ps1 @@ -32,6 +32,12 @@ $HKLM_LOCALE = "HKLM:\SYSTEM\CurrentControlSet\Control\Nls\Locale" $HKLM_CODE_PAGE = "HKLM:\System\CurrentControlSet\Control\Nls\CodePage" $CODE_PAGES = "ACP", "MACCP", "OEMCP" +$HKDEF_INTERNATIONAL = "Registry::HKEY_USERS\.DEFAULT\Control Panel\International" +$HKDEF_GEO = "Registry::HKEY_USERS\.DEFAULT\Control Panel\International\Geo" +$HKDEF_USER_PROFILE = "Registry::HKEY_USERS\.DEFAULT\Control Panel\International\User Profile" +$HKDEF_DESKTOP = "Registry::HKEY_USERS\.DEFAULT\Control Panel\Desktop" +$HKDEF_MUICACHED = "Registry::HKEY_USERS\.DEFAULT\Control Panel\Desktop\MuiCached" + function ShowSetting([string]$Key, [string]$VName, [string]$SName) { @@ -56,6 +62,7 @@ function ShowSettings() ShowSetting $HKCU_GEO "Name" "CountryName" ShowSetting $HKCU_USER_PROFILE "InputMethodOverride" "InputMethod" ShowSetting $HKCU_USER_PROFILE "Languages" + ShowSetting $HKCU_USER_PROFILE "WindowsOverride" ShowSetting $HKCU_DESKTOP "PreferredUILanguages" ShowSetting $HKCU_DESKTOP "PreferredUILanguagesPending" ShowSetting $HKCU_DESKTOP "PreviousPreferredUILanguages" @@ -63,6 +70,7 @@ function ShowSettings() Write-Output "" Write-Output "System settings:" ShowSetting $HKLM_LANGUAGE "Default" "SysLanguage" + ShowSetting $HKLM_LANGUAGE "InstallLanguage" "SysInstallLang" try { ShowSetting $HKLM_LOCALE "(Default)" "SysLocale" @@ -78,6 +86,20 @@ function ShowSettings() ShowSetting $HKLM_CODE_PAGE $CodePage } + Write-Output "" + Write-Output ".DEFAULT account:" + ShowSetting $HKDEF_INTERNATIONAL "Locale" "DefLocale" + ShowSetting $HKDEF_INTERNATIONAL "LocaleName" "DefLocaleName" + ShowSetting $HKDEF_GEO "Nation" "DefCountry" + ShowSetting $HKDEF_GEO "Name" "DefCountryName" + ShowSetting $HKDEF_USER_PROFILE "InputMethodOverride" "DefInputMethod" + ShowSetting $HKDEF_USER_PROFILE "Languages" "DefLanguages" + ShowSetting $HKDEF_USER_PROFILE "WindowsOverride" "DefWindowsOverride" + ShowSetting $HKDEF_DESKTOP "PreferredUILanguages" "DefPreferredUILanguages" + ShowSetting $HKDEF_DESKTOP "PreferredUILanguagesPending" "DefPreferredUILanguagesPending" + ShowSetting $HKDEF_DESKTOP "PreviousPreferredUILanguages" "DefPreviousPreferredUILanguages" + ShowSetting $HKDEF_MUICACHED "MachinePreferredUILanguages" "DefMachinePreferredUILanguages" + exit 0 }

1 0

Zebediah Figura : tests: Rename shader_runner_d3d12 to shader_runner.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: 63622a92e84f3f8a93de8d1e604350bca686194e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=63622a92e84f3f8a93de8d1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:26 2022 -0600 tests: Rename shader_runner_d3d12 to shader_runner. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 6 +++--- tests/{shader_runner_d3d12.c => shader_runner.c} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index db0a6f6..17fcae3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,7 @@ vkd3d_cross_tests = \ tests/hlsl_d3d12 vkd3d_shader_runners = \ - tests/shader_runner_d3d12 + tests/shader_runner vkd3d_shader_tests = \ tests/abs.shader_test \ @@ -282,10 +282,10 @@ TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ tests_hlsl_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ -tests_shader_runner_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ +tests_shader_runner_LDADD = $(LDADD) @VULKAN_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la -SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 +SHADER_TEST_LOG_COMPILER = tests/shader_runner XFAIL_TESTS = \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner.c similarity index 99% rename from tests/shader_runner_d3d12.c rename to tests/shader_runner.c index 4a8d1f1..5db963f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner.c @@ -643,7 +643,7 @@ static struct texture *get_texture(struct shader_context *context, unsigned int return NULL; } -START_TEST(shader_runner_d3d12) +START_TEST(shader_runner) { static const struct test_context_desc desc = {

1 0

Zebediah Figura : tests: Move HLSL shader compilation to a new d3d12 shader runner backend.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: 85d61f0c642f09e4b8f8ccdf1066d76233bd2c1a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=85d61f0c642f09e4b8f8ccd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:27 2022 -0600 tests: Move HLSL shader compilation to a new d3d12 shader runner backend. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 37 +++++++++++++++++-------- include/private/vkd3d_test.h | 19 +++++++++---- tests/shader_runner.c | 49 ++++++++------------------------ tests/shader_runner.h | 37 +++++++++++++++++++++++++ tests/shader_runner_d3d12.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 154 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=85d61f0c642f09e4b8f…

1 0

Zebediah Figura : tests: Move the drawing and readback implementation to the d3d12 shader runner.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: 09e3018b6d9d08bf4bfcd6e878c3e5eed26e3a99 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=09e3018b6d9d08bf4bfcd6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:28 2022 -0600 tests: Move the drawing and readback implementation to the d3d12 shader runner. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 +- tests/d3d12_test_utils.h | 5 +- tests/shader_runner.c | 285 +++++++------------------------------------- tests/shader_runner.h | 58 ++++++++- tests/shader_runner_d3d12.c | 200 +++++++++++++++++++++++++++++-- tests/utils.h | 58 +++++++++ 6 files changed, 351 insertions(+), 258 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=09e3018b6d9d08bf4bf…

1 0