commit 9c1de6de307c7435eefbbcd4f6b01eb0bbe53461
author Patrik Stridvall <ps@leissner.se> Thu Sep 12 22:07:02 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Sep 12 22:07:02 2002 +0000
tree 19b38f7b77e232231f9be9c4136d18522a92d387
parent a9298731faf8f520348d566d1e28163f45edeb1c

Moved all the content of the DDK files ntdef.h and ntddk.h to
winternl.h.

dlls/ntdll/time.c

diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index bf44403..ecabb32 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -33,7 +33,7 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#include "ntddk.h"
+#include "winternl.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
@@ -211,9 +211,9 @@
 /******************************************************************************
  *  RtlTimeToSecondsSince1970		[NTDLL.@]
  */
-BOOLEAN WINAPI RtlTimeToSecondsSince1970( const FILETIME *time, LPDWORD res )
+BOOLEAN WINAPI RtlTimeToSecondsSince1970( const LARGE_INTEGER *time, PULONG res )
 {
-    ULONGLONG tmp = ((ULONGLONG)time->dwHighDateTime << 32) | time->dwLowDateTime;
+    ULONGLONG tmp = ((ULONGLONG)time->s.HighPart << 32) | time->s.LowPart;
     tmp = RtlLargeIntegerDivide( tmp, 10000000, NULL );
     tmp -= SECS_1601_TO_1970;
     if (tmp > 0xffffffff) return FALSE;
@@ -224,9 +224,9 @@
 /******************************************************************************
  *  RtlTimeToSecondsSince1980		[NTDLL.@]
  */
-BOOLEAN WINAPI RtlTimeToSecondsSince1980( const FILETIME *time, LPDWORD res )
+BOOLEAN WINAPI RtlTimeToSecondsSince1980( const LARGE_INTEGER *time, LPDWORD res )
 {
-    ULONGLONG tmp = ((ULONGLONG)time->dwHighDateTime << 32) | time->dwLowDateTime;
+    ULONGLONG tmp = ((ULONGLONG)time->s.HighPart << 32) | time->s.LowPart;
     tmp = RtlLargeIntegerDivide( tmp, 10000000, NULL );
     tmp -= SECS_1601_to_1980;
     if (tmp > 0xffffffff) return FALSE;
@@ -237,21 +237,21 @@
 /******************************************************************************
  *  RtlSecondsSince1970ToTime		[NTDLL.@]
  */
-void WINAPI RtlSecondsSince1970ToTime( DWORD time, FILETIME *res )
+void WINAPI RtlSecondsSince1970ToTime( DWORD time, LARGE_INTEGER *res )
 {
     ULONGLONG secs = RtlExtendedIntegerMultiply( time + SECS_1601_TO_1970, 10000000 );
-    res->dwLowDateTime  = (DWORD)secs;
-    res->dwHighDateTime = (DWORD)(secs >> 32);
+    res->s.LowPart  = (DWORD)secs;
+    res->s.HighPart = (DWORD)(secs >> 32);
 }
 
 /******************************************************************************
  *  RtlSecondsSince1980ToTime		[NTDLL.@]
  */
-void WINAPI RtlSecondsSince1980ToTime( DWORD time, FILETIME *res )
+void WINAPI RtlSecondsSince1980ToTime( DWORD time, LARGE_INTEGER *res )
 {
     ULONGLONG secs = RtlExtendedIntegerMultiply( time + SECS_1601_to_1980, 10000000 );
-    res->dwLowDateTime  = (DWORD)secs;
-    res->dwHighDateTime = (DWORD)(secs >> 32);
+    res->s.LowPart  = (DWORD)secs;
+    res->s.HighPart = (DWORD)(secs >> 32);
 }
 
 /******************************************************************************
@@ -269,7 +269,7 @@
  *      NtQuerySystemTime   (NTDLL.@)
  *      ZwQuerySystemTime   (NTDLL.@)
  */
-void WINAPI NtQuerySystemTime( LARGE_INTEGER *time )
+NTSTATUS WINAPI NtQuerySystemTime( PLARGE_INTEGER time )
 {
     ULONGLONG secs;
     struct timeval now;
@@ -278,4 +278,5 @@
     secs = 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;
 }