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

Avoid casts between LARGE_INTEGER and FILETIME.

Browse Source 
Fixed day of week of epoch.
Small cleanups.
This commit is contained in:
Alexandre Julliard 2002-12-13 20:53:04 +00:00
parent 309fde7a1a
commit dcc3afd259
3 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
dlls/kernel/time.c
View File

@ -60,14 +60,15 @@ BOOL WINAPI SetLocalTime(
const SYSTEMTIME *systime) /* [in] The desired local time. */ const SYSTEMTIME *systime) /* [in] The desired local time. */
{ {
FILETIME ft; FILETIME ft;
LARGE_INTEGER st; LARGE_INTEGER st, st2;
NTSTATUS status; NTSTATUS status;
SystemTimeToFileTime( systime, &ft ); SystemTimeToFileTime( systime, &ft );
st.s.LowPart = ft.dwLowDateTime;
st.s.HighPart = ft.dwHighDateTime;
RtlLocalTimeToSystemTime( &st, &st2 );
RtlLocalTimeToSystemTime( (PLARGE_INTEGER)&ft, &st ); if ((status = NtSetSystemTime(&st2, NULL)))
if ((status = NtSetSystemTime(&st, NULL)))
SetLastError( RtlNtStatusToDosError(status) ); SetLastError( RtlNtStatusToDosError(status) );
return !status; return !status;
} }
@ -112,11 +113,13 @@ BOOL WINAPI GetSystemTimeAdjustment(
BOOL WINAPI SetSystemTime( BOOL WINAPI SetSystemTime(
const SYSTEMTIME *systime) /* [in] The desired system time. */ const SYSTEMTIME *systime) /* [in] The desired system time. */
{ {
FILETIME ft;
LARGE_INTEGER t; LARGE_INTEGER t;
NTSTATUS status; NTSTATUS status;
SystemTimeToFileTime( systime, (PFILETIME)&t ); SystemTimeToFileTime( systime, &ft );
t.s.LowPart = ft.dwLowDateTime;
t.s.HighPart = ft.dwHighDateTime;
if ((status = NtSetSystemTime(&t, NULL))) if ((status = NtSetSystemTime(&t, NULL)))
SetLastError( RtlNtStatusToDosError(status) ); SetLastError( RtlNtStatusToDosError(status) );
return !status; return !status;
@ -194,7 +197,10 @@ BOOL WINAPI SystemTimeToTzSpecificLocalTime(
VOID WINAPI GetSystemTimeAsFileTime( VOID WINAPI GetSystemTimeAsFileTime(
LPFILETIME time) /* [out] The file time struct to be filled with the system time. */ LPFILETIME time) /* [out] The file time struct to be filled with the system time. */
{ {
NtQuerySystemTime( (LARGE_INTEGER *)time ); LARGE_INTEGER t;
NtQuerySystemTime( &t );
time->dwLowDateTime = t.s.LowPart;
time->dwHighDateTime = t.s.HighPart;
} }
@ -435,26 +441,40 @@ int WINAPI SetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, LPCWST
/********************************************************************* /*********************************************************************
* LocalFileTimeToFileTime (KERNEL32.@) * LocalFileTimeToFileTime (KERNEL32.@)
*/ */
BOOL WINAPI LocalFileTimeToFileTime( const FILETIME *localft, BOOL WINAPI LocalFileTimeToFileTime( const FILETIME *localft, LPFILETIME utcft )
LPFILETIME utcft )
{ {
NTSTATUS status; NTSTATUS status;
if ((status = RtlLocalTimeToSystemTime((PLARGE_INTEGER)localft, LARGE_INTEGER local, utc;
(PLARGE_INTEGER)utcft)))
SetLastError( RtlNtStatusToDosError(status) ); local.s.LowPart = localft->dwLowDateTime;
local.s.HighPart = localft->dwHighDateTime;
if (!(status = RtlLocalTimeToSystemTime( &local, &utc )))
{
utcft->dwLowDateTime = utc.s.LowPart;
utcft->dwHighDateTime = utc.s.HighPart;
}
else SetLastError( RtlNtStatusToDosError(status) );
return !status; return !status;
} }
/********************************************************************* /*********************************************************************
* FileTimeToLocalFileTime (KERNEL32.@) * FileTimeToLocalFileTime (KERNEL32.@)
*/ */
BOOL WINAPI FileTimeToLocalFileTime( const FILETIME *utcft, BOOL WINAPI FileTimeToLocalFileTime( const FILETIME *utcft, LPFILETIME localft )
LPFILETIME localft )
{ {
NTSTATUS status; NTSTATUS status;
if ((status = RtlSystemTimeToLocalTime((PLARGE_INTEGER)utcft, LARGE_INTEGER local, utc;
(PLARGE_INTEGER)localft)))
SetLastError( RtlNtStatusToDosError(status) ); utc.s.LowPart = utcft->dwLowDateTime;
utc.s.HighPart = utcft->dwHighDateTime;
if (!(status = RtlSystemTimeToLocalTime( &utc, &local )))
{
localft->dwLowDateTime = local.s.LowPart;
localft->dwHighDateTime = local.s.HighPart;
}
else SetLastError( RtlNtStatusToDosError(status) );
return !status; return !status;
} }
@ -464,8 +484,11 @@ BOOL WINAPI FileTimeToLocalFileTime( const FILETIME *utcft,
BOOL WINAPI FileTimeToSystemTime( const FILETIME *ft, LPSYSTEMTIME syst ) BOOL WINAPI FileTimeToSystemTime( const FILETIME *ft, LPSYSTEMTIME syst )
{ {
TIME_FIELDS tf; TIME_FIELDS tf;
LARGE_INTEGER t;
RtlTimeToTimeFields((PLARGE_INTEGER)ft, &tf); t.s.LowPart = ft->dwLowDateTime;
t.s.HighPart = ft->dwHighDateTime;
RtlTimeToTimeFields(&t, &tf);
syst->wYear = tf.Year; syst->wYear = tf.Year;
syst->wMonth = tf.Month; syst->wMonth = tf.Month;
@ -484,6 +507,7 @@ BOOL WINAPI FileTimeToSystemTime( const FILETIME *ft, LPSYSTEMTIME syst )
BOOL WINAPI SystemTimeToFileTime( const SYSTEMTIME *syst, LPFILETIME ft ) BOOL WINAPI SystemTimeToFileTime( const SYSTEMTIME *syst, LPFILETIME ft )
{ {
TIME_FIELDS tf; TIME_FIELDS tf;
LARGE_INTEGER t;
tf.Year = syst->wYear; tf.Year = syst->wYear;
tf.Month = syst->wMonth; tf.Month = syst->wMonth;
@ -493,14 +517,16 @@ BOOL WINAPI SystemTimeToFileTime( const SYSTEMTIME *syst, LPFILETIME ft )
tf.Second = syst->wSecond; tf.Second = syst->wSecond;
tf.Milliseconds = syst->wMilliseconds; tf.Milliseconds = syst->wMilliseconds;
RtlTimeFieldsToTime(&tf, (PLARGE_INTEGER)ft); RtlTimeFieldsToTime(&tf, &t);
ft->dwLowDateTime = t.s.LowPart;
ft->dwHighDateTime = t.s.HighPart;
return TRUE; return TRUE;
} }
/********************************************************************* /*********************************************************************
* CompareFileTime (KERNEL32.@) * CompareFileTime (KERNEL32.@)
*/ */
INT WINAPI CompareFileTime( LPFILETIME x, LPFILETIME y ) INT WINAPI CompareFileTime( const FILETIME *x, const FILETIME *y )
{ {
if (!x || !y) return -1; if (!x || !y) return -1;
@ -521,12 +547,12 @@ INT WINAPI CompareFileTime( LPFILETIME x, LPFILETIME y )
VOID WINAPI GetLocalTime(LPSYSTEMTIME systime) VOID WINAPI GetLocalTime(LPSYSTEMTIME systime)
{ {
FILETIME lft; FILETIME lft;
LARGE_INTEGER ft; LARGE_INTEGER ft, ft2;
NtQuerySystemTime(&ft); NtQuerySystemTime(&ft);
RtlSystemTimeToLocalTime(&ft, &ft2);
RtlSystemTimeToLocalTime(&ft, (PLARGE_INTEGER)&lft); lft.dwLowDateTime = ft2.s.LowPart;
lft.dwHighDateTime = ft2.s.HighPart;
FileTimeToSystemTime(&lft, systime); FileTimeToSystemTime(&lft, systime);
} }
@ -536,8 +562,10 @@ VOID WINAPI GetLocalTime(LPSYSTEMTIME systime)
VOID WINAPI GetSystemTime(LPSYSTEMTIME systime) VOID WINAPI GetSystemTime(LPSYSTEMTIME systime)
{ {
FILETIME ft; FILETIME ft;
LARGE_INTEGER t;
NtQuerySystemTime((PLARGE_INTEGER)&ft); NtQuerySystemTime(&t);
ft.dwLowDateTime = t.s.LowPart;
ft.dwHighDateTime = t.s.HighPart;
FileTimeToSystemTime(&ft, systime); FileTimeToSystemTime(&ft, systime);
} }

15
dlls/ntdll/time.c
View File

@ -258,7 +258,7 @@ static const struct tagTZ_INFO TZ_INFO[] =
#define SECSPERMIN 60 #define SECSPERMIN 60
#define MINSPERHOUR 60 #define MINSPERHOUR 60
#define HOURSPERDAY 24 #define HOURSPERDAY 24
#define EPOCHWEEKDAY 0 #define EPOCHWEEKDAY 1 /* Jan 1, 1601 was Monday */
#define DAYSPERWEEK 7 #define DAYSPERWEEK 7
#define EPOCHYEAR 1601 #define EPOCHYEAR 1601
#define DAYSPERNORMALYEAR 365 #define DAYSPERNORMALYEAR 365
@ -309,11 +309,7 @@ VOID WINAPI RtlTimeToTimeFields(
int SecondsInDay, CurYear; int SecondsInDay, CurYear;
int LeapYear, CurMonth; int LeapYear, CurMonth;
long int Days; long int Days;
LONGLONG Time; LONGLONG Time = liTime->QuadPart;
Time = liTime->s.HighPart;
Time <<= 32;
Time += liTime->s.LowPart;
/* Extract millisecond from time and convert time into seconds */ /* Extract millisecond from time and convert time into seconds */
TimeFields->Milliseconds = (CSHORT) ((Time % TICKSPERSEC) / TICKSPERMSEC); TimeFields->Milliseconds = (CSHORT) ((Time % TICKSPERSEC) / TICKSPERMSEC);
@ -408,7 +404,7 @@ BOOLEAN WINAPI RtlTimeFieldsToTime(
rcTime += TimeFields.Hour * SECSPERHOUR + TimeFields.Minute * SECSPERMIN + TimeFields.Second; rcTime += TimeFields.Hour * SECSPERHOUR + TimeFields.Minute * SECSPERMIN + TimeFields.Second;
rcTime *= TICKSPERSEC; rcTime *= TICKSPERSEC;
rcTime += TimeFields.Milliseconds * TICKSPERMSEC; rcTime += TimeFields.Milliseconds * TICKSPERMSEC;
*Time = *(LARGE_INTEGER *)&rcTime; Time->QuadPart = rcTime;
return TRUE; return TRUE;
} }
@ -582,13 +578,10 @@ VOID WINAPI RtlTimeToElapsedTimeFields(
*/ */
NTSTATUS WINAPI NtQuerySystemTime( PLARGE_INTEGER time ) NTSTATUS WINAPI NtQuerySystemTime( PLARGE_INTEGER time )
{ {
ULONGLONG secs;
struct timeval now; struct timeval now;
gettimeofday( &now, 0 ); gettimeofday( &now, 0 );
secs = RtlExtendedIntegerMultiply( now.tv_sec+SECS_1601_TO_1970, 10000000 ) + now.tv_usec * 10; time->QuadPart = RtlExtendedIntegerMultiply( now.tv_sec+SECS_1601_TO_1970, 10000000 ) + now.tv_usec * 10;
time->s.LowPart = (DWORD)secs;
time->s.HighPart = (DWORD)(secs >> 32);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

2
include/winbase.h
View File

@ -1177,7 +1177,7 @@ BOOL WINAPI CopyFileExA(LPCSTR, LPCSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOO
BOOL WINAPI CopyFileExW(LPCWSTR, LPCWSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL, DWORD); BOOL WINAPI CopyFileExW(LPCWSTR, LPCWSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL, DWORD);
#define CopyFileEx WINELIB_NAME_AW(CopyFileEx) #define CopyFileEx WINELIB_NAME_AW(CopyFileEx)
BOOL WINAPI CopySid(DWORD,PSID,PSID); BOOL WINAPI CopySid(DWORD,PSID,PSID);
INT WINAPI CompareFileTime(LPFILETIME,LPFILETIME); INT WINAPI CompareFileTime(const FILETIME*,const FILETIME*);
HANDLE WINAPI CreateEventA(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCSTR); HANDLE WINAPI CreateEventA(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCSTR);
HANDLE WINAPI CreateEventW(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCWSTR); HANDLE WINAPI CreateEventW(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCWSTR);
#define CreateEvent WINELIB_NAME_AW(CreateEvent) #define CreateEvent WINELIB_NAME_AW(CreateEvent)