From 7f388bab0292159429f0d0b49f97d45320fc32cc Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Fri, 19 Sep 2008 22:42:40 +0000
Subject: [PATCH] fix some 64 bit warnings

svn path=/branches/ros-amd64-bringup/; revision=36332
---
 reactos/ntoskrnl/cc/copy.c             | 2 +-
 reactos/ntoskrnl/ex/harderr.c          | 2 +-
 reactos/ntoskrnl/include/internal/ke.h | 4 ++--
 reactos/ntoskrnl/ke/queue.c            | 6 +++---
 reactos/ntoskrnl/ke/thrdobj.c          | 4 +++-
 reactos/ntoskrnl/ke/thrdschd.c         | 2 +-
 reactos/ntoskrnl/ke/wait.c             | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/reactos/ntoskrnl/cc/copy.c b/reactos/ntoskrnl/cc/copy.c
index 37bdd8a1b9b..39dadb578b1 100644
--- a/reactos/ntoskrnl/cc/copy.c
+++ b/reactos/ntoskrnl/cc/copy.c
@@ -612,7 +612,7 @@ CcZeroData (IN PFILE_OBJECT     FileObject,
 	    {
 	      CurrentLength = Length;
 	    }
-          MmInitializeMdl(Mdl, (PVOID)WriteOffset.u.LowPart, CurrentLength);
+          MmInitializeMdl(Mdl, (PVOID)(ULONG_PTR)WriteOffset.QuadPart, CurrentLength);
 	  Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ);
 	  for (i = 0; i < ((Mdl->Size - sizeof(MDL)) / sizeof(ULONG)); i++)
 	    {
diff --git a/reactos/ntoskrnl/ex/harderr.c b/reactos/ntoskrnl/ex/harderr.c
index 74a5fdeaffc..0ca2427fe34 100644
--- a/reactos/ntoskrnl/ex/harderr.c
+++ b/reactos/ntoskrnl/ex/harderr.c
@@ -370,7 +370,7 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus,
                  IN ULONG ValidResponseOptions,
                  OUT PULONG Response)
 {
-    ULONG Size;
+    SIZE_T Size;
     UNICODE_STRING CapturedParams[MAXIMUM_HARDERROR_PARAMETERS];
     ULONG i;
     PULONG_PTR UserData = NULL, ParameterBase;
diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h
index dfe1f0b46d5..0818a8c06d3 100644
--- a/reactos/ntoskrnl/include/internal/ke.h
+++ b/reactos/ntoskrnl/include/internal/ke.h
@@ -196,7 +196,7 @@ extern ULONG KiDPCTimeout;
 /* INTERNAL KERNEL FUNCTIONS ************************************************/
 
 /* Finds a new thread to run */
-NTSTATUS
+LONG_PTR
 FASTCALL
 KiSwapThread(
     IN PKTHREAD Thread,
@@ -527,7 +527,7 @@ VOID
 FASTCALL
 KiUnwaitThread(
     IN PKTHREAD Thread,
-    IN NTSTATUS WaitStatus,
+    IN LONG_PTR WaitStatus,
     IN KPRIORITY Increment
 );
 
diff --git a/reactos/ntoskrnl/ke/queue.c b/reactos/ntoskrnl/ke/queue.c
index a548a7df098..917b7ee0d61 100644
--- a/reactos/ntoskrnl/ke/queue.c
+++ b/reactos/ntoskrnl/ke/queue.c
@@ -57,7 +57,7 @@ KiActivateWaiterQueue(IN PKQUEUE Queue)
                                           KWAIT_BLOCK,
                                           WaitListEntry);
             Thread = WaitBlock->Thread;
-            KiUnwaitThread(Thread, (NTSTATUS)QueueEntry, IO_NO_INCREMENT);
+            KiUnwaitThread(Thread, (LONG_PTR)QueueEntry, IO_NO_INCREMENT);
         }
     }
 }
@@ -102,7 +102,7 @@ KiInsertQueue(IN PKQUEUE Queue,
         Thread = WaitBlock->Thread;
 
         /* Remove the queue from the thread's wait list */
-        Thread->WaitStatus = (NTSTATUS)Entry;
+        Thread->WaitStatus = (LONG_PTR)Entry;
         if (Thread->WaitListEntry.Flink) RemoveEntryList(&Thread->WaitListEntry);
 
         /* Increase the active threads and remove any wait reason */
@@ -239,7 +239,7 @@ KeRemoveQueue(IN PKQUEUE Queue,
               IN PLARGE_INTEGER Timeout OPTIONAL)
 {
     PLIST_ENTRY QueueEntry;
-    NTSTATUS Status;
+    LONG_PTR Status;
     PKTHREAD Thread = KeGetCurrentThread();
     PKQUEUE PreviousQueue;
     PKWAIT_BLOCK WaitBlock = &Thread->WaitBlock[0];
diff --git a/reactos/ntoskrnl/ke/thrdobj.c b/reactos/ntoskrnl/ke/thrdobj.c
index e8b6dfaec97..656e75d458c 100644
--- a/reactos/ntoskrnl/ke/thrdobj.c
+++ b/reactos/ntoskrnl/ke/thrdobj.c
@@ -1353,7 +1353,9 @@ KeTerminateThread(IN KPRIORITY Increment)
         SavedEntry = Entry;
 
         /* Now try to do the exchange */
-        Entry = InterlockedCompareExchangePointer(ListHead, ThreadAddr, Entry);
+        Entry = InterlockedCompareExchangePointer((PVOID*)ListHead,
+                                                  ThreadAddr,
+                                                  Entry);
 
         /* Break out if the change was succesful */
     } while (Entry != SavedEntry);
diff --git a/reactos/ntoskrnl/ke/thrdschd.c b/reactos/ntoskrnl/ke/thrdschd.c
index ff64d40cf5b..7a658928180 100644
--- a/reactos/ntoskrnl/ke/thrdschd.c
+++ b/reactos/ntoskrnl/ke/thrdschd.c
@@ -291,7 +291,7 @@ KiSelectNextThread(IN PKPRCB Prcb)
     return Thread;
 }
 
-NTSTATUS
+LONG_PTR
 FASTCALL
 KiSwapThread(IN PKTHREAD CurrentThread,
              IN PKPRCB Prcb)
diff --git a/reactos/ntoskrnl/ke/wait.c b/reactos/ntoskrnl/ke/wait.c
index 2ec2cec5159..b1488063b9e 100644
--- a/reactos/ntoskrnl/ke/wait.c
+++ b/reactos/ntoskrnl/ke/wait.c
@@ -87,7 +87,7 @@ KiUnlinkThread(IN PKTHREAD Thread,
 VOID
 FASTCALL
 KiUnwaitThread(IN PKTHREAD Thread,
-               IN NTSTATUS WaitStatus,
+               IN LONG_PTR WaitStatus,
                IN KPRIORITY Increment)
 {
     /* Unlink the thread */