Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

1 files changed, 460 insertions, 105 deletions

diff --git a/src/VBox/Runtime/include/internal/ldrPE.h b/src/VBox/Runtime/include/internal/ldrPE.h
index 6b973a2c..dd2bc378 100644
--- a/src/VBox/Runtime/include/internal/ldrPE.h
+++ b/src/VBox/Runtime/include/internal/ldrPE.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -28,8 +28,9 @@
 #define ___internal_ldrPE_h
 
 #include <iprt/types.h>
+#include <iprt/assert.h>
 
-#pragma pack(4)
+#pragma pack(4) /** @todo Necessary? */
 
 
 /*******************************************************************************
@@ -144,7 +145,8 @@
 #define  IMAGE_SCN_ALIGN_2048BYTES  0x00C00000
 #define  IMAGE_SCN_ALIGN_4096BYTES  0x00D00000
 #define  IMAGE_SCN_ALIGN_8192BYTES  0x00E00000
-#define  IMAGE_SCN_ALIGN_MASK  0x00F00000
+#define  IMAGE_SCN_ALIGN_MASK   0x00F00000
+#define  IMAGE_SCN_ALIGN_SHIFT  20
 
 #define  IMAGE_SCN_LNK_NRELOC_OVFL  0x01000000
 #define  IMAGE_SCN_MEM_DISCARDABLE  0x02000000
@@ -180,28 +182,110 @@
 
 
 /* debug dir */
-#define  IMAGE_DEBUG_TYPE_UNKNOWN  0x0
-#define  IMAGE_DEBUG_TYPE_COFF  0x1
-#define  IMAGE_DEBUG_TYPE_CODEVIEW  0x2
-#define  IMAGE_DEBUG_TYPE_FPO  0x3
-#define  IMAGE_DEBUG_TYPE_MISC  0x4
-#define  IMAGE_DEBUG_TYPE_EXCEPTION  0x5
-#define  IMAGE_DEBUG_TYPE_FIXUP  0x6
-#define  IMAGE_DEBUG_TYPE_OMAP_TO_SRC  0x7
-#define  IMAGE_DEBUG_TYPE_OMAP_FROM_SRC  0x8
-#define  IMAGE_DEBUG_TYPE_BORLAND  0x9
-#define  IMAGE_DEBUG_TYPE_RESERVED10  0x10
+#define  IMAGE_DEBUG_TYPE_UNKNOWN           UINT32_C(0x0)
+#define  IMAGE_DEBUG_TYPE_COFF              UINT32_C(0x1)
+#define  IMAGE_DEBUG_TYPE_CODEVIEW          UINT32_C(0x2)
+#define  IMAGE_DEBUG_TYPE_FPO               UINT32_C(0x3)
+#define  IMAGE_DEBUG_TYPE_MISC              UINT32_C(0x4)
+#define  IMAGE_DEBUG_TYPE_EXCEPTION         UINT32_C(0x5)
+#define  IMAGE_DEBUG_TYPE_FIXUP             UINT32_C(0x6)
+#define  IMAGE_DEBUG_TYPE_OMAP_TO_SRC       UINT32_C(0x7)
+#define  IMAGE_DEBUG_TYPE_OMAP_FROM_SRC     UINT32_C(0x8)
+#define  IMAGE_DEBUG_TYPE_BORLAND           UINT32_C(0x9)
+#define  IMAGE_DEBUG_TYPE_RESERVED10        UINT32_C(0x10)
+
+#define  IMAGE_DEBUG_MISC_EXENAME           UINT32_C(1)
 
 /* security directory */
