[ros-diffs] [tkreuzer] 36928: merge 36224 and 36910 from amd64 branch

Author: tkreuzer
Date: Fri Oct 24 17:13:45 2008
New Revision: 36928
URL: http://svn.reactos.org/svn/reactos?rev=36928&view=rev
Log:
merge 36224 and 36910 from amd64 branch
Modified:
    trunk/reactos/tools/rsym.h
Modified: trunk/reactos/tools/rsym.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.h?rev=36928&…
==============================================================================
--- trunk/reactos/tools/rsym.h [iso-8859-1] (original)
+++ trunk/reactos/tools/rsym.h [iso-8859-1] Fri Oct 24 17:13:45 2008
@@ -6,6 +6,17 @@
 #define IMAGE_DOS_MAGIC 0x5a4d
 #define IMAGE_PE_MAGIC 0x00004550
 #define IMAGE_SIZEOF_SHORT_NAME 8
+
+#define IMAGE_FILE_LINE_NUMS_STRIPPED   0x0004
+#define IMAGE_FILE_LOCAL_SYMS_STRIPPED  0x0008
+#define IMAGE_FILE_DEBUG_STRIPPED   0x0200
+
+#define IMAGE_DIRECTORY_ENTRY_BASERELOC        5
+
+#define IMAGE_SCN_TYPE_NOLOAD     0x00000002
+#define IMAGE_SCN_LNK_REMOVE      0x00000800
+#define IMAGE_SCN_MEM_READ        0x40000000
+#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000
 #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
@@ -34,6 +45,7 @@
 #endif
 #pragma pack(push,2)
+
 typedef struct _IMAGE_DOS_HEADER {
   WORD e_magic;
   WORD e_cblp;
@@ -56,10 +68,6 @@
   LONG e_lfanew;
 } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER;
 #pragma pack(pop)
-
-#define IMAGE_FILE_LINE_NUMS_STRIPPED  4
-#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 8
-#define IMAGE_FILE_DEBUG_STRIPPED      512
 #pragma pack(push,4)
 typedef struct _IMAGE_FILE_HEADER {
@@ -145,41 +153,14 @@
        IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
 } IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64;
-#pragma pack(push,4)
-typedef struct _IMAGE_NT_HEADERS32 {
-       DWORD Signature;
-       IMAGE_FILE_HEADER FileHeader;
-       IMAGE_OPTIONAL_HEADER32 OptionalHeader;
-} IMAGE_NT_HEADERS32,*PIMAGE_NT_HEADERS32;
-#pragma pack(pop)
-
-#pragma pack(push,4)
-typedef struct _IMAGE_NT_HEADERS64 {
-       DWORD Signature;
-       IMAGE_FILE_HEADER FileHeader;
-       IMAGE_OPTIONAL_HEADER64 OptionalHeader;
-} IMAGE_NT_HEADERS64,*PIMAGE_NT_HEADERS64;
-#pragma pack(pop)
 #ifdef _TARGET_PE64
-#error HERE
 typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER;
 typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER;
-typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS;
-typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS;
 #else
 typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER;
 typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER;
-typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS;
-typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS;
 #endif
-
-#define IMAGE_DIRECTORY_ENTRY_BASERELOC        5
-
-#define IMAGE_SCN_TYPE_NOLOAD     0x00000002
-#define IMAGE_SCN_LNK_REMOVE      0x00000800
-#define IMAGE_SCN_MEM_READ        0x40000000
-#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000
 typedef struct _IMAGE_SECTION_HEADER {
   BYTE Name[IMAGE_SIZEOF_SHORT_NAME];
@@ -201,6 +182,7 @@
 typedef struct _IMAGE_BASE_RELOCATION {
        DWORD VirtualAddress;
        DWORD SizeOfBlock;
+    WORD  TypeOffset[1];
 } IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION;
 #pragma pack(pop)