January 2022 - Wine-Commits

Nikolay Sivov : d3d10/tests: Add a test with fx_4_1 binary.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: 61d5e8fd1c221311e3923006381477385bb2a386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61d5e8fd1c221311e3923006… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 26 12:04:49 2022 +0300 d3d10/tests: Add a test with fx_4_1 binary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index dbc4dcf3941..b5df2fd8538 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -8209,6 +8209,43 @@ static void test_effect_value_expression(void) ok(!refcount, "Device has %u references left.\n", refcount); } +#if 0 +technique10 tech0 +{ + pass pass0 {} +}; +#endif +static DWORD fx_test_fx_4_1[] = +{ + 0x43425844, 0x228fcf4d, 0x9396b2f5, 0xd817b31f, 0xab6dd460, 0x00000001, 0x000000a0, 0x00000001, + 0x00000024, 0x30315846, 0x00000074, 0xfeff1011, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x68636574, + 0x61700030, 0x00307373, 0x00000004, 0x00000001, 0x00000000, 0x0000000a, 0x00000000, 0x00000000, +}; + +static void test_effect_fx_4_1(void) +{ + ID3D10Effect *effect; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_test_fx_4_1, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(effect) { test_effect_constant_buffer_type(); @@ -8235,4 +8272,5 @@ START_TEST(effect) test_effect_dynamic_numeric_field(); test_effect_index_expression(); test_effect_value_expression(); + test_effect_fx_4_1(); }

1 0