-#define  WIN_CERT_REVISION_1_0  UINT16_C(0x0100)
-#define  WIN_CERT_REVISION_2_0  UINT16_C(0x0200)
-
-#define  WIN_CERT_TYPE_X509  UINT16_C(1)
-#define  WIN_CERT_TYPE_PKCS_SIGNED_DATA  UINT16_C(2)
-#define  WIN_CERT_TYPE_RESERVED_1  UINT16_C(3)
-#define  WIN_CERT_TYPE_TS_STACK_SIGNED  UINT16_C(4)
-#define  WIN_CERT_TYPE_EFI_PKCS115 UINT16_C(0x0ef0)
-#define  WIN_CERT_TYPE_EFI_GUID UINT16_C(0x0ef1)
+#define  WIN_CERT_REVISION_1_0              UINT16_C(0x0100)
+#define  WIN_CERT_REVISION_2_0              UINT16_C(0x0200)
+
+#define  WIN_CERT_TYPE_X509                 UINT16_C(1)
+#define  WIN_CERT_TYPE_PKCS_SIGNED_DATA     UINT16_C(2)
+#define  WIN_CERT_TYPE_RESERVED_1           UINT16_C(3)
+#define  WIN_CERT_TYPE_TS_STACK_SIGNED      UINT16_C(4)
+#define  WIN_CERT_TYPE_EFI_PKCS115          UINT16_C(0x0ef0)
+#define  WIN_CERT_TYPE_EFI_GUID             UINT16_C(0x0ef1)
+
+
+/* For .DBG files. */
+#define  IMAGE_SEPARATE_DEBUG_SIGNATURE     UINT16_C(0x4944)
+
+#define  IMAGE_SIZE_OF_SYMBOL               18
+#define  IMAGE_SIZE_OF_SYMBOL_EX            20
+
+#define  IMAGE_SYM_UNDEFINED                INT16_C(0)
+#define  IMAGE_SYM_ABSOLUTE                 INT16_C(-1)
+#define  IMAGE_SYM_DEBUG                    INT16_C(-2)
+
+#define  IMAGE_SYM_CLASS_END_OF_FUNCTION    UINT8_C(0xff) /* -1 */
+#define  IMAGE_SYM_CLASS_NULL               UINT8_C(0)
+#define  IMAGE_SYM_CLASS_AUTOMATIC          UINT8_C(1)
+#define  IMAGE_SYM_CLASS_EXTERNAL           UINT8_C(2)
+#define  IMAGE_SYM_CLASS_STATIC             UINT8_C(3)
+#define  IMAGE_SYM_CLASS_REGISTER           UINT8_C(4)
+#define  IMAGE_SYM_CLASS_EXTERNAL_DEF       UINT8_C(5)
+#define  IMAGE_SYM_CLASS_LABEL              UINT8_C(6)
+#define  IMAGE_SYM_CLASS_UNDEFINED_LABEL    UINT8_C(7)
+#define  IMAGE_SYM_CLASS_MEMBER_OF_STRUCT   UINT8_C(8)
+#define  IMAGE_SYM_CLASS_ARGUMENT           UINT8_C(9)
+#define  IMAGE_SYM_CLASS_STRUCT_TAG         UINT8_C(10)
+#define  IMAGE_SYM_CLASS_MEMBER_OF_UNION    UINT8_C(11)
+#define  IMAGE_SYM_CLASS_UNION_TAG          UINT8_C(12)
+#define  IMAGE_SYM_CLASS_TYPE_DEFINITION    UINT8_C(13)
+#define  IMAGE_SYM_CLASS_UNDEFINED_STATIC   UINT8_C(14)
+#define  IMAGE_SYM_CLASS_ENUM_TAG           UINT8_C(15)
+#define  IMAGE_SYM_CLASS_MEMBER_OF_ENUM     UINT8_C(16)
+#define  IMAGE_SYM_CLASS_REGISTER_PARAM     UINT8_C(17)
+#define  IMAGE_SYM_CLASS_BIT_FIELD          UINT8_C(18)
+#define  IMAGE_SYM_CLASS_FAR_EXTERNAL       UINT8_C(68)
+#define  IMAGE_SYM_CLASS_BLOCK              UINT8_C(100)
+#define  IMAGE_SYM_CLASS_FUNCTION           UINT8_C(101)
+#define  IMAGE_SYM_CLASS_END_OF_STRUCT      UINT8_C(102)
+#define  IMAGE_SYM_CLASS_FILE               UINT8_C(103)
+#define  IMAGE_SYM_CLASS_SECTION            UINT8_C(104)
+#define  IMAGE_SYM_CLASS_WEAK_EXTERNAL      UINT8_C(105)
+#define  IMAGE_SYM_CLASS_CLR_TOKEN          UINT8_C(107)
+
+
+#define  IMAGE_SYM_TYPE_NULL                UINT16_C(0x0000)
+#define  IMAGE_SYM_TYPE_VOID                UINT16_C(0x0001)
+#define  IMAGE_SYM_TYPE_CHAR                UINT16_C(0x0002)
+#define  IMAGE_SYM_TYPE_SHORT               UINT16_C(0x0003)
+#define  IMAGE_SYM_TYPE_INT                 UINT16_C(0x0004)
+#define  IMAGE_SYM_TYPE_LONG                UINT16_C(0x0005)
+#define  IMAGE_SYM_TYPE_FLOAT               UINT16_C(0x0006)
+#define  IMAGE_SYM_TYPE_DOUBLE              UINT16_C(0x0007)
+#define  IMAGE_SYM_TYPE_STRUCT              UINT16_C(0x0008)
+#define  IMAGE_SYM_TYPE_UNION               UINT16_C(0x0009)
+#define  IMAGE_SYM_TYPE_ENUM                UINT16_C(0x000a)
+#define  IMAGE_SYM_TYPE_MOE                 UINT16_C(0x000b)
+#define  IMAGE_SYM_TYPE_BYTE                UINT16_C(0x000c)
+#define  IMAGE_SYM_TYPE_WORD                UINT16_C(0x000d)
+#define  IMAGE_SYM_TYPE_UINT                UINT16_C(0x000e)
+#define  IMAGE_SYM_TYPE_DWORD               UINT16_C(0x000f)
+#define  IMAGE_SYM_TYPE_PCODE               UINT16_C(0x8000)
+
+#define  IMAGE_SYM_DTYPE_NULL               UINT16_C(0x0)
+#define  IMAGE_SYM_DTYPE_POINTER            UINT16_C(0x1)
+#define  IMAGE_SYM_DTYPE_FUNCTION           UINT16_C(0x2)
+#define  IMAGE_SYM_DTYPE_ARRAY              UINT16_C(0x3)
+
+
+#define N_BTMASK                            UINT16_C(0x000f)
+#define N_TMASK                             UINT16_C(0x0030)
+#define N_TMASK1                            UINT16_C(0x00c0)
+#define N_TMASK2                            UINT16_C(0x00f0)
+#define N_BTSHFT                            4
+#define N_TSHIFT                            2
+
+#define BTYPE(a_Type)                       ( (a_Type) & N_BTMASK )
+#define ISPTR(a_Type)                       ( ((a_Type) & N_TMASK) == (IMAGE_SYM_DTYPE_POINTER  << N_BTSHFT) )
+#define ISFCN(a_Type)                       ( ((a_Type) & N_TMASK) == (IMAGE_SYM_DTYPE_FUNCTION << N_BTSHFT) )
+#define ISARY(a_Type)                       ( ((a_Type) & N_TMASK) == (IMAGE_SYM_DTYPE_ARRAY    << N_BTSHFT) )
+#define ISTAG(a_StorageClass)               (    (a_StorageClass) == IMAGE_SYM_CLASS_STRUCT_TAG \
+                                              || (a_StorageClass) == IMAGE_SYM_CLASS_UNION_TAG \
+                                              || (a_StorageClass) == IMAGE_SYM_CLASS_ENUM_TAG )
 
 
 /*******************************************************************************
@@ -209,15 +293,17 @@
 *******************************************************************************/
 typedef struct _IMAGE_FILE_HEADER
 {
-    uint16_t  Machine;
-    uint16_t  NumberOfSections;
-    uint32_t  TimeDateStamp;
-    uint32_t  PointerToSymbolTable;
-    uint32_t  NumberOfSymbols;
-    uint16_t  SizeOfOptionalHeader;
-    uint16_t  Characteristics;
-} IMAGE_FILE_HEADER;
+    uint16_t  Machine;                      /**< 0x00 */
+    uint16_t  NumberOfSections;             /**< 0x02 */
+    uint32_t  TimeDateStamp;                /**< 0x04  */
+    uint32_t  PointerToSymbolTable;         /**< 0x08  */
+    uint32_t  NumberOfSymbols;              /**< 0x0c  */
+    uint16_t  SizeOfOptionalHeader;         /**< 0x10  */
+    uint16_t  Characteristics;              /**< 0x12 */
+} IMAGE_FILE_HEADER;                        /* size: 0x14 */
+AssertCompileSize(IMAGE_FILE_HEADER, 0x14);
 typedef IMAGE_FILE_HEADER *PIMAGE_FILE_HEADER;
