ucrtbase: Extend range for seconds to allow for leap-second.
Signed-off-by: Jeff Smith <whydoubt@gmail.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
a0be8d49f2
commit
15bbe64609
|
@ -54,6 +54,12 @@ static const int MonthLengths[2][12] =
|
||||||
{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
|
{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if _MSVCR_VER>=140
|
||||||
|
static const int MAX_SECONDS = 60;
|
||||||
|
#else
|
||||||
|
static const int MAX_SECONDS = 59;
|
||||||
|
#endif
|
||||||
|
|
||||||
static inline BOOL IsLeapYear(int Year)
|
static inline BOOL IsLeapYear(int Year)
|
||||||
{
|
{
|
||||||
return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0);
|
return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0);
|
||||||
|
@ -1141,7 +1147,7 @@ static inline BOOL strftime_format(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR
|
||||||
if(count > 2)
|
if(count > 2)
|
||||||
ret = strftime_nstr(str, pos, max, format, count-2);
|
ret = strftime_nstr(str, pos, max, format, count-2);
|
||||||
if(ret)
|
if(ret)
|
||||||
ret = strftime_int(str, pos, max, mstm->tm_sec, count == 1 ? 0 : 2, 0, 59);
|
ret = strftime_int(str, pos, max, mstm->tm_sec, count == 1 ? 0 : 2, 0, MAX_SECONDS);
|
||||||
break;
|
break;
|
||||||
case 'a':
|
case 'a':
|
||||||
case 'A':
|
case 'A':
|
||||||
|
@ -1381,7 +1387,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case 'S':
|
case 'S':
|
||||||
if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59))
|
if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, MAX_SECONDS))
|
||||||
return 0;
|
return 0;
|
||||||
break;
|
break;
|
||||||
#if _MSVCR_VER>=140
|
#if _MSVCR_VER>=140
|
||||||
|
@ -1397,7 +1403,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
|
||||||
return 0;
|
return 0;
|
||||||
if(ret < max)
|
if(ret < max)
|
||||||
str[ret++] = ':';
|
str[ret++] = ':';
|
||||||
if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59))
|
if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, MAX_SECONDS))
|
||||||
return 0;
|
return 0;
|
||||||
break;
|
break;
|
||||||
case 'u':
|
case 'u':
|
||||||
|
|
|
@ -1004,7 +1004,7 @@ static void test_strftime(void)
|
||||||
{"%#x", "", { 0, 0, 0, 30, 12, 70, 4, 0, 0 }},
|
{"%#x", "", { 0, 0, 0, 30, 12, 70, 4, 0, 0 }},
|
||||||
{"%X", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
|
{"%X", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
|
||||||
{"%X", "14:00:00", { 0, 0, 14, 1, 0, 70, 4, 0, 0 }},
|
{"%X", "14:00:00", { 0, 0, 14, 1, 0, 70, 4, 0, 0 }},
|
||||||
{"%X", "23:59:60", { 60, 59, 23, 1, 0, 70, 4, 0, 0 }, TRUE},
|
{"%X", "23:59:60", { 60, 59, 23, 1, 0, 70, 4, 0, 0 }},
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct {
|
const struct {
|
||||||
|
|
Loading…
Reference in New Issue