From 64cf51962ccd5cb65eef28364f2581821ccec17b Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Tue, 27 Jul 2010 14:08:36 +0000
Subject: [PATCH] [dbghelp.h] / [imagehlp.h] - fix LOADED_IMAGE,
 UpdateDebugInfoFile, UpdateDebugInfoFileEx, ReBaseImage

svn path=/trunk/; revision=48306
---
 reactos/include/psdk/dbghelp.h  |  6 +++++-
 reactos/include/psdk/imagehlp.h | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/reactos/include/psdk/dbghelp.h b/reactos/include/psdk/dbghelp.h
index 09e54b1224f..aba4d5e0802 100644
--- a/reactos/include/psdk/dbghelp.h
+++ b/reactos/include/psdk/dbghelp.h
@@ -33,7 +33,11 @@ typedef struct _LOADED_IMAGE
     PSTR                        ModuleName;
     HANDLE                      hFile;
     PUCHAR                      MappedAddress;
-    PIMAGE_NT_HEADERS           FileHeader;
+#ifdef _IMAGEHLP64
+    PIMAGE_NT_HEADERS64         FileHeader;
+#else
+    PIMAGE_NT_HEADERS32         FileHeader;
+#endif
     PIMAGE_SECTION_HEADER       LastRvaSection;
     ULONG                       NumberOfSections;
     PIMAGE_SECTION_HEADER       Sections;
diff --git a/reactos/include/psdk/imagehlp.h b/reactos/include/psdk/imagehlp.h
index 8d46bae669e..a138cadda08 100644
--- a/reactos/include/psdk/imagehlp.h
+++ b/reactos/include/psdk/imagehlp.h
@@ -108,16 +108,22 @@ typedef enum _IMAGEHLP_STATUS_REASON {
 } IMAGEHLP_STATUS_REASON;
 typedef BOOL(WINAPI*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,LPSTR,LPSTR,ULONG,ULONG);
 typedef struct _LOADED_IMAGE {
-	LPSTR ModuleName;
+	PSTR ModuleName;
 	HANDLE hFile;
 	PUCHAR MappedAddress;
-	PIMAGE_NT_HEADERS FileHeader;
+#ifdef _IMAGEHLP64
+    PIMAGE_NT_HEADERS64 FileHeader;
+#else
+    PIMAGE_NT_HEADERS32 FileHeader;
+#endif
 	PIMAGE_SECTION_HEADER LastRvaSection;
 	ULONG NumberOfSections;
 	PIMAGE_SECTION_HEADER Sections;
 	ULONG Characteristics;
 	BOOLEAN fSystemImage;
 	BOOLEAN fDOSImage;
+    BOOLEAN fReadOnly;
+    UCHAR Version;
 	LIST_ENTRY Links;
 	ULONG SizeOfImage;
 } LOADED_IMAGE,*PLOADED_IMAGE;
@@ -259,11 +265,11 @@ BOOL IMAGEAPI TouchFileTimes(HANDLE,LPSYSTEMTIME);
 BOOL IMAGEAPI SplitSymbols(LPSTR,LPSTR,LPSTR,DWORD);
 HANDLE IMAGEAPI FindDebugInfoFile(LPSTR,LPSTR,LPSTR);
 HANDLE IMAGEAPI FindExecutableImage(LPSTR,LPSTR,LPSTR);
-BOOL IMAGEAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS);
-BOOL IMAGEAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS,DWORD);
+BOOL IMAGEAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS32);
+BOOL IMAGEAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS32,DWORD);
 BOOL IMAGEAPI BindImage(IN LPSTR,IN LPSTR,IN LPSTR);
 BOOL IMAGEAPI BindImageEx(IN DWORD,IN LPSTR,IN LPSTR,IN LPSTR,IN PIMAGEHLP_STATUS_ROUTINE);
-BOOL IMAGEAPI ReBaseImage(IN LPSTR,IN LPSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG*, OUT ULONG*, IN OUT ULONG*, IN ULONG);
+BOOL IMAGEAPI ReBaseImage(IN LPSTR,IN LPSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG_PTR*, OUT ULONG*, IN OUT ULONG_PTR*, IN ULONG);
 
 PLOADED_IMAGE IMAGEAPI ImageLoad(LPSTR,LPSTR);
 BOOL IMAGEAPI ImageUnload(PLOADED_IMAGE);