mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-19 14:57:32 +09:00
Issue #1971 - Part 2: Update ICU source to 63.2.
This commit is contained in:
parent
8df84683be
commit
1e69214382
3160 changed files with 275815 additions and 234203 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2016 and later: Unicode, Inc. and others.
|
||||
// © 2016 and later: Unicode, Inc. and others.
|
||||
// License & terms of use: http://www.unicode.org/copyright.html
|
||||
/*
|
||||
********************************************************************************
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
#include "unicode/utypes.h"
|
||||
|
||||
#if U_PLATFORM_HAS_WIN32_API && !UCONFIG_NO_FORMATTING
|
||||
#if U_PLATFORM_USES_ONLY_WIN32_API && !UCONFIG_NO_FORMATTING
|
||||
|
||||
#include "wintzimpl.h"
|
||||
|
||||
|
|
@ -24,7 +24,9 @@
|
|||
#include "uassert.h"
|
||||
#include "cmemory.h"
|
||||
|
||||
#ifndef WIN32_LEAN_AND_MEAN
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
#endif
|
||||
# define VC_EXTRALEAN
|
||||
# define NOUSER
|
||||
# define NOSERVICE
|
||||
|
|
@ -63,12 +65,12 @@ static UBool getSystemTimeInformation(TimeZone *tz, SYSTEMTIME &daylightDate, SY
|
|||
// Always use DOW type rule
|
||||
int32_t hour, min, sec, mil;
|
||||
standardDate.wYear = 0;
|
||||
standardDate.wMonth = std->getRule()->getRuleMonth() + 1;
|
||||
standardDate.wDay = std->getRule()->getRuleWeekInMonth();
|
||||
standardDate.wMonth = static_cast<WORD>(std->getRule()->getRuleMonth()) + 1;
|
||||
standardDate.wDay = static_cast<WORD>(std->getRule()->getRuleWeekInMonth());
|
||||
if (standardDate.wDay < 0) {
|
||||
standardDate.wDay = 5;
|
||||
}
|
||||
standardDate.wDayOfWeek = std->getRule()->getRuleDayOfWeek() - 1;
|
||||
standardDate.wDayOfWeek = static_cast<WORD>(std->getRule()->getRuleDayOfWeek()) - 1;
|
||||
|
||||
mil = std->getRule()->getRuleMillisInDay();
|
||||
hour = mil/3600000;
|
||||
|
|
@ -78,18 +80,18 @@ static UBool getSystemTimeInformation(TimeZone *tz, SYSTEMTIME &daylightDate, SY
|
|||
sec = mil/1000;
|
||||
mil %= 1000;
|
||||
|
||||
standardDate.wHour = hour;
|
||||
standardDate.wMinute = min;
|
||||
standardDate.wSecond = sec;
|
||||
standardDate.wMilliseconds = mil;
|
||||
standardDate.wHour = static_cast<WORD>(hour);
|
||||
standardDate.wMinute = static_cast<WORD>(min);
|
||||
standardDate.wSecond = static_cast<WORD>(sec);
|
||||
standardDate.wMilliseconds = static_cast<WORD>(mil);
|
||||
|
||||
daylightDate.wYear = 0;
|
||||
daylightDate.wMonth = dst->getRule()->getRuleMonth() + 1;
|
||||
daylightDate.wDay = dst->getRule()->getRuleWeekInMonth();
|
||||
daylightDate.wMonth = static_cast<WORD>(dst->getRule()->getRuleMonth()) + 1;
|
||||
daylightDate.wDay = static_cast<WORD>(dst->getRule()->getRuleWeekInMonth());
|
||||
if (daylightDate.wDay < 0) {
|
||||
daylightDate.wDay = 5;
|
||||
}
|
||||
daylightDate.wDayOfWeek = dst->getRule()->getRuleDayOfWeek() - 1;
|
||||
daylightDate.wDayOfWeek = static_cast<WORD>(dst->getRule()->getRuleDayOfWeek()) - 1;
|
||||
|
||||
mil = dst->getRule()->getRuleMillisInDay();
|
||||
hour = mil/3600000;
|
||||
|
|
@ -99,10 +101,10 @@ static UBool getSystemTimeInformation(TimeZone *tz, SYSTEMTIME &daylightDate, SY
|
|||
sec = mil/1000;
|
||||
mil %= 1000;
|
||||
|
||||
daylightDate.wHour = hour;
|
||||
daylightDate.wMinute = min;
|
||||
daylightDate.wSecond = sec;
|
||||
daylightDate.wMilliseconds = mil;
|
||||
daylightDate.wHour = static_cast<WORD>(hour);
|
||||
daylightDate.wMinute = static_cast<WORD>(min);
|
||||
daylightDate.wSecond = static_cast<WORD>(sec);
|
||||
daylightDate.wMilliseconds = static_cast<WORD>(mil);
|
||||
}
|
||||
} else {
|
||||
result = FALSE;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue