Changeset 46101 in vbox for trunk/src/VBox/Runtime/include

Timestamp:

May 15, 2013 3:36:43 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

85787

Message:

More NT4 debugging. Getting closer to working state...

Location:

trunk/src/VBox/Runtime/include/internal

Files:

• dbgmod.h (modified) (1 diff)
• ldrPE.h (modified) (5 diffs)

trunk/src/VBox/Runtime/include/internal/dbgmod.h

@@ -529 +529 @@
     /** The module name (short). */
     char const         *pszName;
+    /** The image file specified by the user.  Can be NULL. */
+    char const         *pszImgFileSpecified;
     /** The module filename. Can be NULL. */
     char const         *pszImgFile;

trunk/src/VBox/Runtime/include/internal/ldrPE.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -29 +29 @@
 
 #include <iprt/types.h>
-
-#pragma pack(4)
+#include <iprt/assert.h>
+
+#pragma pack(4) /** @todo Necessary? */
 
 
@@ -222 +223 @@
     uint16_t  Characteristics;
 } IMAGE_FILE_HEADER;
+AssertCompileSize(IMAGE_FILE_HEADER, 2+2+4+4+4+2+2);
 typedef IMAGE_FILE_HEADER *PIMAGE_FILE_HEADER;
 typedef IMAGE_FILE_HEADER const *PCIMAGE_FILE_HEADER;
@@ -315 +317 @@
     IMAGE_OPTIONAL_HEADER32 OptionalHeader;
 } IMAGE_NT_HEADERS32;
+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;
@@ -324 +328 @@
     IMAGE_OPTIONAL_HEADER64 OptionalHeader;
 } IMAGE_NT_HEADERS64;
+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;