AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-20302 Timezone detection fails on Windows 7. Also add a test case for Windows time zone detection failing.

Browse Source
This commit is contained in:
Jeff Genovy 2018-12-12 19:42:48 -08:00
parent 7ec3357d70
commit 5bc7485de6
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icu4c/source/common/wintz.cpp
View File

@ -35,7 +35,7 @@
U_NAMESPACE_BEGIN
// The value of MAX_TIMEZONE_ID_LENGTH is 128, which is defined in DYNAMIC_TIME_ZONE_INFORMATION
// The max size of TimeZoneKeyName is 128, defined in DYNAMIC_TIME_ZONE_INFORMATION
#define MAX_TIMEZONE_ID_LENGTH 128
/**
@ -44,7 +44,7 @@ U_NAMESPACE_BEGIN
* Note: We use the Win32 API GetDynamicTimeZoneInformation to get the current time zone info.
* This API returns a non-localized time zone name, which we can then map to an ICU time zone name.
*/
U_CFUNC const char* U_EXPORT2
U_INTERNAL const char* U_EXPORT2
uprv_detectWindowsTimeZone()
{
UErrorCode status = U_ZERO_ERROR;
@ -79,7 +79,7 @@ uprv_detectWindowsTimeZone()
// convert from wchar_t* (UTF-16 on Windows) to char* (UTF-8).
u_strToUTF8(dynamicTZKeyName, UPRV_LENGTHOF(dynamicTZKeyName), nullptr,
reinterpret_cast<const UChar*>(dynamicTZI.TimeZoneKeyName), UPRV_LENGTHOF(dynamicTZI.TimeZoneKeyName), &status);
reinterpret_cast<const UChar*>(dynamicTZI.TimeZoneKeyName), -1, &status);
if (U_FAILURE(status)) {
return nullptr;

13
icu4c/source/test/cintltst/putiltst.c
View File

@ -214,8 +214,19 @@ static void TestPUtilAPI(void){
log_info("Note: t_timezone offset of %ld (for %s : %s) is not a multiple of 30min.", tzoffset, uprv_tzname(0), uprv_tzname(1));
}
/*tzoffset=uprv_getUTCtime();*/
}
#if U_PLATFORM_USES_ONLY_WIN32_API
log_verbose("Testing uprv_detectWindowsTimeZone() ....\n");
{
char* timezone = uprv_detectWindowsTimeZone();
if (timezone == NULL) {
log_err("ERROR: uprv_detectWindowsTimeZone failed (returned NULL).\n");
} else {
log_verbose("Detected TimeZone = %s\n", timezone);
}
}
#endif
}
static void TestVersion(void)