[jgardou] 64283: [KERNEL32] - Get rid of the GetTickCount64 export, now in kernel32_vista.dll - Add a few "-norelay" clauses when relay tracing is enabled

Author: jgardou
Date: Thu Sep 25 18:25:55 2014
New Revision: 64283

URL: http://svn.reactos.org/svn/reactos?rev=64283&view=rev
Log:
[KERNEL32]
 - Get rid of the GetTickCount64 export, now in kernel32_vista.dll
 - Add a few "-norelay" clauses when relay tracing is enabled

Modified:
    trunk/reactos/dll/win32/kernel32/client/vista.c
    trunk/reactos/dll/win32/kernel32/kernel32.spec

Modified: trunk/reactos/dll/win32/kernel32/client/vista.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/vista.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/vista.c	[iso-8859-1] Thu Sep 25 18:25:55 2014
@@ -710,7 +710,6 @@
     return INVALID_HANDLE_VALUE;
 }
 
-#endif
 
 /*
  * @implemented
@@ -734,6 +733,8 @@
      return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier)
>> 24) +
             (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier)
<< 8);
 }
+
+#endif
 
 /*
   Vista+ MUI support functions

Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/kernel32.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/kernel32.spec	[iso-8859-1] Thu Sep 25 18:25:55 2014
@@ -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