[PATCH 2/3] kernel32: Separate GetTickCount from get_tick_count64.
Andrew Wesie
awesie at gmail.com
Thu May 30 01:34:52 CDT 2019
Fixes regression in 3e927c4aec9dbeef930b83f62ee0651b8c147247.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47265
Signed-off-by: Andrew Wesie <awesie at gmail.com>
---
dlls/kernel32/kernel32.spec | 4 ++--
dlls/kernel32/kernel_main.c | 27 +++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 5f3f1fa..c01f132 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -858,8 +858,8 @@
@ stdcall GetThreadPriorityBoost(long ptr)
@ stdcall GetThreadSelectorEntry(long long ptr)
@ stdcall GetThreadTimes(long ptr ptr ptr ptr)
-@ stdcall GetTickCount() ntdll.NtGetTickCount
-@ stdcall -ret64 GetTickCount64() ntdll.NtGetTickCount
+@ stdcall GetTickCount()
+@ stdcall -ret64 GetTickCount64()
@ stdcall GetTimeFormatA(long long ptr str ptr long)
@ stdcall GetTimeFormatEx(wstr long ptr wstr ptr long)
@ stdcall GetTimeFormatW(long long ptr wstr ptr long)
diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c
index dfa66f0..4c8edf9 100644
--- a/dlls/kernel32/kernel_main.c
+++ b/dlls/kernel32/kernel_main.c
@@ -179,6 +179,33 @@ INT WINAPI MulDiv( INT nMultiplicand, INT nMultiplier, INT nDivisor)
}
/******************************************************************************
+ * GetTickCount64 (KERNEL32.@)
+ */
+ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void)
+{
+ return wine_get_tick_count64();
+}
+
+/***********************************************************************
+ * GetTickCount (KERNEL32.@)
+ *
+ * Get the number of milliseconds the system has been running.
+ *
+ * PARAMS
+ * None.
+ *
+ * RETURNS
+ * The current tick count.
+ *
+ * NOTES
+ * The value returned will wrap around every 2^32 milliseconds.
+ */
+DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void)
+{
+ return wine_get_tick_count64();
+}
+
+/******************************************************************************
* GetSystemRegistryQuota (KERNEL32.@)
*/
BOOL WINAPI GetSystemRegistryQuota(PDWORD pdwQuotaAllowed, PDWORD pdwQuotaUsed)
--
2.1.4
More information about the wine-devel
mailing list