From af46c1ee60fefcd842e08894f86e1e81cf26dff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= <jerome.gardou@reactos.org>
Date: Thu, 25 Sep 2014 18:25:55 +0000
Subject: [PATCH] [KERNEL32]  - Get rid of the GetTickCount64 export, now in
 kernel32_vista.dll  - Add a few "-norelay" clauses when relay tracing is
 enabled

svn path=/trunk/; revision=64283
---
 reactos/dll/win32/kernel32/client/vista.c |  3 ++-
 reactos/dll/win32/kernel32/kernel32.spec  | 17 ++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/reactos/dll/win32/kernel32/client/vista.c b/reactos/dll/win32/kernel32/client/vista.c
index 02927ab4665..e5cd45f5104 100644
--- a/reactos/dll/win32/kernel32/client/vista.c
+++ b/reactos/dll/win32/kernel32/client/vista.c
@@ -710,7 +710,6 @@ OpenFileById(IN HANDLE hFile,
     return INVALID_HANDLE_VALUE;
 }
 
-#endif
 
 /*
  * @implemented
@@ -735,6 +734,8 @@ GetTickCount64(VOID)
             (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8);
 }
 
+#endif
+
 /*
   Vista+ MUI support functions
 
diff --git a/reactos/dll/win32/kernel32/kernel32.spec b/reactos/dll/win32/kernel32/kernel32.spec
index ff10fb5af17..58d96b60f8b 100644
--- a/reactos/dll/win32/kernel32/kernel32.spec
+++ b/reactos/dll/win32/kernel32/kernel32.spec
@@ -325,11 +325,11 @@
 @ stdcall GetCurrentConsoleFont(long long ptr)
 @ stdcall GetCurrentDirectoryA(long ptr)
 @ stdcall GetCurrentDirectoryW(long ptr)
-@ stdcall GetCurrentProcess()
-@ stdcall GetCurrentProcessId()
+@ stdcall -norelay GetCurrentProcess()
+@ stdcall -norelay GetCurrentProcessId()
 @ stdcall GetCurrentProcessorNumber() ntdll.RtlGetCurrentProcessorNumber
-@ stdcall GetCurrentThread()
-@ stdcall GetCurrentThreadId()
+@ stdcall -norelay GetCurrentThread()
+@ stdcall -norelay GetCurrentThreadId()
 @ stdcall GetDateFormatA(long long ptr str ptr long)
 @ stdcall GetDateFormatW(long long ptr wstr ptr long)
 @ stdcall GetDefaultCommConfigA(str ptr long)
@@ -422,7 +422,7 @@
 @ stdcall GetProcAddress(long str)
 @ stdcall GetProcessAffinityMask(long ptr ptr)
 @ stdcall GetProcessHandleCount(long ptr)
-@ stdcall GetProcessHeap()
+@ stdcall -norelay GetProcessHeap()
 @ stdcall GetProcessHeaps(long ptr)
 @ stdcall GetProcessId(long)
 @ stdcall GetProcessIdOfThread(ptr)
@@ -682,7 +682,7 @@
 @ stdcall QueryPerformanceFrequency(ptr)
 @ stdcall QueueUserAPC(ptr long long)
 @ stdcall QueueUserWorkItem(ptr ptr long)
-@ stdcall RaiseException(long long long ptr)
+@ stdcall -norelay RaiseException(long long long ptr)
 @ stdcall ReOpenFile(ptr long long long)
 @ stdcall ReadConsoleA(long ptr long ptr ptr)
 @ stdcall ReadConsoleInputA(long ptr long ptr)
@@ -884,8 +884,8 @@
 @ stdcall Thread32Next(long ptr)
 @ stdcall TlsAlloc()
 @ stdcall TlsFree(long)
-@ stdcall TlsGetValue(long)
-@ stdcall TlsSetValue(long ptr)
+@ stdcall -norelay TlsGetValue(long)
+@ stdcall -norelay TlsSetValue(long ptr)
 @ stdcall Toolhelp32ReadProcessMemory(long ptr ptr long ptr)
 @ stdcall TransactNamedPipe(long ptr long ptr long ptr ptr)
 @ stdcall TransmitCommChar(long long)
@@ -1002,4 +1002,3 @@
 ;@ stdcall -arch=x86_64 uaw_wcslen(wstr)
 ;@ stdcall -arch=x86_64 uaw_wcsrchr(wstr long)
 
-@ stdcall GetTickCount64() ; FOR WINE