+typedef IMAGE_FILE_HEADER const *PCIMAGE_FILE_HEADER;
 
 
 typedef struct _IMAGE_DATA_DIRECTORY
@@ -226,95 +312,107 @@ typedef struct _IMAGE_DATA_DIRECTORY
     uint32_t  Size;
 } IMAGE_DATA_DIRECTORY;
 typedef IMAGE_DATA_DIRECTORY *PIMAGE_DATA_DIRECTORY;
+typedef IMAGE_DATA_DIRECTORY const *PCIMAGE_DATA_DIRECTORY;
 
 
 typedef struct _IMAGE_OPTIONAL_HEADER32
 {
-    uint16_t  Magic;
-    uint8_t  MajorLinkerVersion;
-    uint8_t  MinorLinkerVersion;
-    uint32_t  SizeOfCode;
-    uint32_t  SizeOfInitializedData;
-    uint32_t  SizeOfUninitializedData;
-    uint32_t  AddressOfEntryPoint;
-    uint32_t  BaseOfCode;
-    uint32_t  BaseOfData;
-    uint32_t  ImageBase;
-    uint32_t  SectionAlignment;
-    uint32_t  FileAlignment;
-    uint16_t  MajorOperatingSystemVersion;
-    uint16_t  MinorOperatingSystemVersion;
-    uint16_t  MajorImageVersion;
-    uint16_t  MinorImageVersion;
-    uint16_t  MajorSubsystemVersion;
-    uint16_t  MinorSubsystemVersion;
-    uint32_t  Win32VersionValue;
-    uint32_t  SizeOfImage;
-    uint32_t  SizeOfHeaders;
-    uint32_t  CheckSum;
-    uint16_t  Subsystem;
-    uint16_t  DllCharacteristics;
-    uint32_t  SizeOfStackReserve;
-    uint32_t  SizeOfStackCommit;
-    uint32_t  SizeOfHeapReserve;
-    uint32_t  SizeOfHeapCommit;
-    uint32_t  LoaderFlags;
-    uint32_t  NumberOfRvaAndSizes;
-    IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
-} IMAGE_OPTIONAL_HEADER32;
+    uint16_t  Magic;                        /**< 0x00 */
+    uint8_t   MajorLinkerVersion;           /**< 0x02 */
+    uint8_t   MinorLinkerVersion;           /**< 0x03 */
+    uint32_t  SizeOfCode;                   /**< 0x04 */
+    uint32_t  SizeOfInitializedData;        /**< 0x08 */
+    uint32_t  SizeOfUninitializedData;      /**< 0x0c */
+    uint32_t  AddressOfEntryPoint;          /**< 0x10 */
+    uint32_t  BaseOfCode;                   /**< 0x14 */
+    uint32_t  BaseOfData;                   /**< 0x18 */
+    uint32_t  ImageBase;                    /**< 0x1c */
+    uint32_t  SectionAlignment;             /**< 0x20 */
+    uint32_t  FileAlignment;                /**< 0x24 */
+    uint16_t  MajorOperatingSystemVersion;  /**< 0x28 */
+    uint16_t  MinorOperatingSystemVersion;  /**< 0x2a */
+    uint16_t  MajorImageVersion;            /**< 0x2c */
+    uint16_t  MinorImageVersion;            /**< 0x2e */
+    uint16_t  MajorSubsystemVersion;        /**< 0x30 */
+    uint16_t  MinorSubsystemVersion;        /**< 0x32 */
+    uint32_t  Win32VersionValue;            /**< 0x34 */
+    uint32_t  SizeOfImage;                  /**< 0x38 */
+    uint32_t  SizeOfHeaders;                /**< 0x3c */
+    uint32_t  CheckSum;                     /**< 0x40 */
+    uint16_t  Subsystem;                    /**< 0x44 */
+    uint16_t  DllCharacteristics;           /**< 0x46 */
+    uint32_t  SizeOfStackReserve;           /**< 0x48 */
+    uint32_t  SizeOfStackCommit;            /**< 0x4c */
+    uint32_t  SizeOfHeapReserve;            /**< 0x50 */
+    uint32_t  SizeOfHeapCommit;             /**< 0x54 */
+    uint32_t  LoaderFlags;                  /**< 0x58 */
+    uint32_t  NumberOfRvaAndSizes;          /**< 0x5c */
+    IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; /**< 0x60; 0x10*8 = 0x80 */
+} IMAGE_OPTIONAL_HEADER32;                  /* size: 0xe0 */
+AssertCompileSize(IMAGE_OPTIONAL_HEADER32, 0xe0);
 typedef IMAGE_OPTIONAL_HEADER32 *PIMAGE_OPTIONAL_HEADER32;
+typedef IMAGE_OPTIONAL_HEADER32 const *PCIMAGE_OPTIONAL_HEADER32;
 
 typedef struct _IMAGE_OPTIONAL_HEADER64
 {
-    uint16_t  Magic;
-    uint8_t  MajorLinkerVersion;
-    uint8_t  MinorLinkerVersion;
-    uint32_t  SizeOfCode;
-    uint32_t  SizeOfInitializedData;
-    uint32_t  SizeOfUninitializedData;
-    uint32_t  AddressOfEntryPoint;
-    uint32_t  BaseOfCode;
-    uint64_t  ImageBase;
-    uint32_t  SectionAlignment;
-    uint32_t  FileAlignment;
-    uint16_t  MajorOperatingSystemVersion;
-    uint16_t  MinorOperatingSystemVersion;
-    uint16_t  MajorImageVersion;
-    uint16_t  MinorImageVersion;
-    uint16_t  MajorSubsystemVersion;
-    uint16_t  MinorSubsystemVersion;
-    uint32_t  Win32VersionValue;
-    uint32_t  SizeOfImage;
-    uint32_t  SizeOfHeaders;
-    uint32_t  CheckSum;
-    uint16_t  Subsystem;
-    uint16_t  DllCharacteristics;
-    uint64_t  SizeOfStackReserve;
-    uint64_t  SizeOfStackCommit;
-    uint64_t  SizeOfHeapReserve;
-    uint64_t  SizeOfHeapCommit;
-    uint32_t  LoaderFlags;
-    uint32_t  NumberOfRvaAndSizes;
-    IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
-} IMAGE_OPTIONAL_HEADER64;
+    uint16_t  Magic;                        /**< 0x00 */
+    uint8_t   MajorLinkerVersion;           /**< 0x02 */
+    uint8_t   MinorLinkerVersion;           /**< 0x03 */
+    uint32_t  SizeOfCode;                   /**< 0x04 */
+    uint32_t  SizeOfInitializedData;        /**< 0x08 */
+    uint32_t  SizeOfUninitializedData;      /**< 0x0c */
+    uint32_t  AddressOfEntryPoint;          /**< 0x10 */
+    uint32_t  BaseOfCode;                   /**< 0x14 */
+    uint64_t  ImageBase;                    /**< 0x18 */
+    uint32_t  SectionAlignment;             /**< 0x20 */
+    uint32_t  FileAlignment;                /**< 0x24 */
+    uint16_t  MajorOperatingSystemVersion;  /**< 0x28 */
+    uint16_t  MinorOperatingSystemVersion;  /**< 0x2a */
+    uint16_t  MajorImageVersion;            /**< 0x2c */
+    uint16_t  MinorImageVersion;            /**< 0x2e */
+    uint16_t  MajorSubsystemVersion;        /**< 0x30 */
+    uint16_t  MinorSubsystemVersion;        /**< 0x32 */
+    uint32_t  Win32VersionValue;            /**< 0x34 */
+    uint32_t  SizeOfImage;                  /**< 0x38 */
+    uint32_t  SizeOfHeaders;                /**< 0x3c */
+    uint32_t  CheckSum;                     /**< 0x40 */
+    uint16_t  Subsystem;                    /**< 0x44 */
+    uint16_t  DllCharacteristics;           /**< 0x46 */
+    uint64_t  SizeOfStackReserve;           /**< 0x48 */
+    uint64_t  SizeOfStackCommit;            /**< 0x50 */
+    uint64_t  SizeOfHeapReserve;            /**< 0x58 */
+    uint64_t  SizeOfHeapCommit;             /**< 0x60 */
+    uint32_t  LoaderFlags;                  /**< 0x68 */
+    uint32_t  NumberOfRvaAndSizes;          /**< 0x6c */
+    IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; /**< 0x70; 0x10*8 = 0x80 */
+} IMAGE_OPTIONAL_HEADER64;                  /* size: 0xf0 */
 typedef IMAGE_OPTIONAL_HEADER64 *PIMAGE_OPTIONAL_HEADER64;
