[NTOS]: My SVN is haunted. Commit missing changes?

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

diff --git a/reactos/ntoskrnl/ke/bug.c b/reactos/ntoskrnl/ke/bug.c
index 6aef752..389a3ac 100644 (file)
--- a/reactos/ntoskrnl/ke/bug.c
+++ b/reactos/ntoskrnl/ke/bug.c
@@ -23,7 +23,7 @@ LIST_ENTRY KeBugcheckReasonCallbackListHead;
 KSPIN_LOCK BugCheckCallbackLock;
 ULONG KeBugCheckActive, KeBugCheckOwner;
 LONG KeBugCheckOwnerRecursionCount;
-PRTL_MESSAGE_RESOURCE_DATA KiBugCodeMessages;
+PMESSAGE_RESOURCE_DATA KiBugCodeMessages;
 ULONG KeBugCheckCount = 1;
 ULONG KiHardwareTrigger;
 PUNICODE_STRING KiBugCheckDriver;
@@ -229,13 +229,13 @@ KeRosCaptureUserStackBackTrace(IN ULONG FramesToSkip,
     return (USHORT)i;
 }
 
+
 VOID
 FASTCALL
-KeRosDumpStackFrameArray(IN PULONG_PTR Frames,
+KeRosDumpStackFrameArray(IN PULONG Frames,
                          IN ULONG FrameCount)
 {
-    ULONG i;
-    ULONG_PTR Addr;
+    ULONG i, Addr;
     BOOLEAN InSystem;
     PVOID p;
 
@@ -271,13 +271,13 @@ KeRosDumpStackFrameArray(IN PULONG_PTR Frames,
             {
                 /* Print out the module name */
                 Addr -= (ULONG_PTR)LdrEntry->DllBase;
-                DbgPrint("<%wZ: %p>", &LdrEntry->FullDllName, (PVOID)Addr);
+                DbgPrint("<%wZ: %x>\n", &LdrEntry->FullDllName, Addr);
             }
         }
         else
         {
             /* Print only the address */
-            DbgPrint("<%p>", (PVOID)Addr);
+            DbgPrint("<%x>\n", Addr);
         }
 
         /* Go to the next frame */
@@ -287,10 +287,10 @@ KeRosDumpStackFrameArray(IN PULONG_PTR Frames,
 
 VOID
 NTAPI
-KeRosDumpStackFrames(IN PULONG_PTR Frame OPTIONAL,
+KeRosDumpStackFrames(IN PULONG Frame OPTIONAL,
                      IN ULONG FrameCount OPTIONAL)
 {
-    ULONG_PTR Frames[32];
+    ULONG Frames[32];
     ULONG RealFrameCount;
 
     /* If the caller didn't ask, assume 32 frames */
@@ -321,7 +321,6 @@ KeRosDumpStackFrames(IN PULONG_PTR Frame OPTIONAL,
     }
 }
 
-
 VOID
 NTAPI
 KeRosDumpTriageForBugZillaReport(VOID)
@@ -395,7 +394,7 @@ INIT_FUNCTION
 NTAPI
 KiInitializeBugCheck(VOID)
 {
-    PRTL_MESSAGE_RESOURCE_DATA BugCheckData;
+    PMESSAGE_RESOURCE_DATA BugCheckData;
     LDR_RESOURCE_INFO ResourceInfo;
     PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry;
     NTSTATUS Status;
@@ -459,12 +458,12 @@ KeGetBugMessageText(IN ULONG BugCheckCode,
             for (i = 0; i < IdOffset; i++)
             {
                 /* Advance in the Entries */
-                MessageEntry += ((PRTL_MESSAGE_RESOURCE_ENTRY)MessageEntry)->
+                MessageEntry += ((PMESSAGE_RESOURCE_ENTRY)MessageEntry)->
                                 Length;
             }
 
             /* Get the final Code */
-            BugCode = ((PRTL_MESSAGE_RESOURCE_ENTRY)MessageEntry)->Text;
+            BugCode = ((PMESSAGE_RESOURCE_ENTRY)MessageEntry)->Text;
             i = strlen(BugCode);
 
             /* Handle newlines */
@@ -742,8 +741,8 @@ KiDisplayBlueScreen(IN ULONG MessageId,
 
     /* Show the technical Data */
     sprintf(AnsiName,
-            "\r\n\r\n*** STOP: 0x%p (0x%p,0x%p,0x%p,0x%p)\r\n\r\n",
-            (PVOID)KiBugCheckData[0],
+            "\r\n\r\n*** STOP: 0x%08lX (0x%p,0x%p,0x%p,0x%p)\r\n\r\n",
+            KiBugCheckData[0],
             (PVOID)KiBugCheckData[1],
             (PVOID)KiBugCheckData[2],
             (PVOID)KiBugCheckData[3],