[PATCH v2 1/3] ntdll: Separate NtGetTickCount from get_tick_count64.

[Andrew Wesie]

Signed-off-by: Andrew Wesie <awesie at gmail.com>
---
 dlls/ntdll/ntdll.spec   | 7 +++++--
 dlls/ntdll/ntdll_misc.h | 3 ---
 dlls/ntdll/time.c       | 8 ++++++--
 include/winternl.h      | 1 +
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 050ebc7..4ffb3c9 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -194,7 +194,7 @@
 @ stdcall NtGetCurrentProcessorNumber()
 # @ stub NtGetDevicePowerState
 @ stub NtGetPlugPlayEvent
-@ stdcall -ret64 NtGetTickCount() get_tick_count64
+@ stdcall NtGetTickCount()
 @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr)
 @ stdcall NtImpersonateAnonymousToken(long)
 @ stub NtImpersonateClientOfPort
@@ -1142,7 +1142,7 @@
 @ stdcall -private ZwGetCurrentProcessorNumber() NtGetCurrentProcessorNumber
 # @ stub ZwGetDevicePowerState
 @ stub ZwGetPlugPlayEvent
-@ stdcall -private -ret64 ZwGetTickCount() get_tick_count64
+@ stdcall -private ZwGetTickCount() NtGetTickCount
 @ stdcall -private ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch
 @ stdcall -private ZwImpersonateAnonymousToken(long) NtImpersonateAnonymousToken
 @ stub ZwImpersonateClientOfPort
@@ -1529,3 +1529,6 @@
 # Filesystem
 @ cdecl wine_nt_to_unix_file_name(ptr ptr long long)
 @ cdecl wine_unix_to_nt_file_name(ptr ptr)
+
+# Time
+@ cdecl -ret64 wine_get_tick_count64()
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 2d83f54..72510b1c 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -269,7 +269,4 @@ void     WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR);
 int __cdecl NTDLL_tolower( int c );
 int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 );
 
-/* time functions */
-ULONGLONG WINAPI get_tick_count64( void );
-#define NtGetTickCount get_tick_count64
 #endif
diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index 41e4563..d3853e0 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -552,14 +552,18 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER
     return STATUS_SUCCESS;
 }
 
+ULONGLONG CDECL wine_get_tick_count64(void)
+{
+    return monotonic_counter() / TICKSPERMSEC;
+}
 
 /******************************************************************************
  * NtGetTickCount   (NTDLL.@)
  * ZwGetTickCount   (NTDLL.@)
  */
-ULONGLONG WINAPI DECLSPEC_HOTPATCH get_tick_count64(void)
+ULONG WINAPI NtGetTickCount(void)
 {
-    return monotonic_counter() / TICKSPERMSEC;
+    return wine_get_tick_count64();
 }
 
 /* calculate the mday of dst change date, so that for instance Sun 5 Oct 2007
diff --git a/include/winternl.h b/include/winternl.h
index e7f89b0..921386d 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -2946,6 +2946,7 @@ NTSYSAPI void      WINAPI TpWaitForWork(TP_WORK *,BOOL);
 NTSYSAPI NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret,
                                                    UINT disposition, BOOLEAN check_case );
 NTSYSAPI NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt );
+NTSYSAPI ULONGLONG CDECL wine_get_tick_count64( void );
 
 
 /***********************************************************************
-- 
2.1.4