rename IsKernelPointer to IsPointerOffset

svn path=/trunk/; revision=17477

diff --git a/reactos/ntoskrnl/include/internal/ntoskrnl.h b/reactos/ntoskrnl/include/internal/ntoskrnl.h
index 8ce0e52..2423c5b 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/internal/ntoskrnl.h
@@ -148,22 +148,22 @@ RtlReleaseCapturedUnicodeString(
 #define ProbeForReadUlargeInteger(Ptr) ((ULARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, ULONGLONG, 0))
 
 /*
- * Use IsKernelPointer to test whether a pointer points to the kernel address
- * space
+ * Use IsPointerOffset to test whether a pointer should be interpreted as an offset
+ * or as a pointer
  */
 #if defined(_X86_) || defined(_M_AMD64)
 
 /* for x86 and x86-64 the MSB is 1 so we can simply test on that */
-#define IsKernelPointer(Ptr) ((LONG_PTR)(Ptr) < 0)
+#define IsPointerOffset(Ptr) ((LONG_PTR)(Ptr) >= 0)
 
 #elif defined(_IA64_)
 
 /* on Itanium if the 24 most significant bits are set, we're not dealing with
-   user mode pointers. */
-#define IsKernelPointer(Ptr)  (((ULONG_PTR)(Ptr) & 0xFFFFFF0000000000ULL) != 0)
+   offsets anymore. */
+#define IsPointerOffset(Ptr)  (((ULONG_PTR)(Ptr) & 0xFFFFFF0000000000ULL) == 0)
 
 #else
-#error IsKernelPointer() needs to be defined for this architecture
+#error IsPointerOffset() needs to be defined for this architecture
 #endif
 
 #endif

diff --git a/reactos/ntoskrnl/ob/wait.c b/reactos/ntoskrnl/ob/wait.c
index 538cc42..a77e998 100644 (file)
--- a/reactos/ntoskrnl/ob/wait.c
+++ b/reactos/ntoskrnl/ob/wait.c
@@ -149,7 +149,7 @@ NtWaitForMultipleObjects(IN ULONG ObjectCount,
         DefaultObject = ObjectHeader->Type->DefaultObject;
 
         /* Check if it's the internal offset */
-        if (!IsKernelPointer(DefaultObject))
+        if (IsPointerOffset(DefaultObject))
         {
             /* Increase reference count */
             InterlockedIncrement(&ObjectHeader->PointerCount);
@@ -295,7 +295,7 @@ NtWaitForSingleObject(IN HANDLE ObjectHandle,
         WaitableObject = BODY_TO_HEADER(Object)->Type->DefaultObject;
 
         /* Is it an offset for internal objects? */
-        if (!IsKernelPointer(WaitableObject))
+        if (IsPointerOffset(WaitableObject))
         {
             /* Turn it into a pointer */
             WaitableObject = (PVOID)((ULONG_PTR)Object +
@@ -389,7 +389,7 @@ NtSignalAndWaitForSingleObject(IN HANDLE ObjectHandleToSignal,
     WaitableObject = BODY_TO_HEADER(WaitObj)->Type->DefaultObject;
 
     /* Handle internal offset */
-    if (!IsKernelPointer(WaitableObject))
+    if (IsPointerOffset(WaitableObject))
     {
         /* Get real pointer */
         WaitableObject = (PVOID)((ULONG_PTR)WaitObj +