[tkreuzer] 48306: [dbghelp.h] / [imagehlp.h] - fix LOADED_IMAGE, UpdateDebugInfoFile, UpdateDebugInfoFileEx, ReBaseImage

Author: tkreuzer
Date: Tue Jul 27 14:08:36 2010
New Revision: 48306

URL: http://svn.reactos.org/svn/reactos?rev=48306&view=rev
Log:
[dbghelp.h] / [imagehlp.h]
- fix LOADED_IMAGE, UpdateDebugInfoFile, UpdateDebugInfoFileEx, ReBaseImage

Modified:
    trunk/reactos/include/psdk/dbghelp.h
    trunk/reactos/include/psdk/imagehlp.h

Modified: trunk/reactos/include/psdk/dbghelp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev=...
==============================================================================
--- trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] Tue Jul 27 14:08:36 2010
@@ -33,7 +33,11 @@
     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;

Modified: trunk/reactos/include/psdk/imagehlp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imagehlp.h?rev...
==============================================================================
--- trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] Tue Jul 27 14:08:36 2010
@@ -108,16 +108,22 @@
 } 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 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);