- Properly implement inline versions of KeGetCurrentThread and KeGetPreviousMode...

svn path=/trunk/; revision=24639

diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h
index 71c9603..5821302 100644 (file)
--- a/reactos/include/ddk/winddk.h
+++ b/reactos/include/ddk/winddk.h
@@ -8678,12 +8678,6 @@ NTAPI
 KeGetCurrentThread(
   VOID);
 
-NTKERNELAPI
-KPROCESSOR_MODE
-NTAPI
-KeGetPreviousMode(
-  VOID);
-
 NTKERNELAPI
 ULONG
 NTAPI

diff --git a/reactos/include/ndk/ketypes.h b/reactos/include/ndk/ketypes.h
index ca11ac4..6cb747d 100644 (file)
--- a/reactos/include/ndk/ketypes.h
+++ b/reactos/include/ndk/ketypes.h
@@ -95,7 +95,7 @@ Author:
 //
 #define K0IPCR                          ((ULONG_PTR)(KIP0PCRADDRESS))
 #define PCR                             ((volatile KPCR * const)K0IPCR)
-#ifdef _WE_USE_THE_SAME_PCR_ADDRESS
+#if !defined(CONFIG_SMP) && !defined(NT_BUILD)
 #define KeGetPcr()                      PCR
 #else
 #define KeGetPcr()                      ((volatile KPCR * const)__readfsdword(0x1C))

diff --git a/reactos/ntoskrnl/ex/sysinfo.c b/reactos/ntoskrnl/ex/sysinfo.c
index 27888f1..1cab664 100644 (file)
--- a/reactos/ntoskrnl/ex/sysinfo.c
+++ b/reactos/ntoskrnl/ex/sysinfo.c
@@ -30,11 +30,12 @@ LIST_ENTRY ExpFirmwareTableProviderListHead;
 /*
  * @implemented
  */
+#undef ExGetPreviousMode
 KPROCESSOR_MODE
 NTAPI
 ExGetPreviousMode (VOID)
 {
-    return (KPROCESSOR_MODE)PsGetCurrentThread()->Tcb.PreviousMode;
+    return KeGetPreviousMode();
 }
 
 /*

diff --git a/reactos/ntoskrnl/include/internal/ex.h b/reactos/ntoskrnl/include/internal/ex.h
index 15f8295..a196633 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ex.h
+++ b/reactos/ntoskrnl/include/internal/ex.h
@@ -47,6 +47,7 @@ PVOID ExpNlsSectionPointer;
 #define ExInitializeRundownProtection                   _ExInitializeRundownProtection
 #define ExWaitForRundownProtectionRelease               _ExWaitForRundownProtectionRelease
 #define ExRundownCompleted                              _ExRundownCompleted
+#define ExGetPreviousMode                               KeGetPreviousMode
 
 /* INITIALIZATION FUNCTIONS *************************************************/
 

diff --git a/reactos/ntoskrnl/include/internal/ke_x.h b/reactos/ntoskrnl/include/internal/ke_x.h
index f90b97a..5f051e8 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ke_x.h
+++ b/reactos/ntoskrnl/include/internal/ke_x.h
@@ -1263,3 +1263,18 @@ KiComputeNewPriority(IN PKTHREAD Thread)
     return Priority;\r
 }\r
 \r
+PRKTHREAD\r
+FORCEINLINE\r
+KeGetCurrentThread(VOID)\r
+{\r
+    /* Return the current thread */\r
+    return ((PKIPCR)KeGetPcr())->PrcbData.CurrentThread;\r
+}\r
+\r
+UCHAR\r
+FORCEINLINE\r
+KeGetPreviousMode(VOID)\r
+{\r
+    /* Return the current mode */\r
+    return KeGetCurrentThread()->PreviousMode;\r
+}\r

diff --git a/reactos/ntoskrnl/include/internal/ntoskrnl.h b/reactos/ntoskrnl/include/internal/ntoskrnl.h
index aab9712..d62290a 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/internal/ntoskrnl.h
@@ -17,6 +17,9 @@
 
 #ifdef _NTOSKRNL_
 
+#define KeGetCurrentThread _KeGetCurrentThread
+#define KeGetPreviousMode _KeGetPreviousMode
+
 #include "ke.h"
 #include "i386/mm.h"
 #include "i386/fpu.h"

diff --git a/reactos/ntoskrnl/ke/thrdobj.c b/reactos/ntoskrnl/ke/thrdobj.c
index e2f63f6..83290b4 100644 (file)
--- a/reactos/ntoskrnl/ke/thrdobj.c
+++ b/reactos/ntoskrnl/ke/thrdobj.c
@@ -882,18 +882,19 @@ NTAPI
 KeGetCurrentThread(VOID)\r
 {\r
     /* Return the current thread on this PCR */\r
-    return ((PKIPCR)KeGetPcr())->PrcbData.CurrentThread;\r
+    return _KeGetCurrentThread();\r
 }\r
 \r
 /*\r
  * @implemented\r
  */\r
-KPROCESSOR_MODE\r
+#undef KeGetPreviousMode\r
+UCHAR\r
 NTAPI\r
 KeGetPreviousMode(VOID)\r
 {\r
     /* Return the previous mode of this thread */\r
-    return KeGetCurrentThread()->PreviousMode;\r
+    return _KeGetPreviousMode();\r
 }\r
 \r
 /*\r