+typedef IMAGE_OPTIONAL_HEADER64 const *PCIMAGE_OPTIONAL_HEADER64;
 
 
 typedef struct _IMAGE_NT_HEADERS
 {
-    uint32_t  Signature;
-    IMAGE_FILE_HEADER FileHeader;
-    IMAGE_OPTIONAL_HEADER32 OptionalHeader;
-} IMAGE_NT_HEADERS32;
+    uint32_t  Signature;                    /**< 0x00 */
+    IMAGE_FILE_HEADER FileHeader;           /**< 0x04 */
+    IMAGE_OPTIONAL_HEADER32 OptionalHeader; /**< 0x18 */
+} IMAGE_NT_HEADERS32;                       /* size:  0xf8 */
+AssertCompileSize(IMAGE_NT_HEADERS32, 0xf8);
+AssertCompileMemberOffset(IMAGE_NT_HEADERS32, FileHeader, 4);
+AssertCompileMemberOffset(IMAGE_NT_HEADERS32, OptionalHeader, 24);
 typedef IMAGE_NT_HEADERS32 *PIMAGE_NT_HEADERS32;
+typedef IMAGE_NT_HEADERS32 const *PCIMAGE_NT_HEADERS32;
 
 typedef struct _IMAGE_NT_HEADERS64
 {
-    uint32_t  Signature;
-    IMAGE_FILE_HEADER FileHeader;
-    IMAGE_OPTIONAL_HEADER64 OptionalHeader;
-} IMAGE_NT_HEADERS64;
+    uint32_t  Signature;                    /**< 0x00 */
+    IMAGE_FILE_HEADER FileHeader;           /**< 0x04 */
+    IMAGE_OPTIONAL_HEADER64 OptionalHeader; /**< 0x18 */
+} IMAGE_NT_HEADERS64;                       /**< 0x108 */
+AssertCompileSize(IMAGE_NT_HEADERS64, 0x108);
+AssertCompileMemberOffset(IMAGE_NT_HEADERS64, FileHeader, 4);
+AssertCompileMemberOffset(IMAGE_NT_HEADERS64, OptionalHeader, 24);
 typedef IMAGE_NT_HEADERS64 *PIMAGE_NT_HEADERS64;
+typedef IMAGE_NT_HEADERS64 const *PCIMAGE_NT_HEADERS64;
 
 
 typedef struct _IMAGE_SECTION_HEADER
@@ -335,6 +433,7 @@ typedef struct _IMAGE_SECTION_HEADER
     uint32_t  Characteristics;
 } IMAGE_SECTION_HEADER;
 typedef IMAGE_SECTION_HEADER *PIMAGE_SECTION_HEADER;
+typedef IMAGE_SECTION_HEADER const *PCIMAGE_SECTION_HEADER;
 
 
 typedef struct _IMAGE_BASE_RELOCATION
@@ -343,6 +442,7 @@ typedef struct _IMAGE_BASE_RELOCATION
     uint32_t  SizeOfBlock;
 } IMAGE_BASE_RELOCATION;
 typedef IMAGE_BASE_RELOCATION *PIMAGE_BASE_RELOCATION;
+typedef IMAGE_BASE_RELOCATION const *PCIMAGE_BASE_RELOCATION;
 
 
 typedef struct _IMAGE_EXPORT_DIRECTORY
