From eea2c1d47cf66c702e134d69c8e0418f95ff6ddb Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 4 Jul 2005 22:25:46 +0000
Subject: [PATCH] some %x -> %p fixes

svn path=/trunk/; revision=16418
---
 reactos/lib/rtl/env.c     | 2 +-
 reactos/lib/rtl/heap.c    | 2 +-
 reactos/lib/rtl/image.c   | 4 ++--
 reactos/lib/rtl/process.c | 2 +-
 reactos/lib/rtl/unicode.c | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/reactos/lib/rtl/env.c b/reactos/lib/rtl/env.c
index e724a3396cb..fde857eb9c9 100644
--- a/reactos/lib/rtl/env.c
+++ b/reactos/lib/rtl/env.c
@@ -251,7 +251,7 @@ RtlSetCurrentEnvironment(PWSTR NewEnvironment,
 {
    PVOID EnvPtr;
 
-   DPRINT("NewEnvironment %x OldEnvironment %x\n",
+   DPRINT("NewEnvironment 0x%p OldEnvironment 0x%p\n",
           NewEnvironment, OldEnvironment);
 
    RtlAcquirePebLock();
diff --git a/reactos/lib/rtl/heap.c b/reactos/lib/rtl/heap.c
index e44ced62be3..79920aea254 100644
--- a/reactos/lib/rtl/heap.c
+++ b/reactos/lib/rtl/heap.c
@@ -937,7 +937,7 @@ void DumpStackFrames ( PULONG Frame, ULONG FrameCount )
 	}
 	while ( Frame != 0 && (ULONG)Frame != 0xDEADBEEF && (ULONG)Frame != 0xcdcdcdcd && (ULONG)Frame != 0xcccccccc && i++ < FrameCount )
 	{
-		DbgPrint("<%X>", (PVOID)Frame[1]);
+		DbgPrint("<%p>", (PVOID)Frame[1]);
 		if (Frame[1] == 0xdeadbeef)
 		    break;
 		Frame = (PULONG)Frame[0];
diff --git a/reactos/lib/rtl/image.c b/reactos/lib/rtl/image.c
index c1f5489aa79..6d778c35b96 100644
--- a/reactos/lib/rtl/image.c
+++ b/reactos/lib/rtl/image.c
@@ -28,12 +28,12 @@ RtlImageNtHeader (IN PVOID BaseAddress)
   if (DosHeader && DosHeader->e_magic != IMAGE_DOS_SIGNATURE)
     {
       DPRINT1("DosHeader->e_magic %x\n", DosHeader->e_magic);
-      DPRINT1("NtHeader %x\n", (BaseAddress + DosHeader->e_lfanew));
+      DPRINT1("NtHeader 0x%p\n", ((ULONG_PTR)BaseAddress + DosHeader->e_lfanew));
     }
 
   if (DosHeader && DosHeader->e_magic == IMAGE_DOS_SIGNATURE)
     {
-      NtHeader = (PIMAGE_NT_HEADERS)(BaseAddress + DosHeader->e_lfanew);
+      NtHeader = (PIMAGE_NT_HEADERS)((ULONG_PTR)BaseAddress + DosHeader->e_lfanew);
       if (NtHeader->Signature == IMAGE_NT_SIGNATURE)
 	return NtHeader;
     }
diff --git a/reactos/lib/rtl/process.c b/reactos/lib/rtl/process.c
index 7c761775322..648530fa955 100644
--- a/reactos/lib/rtl/process.c
+++ b/reactos/lib/rtl/process.c
@@ -35,7 +35,7 @@ RtlpMapFile(PUNICODE_STRING ImageFileName,
 
    RtlDeNormalizeProcessParams (Ppb);
 
-//   DbgPrint("ImagePathName %x\n", Ppb->ImagePathName.Buffer);
+/*   DbgPrint("ImagePathName 0x%p\n", Ppb->ImagePathName.Buffer); */
 
    InitializeObjectAttributes(&ObjectAttributes,
 			      ImageFileName,
diff --git a/reactos/lib/rtl/unicode.c b/reactos/lib/rtl/unicode.c
index 12275277f03..8d99529fb32 100644
--- a/reactos/lib/rtl/unicode.c
+++ b/reactos/lib/rtl/unicode.c
@@ -516,7 +516,7 @@ RtlInitUnicodeString(IN OUT PUNICODE_STRING DestinationString,
 {
    ULONG DestSize;
 
-   DPRINT("RtlInitUnicodeString(DestinationString %x, SourceString %x)\n",
+   DPRINT("RtlInitUnicodeString(DestinationString 0x%p, SourceString 0x%p)\n",
           DestinationString,
           SourceString);