Zebediah Figura : include: Define InterlockedExchangeAdd64() and InterlockedExchangeAddSizeT().
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: c5bdd938d2ab2e81ff3854c4e1c19709e9057e56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5bdd938d2ab2e81ff3854c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 11:44:19 2022 -0600 include: Define InterlockedExchangeAdd64() and InterlockedExchangeAddSizeT(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 9296a3dc555..e20b504a4f9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6276,6 +6276,7 @@ typedef enum _PROCESS_MITIGATION_POLICY #define InterlockedDecrement16 _InterlockedDecrement16 #define InterlockedExchange _InterlockedExchange #define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchangeAdd64 _InterlockedExchangeAdd64 #define InterlockedExchangePointer _InterlockedExchangePointer #define InterlockedIncrement _InterlockedIncrement #define InterlockedIncrement16 _InterlockedIncrement16 @@ -6291,6 +6292,7 @@ typedef enum _PROCESS_MITIGATION_POLICY #pragma intrinsic(_InterlockedCompareExchange64) #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedExchangeAdd64) #pragma intrinsic(_InterlockedIncrement) #pragma intrinsic(_InterlockedIncrement16) #pragma intrinsic(_InterlockedDecrement) @@ -6307,6 +6309,7 @@ long _InterlockedDecrement(long volatile*); short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); +long long _InterlockedExchangeAdd64(long long volatile*,long long); long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); @@ -6432,6 +6435,11 @@ static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG return __sync_fetch_and_add( dest, incr ); } +static FORCEINLINE LONGLONG WINAPI InterlockedExchangeAdd64( LONGLONG volatile *dest, LONGLONG incr ) +{ + return __sync_fetch_and_add( dest, incr ); +} + static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) { return __sync_add_and_fetch( dest, 1 ); @@ -6515,7 +6523,14 @@ static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 } #endif -#endif + +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONGLONG *)(a), (b)) + +#else /* _WIN64 */ + +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)(a), (b)) + +#endif /* _WIN64 */ static FORCEINLINE void YieldProcessor(void) {

1 0

Eric Pouech : crypt32: Use correct integral type.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: f88507a4fd72ffc51b94ca3e0661d74065adfde2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f88507a4fd72ffc51b94ca3e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 27 10:18:01 2022 +0100 crypt32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/protectdata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 3d9447dfdee..b23f1f02117 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -403,7 +403,7 @@ BOOL unserialize(const DATA_BLOB *pSerial, struct protect_data_t *pInfo) } /* cipher_alg */ - if (!unserialize_dword(ptr,&index,size,&pInfo->cipher_alg)) + if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->cipher_alg)) { ERR("reading cipher_alg failed!\n"); return FALSE; @@ -432,7 +432,7 @@ BOOL unserialize(const DATA_BLOB *pSerial, struct protect_data_t *pInfo) } /* hash_alg */ - if (!unserialize_dword(ptr,&index,size,&pInfo->hash_alg)) + if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->hash_alg)) { ERR("reading hash_alg failed!\n"); return FALSE;

1 0

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

Jan. 27, 2022

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

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

Jan. 27, 2022

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: Use Powershell to collect all the locales at once.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

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: Take keyboard layouts preference order into account.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

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

Zebediah Figura : tests: Add a D3D11 shader runner backend.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: vkd3d Branch: master Commit: 22e6581ffca3aeeddd047fb0f0321c509ed29ead URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=22e6581ffca3aeeddd047fb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:33 2022 -0600 tests: Add a D3D11 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 | 1 + tests/d3d12.c | 5 - tests/d3d12_test_utils.h | 33 --- tests/shader_runner.c | 7 +- tests/shader_runner.h | 4 + tests/shader_runner_d3d11.c | 639 ++++++++++++++++++++++++++++++++++++++++++++ tests/utils.h | 39 +++ 7 files changed, 689 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=22e6581ffca3aeeddd0…

1 0

Zebediah Figura : tests: Move d3d12-specific members of struct texture to a new d3d12_texture structure.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: vkd3d Branch: master Commit: 33c845ece52ef6bd7c6ae9ee3825d7583710617b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33c845ece52ef6bd7c6ae9e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:30 2022 -0600 tests: Move d3d12-specific members of struct texture to a new d3d12_texture structure. 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> --- tests/shader_runner.h | 5 ----- tests/shader_runner_d3d12.c | 31 ++++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/tests/shader_runner.h b/tests/shader_runner.h index c541b56..2e6d360 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -60,11 +60,6 @@ struct texture_params struct texture { unsigned int slot; - - D3D12_DESCRIPTOR_RANGE descriptor_range; - ID3D12DescriptorHeap *heap; - ID3D12Resource *resource; - unsigned int root_index; }; struct shader_context diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 94399ae..f79c53b 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -24,6 +24,21 @@ #include "d3d12_crosstest.h" #include "shader_runner.h" +struct d3d12_texture +{ + struct texture t; + + D3D12_DESCRIPTOR_RANGE descriptor_range; + ID3D12DescriptorHeap *heap; + ID3D12Resource *resource; + unsigned int root_index; +}; + +static struct d3d12_texture *d3d12_texture(struct texture *t) +{ + return CONTAINING_RECORD(t, struct d3d12_texture, t); +} + struct d3d12_shader_context { struct shader_context c; @@ -68,11 +83,11 @@ static struct texture *d3d12_runner_create_texture(struct shader_context *c, con struct test_context *test_context = &context->test_context; ID3D12Device *device = test_context->device; D3D12_SUBRESOURCE_DATA resource_data; - struct texture *texture; + struct d3d12_texture *texture; texture = calloc(1, sizeof(*texture)); - texture->slot = params->slot; + texture->t.slot = params->slot; texture->heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); texture->resource = create_default_texture(device, params->width, params->height, @@ -86,11 +101,13 @@ static struct texture *d3d12_runner_create_texture(struct shader_context *c, con ID3D12Device_CreateShaderResourceView(device, texture->resource, NULL, get_cpu_descriptor_handle(test_context, texture->heap, 0)); - return texture; + return &texture->t; } -static void d3d12_runner_destroy_texture(struct shader_context *c, struct texture *texture) +static void d3d12_runner_destroy_texture(struct shader_context *c, struct texture *t) { + struct d3d12_texture *texture = d3d12_texture(t); + ID3D12DescriptorHeap_Release(texture->heap); ID3D12Resource_Release(texture->resource); free(texture); @@ -133,7 +150,7 @@ static void d3d12_runner_draw_quad(struct shader_context *c) for (i = 0; i < context->c.texture_count; ++i) { - struct texture *texture = context->c.textures[i]; + struct d3d12_texture *texture = d3d12_texture(context->c.textures[i]); D3D12_DESCRIPTOR_RANGE *range; range = &texture->descriptor_range; @@ -147,7 +164,7 @@ static void d3d12_runner_draw_quad(struct shader_context *c) range->RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; range->NumDescriptors = 1; - range->BaseShaderRegister = texture->slot; + range->BaseShaderRegister = texture->t.slot; range->RegisterSpace = 0; range->OffsetInDescriptorsFromTableStart = 0; } @@ -188,7 +205,7 @@ static void d3d12_runner_draw_quad(struct shader_context *c) context->c.uniform_count, context->c.uniforms, 0); for (i = 0; i < context->c.texture_count; ++i) { - struct texture *texture = context->c.textures[i]; + struct d3d12_texture *texture = d3d12_texture(context->c.textures[i]); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, texture->root_index, get_gpu_descriptor_handle(test_context, texture->heap, 0));

1 0

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

Jan. 27, 2022

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