Author: tkreuzer
Date: Thu Aug 7 12:59:46 2008
New Revision: 35167
URL:
http://svn.reactos.org/svn/reactos?rev=35167&view=rev
Log:
add macro definitions for KeQuerySystemTime, KeQueryTickCount
and KeQueryInterruptTime to ddk, remove corresponding exports from ntoskrnl
Modified:
branches/ros-amd64-bringup/reactos/include/ddk/winddk.h
branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def
Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Thu Aug 7
12:59:46 2008
@@ -5514,6 +5514,18 @@
#define MM_LOWEST_SYSTEM_ADDRESS (PVOID)0xFFFF080000000000ULL
#define KI_USER_SHARED_DATA 0xFFFFF78000000000ULL
+#define SharedUserData ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA)
+#define SharedInterruptTime (&SharedUserData->InterruptTime)
+#define SharedSystemTime (&SharedUserData->SystemTime)
+#define SharedTickCount (&SharedUserData->TickCount)
+
+#define KeQueryInterruptTime() \
+ (*(volatile ULONG64*)SharedInterruptTime)
+#define KeQuerySystemTime(CurrentCount) \
+ *(ULONG64*)(CurrentCount) = *(volatile ULONG64*)SharedSystemTime
+#define KeQueryTickCount(CurrentCount) \
+ *(ULONG64*)(CurrentCount) = *(volatile ULONG64*)SharedTickCount
+
typedef struct _KPCR
{
union
@@ -9634,24 +9646,25 @@
IN KPRIORITY Increment,
IN BOOLEAN Wait);
+NTHALAPI
+LARGE_INTEGER
+NTAPI
+KeQueryPerformanceCounter(
+ OUT PLARGE_INTEGER PerformanceFrequency OPTIONAL);
+
+NTKERNELAPI
+KPRIORITY
+NTAPI
+KeQueryPriorityThread(
+ IN PRKTHREAD Thread);
+
+#if !defined(_M_AMD64)
NTKERNELAPI
ULONGLONG
NTAPI
KeQueryInterruptTime(
VOID);
-NTHALAPI
-LARGE_INTEGER
-NTAPI
-KeQueryPerformanceCounter(
- OUT PLARGE_INTEGER PerformanceFrequency OPTIONAL);
-
-NTKERNELAPI
-KPRIORITY
-NTAPI
-KeQueryPriorityThread(
- IN PRKTHREAD Thread);
-
NTKERNELAPI
VOID
NTAPI
@@ -9663,6 +9676,7 @@
NTAPI
KeQueryTickCount(
OUT PLARGE_INTEGER TickCount);
+#endif
NTKERNELAPI
ULONG
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def [iso-8859-1] Thu Aug 7
12:59:46 2008
@@ -4,7 +4,6 @@
;
EXPORTS
;
-KeQuerySystemTime
KfAcquireSpinLock
KfReleaseSpinLock
KeRaiseIrql
@@ -14,8 +13,6 @@
KeGetCurrentProcessorNumber
RtlConvertUlongToLargeInteger
RtlExtendedIntegerMultiply
-KeQueryTickCount
-KeQueryInterruptTime
;
; original:
CcCanIWrite