@@ -358,7 +458,9 @@ typedef struct _IMAGE_EXPORT_DIRECTORY
     uint32_t  AddressOfFunctions;
     uint32_t  AddressOfNames;
     uint32_t  AddressOfNameOrdinals;
-} IMAGE_EXPORT_DIRECTORY, *PIMAGE_EXPORT_DIRECTORY;
+} IMAGE_EXPORT_DIRECTORY;
+typedef IMAGE_EXPORT_DIRECTORY *PIMAGE_EXPORT_DIRECTORY;
+typedef IMAGE_EXPORT_DIRECTORY const *PCIMAGE_EXPORT_DIRECTORY;
 
 
 typedef struct _IMAGE_IMPORT_DESCRIPTOR
@@ -374,14 +476,16 @@ typedef struct _IMAGE_IMPORT_DESCRIPTOR
     uint32_t  FirstThunk;
 } IMAGE_IMPORT_DESCRIPTOR;
 typedef IMAGE_IMPORT_DESCRIPTOR *PIMAGE_IMPORT_DESCRIPTOR;
+typedef IMAGE_IMPORT_DESCRIPTOR const *PCIMAGE_IMPORT_DESCRIPTOR;
 
 
 typedef struct _IMAGE_IMPORT_BY_NAME
 {
     uint16_t  Hint;
-    uint8_t  Name[1];
+    uint8_t   Name[1];
 } IMAGE_IMPORT_BY_NAME;
 typedef IMAGE_IMPORT_BY_NAME *PIMAGE_IMPORT_BY_NAME;
+typedef IMAGE_IMPORT_BY_NAME const *PCIMAGE_IMPORT_BY_NAME;
 
 
 /* The image_thunk_data32/64 structures are not very helpful except for getting RSI. keep them around till all the code has been converted. */
@@ -396,6 +500,7 @@ typedef struct _IMAGE_THUNK_DATA64
     } u1;
 } IMAGE_THUNK_DATA64;
 typedef IMAGE_THUNK_DATA64 *PIMAGE_THUNK_DATA64;
+typedef IMAGE_THUNK_DATA64 const *PCIMAGE_THUNK_DATA64;
 
 typedef struct _IMAGE_THUNK_DATA32
 {
@@ -408,6 +513,7 @@ typedef struct _IMAGE_THUNK_DATA32
     } u1;
 } IMAGE_THUNK_DATA32;
 typedef IMAGE_THUNK_DATA32 *PIMAGE_THUNK_DATA32;
+typedef IMAGE_THUNK_DATA32 const *PCIMAGE_THUNK_DATA32;
 
 
 typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY32
@@ -433,7 +539,8 @@ typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY32
     uint32_t  SEHandlerTable;
     uint32_t  SEHandlerCount;
 } IMAGE_LOAD_CONFIG_DIRECTORY32;
-typedef IMAGE_LOAD_CONFIG_DIRECTORY32 PIMAGE_LOAD_CONFIG_DIRECTORY32;
+typedef IMAGE_LOAD_CONFIG_DIRECTORY32 *PIMAGE_LOAD_CONFIG_DIRECTORY32;
+typedef IMAGE_LOAD_CONFIG_DIRECTORY32 const *PCIMAGE_LOAD_CONFIG_DIRECTORY32;
 
 typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY64
 {
@@ -459,6 +566,7 @@ typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY64
     uint64_t  SEHandlerCount;
 } IMAGE_LOAD_CONFIG_DIRECTORY64;
 typedef IMAGE_LOAD_CONFIG_DIRECTORY64 *PIMAGE_LOAD_CONFIG_DIRECTORY64;
+typedef IMAGE_LOAD_CONFIG_DIRECTORY64 const *PCIMAGE_LOAD_CONFIG_DIRECTORY64;
 
 
 typedef struct _IMAGE_DEBUG_DIRECTORY
@@ -473,6 +581,18 @@ typedef struct _IMAGE_DEBUG_DIRECTORY
     uint32_t  PointerToRawData;
 } IMAGE_DEBUG_DIRECTORY;
 typedef IMAGE_DEBUG_DIRECTORY *PIMAGE_DEBUG_DIRECTORY;
+typedef IMAGE_DEBUG_DIRECTORY const *PCIMAGE_DEBUG_DIRECTORY;
+
+typedef struct _IMAGE_DEBUG_MISC
+{
+    uint32_t   DataType;
+    uint32_t   Length;
+    uint8_t    Unicode;
+    uint8_t    Reserved[3];
+    uint8_t    Data[1];
+} IMAGE_DEBUG_MISC;
+typedef IMAGE_DEBUG_MISC *PIMAGE_DEBUG_MISC;
+typedef IMAGE_DEBUG_MISC const *PCIMAGE_DEBUG_MISC;
 
 
 typedef struct WIN_CERTIFICATE
@@ -483,8 +603,243 @@ typedef struct WIN_CERTIFICATE
     uint8_t     bCertificate[8];
 } WIN_CERTIFICATE;
 typedef WIN_CERTIFICATE *PWIN_CERTIFICATE;
