gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix time zone lookup on Windows MSVC by converting Windows timezone name to IANA identifier

Browse source
This commit is contained in:
Frederik Seiffert 2022-01-13 12:57:05 +01:00 committed by Frederik Seiffert
parent 93d4c634e5
commit 542d870302
2 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2022-01-13 Frederik Seiffert <frederik@algoriddim.com>
* Source/NSTimeZone.m:
Fix time zone lookup on Windows MSVC by converting Windows timezone
name to IANA identifier.
2022-01-04 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSOperation.m:

45
Source/NSTimeZone.m
View file

@ -1437,20 +1437,39 @@ static NSMapTable *absolutes = 0;
* Try to get timezone from windows system call.
*/
{
TIME_ZONE_INFORMATION tz;
DWORD DST = GetTimeZoneInformation(&tz);
TIME_ZONE_INFORMATION tz;
DWORD dst = GetTimeZoneInformation(&tz);
wchar_t *tzName;
localZoneSource = @"function: 'GetTimeZoneInformation()'";
if (DST == TIME_ZONE_ID_DAYLIGHT)
{
localZoneString = [NSString stringWithCharacters: tz.DaylightName
length: wcslen(tz.DaylightName)];
}
else
{
localZoneString = [NSString stringWithCharacters: tz.StandardName
length: wcslen(tz.StandardName)];
}
if (dst == TIME_ZONE_ID_DAYLIGHT)
tzName = tz.DaylightName;
else
tzName = tz.StandardName;
#if defined(_MSC_VER) && defined(UCAL_H)
// Convert Windows timezone name to IANA identifier
if (tzName)
{
UErrorCode status = U_ZERO_ERROR;
UChar ianaTzName[128];
ucal_getTimeZoneIDForWindowsID(tzName, -1, NULL, ianaTzName, 128,
&status);
if (U_SUCCESS(status)) {
localZoneString = [NSString stringWithCharacters: ianaTzName
length: u_strlen(ianaTzName)];
} else {
NSLog(@"Error converting timezone '%ls' to IANA format: %s",
tzName, u_errorName(status));
}
}
#endif
if (localZoneString == nil)
{
localZoneString = [NSString stringWithCharacters: tzName
length: wcslen(tzName)];
}
}
#endif