[tools 2/2] testbot/SetWinLocale: Show more locale settings.

[Francois Gouget]

In particular show how the system account (System/LocalSystem)
settings are affected by SetWinLocale.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
 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 25023bb94f..f1b72176eb 100755
--- a/testbot/bin/SetWinLocale
+++ b/testbot/bin/SetWinLocale
@@ -627,19 +627,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 8d6b3a94bc..702b3301dc 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
 }
 
-- 
2.30.2