+typedef WIN_CERTIFICATE const *PCWIN_CERTIFICATE;
+
+
+
+
+/* WARNING! NO MORE PRAGMA PACK 4 from here on. Assert size of all new types. */
+/* WARNING! NO MORE PRAGMA PACK 4 from here on. Assert size of all new types. */
+/* WARNING! NO MORE PRAGMA PACK 4 from here on. Assert size of all new types. */
+/* WARNING! NO MORE PRAGMA PACK 4 from here on. Assert size of all new types. */
+/* WARNING! NO MORE PRAGMA PACK 4 from here on. Assert size of all new types. */
+/* WARNING! NO MORE PRAGMA PACK 4 from here on. Assert size of all new types. */
+/* WARNING! NO MORE PRAGMA PACK 4 from here on. Assert size of all new types. */
+/* WARNING! NO MORE PRAGMA PACK 4 from here on. Assert size of all new types. */
+/* WARNING! NO MORE PRAGMA PACK 4 from here on. Assert size of all new types. */
+#pragma pack()
+
+
+
+
 
+/** The header of a .DBG file (NT4). */
+typedef struct _IMAGE_SEPARATE_DEBUG_HEADER
+{
+    uint16_t    Signature;              /**< 0x00 */
+    uint16_t    Flags;                  /**< 0x02 */
+    uint16_t    Machine;                /**< 0x04 */
+    uint16_t    Characteristics;        /**< 0x06 */
+    uint32_t    TimeDateStamp;          /**< 0x08 */
+    uint32_t    CheckSum;               /**< 0x0c */
+    uint32_t    ImageBase;              /**< 0x10 */
+    uint32_t    SizeOfImage;            /**< 0x14 */
+    uint32_t    NumberOfSections;       /**< 0x18 */
+    uint32_t    ExportedNamesSize;      /**< 0x1c */
+    uint32_t    DebugDirectorySize;     /**< 0x20 */
+    uint32_t    SectionAlignment;       /**< 0x24 */
+    uint32_t    Reserved[2];            /**< 0x28 */
+} IMAGE_SEPARATE_DEBUG_HEADER;          /* size: 0x30 */
+AssertCompileSize(IMAGE_SEPARATE_DEBUG_HEADER, 0x30);
+typedef IMAGE_SEPARATE_DEBUG_HEADER *PIMAGE_SEPARATE_DEBUG_HEADER;
+typedef IMAGE_SEPARATE_DEBUG_HEADER const *PCIMAGE_SEPARATE_DEBUG_HEADER;
+
+
+typedef struct _IMAGE_COFF_SYMBOLS_HEADER
+{
+    uint32_t    NumberOfSymbols;
+    uint32_t    LvaToFirstSymbol;
+    uint32_t    NumberOfLinenumbers;
+    uint32_t    LvaToFirstLinenumber;
+    uint32_t    RvaToFirstByteOfCode;
+    uint32_t    RvaToLastByteOfCode;
+    uint32_t    RvaToFirstByteOfData;
+    uint32_t    RvaToLastByteOfData;
+} IMAGE_COFF_SYMBOLS_HEADER;
+AssertCompileSize(IMAGE_COFF_SYMBOLS_HEADER, 0x20);
+typedef IMAGE_COFF_SYMBOLS_HEADER *PIMAGE_COFF_SYMBOLS_HEADER;
+typedef IMAGE_COFF_SYMBOLS_HEADER const *PCIMAGE_COFF_SYMBOLS_HEADER;
+
+
+#pragma pack(2)
+typedef struct _IMAGE_LINENUMBER
+{
+    union
+    {
+        uint32_t    VirtualAddress;
+        uint32_t    SymbolTableIndex;
+    } Type;
+    uint16_t    Linenumber;
+} IMAGE_LINENUMBER;
 #pragma pack()
