Akihiro Sagawa : kernel32: Resolve an MUI time zone name.
Alexandre Julliard
julliard at winehq.org
Thu Dec 6 15:24:59 CST 2018
Module: wine
Branch: master
Commit: afad5636cb3a49dff1e40054b47a8407629b3c01
URL: https://source.winehq.org/git/wine.git/?a=commit;h=afad5636cb3a49dff1e40054b47a8407629b3c01
Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date: Fri Dec 7 00:33:26 2018 +0900
kernel32: Resolve an MUI time zone name.
Signed-off-by: Akihiro Sagawa <sagawa.aki at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kernel32/time.c | 54 +++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 43 insertions(+), 11 deletions(-)
diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c
index 57ad10d..69ebd82 100644
--- a/dlls/kernel32/time.c
+++ b/dlls/kernel32/time.c
@@ -59,6 +59,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(time);
#define FILETIME2LL( pft, ll) \
ll = (((LONGLONG)((pft)->dwHighDateTime))<<32) + (pft)-> dwLowDateTime ;
+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 int MonthLengths[2][12] =
{
@@ -367,6 +369,24 @@ static BOOL reg_query_value(HKEY hkey, LPCWSTR name, DWORD type, void *data, DWO
return TRUE;
}
+static BOOL reg_load_mui_string(HKEY hkey, LPCWSTR value, LPWSTR buffer, DWORD size)
+{
+ static const WCHAR advapi32W[] = {'a','d','v','a','p','i','3','2','.','d','l','l',0};
+ DWORD (WINAPI *pRegLoadMUIStringW)(HKEY, LPCWSTR, LPWSTR, DWORD, DWORD *, DWORD, LPCWSTR);
+ HMODULE hDll;
+ BOOL ret = FALSE;
+
+ hDll = LoadLibraryExW(advapi32W, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
+ if (hDll) {
+ pRegLoadMUIStringW = (void *)GetProcAddress(hDll, "RegLoadMUIStringW");
+ if (pRegLoadMUIStringW &&
+ !pRegLoadMUIStringW(hkey, value, buffer, size, NULL, 0, NULL))
+ ret = TRUE;
+ FreeLibrary(hDll);
+ }
+ return ret;
+}
+
/***********************************************************************
* TIME_GetSpecificTimeZoneInfo
*
@@ -406,8 +426,15 @@ static BOOL TIME_GetSpecificTimeZoneInfo( const WCHAR *key_name, WORD year,
if (!TIME_GetSpecificTimeZoneKey( key_name, &time_zone_key ))
return FALSE;
- if (!reg_query_value( time_zone_key, stdW, REG_SZ, tzinfo->StandardName, sizeof(tzinfo->StandardName)) ||
- !reg_query_value( time_zone_key, dltW, REG_SZ, tzinfo->DaylightName, sizeof(tzinfo->DaylightName)))
+ if (!reg_load_mui_string( time_zone_key, mui_stdW, tzinfo->StandardName, sizeof(tzinfo->StandardName) ) &&
+ !reg_query_value( time_zone_key, stdW, REG_SZ, tzinfo->StandardName, sizeof(tzinfo->StandardName) ))
+ {
+ NtClose( time_zone_key );
+ return FALSE;
+ }
+
+ if (!reg_load_mui_string( time_zone_key, mui_dltW, tzinfo->DaylightName, sizeof(tzinfo->DaylightName) ) &&
+ !reg_query_value( time_zone_key, dltW, REG_SZ, tzinfo->DaylightName, sizeof(tzinfo->DaylightName) ))
{
NtClose( time_zone_key );
return FALSE;
@@ -577,17 +604,14 @@ BOOL WINAPI SetSystemTimeAdjustment( DWORD dwTimeAdjustment, BOOL bTimeAdjustmen
* TIME_ZONE_ID_STANDARD Current time is standard time
* TIME_ZONE_ID_DAYLIGHT Current time is daylight savings time
*/
-DWORD WINAPI GetTimeZoneInformation( LPTIME_ZONE_INFORMATION tzinfo )
+DWORD WINAPI GetTimeZoneInformation( LPTIME_ZONE_INFORMATION ret )
{
- NTSTATUS status;
+ DYNAMIC_TIME_ZONE_INFORMATION tzinfo;
+ DWORD time_zone_id;
- status = RtlQueryTimeZoneInformation( (RTL_TIME_ZONE_INFORMATION*)tzinfo );
- if ( status != STATUS_SUCCESS )
- {
- SetLastError( RtlNtStatusToDosError(status) );
- return TIME_ZONE_ID_INVALID;
- }
- return TIME_ZoneID( tzinfo );
+ time_zone_id = GetDynamicTimeZoneInformation( &tzinfo );
+ memcpy( ret, &tzinfo, sizeof(*ret) );
+ return time_zone_id;
}
/***********************************************************************
@@ -1437,6 +1461,7 @@ BOOL WINAPI GetSystemTimes(LPFILETIME lpIdleTime, LPFILETIME lpKernelTime, LPFIL
DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo)
{
NTSTATUS status;
+ HANDLE time_zone_key;
status = RtlQueryDynamicTimeZoneInformation( (RTL_DYNAMIC_TIME_ZONE_INFORMATION*)tzinfo );
if ( status != STATUS_SUCCESS )
@@ -1444,6 +1469,13 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo
SetLastError( RtlNtStatusToDosError(status) );
return TIME_ZONE_ID_INVALID;
}
+
+ if (!TIME_GetSpecificTimeZoneKey( tzinfo->TimeZoneKeyName, &time_zone_key ))
+ return TIME_ZONE_ID_INVALID;
+ reg_load_mui_string( time_zone_key, mui_stdW, tzinfo->StandardName, sizeof(tzinfo->StandardName) );
+ reg_load_mui_string( time_zone_key, mui_dltW, tzinfo->DaylightName, sizeof(tzinfo->DaylightName) );
+ NtClose( time_zone_key );
+
return TIME_ZoneID( (TIME_ZONE_INFORMATION*)tzinfo );
}
More information about the wine-cvs
mailing list