ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Fixed mkgmtime and _mkgmtime64 implementation.

This commit is contained in:
Piotr Caban 2012-12-10 12:47:26 +01:00 committed by Alexandre Julliard
parent a66ed048a3
commit c9a7436812
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/msvcrt/time.c
View File

@ -348,32 +348,7 @@ MSVCRT___time32_t CDECL MSVCRT_mktime(struct MSVCRT_tm *mstm)
*/
MSVCRT___time64_t CDECL MSVCRT__mkgmtime64(struct MSVCRT_tm *time)
{
SYSTEMTIME st;
FILETIME ft;
MSVCRT___time64_t ret;
int i;
st.wMilliseconds = 0;
st.wSecond = time->tm_sec;
st.wMinute = time->tm_min;
st.wHour = time->tm_hour;
st.wDay = time->tm_mday;
st.wMonth = time->tm_mon+1;
st.wYear = time->tm_year+1900;
if(!SystemTimeToFileTime(&st, &ft))
return -1;
FileTimeToSystemTime(&ft, &st);
time->tm_wday = st.wDayOfWeek;
for(i=time->tm_yday=0; i<st.wMonth-1; i++)
time->tm_yday += MonthLengths[IsLeapYear(st.wYear)][i];
time->tm_yday += st.wDay-1;
ret = ((MSVCRT___time64_t)ft.dwHighDateTime<<32)+ft.dwLowDateTime;
ret = (ret-TICKS_1601_TO_1970)/TICKSPERSEC;
return ret;
return mktime_helper(time, FALSE);
}
/**********************************************************************
@ -381,7 +356,8 @@ MSVCRT___time64_t CDECL MSVCRT__mkgmtime64(struct MSVCRT_tm *time)
*/
MSVCRT___time32_t CDECL MSVCRT__mkgmtime32(struct MSVCRT_tm *time)
{
return MSVCRT__mkgmtime64(time);
MSVCRT___time64_t ret = MSVCRT__mkgmtime64(time);
return ret == (MSVCRT___time32_t)ret ? ret : -1;
}
/**********************************************************************