Changeset 46273 in vbox

Timestamp:

May 26, 2013 10:38:33 PM (12 years ago)

Author:

vboxsync

Message:

ldr.h,ldrPE.cpp: Report COFF debug type. Correctly report cbImage for CodeView.

Location:

trunk

Files:

• include/iprt/ldr.h (modified) (3 diffs)
• src/VBox/Runtime/common/ldr/ldrPE.cpp (modified) (2 diffs)

trunk/include/iprt/ldr.h

@@ -481 +481 @@
     /** Microsoft Codeview debug info, in external file (DBG). */
     RTLDRDBGINFOTYPE_CODEVIEW_DBG,
+    /** Microsoft COFF debug info. */
+    RTLDRDBGINFOTYPE_COFF,
     /** Watcom debug info. */
     RTLDRDBGINFOTYPE_WATCOM,
@@ -530 +532 @@
         } Dwo;
 
-        /** RTLDRDBGINFOTYPE_CODEVIEW_PDB20, RTLDRDBGINFOTYPE_CODEVIEW_DBG */
+        /** RTLDRDBGINFOTYPE_CODEVIEW, RTLDRDBGINFOTYPE_COFF  */
         struct
         {
@@ -541 +543 @@
             /** The minor version from the entry. */
             uint32_t    uMinorVer;
-        } Cv;
+        } Cv, Coff;
 
         /** RTLDRDBGINFOTYPE_CODEVIEW_DBG */

trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

@@ -1186 +1186 @@
             case IMAGE_DEBUG_TYPE_CODEVIEW:
                 DbgInfo.enmType = RTLDRDBGINFOTYPE_CODEVIEW;
+                DbgInfo.u.Cv.cbImage    = pModPe->cbImage;
                 DbgInfo.u.Cv.uMajorVer  = paDbgDir[i].MajorVersion;
                 DbgInfo.u.Cv.uMinorVer  = paDbgDir[i].MinorVersion;
@@ -1264 +1265 @@
                 break;
 
+            case IMAGE_DEBUG_TYPE_COFF:
+                DbgInfo.enmType = RTLDRDBGINFOTYPE_COFF;
+                DbgInfo.u.Coff.cbImage    = pModPe->cbImage;
+                DbgInfo.u.Coff.uMajorVer  = paDbgDir[i].MajorVersion;
+                DbgInfo.u.Coff.uMinorVer  = paDbgDir[i].MinorVersion;
+                DbgInfo.u.Coff.uTimestamp = paDbgDir[i].TimeDateStamp;
+                break;
+
             default:
                 DbgInfo.enmType = RTLDRDBGINFOTYPE_UNKNOWN;