Akihiro Sagawa : ntdll: Use an MUI time zone name if available.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 434bc1baf5da24b744753d1b230dba14e4739731
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=434bc1baf5da24b744753d1b2...

Author: Akihiro Sagawa <sagawa.aki(a)gmail.com>
Date:   Fri Dec  7 00:33:24 2018 +0900

ntdll: Use an MUI time zone name if available.

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ntdll/time.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index b0eefb8..a4762fa 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -681,6 +681,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char*
     {
         static const WCHAR stdW[] = { 'S','t','d',0 };
         static const WCHAR dltW[] = { 'D','l','t',0 };
+        static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 };
+        static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 };
         static const WCHAR tziW[] = { 'T','Z','I',0 };
         RTL_DYNAMIC_TIME_ZONE_INFORMATION reg_tzi;
         HANDLE hSubkey, hSubkeyDynamicDST;
@@ -715,8 +717,10 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char*
         continue; \
     }
 
-        get_value(hSubkey, stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName));
-        get_value(hSubkey, dltW, REG_SZ, reg_tzi.DaylightName, sizeof(reg_tzi.DaylightName));
+        if (!reg_query_value(hSubkey, mui_stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName)))
+            get_value(hSubkey, stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName));
+        if (!reg_query_value(hSubkey, mui_dltW, REG_SZ, reg_tzi.DaylightName, sizeof(reg_tzi.DaylightName)))
+            get_value(hSubkey, dltW, REG_SZ, reg_tzi.DaylightName, sizeof(reg_tzi.DaylightName));
         memcpy(reg_tzi.TimeZoneKeyName, nameW.Buffer, nameW.Length);
         reg_tzi.TimeZoneKeyName[nameW.Length/sizeof(WCHAR)] = 0;