+AssertCompileSize(IMAGE_LINENUMBER, 6);
+typedef IMAGE_LINENUMBER *PIMAGE_LINENUMBER;
+typedef IMAGE_LINENUMBER const *PCIMAGE_LINENUMBER;
+
+
+#pragma pack(2)
+typedef struct _IMAGE_SYMBOL
+{
+    union
+    {
+        uint8_t         ShortName[8];
+        struct
+        {
+            uint32_t    Short;
+            uint32_t    Long;
+        } Name;
+        uint32_t        LongName[2];
+    } N;
+
+    uint32_t    Value;
+    int16_t     SectionNumber;
+    uint16_t    Type;
+    uint8_t     StorageClass;
+    uint8_t     NumberOfAuxSymbols;
+} IMAGE_SYMBOL;
+#pragma pack()
+AssertCompileSize(IMAGE_SYMBOL, IMAGE_SIZE_OF_SYMBOL);
+typedef IMAGE_SYMBOL *PIMAGE_SYMBOL;
+typedef IMAGE_SYMBOL const *PCIMAGE_SYMBOL;
+
+
+#pragma pack(2)
+typedef struct IMAGE_AUX_SYMBOL_TOKEN_DEF
+{
+    uint8_t     bAuxType;
+    uint8_t     bReserved;
+    uint32_t    SymbolTableIndex;
+    uint8_t     rgbReserved[12];
+} IMAGE_AUX_SYMBOL_TOKEN_DEF;
+#pragma pack()
+AssertCompileSize(IMAGE_AUX_SYMBOL_TOKEN_DEF, IMAGE_SIZE_OF_SYMBOL);
+typedef IMAGE_AUX_SYMBOL_TOKEN_DEF *PIMAGE_AUX_SYMBOL_TOKEN_DEF;
+typedef IMAGE_AUX_SYMBOL_TOKEN_DEF const *PCIMAGE_AUX_SYMBOL_TOKEN_DEF;
+
+
+#pragma pack(1)
+typedef union _IMAGE_AUX_SYMBOL
+{
+    struct
+    {
+        uint32_t    TagIndex;
+        union
+        {
+            struct
+            {
+                uint16_t    Linenumber;
+                uint16_t    Size;
+            } LnSz;
+        } Misc;
+        union
+        {
+            struct
+            {
+                uint32_t    PointerToLinenumber;
+                uint32_t    PointerToNextFunction;
+            } Function;
+            struct
+            {
+                uint16_t    Dimension[4];
+            } Array;
+        } FcnAry;
+        uint16_t    TvIndex;
+    } Sym;
+
+    struct
+    {
+        uint8_t     Name[IMAGE_SIZE_OF_SYMBOL];
+    } File;
+
+    struct
+    {
+        uint32_t    Length;
+        uint16_t    NumberOfRelocations;
+        uint16_t    NumberOfLinenumbers;
+        uint32_t    CheckSum;
+        uint16_t    Number;
+        uint8_t     Selection;
+        uint8_t     bReserved;
+        uint16_t    HighNumber;
+    } Section;
+
+    IMAGE_AUX_SYMBOL_TOKEN_DEF TokenDef;
+    struct
+    {
+        uint32_t    crc;
+        uint8_t     rgbReserved[14];
+    } CRC;
+} IMAGE_AUX_SYMBOL;
+#pragma pack()
+AssertCompileSize(IMAGE_AUX_SYMBOL, IMAGE_SIZE_OF_SYMBOL);
+typedef IMAGE_AUX_SYMBOL *PIMAGE_AUX_SYMBOL;
+typedef IMAGE_AUX_SYMBOL const *PCIMAGE_AUX_SYMBOL;
+
+
+
+typedef struct _IMAGE_SYMBOL_EX
+{
+    union
+    {
+        uint8_t         ShortName[8];
+        struct
+        {
+            uint32_t    Short;
+            uint32_t    Long;
+        } Name;
+        uint32_t        LongName[2];
+    } N;
+
+    uint32_t    Value;
+    int32_t     SectionNumber;          /* The difference from IMAGE_SYMBOL */
+    uint16_t    Type;
+    uint8_t     StorageClass;
+    uint8_t     NumberOfAuxSymbols;
+} IMAGE_SYMBOL_EX;
+AssertCompileSize(IMAGE_SYMBOL_EX, IMAGE_SIZE_OF_SYMBOL_EX);
+typedef IMAGE_SYMBOL_EX *PIMAGE_SYMBOL_EX;
+typedef IMAGE_SYMBOL_EX const *PCIMAGE_SYMBOL_EX;
+
+
+typedef union _IMAGE_AUX_SYMBOL_EX
+{
+    struct
+    {
+        uint32_t    WeakDefaultSymIndex;
+        uint32_t    WeakSearchType;
+        uint8_t     rgbReserved[12];
+    } Sym;
+
+    struct
+    {
+        uint8_t     Name[IMAGE_SIZE_OF_SYMBOL_EX];
+    } File;
+
+    struct
+    {
+        uint32_t    Length;
+        uint16_t    NumberOfRelocations;
+        uint16_t    NumberOfLinenumbers;
+        uint32_t    CheckSum;
+        uint16_t    Number;
+        uint8_t     Selection;
+        uint8_t     bReserved;
+        uint16_t    HighNumber;
+        uint8_t     rgbReserved[2];
+    } Section;
+
+    IMAGE_AUX_SYMBOL_TOKEN_DEF TokenDef;
+
+    struct
+    {
+        uint32_t    crc;
+        uint8_t     rgbReserved[16];
+    } CRC;
+} IMAGE_AUX_SYMBOL_EX;
+AssertCompileSize(IMAGE_AUX_SYMBOL_EX, IMAGE_SIZE_OF_SYMBOL_EX);
+typedef IMAGE_AUX_SYMBOL_EX *PIMAGE_AUX_SYMBOL_EX;
+typedef IMAGE_AUX_SYMBOL_EX const *PCIMAGE_AUX_SYMBOL_EX;
+
 
 #endif