Merge 36852, 37322, 37333, 37334, 43428, 43451, 44259, 46404 from amd64 branch.

[reactos.git] / reactos / ntoskrnl / ke / bug.c

diff --git a/reactos/ntoskrnl/ke/bug.c b/reactos/ntoskrnl/ke/bug.c
index 642c9a2..0484093 100644 (file)
--- a/reactos/ntoskrnl/ke/bug.c
+++ b/reactos/ntoskrnl/ke/bug.c
@@ -232,7 +232,7 @@ KeRosCaptureUserStackBackTrace(IN ULONG FramesToSkip,
 
 VOID
 FASTCALL
-KeRosDumpStackFrameArray(IN PULONG Frames,
+KeRosDumpStackFrameArray(IN PULONG_PTR Frames,
                          IN ULONG FrameCount)
 {
     ULONG i, Addr;
@@ -271,13 +271,13 @@ KeRosDumpStackFrameArray(IN PULONG Frames,
             {
                 /* Print out the module name */
                 Addr -= (ULONG_PTR)LdrEntry->DllBase;
-                DbgPrint("<%wZ: %x>\n", &LdrEntry->FullDllName, Addr);
+                DbgPrint("<%wZ: %p>", &LdrEntry->FullDllName, (PVOID)Addr);
             }
         }
         else
         {
             /* Print only the address */
-            DbgPrint("<%x>\n", Addr);
+            DbgPrint("<%p>", (PVOID)Addr);
         }
 
         /* Go to the next frame */
@@ -287,10 +287,10 @@ KeRosDumpStackFrameArray(IN PULONG Frames,
 
 VOID
 NTAPI
-KeRosDumpStackFrames(IN PULONG Frame OPTIONAL,
+KeRosDumpStackFrames(IN PULONG_PTR Frame OPTIONAL,
                      IN ULONG FrameCount OPTIONAL)
 {
-    ULONG Frames[32];
+    ULONG_PTR Frames[32];
     ULONG RealFrameCount;
 
     /* If the caller didn't ask, assume 32 frames */
@@ -1410,7 +1410,7 @@ KeRegisterNmiCallback(IN PNMI_CALLBACK CallbackRoutine,
     //
     KiAcquireNmiListLock(&OldIrql);
     NmiData->Next = KiNmiCallbackListHead;
-    Next = InterlockedCompareExchangePointer(&KiNmiCallbackListHead,
+    Next = InterlockedCompareExchangePointer((PVOID*)&KiNmiCallbackListHead,
                                              NmiData,
                                              NmiData->Next);
     ASSERT(Next == NmiData->Next);