Changeset 46101 in vbox

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

Files:

• include/iprt/dbg.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/strcache.h (modified) (1 diff)
• src/VBox/Debugger/DBGCEmulateCodeView.cpp (modified) (4 diffs)
• src/VBox/Debugger/DBGPlugInWinNt.cpp (modified) (10 diffs)
• src/VBox/Runtime/common/dbg/dbgmod.cpp (modified) (46 diffs)
• src/VBox/Runtime/common/ldr/ldrPE.cpp (modified) (12 diffs)
• src/VBox/Runtime/common/string/strcache.cpp (modified) (1 diff)
• src/VBox/Runtime/generic/strcache-stubs-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/include/internal/dbgmod.h (modified) (1 diff)
• src/VBox/Runtime/include/internal/ldrPE.h (modified) (5 diffs)

trunk/include/iprt/dbg.h

@@ -972 +972 @@
 
 /**
+ * Gets the name of the debug info file we're using.
+ *
+ * @returns Pointer to a read only string containing the filename, NULL if we
+ *          don't use one.
+ *
+ * @param   hDbgMod         The module handle.
+ */
+RTDECL(const char *) RTDbgModDebugFile(RTDBGMOD hDbgMod);
+
+/**
+ * Gets the image filename (as specified by the user).
+ *
+ * @returns Pointer to a read only string containing the filename.
+ *
+ * @param   hDbgMod         The module handle.
+ */
+RTDECL(const char *) RTDbgModImageFile(RTDBGMOD hDbgMod);
+
+/**
+ * Gets the image filename actually used if it differs from RTDbgModImageFile.
+ *
+ * @returns Pointer to a read only string containing the filename, NULL if same
+ *          as RTDBgModImageFile.
+ *
+ * @param   hDbgMod         The module handle.
+ */
+RTDECL(const char *) RTDbgModImageFileUsed(RTDBGMOD hDbgMod);
+
+/**
  * Converts an image relative address to a segment:offset address.
  *

trunk/include/iprt/mangling.h

@@ -401 +401 @@
 # define RTDbgModLineCount                              RT_MANGLER(RTDbgModLineCount)
 # define RTDbgModName                                   RT_MANGLER(RTDbgModName)
+# define RTDbgModDebugFile                              RT_MANGLER(RTDbgModDebugFile)
+# define RTDbgModImageFile                              RT_MANGLER(RTDbgModImageFile)
+# define RTDbgModImageFileUsed                          RT_MANGLER(RTDbgModImageFileUsed)
 # define RTDbgModRelease                                RT_MANGLER(RTDbgModRelease)
 # define RTDbgModRetain                                 RT_MANGLER(RTDbgModRetain)

trunk/include/iprt/strcache.h

@@ -88 +88 @@
 
 /**
+ * Enters a string into the cache in lower cased form.
+ *
+ * @returns Pointer to a read-only lower cased copy of the string.
+ *
+ * @param   hStrCache           Handle to the string cache.
+ * @param   pchString           Pointer to a string. This does not need to be
+ *                              zero terminated, but must not contain any zero
+ *                              characters.
+ * @param   cchString           The number of characters (bytes) to enter.
+ *
+ * @remarks It is implementation dependent whether the returned string pointer
+ *          differs when entering the same string twice.
+ */
+RTDECL(const char *) RTStrCacheEnterLowerN(RTSTRCACHE hStrCache, const char *pchString, size_t cchString);
+
+/**
+ * Enters a string into the cache in lower cased form.
+ *
+ * @returns Pointer to a read-only lower cased copy of the string.
+ *
+ * @param   hStrCache           Handle to the string cache.
+ * @param   psz                 Pointer to a zero terminated string.
+ *
+ * @remarks See RTStrCacheEnterN.
+ */
+RTDECL(const char *) RTStrCacheEnterLower(RTSTRCACHE hStrCache, const char *psz);
+
+
+/**
  * Retains a reference to a string.
  *

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -342 +342 @@
     { "kh",         0,        0,        NULL,               0,                              0,       dbgcCmdStack,       "",                     "Callstack - hypervisor." },
     { "lm",         0,        ~0U,      &g_aArgListMods[0], RT_ELEMENTS(g_aArgListMods),    0,       dbgcCmdListModules, "[module [..]]",        "List modules." },
+    { "lmv",        0,        ~0U,      &g_aArgListMods[0], RT_ELEMENTS(g_aArgListMods),    0,       dbgcCmdListModules, "[module [..]]",        "List modules, verbose." },
     { "lmo",        0,        ~0U,      &g_aArgListMods[0], RT_ELEMENTS(g_aArgListMods),    0,       dbgcCmdListModules, "[module [..]]",        "List modules and their segments." },
+    { "lmov",       0,        ~0U,      &g_aArgListMods[0], RT_ELEMENTS(g_aArgListMods),    0,       dbgcCmdListModules, "[module [..]]",        "List modules and their segments, verbose." },
     { "ln",         0,        ~0U,      &g_aArgListNear[0], RT_ELEMENTS(g_aArgListNear),    0,       dbgcCmdListNear,    "[addr/sym [..]]",      "List symbols near to the address. Default address is CS:EIP." },
     { "ls",         0,        1,        &g_aArgListSource[0],RT_ELEMENTS(g_aArgListSource), 0,       dbgcCmdListSource,  "[addr]",               "Source." },
@@ -3892 +3894 @@
 {
     bool const  fMappings   = pCmd->pszCmd[2] == 'o';
+    bool const  fVerbose    = pCmd->pszCmd[strlen(pCmd->pszCmd) - 1] == 'v';
     PDBGC       pDbgc       = DBGC_CMDHLP2DBGC(pCmdHlp);
 
@@ -3905 +3908 @@
         if (hMod != NIL_RTDBGMOD)
         {
-            uint32_t const      cSegs   = RTDbgModSegmentCount(hMod);
-            const char * const  pszName = RTDbgModName(hMod);
+            uint32_t const      cSegs            = RTDbgModSegmentCount(hMod);
+            const char * const  pszName          = RTDbgModName(hMod);
+            const char * const  pszImgFile       = RTDbgModImageFile(hMod);
+            const char * const  pszImgFileUsed   = RTDbgModImageFileUsed(hMod);
+            const char * const  pszDbgFile       = RTDbgModDebugFile(hMod);
             if (    cArgs == 0
                 ||  dbgcCmdListModuleMatch(pszName, paArgs, cArgs))
@@ -3926 +3932 @@
                                  ||  aMappings[iMap].iSeg == NIL_RTDBGSEGIDX))
                             uMin = aMappings[iMap].Address;
-                    DBGCCmdHlpPrintf(pCmdHlp, "%RGv %04x %s\n", (RTGCUINTPTR)uMin, cSegs, pszName);
+                    if (!fVerbose || !pszImgFile)
+                        DBGCCmdHlpPrintf(pCmdHlp, "%RGv %04x %s\n", (RTGCUINTPTR)uMin, cSegs, pszName);
+                    else
+                        DBGCCmdHlpPrintf(pCmdHlp, "%RGv %04x %-12s  %s\n", (RTGCUINTPTR)uMin, cSegs, pszName, pszImgFile);
+                    if (fVerbose && pszImgFileUsed)
+                        DBGCCmdHlpPrintf(pCmdHlp, "    Local image: %s\n", pszImgFileUsed);
+                    if (fVerbose && pszDbgFile)
+                        DBGCCmdHlpPrintf(pCmdHlp, "    Debug file:  %s\n", pszDbgFile);
 
                     if (fMappings)

trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp

@@ -162 +162 @@
 } NTPRODUCTTYPE;
 
-/**
- * PDB v2.0 in image debug info.
- * The URL is constructed from the timestamp and the %02x age?
- */
-typedef struct CV_INFO_PDB20
-{
-    uint32_t    Signature;              /**< CV_SIGNATURE_PDB70. */
-    int32_t     Offset;                 /**< Always 0. Used to be the offset to the real debug info. */
-    uint32_t    TimeDateStamp;
-    uint32_t    Age;
-    uint8_t     PdbFilename[4];
-} CV_INFO_PDB20;
-/** The CV_INFO_PDB20 signature. */
-#define CV_SIGNATURE_PDB20  RT_MAKE_U32_FROM_U8('N','B','1','0')
-
-/**
- * PDB v7.0 in image debug info.
- * The URL is constructed from the signature and the %02x age.
- */
-#pragma pack(4)
-typedef struct CV_INFO_PDB70
-{
-    uint32_t    CvSignature;            /**< CV_SIGNATURE_PDB70. */
-    RTUUID      Signature;
-    uint32_t    Age;
-    uint8_t     PdbFilename[4];
-} CV_INFO_PDB70;
-#pragma pack()
-AssertCompileMemberOffset(CV_INFO_PDB70, Signature, 4);
-AssertCompileMemberOffset(CV_INFO_PDB70, Age, 4 + 16);
-/** The CV_INFO_PDB70 signature. */
-#define CV_SIGNATURE_PDB70  RT_MAKE_U32_FROM_U8('R','S','D','S')
+
+/** NT image header union. */
+typedef union NTHDRSU
+{
+    IMAGE_NT_HEADERS32  vX_32;
+    IMAGE_NT_HEADERS64  vX_64;
+} NTHDRS;
+/** Pointer to NT image header union. */
+typedef NTHDRS *PNTHDRS;
+/** Pointer to const NT image header union. */
+typedef NTHDRS const *PCNTHDRS;
 
 /** @} */
+
 
 
@@ -251 +231 @@
     /** The image size. */
     uint32_t            cbImage;
+    /** The file offset of the SizeOfImage field in the optional header if it
+     *  needs patching, otherwise set to UINT32_MAX. */
+    uint32_t            offSizeOfImage;
+    /** The correct image size. */
+    uint32_t            cbCorrectImageSize;
     /** Number of entries in the aMappings table. */
     uint32_t            cMappings;
@@ -310 +295 @@
 {
     PDBGDIGGERWINNTRDR pThis = (PDBGDIGGERWINNTRDR)pvUser;
+    uint32_t           offFile = (uint32_t)off;
+    AssertReturn(offFile == off, VERR_INVALID_PARAMETER);
 
     uint32_t i = pThis->iHint;
-    if (pThis->aMappings[i].offFile > off)
+    if (pThis->aMappings[i].offFile > offFile)
     {
         i = pThis->cMappings;
         while (i-- > 0)
-            if (off >= pThis->aMappings[i].offFile)
+            if (offFile >= pThis->aMappings[i].offFile)
                 break;
         pThis->iHint = i;
@@ -324 +311 @@
     {
         uint32_t offNextMap =  i + 1 < pThis->cMappings ? pThis->aMappings[i + 1].offFile : pThis->cbImage;
-        uint32_t offMap     = (uint32_t)off - pThis->aMappings[i].offFile;
+        uint32_t offMap     = offFile - pThis->aMappings[i].offFile;
 
         /* Read file bits backed by memory. */
-        if (off < pThis->aMappings[i].cbMem)
+        if (offMap < pThis->aMappings[i].cbMem)
         {
             uint32_t cbToRead = pThis->aMappings[i].cbMem - offMap;
@@ -339 +326 @@
             if (RT_FAILURE(rc))
                 return rc;
+
+            /* Patch it? */
+            if (   pThis->offSizeOfImage != UINT32_MAX
+                && offFile            < pThis->offSizeOfImage + 4
+                && offFile + cbToRead > pThis->offSizeOfImage)
+            {
+                uint32_t SizeOfImage = pThis->cbCorrectImageSize;
+                int32_t  offPatch    = pThis->offSizeOfImage - offFile;
+                uint8_t *pbPatch     = (uint8_t *)pvBuf + offPatch;
+                uint32_t cbPatch     = sizeof(uint32_t);
+                if (offFile + cbToRead < pThis->offSizeOfImage + cbPatch)
+                    cbPatch = offFile + cbToRead - pThis->offSizeOfImage;
+                while (cbPatch-- > 0)
+                {
+                    if (offPatch >= 0)
+                        *pbPatch = (uint8_t)SizeOfImage;
+                    offPatch++;
+                    pbPatch++;
+                    SizeOfImage >>= 8;
+                }
+            }
+
+            /* Done? */
             if (cbToRead == cb)
                 break;
 
-            off  += cbToRead;
-            cb   -= cbToRead;
-            pvBuf = (char *)pvBuf + cbToRead;
+            offFile += cbToRead;
+            cb      -= cbToRead;
+            pvBuf    = (char *)pvBuf + cbToRead;
         }
 
         /* Mind the gap. */
-        if (offNextMap > off)
-        {
-            uint32_t cbZero = offNextMap - (uint32_t)off;
+        if (offNextMap > offFile)
+        {
+            uint32_t cbZero = offNextMap - offFile;
             if (cbZero > cb)
             {
@@ -358 +368 @@
 
             RT_BZERO(pvBuf, cbZero);
-            off  += cbZero;
-            cb   -= cbZero;
-            pvBuf = (char *)pvBuf + cbZero;
+            offFile += cbZero;
+            cb      -= cbZero;
+            pvBuf   = (char *)pvBuf + cbZero;
         }
 
@@ -378 +388 @@
     pThis->pUVM = NULL;
     RTMemFree(pvUser);
+}
+
+
+/**
+ * Checks if the section headers look okay.
+ *
+ * @returns true / false.
+ * @param   paShs               Pointer to the section headers.
+ * @param   cShs                Number of headers.
+ * @param   cbImage             The image size.
+ */
+static bool dbgDiggerWinNtIsSectionHeaderOk(PCIMAGE_SECTION_HEADER paShs, uint32_t cShs, uint32_t cbImage)
+{
+    for (uint32_t i = 0; i < cShs; i++)
+    {
+        if (!paShs[i].Name[0])
+        {
+            Log(("DigWinNt: Section header #%u has no name\n", i));
+            return false;
+        }
+
+        if (paShs[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)
+            continue;
+        if (paShs[i].VirtualAddress >= cbImage)
+        {
+            Log(("DigWinNt: Section header #%u has a virtual address beyond the image: %#x cbImage=%#x\n",
+                 i, paShs[i].VirtualAddress, cbImage));
+            return false;
+        }
+        if (paShs[i].Misc.VirtualSize >= cbImage) /* we don't check too strictly here becuase NT4 SP1 ntfs.sys. */
+        {
+            Log(("DigWinNt: Section header #%u has a end beyond the image: VirtualAddress=%#x VirtualSize=%#x cbImage=%#x\n",
+                 i, paShs[i].VirtualAddress, paShs[i].Misc.VirtualSize, cbImage));
+            return false;
+        }
+    }
+    return true;
+}
+
+
+/**
+ * Create a loader module for the in-guest-memory PE module.
+ */
+static int dbgDiggerWinNtCreateLdrMod(PDBGDIGGERWINNT pThis, PUVM pUVM, const char *pszName, PCDBGFADDRESS pImageAddr,
+                                      uint32_t cbImage, uint8_t *pbBuf, size_t cbBuf,
+                                      uint32_t offHdrs, PCNTHDRS pHdrs, PRTLDRMOD phLdrMod)
+{
+    /*
+     * Allocate and create a reader instance.
+     */
+    uint32_t const      cShs = WINNT_UNION(pThis, pHdrs, FileHeader.NumberOfSections);
+    PDBGDIGGERWINNTRDR  pRdr = (PDBGDIGGERWINNTRDR)RTMemAlloc(RT_OFFSETOF(DBGDIGGERWINNTRDR, aMappings[cShs + 2]));
+    if (!pRdr)
+        return VERR_NO_MEMORY;
+
+    VMR3RetainUVM(pUVM);
+    pRdr->pUVM               = pUVM;
+    pRdr->ImageAddr          = *pImageAddr;
+    pRdr->cbImage            = cbImage;
+    pRdr->cbCorrectImageSize = cbImage;
+    pRdr->offSizeOfImage     = UINT32_MAX;
+    pRdr->iHint              = 0;
+
+    /*
+     * Use the section table to construct a more accurate view of the file/
+     * image if it's in the buffer (it should be).
+     */
+    uint32_t offShs = offHdrs
+                    + (  pThis->f32Bit
+                       ? pHdrs->vX_32.FileHeader.SizeOfOptionalHeader + RT_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader)
+                       : pHdrs->vX_64.FileHeader.SizeOfOptionalHeader + RT_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader));
+    uint32_t cbShs  = cShs * sizeof(IMAGE_SECTION_HEADER);
+    PCIMAGE_SECTION_HEADER paShs = (PCIMAGE_SECTION_HEADER)(pbBuf + offShs);
+    if (   offShs + cbShs <= RT_MIN(cbImage, cbBuf)
+        && dbgDiggerWinNtIsSectionHeaderOk(paShs, cShs, cbImage))
+    {
+        pRdr->cMappings = 0;
+
+        for (uint32_t i = 0; i < cShs; i++)
+            if (   paShs[i].SizeOfRawData    > 0
+                && paShs[i].PointerToRawData > 0)
+            {
+                uint32_t j = 1;
+                if (!pRdr->cMappings)
+                    pRdr->cMappings++;
+                else
+                {
+                    while (j < pRdr->cMappings && pRdr->aMappings[j].offFile < paShs[i].PointerToRawData)
+                        j++;
+                    if (j < pRdr->cMappings)
+                        memmove(&pRdr->aMappings[j + 1], &pRdr->aMappings[j], (pRdr->cMappings - j) * sizeof(pRdr->aMappings));
+                }
+                pRdr->aMappings[j].offFile = paShs[i].PointerToRawData;
+                pRdr->aMappings[j].offMem  = paShs[i].VirtualAddress;
+                pRdr->aMappings[j].cbMem   = i + 1 < cShs
+                                           ? paShs[i + 1].VirtualAddress - paShs[i].VirtualAddress
+                                           : paShs[i].Misc.VirtualSize;
+                if (j == pRdr->cMappings)
+                    pRdr->cbImage = paShs[i].PointerToRawData + paShs[i].SizeOfRawData;
+                pRdr->cMappings++;
+            }
+
+        /* Insert the mapping of the headers that isn't covered by the section table. */
+        pRdr->aMappings[0].offFile = 0;
+        pRdr->aMappings[0].offMem  = 0;
+        pRdr->aMappings[0].cbMem   = pRdr->cMappings ? pRdr->aMappings[1].offFile : pRdr->cbImage;
+
+        int j = pRdr->cMappings - 1;
+        while (j-- > 0)
+        {
+            uint32_t cbFile = pRdr->aMappings[j + 1].offFile - pRdr->aMappings[j].offFile;
+            if (pRdr->aMappings[j].cbMem > cbFile)
+                pRdr->aMappings[j].cbMem = cbFile;
+        }
+    }
+    else
+    {
+        /*
+         * Fallback, fake identity mapped file data.
+         */
+        pRdr->cMappings = 1;
+        pRdr->aMappings[0].offFile = 0;
+        pRdr->aMappings[0].offMem  = 0;
+        pRdr->aMappings[0].cbMem   = pRdr->cbImage;
+    }
+
+    /*
+     * Call the loader to open the PE image for debugging.
+     * Note! It always calls pfnDtor.
+     */
+    RTLDRMOD hLdrMod;
+    int rc = RTLdrOpenInMemory(pszName, RTLDR_O_FOR_DEBUG, RTLDRARCH_WHATEVER, pRdr->cbImage,
+                               dbgDiggerWinNtRdr_Read, dbgDiggerWinNtRdr_Dtor, pRdr,
+                               &hLdrMod);
+    if (RT_SUCCESS(rc))
+        *phLdrMod = hLdrMod;
+    else
+        *phLdrMod = NIL_RTLDRMOD;
+    return rc;
 }
 
@@ -413 +562 @@
     /* Dig out the NT/PE headers. */
     IMAGE_DOS_HEADER const *pMzHdr = (IMAGE_DOS_HEADER const *)pbBuf;
-    typedef union NTHDRSU
-    {
-        IMAGE_NT_HEADERS32  vX_32;
-        IMAGE_NT_HEADERS64  vX_64;
-    } NTHDRS;
-    NTHDRS const   *pHdrs;
+    PCNTHDRS        pHdrs;
     uint32_t        offHdrs;
     if (pMzHdr->e_magic != IMAGE_DOS_SIGNATURE)
     {
         offHdrs = 0;
-        pHdrs   = (NTHDRS const *)pbBuf;
+        pHdrs   = (PCNTHDRS)pbBuf;
     }
     else if (   pMzHdr->e_lfanew >= cbImage
@@ -460 +604 @@
         return;
     }
+    if (WINNT_UNION(pThis, pHdrs, FileHeader.NumberOfSections) > 64)
+    {
+        Log(("DigWinNt: %s: Too many sections: %#x\n", pszName, WINNT_UNION(pThis, pHdrs, FileHeader.NumberOfSections)));
+        return;
+    }
+
     const uint32_t TimeDateStamp = pHdrs->vX_32.FileHeader.TimeDateStamp;
 
@@ -480 +630 @@
     }
 
-    uint32_t uRvaDebugDir = 0;
-    uint32_t cbDebugDir   = 0;
-    IMAGE_DATA_DIRECTORY const *pDir = &WINNT_UNION(pThis, pHdrs, OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG]);
-    if (    pDir->VirtualAddress > offHdrs
-        &&  pDir->VirtualAddress < cbImage
-        &&  pDir->Size           >= sizeof(IMAGE_DEBUG_DIRECTORY)
-        &&  pDir->Size           < cbImage
-        &&  pDir->VirtualAddress + pDir->Size <= cbImage
-       )
-    {
-        uRvaDebugDir = pDir->VirtualAddress;
-        cbDebugDir   = pDir->Size;
-    }
 
     /*
-     * Create the module.
+     * Create the module using the in memory image first, falling back
+     * on cached image.
      */
+    RTLDRMOD hLdrMod;
+    int rc = dbgDiggerWinNtCreateLdrMod(pThis, pUVM, pszName, pImageAddr, cbImage, pbBuf, cbBuf, offHdrs, pHdrs,
+                                        &hLdrMod);
+    if (RT_FAILURE(rc))
+        hLdrMod = NIL_RTLDRMOD;
+
     RTDBGMOD hMod;
-    int rc = RTDbgModCreateFromPeImage(&hMod, pszName, NULL, NIL_RTLDRMOD,
-                                       cbImageFromHdr, TimeDateStamp, DBGFR3AsGetConfig(pUVM));
+    rc = RTDbgModCreateFromPeImage(&hMod, pszName, NULL, hLdrMod,
+                                   cbImageFromHdr, TimeDateStamp, DBGFR3AsGetConfig(pUVM));
     if (RT_FAILURE(rc))
     {
         /*
-         * Probably didn't find the image any where, try fake an image
-         * from guest memory.
+         * Final fallback is a container module.
          */
-        uint32_t            cMappings = WINNT_UNION(pThis, pHdrs, FileHeader.NumberOfSections) + 3;
-        PDBGDIGGERWINNTRDR  pRdr = (PDBGDIGGERWINNTRDR)RTMemAlloc(RT_OFFSETOF(DBGDIGGERWINNTRDR, aMappings[cMappings]));
-        if (!pRdr)
+        rc = RTDbgModCreate(&hMod, pszName, cbImage, 0);
+        if (RT_FAILURE(rc))
             return;
 
-        VMR3RetainUVM(pUVM);
-        pRdr->pUVM          = pUVM;
-        pRdr->ImageAddr     = *pImageAddr;
-        pRdr->cbImage       = cbImageFromHdr;
-        pRdr->cMappings     = 1;
-        pRdr->iHint         = 0;
-        pRdr->aMappings[0].offFile = 0;
-        pRdr->aMappings[0].offMem  =  0;
-        pRdr->aMappings[0].cbMem   = cbImageFromHdr;
-
-        RTLDRMOD hLdrMod;
-        rc = RTLdrOpenInMemory(pszName, RTLDR_O_FOR_DEBUG, RTLDRARCH_WHATEVER, pRdr->cbImage,
-                               dbgDiggerWinNtRdr_Read, dbgDiggerWinNtRdr_Dtor, pRdr,
-                               &hLdrMod);
-        if (RT_SUCCESS(rc))
-        {
-            rc = RTDbgModCreateFromPeImage(&hMod, pszName, NULL, hLdrMod,
-                                           cbImageFromHdr, TimeDateStamp, DBGFR3AsGetConfig(pUVM));
-            if (RT_FAILURE(rc))
-                RTLdrClose(hLdrMod);
-        }
-        if (RT_FAILURE(rc))
-        {
-            /*
-             * Final fallback is a container module.
-             */
-            rc = RTDbgModCreate(&hMod, pszName, cbImage, 0);
-            if (RT_FAILURE(rc))
-                return;
-
-            rc = RTDbgModSymbolAdd(hMod, "Headers", 0 /*iSeg*/, 0, cbImage, 0 /*fFlags*/, NULL); AssertRC(rc);
-        }
-    }
-    rc = RTDbgModSetTag(hMod, DIG_WINNT_MOD_TAG); AssertRC(rc);
-
-#if 0
-    /*
-     * Dig out debug info if possible.  What we're after is the CODEVIEW part.
-     */
-    /** @todo do we really need this? */
-    if (uRvaDebugDir != 0)
-    {
-        DBGFADDRESS Addr = *pImageAddr;
-        DBGFR3AddrAdd(&Addr, uRvaDebugDir);
-        rc = DBGFR3MemRead(pUVM, 0 /*idCpu*/, &Addr, pbBuf, RT_MIN(cbDebugDir, cbBuf));
-        if (RT_SUCCESS(rc))
-        {
-            IMAGE_DEBUG_DIRECTORY const    *pa = (IMAGE_DEBUG_DIRECTORY const *)pbBuf;
-            size_t                          c  = RT_MIN(RT_MIN(cbDebugDir, cbBuf) / sizeof(*pa), 10);
-            for (uint32_t i = 0; i < c; i++)
-                if (    pa[i].AddressOfRawData > offHdrs
-                    &&  pa[i].AddressOfRawData < cbImage
-                    &&  pa[i].SizeOfData       < cbImage
-                    &&  pa[i].AddressOfRawData + pa[i].SizeOfData <= cbImage
-                    &&  pa[i].TimeDateStamp   == TimeDateStamp /* too paranoid? */
-                    &&  pa[i].Type == IMAGE_DEBUG_TYPE_CODEVIEW
-                    )
-                {
-                }
-        }
-    }
-#endif
+        rc = RTDbgModSymbolAdd(hMod, "Headers", 0 /*iSeg*/, 0, cbImage, 0 /*fFlags*/, NULL);
+        AssertRC(rc);
+    }
+
+    /* Tag the module. */
+    rc = RTDbgModSetTag(hMod, DIG_WINNT_MOD_TAG);
+    AssertRC(rc);
 
     /*

trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp

@@ -33 +33 @@
 #include "internal/iprt.h"
 
+#include <iprt/alloca.h>
 #include <iprt/asm.h>
 #include <iprt/assert.h>
@@ -302 +303 @@
 
 
+/**
+ * Performs lazy init of our global variables.
+ * @returns IPRT status code.
+ */
 DECLINLINE(int) rtDbgModLazyInit(void)
 {
@@ -308 +313 @@
 
 
-/**
- * Creates a module based on the default debug info container.
- *
- * This can be used to manually load a module and its symbol. The primary user
- * group is the debug info interpreters, which use this API to create an
- * efficient debug info container behind the scenes and forward all queries to
- * it once the info has been loaded.
- *
- * @returns IPRT status code.
- *
- * @param   phDbgMod        Where to return the module handle.
- * @param   pszName         The name of the module (mandatory).
- * @param   cbSeg           The size of initial segment. If zero, segments will
- *                          have to be added manually using RTDbgModSegmentAdd.
- * @param   fFlags          Flags reserved for future extensions, MBZ for now.
- */
 RTDECL(int) RTDbgModCreate(PRTDBGMOD phDbgMod, const char *pszName, RTUINTPTR cbSeg, uint32_t fFlags)
 {
@@ -350 +339 @@
     if (RT_SUCCESS(rc))
     {
-        pDbgMod->pszName = RTStrCacheEnter(g_hDbgModStrCache, pszName);
+        pDbgMod->pszImgFileSpecified = RTStrCacheEnter(g_hDbgModStrCache, pszName);
+        pDbgMod->pszName             = RTStrCacheEnterLower(g_hDbgModStrCache, RTPathFilename(pszName));
         if (pDbgMod->pszName)
         {
@@ -359 +349 @@
                 return rc;
             }
+            RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszImgFile);
             RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszName);
         }
@@ -399 +390 @@
     if (RT_SUCCESS(rc))
     {
-        pDbgMod->pszName = RTStrCacheEnter(g_hDbgModStrCache, pszName);
+        pDbgMod->pszName = RTStrCacheEnterLower(g_hDbgModStrCache, pszName);
         if (pDbgMod->pszName)
         {
@@ -405 +396 @@
             if (pDbgMod->pszImgFile)
             {
+                RTStrCacheRetain(pDbgMod->pszImgFile);
+                pDbgMod->pszImgFileSpecified = pDbgMod->pszImgFile;
+
                 /*
                  * Find an image reader which groks the file.
@@ -488 +482 @@
                     RTSemRWReleaseRead(g_hDbgModRWSem);
                 }
-                RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszName);
+                RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszImgFileSpecified);
+                RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszImgFile);
             }
             else
                 rc = VERR_NO_STR_MEMORY;
-            RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszImgFile);
+            RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszName);
         }
         else
@@ -537 +532 @@
     if (RT_SUCCESS(rc))
     {
-        pDbgMod->pszName = RTStrCacheEnter(g_hDbgModStrCache, pszName);
+        pDbgMod->pszName = RTStrCacheEnterLower(g_hDbgModStrCache, pszName);
         if (pDbgMod->pszName)
         {
@@ -700 +695 @@
 rtDbgModOpenDebugInfoExternalToImageCallback(RTLDRMOD hLdrMod, PCRTLDRDBGINFO pDbgInfo, void *pvUser)
 {
-    if (!pDbgInfo->pszExtFile)
-        return VINF_SUCCESS;
-
+    RTDBGMODOPENDIETI *pArgs = (RTDBGMODOPENDIETI *)pvUser;
+
+    Assert(pDbgInfo->enmType > RTLDRDBGINFOTYPE_INVALID && pDbgInfo->enmType < RTLDRDBGINFOTYPE_END);
+    const char *pszExtFile = pDbgInfo->pszExtFile;
+    if (!pszExtFile)
+    {
+        /*
+         * If a external debug type comes without a file name, calculate a
+         * likely debug filename for it. (Hack for NT4 drivers.)
+         */
+        const char *pszExt = NULL;
+        if (pDbgInfo->enmType == RTLDRDBGINFOTYPE_CODEVIEW_DBG)
+            pszExt = ".dbg";
+        else if (   pDbgInfo->enmType == RTLDRDBGINFOTYPE_CODEVIEW_PDB20
+                 || pDbgInfo->enmType == RTLDRDBGINFOTYPE_CODEVIEW_PDB70)
+            pszExt = ".pdb";
+        if (pszExt && pArgs->pDbgMod->pszName)
+        {
+            size_t cchName = strlen(pArgs->pDbgMod->pszName);
+            char *psz = (char *)alloca(cchName + strlen(pszExt) + 1);
+            if (psz)
+            {
+                memcpy(psz, pArgs->pDbgMod->pszName, cchName + 1);
+                RTPathStripExt(psz);
+                pszExtFile = strcat(psz, pszExt);
+            }
+        }
+
+        if (!pszExtFile)
+        {
+            Log2(("rtDbgModOpenDebugInfoExternalToImageCallback: enmType=%d\n", pDbgInfo->enmType));
+            return VINF_SUCCESS;
+        }
+    }
+
+    /*
+     * Switch on type and call the appropriate search function.
+     */
     int rc;
-    RTDBGMODOPENDIETI *pArgs = (RTDBGMODOPENDIETI *)pvUser;
     switch (pDbgInfo->enmType)
     {
         case RTLDRDBGINFOTYPE_CODEVIEW_PDB70:
-            rc = RTDbgCfgOpenPdb70(pArgs->hDbgCfg, pDbgInfo->pszExtFile,
+            rc = RTDbgCfgOpenPdb70(pArgs->hDbgCfg, pszExtFile,
                                    &pDbgInfo->u.Pdb70.Uuid,
                                    pDbgInfo->u.Pdb70.uAge,
@@ -715 +744 @@
 
         case RTLDRDBGINFOTYPE_CODEVIEW_PDB20:
-            rc = RTDbgCfgOpenPdb20(pArgs->hDbgCfg, pDbgInfo->pszExtFile,
+            rc = RTDbgCfgOpenPdb20(pArgs->hDbgCfg, pszExtFile,
                                    pDbgInfo->u.Pdb20.cbImage,
                                    pDbgInfo->u.Pdb20.uTimestamp,
@@ -723 +752 @@
 
         case RTLDRDBGINFOTYPE_CODEVIEW_DBG:
-            rc = RTDbgCfgOpenDbg(pArgs->hDbgCfg, pDbgInfo->pszExtFile,
+            rc = RTDbgCfgOpenDbg(pArgs->hDbgCfg, pszExtFile,
                                  pDbgInfo->u.Dbg.cbImage,
                                  pDbgInfo->u.Dbg.uTimestamp,
@@ -730 +759 @@
 
         case RTLDRDBGINFOTYPE_DWARF_DWO:
-            rc = RTDbgCfgOpenDwo(pArgs->hDbgCfg, pDbgInfo->pszExtFile,
+            rc = RTDbgCfgOpenDwo(pArgs->hDbgCfg, pszExtFile,
                                  pDbgInfo->u.Dwo.uCrc32,
                                  rtDbgModExtDbgInfoOpenCallback, pArgs->pDbgMod, (void *)pDbgInfo);
@@ -737 +766 @@
         default:
             Log(("rtDbgModOpenDebugInfoExternalToImageCallback: Don't know how to handle enmType=%d and pszFileExt=%s\n",
-                 pDbgInfo->enmType, pDbgInfo->pszExtFile));
+                 pDbgInfo->enmType, pszExtFile));
             return VERR_DBG_TODO;
     }
@@ -747 +776 @@
     }
     Log(("rtDbgModOpenDebugInfoExternalToImageCallback: '%s' (enmType=%d) for '%s'  -> %Rrc\n",
-         pDbgInfo->pszExtFile, pDbgInfo->enmType, pArgs->pDbgMod->pszImgFile, rc));
+         pszExtFile, pDbgInfo->enmType, pArgs->pDbgMod->pszImgFile, rc));
     return rc;
 }
@@ -761 +790 @@
 static int rtDbgModOpenDebugInfoExternalToImage(PRTDBGMODINT pDbgMod, RTDBGCFG hDbgCfg)
 {
+    Assert(!pDbgMod->pDbgVt);
+
     RTDBGMODOPENDIETI Args;
     Args.pDbgMod = pDbgMod;
@@ -767 +798 @@
     if (RT_SUCCESS(rc) && pDbgMod->pDbgVt)
         return VINF_SUCCESS;
+
+    LogFlow(("rtDbgModOpenDebugInfoExternalToImage: rc=%Rrc\n", rc));
     return VERR_NOT_FOUND;
 }
@@ -944 +977 @@
             if (pDbgMod->pszImgFile)
             {
+                RTStrCacheRetain(pDbgMod->pszImgFile);
+                pDbgMod->pszImgFileSpecified = pDbgMod->pszImgFile;
+
                 /*
                  * If we have a loader module, we must instantiate the loader
@@ -993 +1029 @@
             else
                 rc = VERR_NO_STR_MEMORY;
+            RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszImgFileSpecified);
             RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszImgFile);
         }
@@ -1038 +1075 @@
     RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszName);
     RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszImgFile);
+    RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszImgFileSpecified);
     RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszDbgFile);
     RTCritSectLeave(&pDbgMod->CritSect); /* paranoia  */
@@ -1045 +1083 @@
 
 
-/**
- * Retains another reference to the module.
- *
- * @returns New reference count, UINT32_MAX on invalid handle (asserted).
- *
- * @param   hDbgMod         The module handle.
- *
- * @remarks Will not take any locks.
- */
 RTDECL(uint32_t) RTDbgModRetain(RTDBGMOD hDbgMod)
 {
@@ -1063 +1092 @@
 
 
-/**
- * Release a reference to the module.
- *
- * When the reference count reaches zero, the module is destroyed.
- *
- * @returns New reference count, UINT32_MAX on invalid handle (asserted).
- *
- * @param   hDbgMod         The module handle. The NIL handle is quietly ignored
- *                          and 0 is returned.
- *
- * @remarks Will not take any locks.
- */
 RTDECL(uint32_t) RTDbgModRelease(RTDBGMOD hDbgMod)
 {
@@ -1090 +1107 @@
 
 
-/**
- * Gets the module name.
- *
- * @returns Pointer to a read only string containing the name.
- *
- * @param   hDbgMod         The module handle.
- */
 RTDECL(const char *) RTDbgModName(RTDBGMOD hDbgMod)
 {
@@ -1106 +1116 @@
 
 
-/**
- * Converts an image relative address to a segment:offset address.
- *
- * @returns Segment index on success.
- *          NIL_RTDBGSEGIDX is returned if the module handle or the RVA are
- *          invalid.
- *
- * @param   hDbgMod         The module handle.
- * @param   uRva            The image relative address to convert.
- * @param   poffSeg         Where to return the segment offset. Optional.
- */
+RTDECL(const char *) RTDbgModDebugFile(RTDBGMOD hDbgMod)
+{
+    PRTDBGMODINT pDbgMod = hDbgMod;
+    RTDBGMOD_VALID_RETURN_RC(pDbgMod, NULL);
+    if (pDbgMod->fDeferred || pDbgMod->fExports)
+        return NULL;
+    return pDbgMod->pszDbgFile;
+}
+RT_EXPORT_SYMBOL(RTDbgModDebugFile);
+
+
+RTDECL(const char *) RTDbgModImageFile(RTDBGMOD hDbgMod)
+{
+    PRTDBGMODINT pDbgMod = hDbgMod;
+    RTDBGMOD_VALID_RETURN_RC(pDbgMod, NULL);
+    return pDbgMod->pszImgFileSpecified;
+}
+RT_EXPORT_SYMBOL(RTDbgModImageFile);
+
+
+RTDECL(const char *) RTDbgModImageFileUsed(RTDBGMOD hDbgMod)
+{
+    PRTDBGMODINT pDbgMod = hDbgMod;
+    RTDBGMOD_VALID_RETURN_RC(pDbgMod, NULL);
+    return pDbgMod->pszImgFile == pDbgMod->pszImgFileSpecified ? NULL : pDbgMod->pszImgFile;
+}
+RT_EXPORT_SYMBOL(RTDbgModImageFileUsed);
+
+
 RTDECL(RTDBGSEGIDX) RTDbgModRvaToSegOff(RTDBGMOD hDbgMod, RTUINTPTR uRva, PRTUINTPTR poffSeg)
 {
@@ -1131 +1159 @@
 
 
-/**
- * Image size when mapped if segments are mapped adjacently.
- *
- * For ELF, PE, and Mach-O images this is (usually) a natural query, for LX and
- * NE and such it's a bit odder and the answer may not make much sense for them.
- *
- * @returns Image mapped size.
- *          RTUINTPTR_MAX is returned if the handle is invalid.
- *
- * @param   hDbgMod         The module handle.
- */
 RTDECL(RTUINTPTR) RTDbgModImageSize(RTDBGMOD hDbgMod)
 {
@@ -1156 +1173 @@
 
 
-/**
- * Gets the module tag value if any.
- *
- * @returns The tag. 0 if hDbgMod is invalid.
- *
- * @param   hDbgMod         The module handle.
- */
 RTDECL(uint64_t) RTDbgModGetTag(RTDBGMOD hDbgMod)
 {
@@ -1172 +1182 @@
 
 
-/**
- * Tags or untags the module.
- *
- * @returns IPRT status code.
- * @retval  VERR_INVALID_HANDLE if hDbgMod is invalid.
- *
- * @param   hDbgMod         The module handle.
- * @param   uTag            The tag value.  The convention is that 0 is no tag
- *                          and any other value means it's tagged.  It's adviced
- *                          to use some kind of unique number like an address
- *                          (global or string cache for instance) to avoid
- *                          collisions with other users
- */
 RTDECL(int) RTDbgModSetTag(RTDBGMOD hDbgMod, uint64_t uTag)
 {
@@ -1199 +1196 @@
 
 
-/**
- * Adds a segment to the module. Optional feature.
- *
- * This method is intended used for manually constructing debug info for a
- * module. The main usage is from other debug info interpreters that want to
- * avoid writing a debug info database and instead uses the standard container
- * behind the scenes.
- *
- * @returns IPRT status code.
- * @retval  VERR_NOT_SUPPORTED if this feature isn't support by the debug info
- *          interpreter. This is a common return code.
- * @retval  VERR_INVALID_HANDLE if hDbgMod is invalid.
- * @retval  VERR_DBG_ADDRESS_WRAP if uRva+cb wraps around.
- * @retval  VERR_DBG_SEGMENT_NAME_OUT_OF_RANGE if pszName is too short or long.
- * @retval  VERR_INVALID_PARAMETER if fFlags contains undefined flags.
- * @retval  VERR_DBG_SPECIAL_SEGMENT if *piSeg is a special segment.
- * @retval  VERR_DBG_INVALID_SEGMENT_INDEX if *piSeg doesn't meet expectations.
- *
- * @param   hDbgMod             The module handle.
- * @param   uRva                The image relative address of the segment.
- * @param   cb                  The size of the segment.
- * @param   pszName             The segment name. Does not normally need to be
- *                              unique, although this is somewhat up to the
- *                              debug interpreter to decide.
- * @param   fFlags              Segment flags. Reserved for future used, MBZ.
- * @param   piSeg               The segment index or NIL_RTDBGSEGIDX on input.
- *                              The assigned segment index on successful return.
- *                              Optional.
- */
 RTDECL(int) RTDbgModSegmentAdd(RTDBGMOD hDbgMod, RTUINTPTR uRva, RTUINTPTR cb, const char *pszName,
                                uint32_t fFlags, PRTDBGSEGIDX piSeg)
@@ -1258 +1226 @@
 
 
-/**
- * Gets the number of segments in the module.
- *
- * This is can be used to determine the range which can be passed to
- * RTDbgModSegmentByIndex and derivatives.
- *
- * @returns The segment relative address.
- *          NIL_RTDBGSEGIDX if the handle is invalid.
- *
- * @param   hDbgMod         The module handle.
- */
 RTDECL(RTDBGSEGIDX) RTDbgModSegmentCount(RTDBGMOD hDbgMod)
 {
@@ -1283 +1240 @@
 
 
-/**
- * Query information about a segment.
- *
- * This can be used together with RTDbgModSegmentCount to enumerate segments.
- * The index starts a 0 and stops one below RTDbgModSegmentCount.
- *
- * @returns IPRT status code.
- * @retval  VERR_DBG_INVALID_SEGMENT_INDEX if iSeg is too high.
- * @retval  VERR_DBG_SPECIAL_SEGMENT if iSeg indicates a special segment.
- * @retval  VERR_INVALID_HANDLE if hDbgMod is invalid.
- *
- * @param   hDbgMod         The module handle.
- * @param   iSeg            The segment index. No special segments.
- * @param   pSegInfo        Where to return the segment info. The
- *                          RTDBGSEGMENT::Address member will be set to
- *                          RTUINTPTR_MAX or the load address used at link time.
- */
 RTDECL(int) RTDbgModSegmentByIndex(RTDBGMOD hDbgMod, RTDBGSEGIDX iSeg, PRTDBGSEGMENT pSegInfo)
 {
@@ -1315 +1255 @@
 
 
-/**
- * Gets the size of a segment.
- *
- * This is a just a wrapper around RTDbgModSegmentByIndex.
- *
- * @returns The segment size.
- *          RTUINTPTR_MAX is returned if either the handle and segment index are
- *          invalid.
- *
- * @param   hDbgMod         The module handle.
- * @param   iSeg            The segment index. RTDBGSEGIDX_ABS is not allowed.
- *                          If RTDBGSEGIDX_RVA is used, the functions returns
- *                          the same value as RTDbgModImageSize.
- */
 RTDECL(RTUINTPTR) RTDbgModSegmentSize(RTDBGMOD hDbgMod, RTDBGSEGIDX iSeg)
 {
@@ -1340 +1266 @@
 
 
-/**
- * Gets the image relative address of a segment.
- *
- * This is a just a wrapper around RTDbgModSegmentByIndex.
- *
- * @returns The segment relative address.
- *          RTUINTPTR_MAX is returned if either the handle and segment index are
- *          invalid.
- *
- * @param   hDbgMod         The module handle.
- * @param   iSeg            The segment index. No special segment indexes
- *                          allowed (asserted).
- */
 RTDECL(RTUINTPTR) RTDbgModSegmentRva(RTDBGMOD hDbgMod, RTDBGSEGIDX iSeg)
 {
@@ -1362 +1275 @@
 
 
-/**
- * Adds a line number to the module.
- *
- * @returns IPRT status code.
- * @retval  VERR_NOT_SUPPORTED if the module interpret doesn't support adding
- *          custom symbols. This is a common place occurrence.
- * @retval  VERR_INVALID_HANDLE if hDbgMod is invalid.
- * @retval  VERR_DBG_SYMBOL_NAME_OUT_OF_RANGE if the symbol name is too long or
- *          short.
- * @retval  VERR_DBG_INVALID_RVA if an image relative address is specified and
- *          it's not inside any of the segments defined by the module.
- * @retval  VERR_DBG_INVALID_SEGMENT_INDEX if the segment index isn't valid.
- * @retval  VERR_DBG_INVALID_SEGMENT_OFFSET if the segment offset is beyond the
- *          end of the segment.
- * @retval  VERR_DBG_ADDRESS_WRAP if off+cb wraps around.
- * @retval  VERR_INVALID_PARAMETER if the symbol flags sets undefined bits.
- *
- * @param   hDbgMod         The module handle.
- * @param   pszSymbol       The symbol name.
- * @param   iSeg            The segment index.
- * @param   off             The segment offset.
- * @param   cb              The size of the symbol. Can be zero, although this
- *                          may depend somewhat on the debug interpreter.
- * @param   fFlags          Symbol flags. Reserved for the future, MBZ.
- * @param   piOrdinal       Where to return the symbol ordinal on success. If
- *                          the interpreter doesn't do ordinals, this will be set to
- *                          UINT32_MAX. Optional.
- */
 RTDECL(int) RTDbgModSymbolAdd(RTDBGMOD hDbgMod, const char *pszSymbol, RTDBGSEGIDX iSeg, RTUINTPTR off,
                               RTUINTPTR cb, uint32_t fFlags, uint32_t *piOrdinal)
@@ -1436 +1321 @@
 
 
-/**
- * Gets the symbol count.
- *
- * This can be used together wtih RTDbgModSymbolByOrdinal or
- * RTDbgModSymbolByOrdinalA to enumerate all the symbols.
- *
- * @returns The number of symbols in the module.
- *          UINT32_MAX is returned if the module handle is invalid or some other
- *          error occurs.
- *
- * @param   hDbgMod             The module handle.
- */
 RTDECL(uint32_t) RTDbgModSymbolCount(RTDBGMOD hDbgMod)
 {
@@ -1462 +1335 @@
 
 
-/**
- * Queries symbol information by ordinal number.
- *
- * @returns IPRT status code.
- * @retval  VERR_SYMBOL_NOT_FOUND if there is no symbol at the given number.
- * @retval  VERR_DBG_NO_SYMBOLS if there aren't any symbols.
- * @retval  VERR_INVALID_HANDLE if hDbgMod is invalid.
- * @retval  VERR_NOT_SUPPORTED if lookup by ordinal is not supported.
- *
- * @param   hDbgMod             The module handle.
- * @param   iOrdinal            The symbol ordinal number. 0-based. The highest
- *                              number is RTDbgModSymbolCount() - 1.
- * @param   pSymInfo            Where to store the symbol information.
- */
 RTDECL(int) RTDbgModSymbolByOrdinal(RTDBGMOD hDbgMod, uint32_t iOrdinal, PRTDBGSYMBOL pSymInfo)
 {
@@ -1490 +1349 @@
 
 
-/**
- * Queries symbol information by ordinal number.
- *
- * @returns IPRT status code.
- * @retval  VERR_DBG_NO_SYMBOLS if there aren't any symbols.
- * @retval  VERR_NOT_SUPPORTED if lookup by ordinal is not supported.
- * @retval  VERR_SYMBOL_NOT_FOUND if there is no symbol at the given number.
- * @retval  VERR_NO_MEMORY if RTDbgSymbolAlloc fails.
- *
- * @param   hDbgMod             The module handle.
- * @param   iOrdinal            The symbol ordinal number. 0-based. The highest
- *                              number is RTDbgModSymbolCount() - 1.
- * @param   ppSymInfo           Where to store the pointer to the returned
- *                              symbol information. Always set. Free with
- *                              RTDbgSymbolFree.
- */
 RTDECL(int) RTDbgModSymbolByOrdinalA(RTDBGMOD hDbgMod, uint32_t iOrdinal, PRTDBGSYMBOL *ppSymInfo)
 {
@@ -1526 +1369 @@
 
 
-/**
- * Queries symbol information by address.
- *
- * The returned symbol is what the debug info interpreter considers the symbol
- * most applicable to the specified address. This usually means a symbol with an
- * address equal or lower than the requested.
- *
- * @returns IPRT status code.
- * @retval  VERR_SYMBOL_NOT_FOUND if no suitable symbol was found.
- * @retval  VERR_DBG_NO_SYMBOLS if there aren't any symbols.
- * @retval  VERR_INVALID_HANDLE if hDbgMod is invalid.
- * @retval  VERR_DBG_INVALID_RVA if an image relative address is specified and
- *          it's not inside any of the segments defined by the module.
- * @retval  VERR_DBG_INVALID_SEGMENT_INDEX if the segment index isn't valid.
- * @retval  VERR_DBG_INVALID_SEGMENT_OFFSET if the segment offset is beyond the
- *          end of the segment.
- * @retval  VERR_INVALID_PARAMETER if incorrect flags.
- *
- * @param   hDbgMod             The module handle.
- * @param   iSeg                The segment number.
- * @param   off                 The offset into the segment.
- * @param   fFlags              Symbol search flags, see RTDBGSYMADDR_FLAGS_XXX.
- * @param   poffDisp            Where to store the distance between the
- *                              specified address and the returned symbol.
- *                              Optional.
- * @param   pSymInfo            Where to store the symbol information.
- */
 RTDECL(int) RTDbgModSymbolByAddr(RTDBGMOD hDbgMod, RTDBGSEGIDX iSeg, RTUINTPTR off, uint32_t fFlags,
                                  PRTINTPTR poffDisp, PRTDBGSYMBOL pSymInfo)
@@ -1591 +1407 @@
 
 
-/**
- * Queries symbol information by address.
- *
- * The returned symbol is what the debug info interpreter considers the symbol
- * most applicable to the specified address. This usually means a symbol with an
- * address equal or lower than the requested.
- *
- * @returns IPRT status code.
- * @retval  VERR_SYMBOL_NOT_FOUND if no suitable symbol was found.
- * @retval  VERR_DBG_NO_SYMBOLS if there aren't any symbols.
- * @retval  VERR_INVALID_HANDLE if hDbgMod is invalid.
- * @retval  VERR_DBG_INVALID_RVA if an image relative address is specified and
- *          it's not inside any of the segments defined by the module.
- * @retval  VERR_DBG_INVALID_SEGMENT_INDEX if the segment index isn't valid.
- * @retval  VERR_DBG_INVALID_SEGMENT_OFFSET if the segment offset is beyond the
- *          end of the segment.
- * @retval  VERR_NO_MEMORY if RTDbgSymbolAlloc fails.
- * @retval  VERR_INVALID_PARAMETER if incorrect flags.
- *
- * @param   hDbgMod             The module handle.
- * @param   iSeg                The segment index.
- * @param   off                 The offset into the segment.
- * @param   fFlags              Symbol search flags, see RTDBGSYMADDR_FLAGS_XXX.
- * @param   poffDisp            Where to store the distance between the
- *                              specified address and the returned symbol. Optional.
- * @param   ppSymInfo           Where to store the pointer to the returned
- *                              symbol information. Always set. Free with
- *                              RTDbgSymbolFree.
- */
 RTDECL(int) RTDbgModSymbolByAddrA(RTDBGMOD hDbgMod, RTDBGSEGIDX iSeg, RTUINTPTR off, uint32_t fFlags,
                                   PRTINTPTR poffDisp, PRTDBGSYMBOL *ppSymInfo)
@@ -1641 +1428 @@
 
 
-/**
- * Queries symbol information by symbol name.
- *
- * @returns IPRT status code.
- * @retval  VERR_DBG_NO_SYMBOLS if there aren't any symbols.
- * @retval  VERR_SYMBOL_NOT_FOUND if no suitable symbol was found.
- * @retval  VERR_DBG_SYMBOL_NAME_OUT_OF_RANGE if the symbol name is too long or
- *          short.
- *
- * @param   hDbgMod             The module handle.
- * @param   pszSymbol           The symbol name.
- * @param   pSymInfo            Where to store the symbol information.
- */
 RTDECL(int) RTDbgModSymbolByName(RTDBGMOD hDbgMod, const char *pszSymbol, PRTDBGSYMBOL pSymInfo)
 {
@@ -1679 +1453 @@
 
 
-/**
- * Queries symbol information by symbol name.
- *
- * @returns IPRT status code.
- * @retval  VERR_DBG_NO_SYMBOLS if there aren't any symbols.
- * @retval  VERR_SYMBOL_NOT_FOUND if no suitable symbol was found.
- * @retval  VERR_DBG_SYMBOL_NAME_OUT_OF_RANGE if the symbol name is too long or
- *          short.
- * @retval  VERR_NO_MEMORY if RTDbgSymbolAlloc fails.
- *
- * @param   hDbgMod             The module handle.
- * @param   pszSymbol           The symbol name.
- * @param   ppSymInfo           Where to store the pointer to the returned
- *                              symbol information. Always set. Free with
- *                              RTDbgSymbolFree.
- */
 RTDECL(int) RTDbgModSymbolByNameA(RTDBGMOD hDbgMod, const char *pszSymbol, PRTDBGSYMBOL *ppSymInfo)
 {
@@ -1715 +1473 @@
 
 
-/**
- * Adds a line number to the module.
- *
- * @returns IPRT status code.
- * @retval  VERR_NOT_SUPPORTED if the module interpret doesn't support adding
- *          custom symbols. This should be consider a normal response.
- * @retval  VERR_INVALID_HANDLE if hDbgMod is invalid.
- * @retval  VERR_DBG_FILE_NAME_OUT_OF_RANGE if the file name is too longer or
- *          empty.
- * @retval  VERR_DBG_INVALID_RVA if an image relative address is specified and
- *          it's not inside any of the segments defined by the module.
- * @retval  VERR_DBG_INVALID_SEGMENT_INDEX if the segment index isn't valid.
- * @retval  VERR_DBG_INVALID_SEGMENT_OFFSET if the segment offset is beyond the
- *          end of the segment.
- * @retval  VERR_INVALID_PARAMETER if the line number flags sets undefined bits.
- *
- * @param   hDbgMod             The module handle.
- * @param   pszFile             The file name.
- * @param   uLineNo             The line number.
- * @param   iSeg                The segment index.
- * @param   off                 The segment offset.
- * @param   piOrdinal           Where to return the line number ordinal on
- *                              success. If  the interpreter doesn't do ordinals,
- *                              this will be set to UINT32_MAX. Optional.
- */
 RTDECL(int) RTDbgModLineAdd(RTDBGMOD hDbgMod, const char *pszFile, uint32_t uLineNo,
                             RTDBGSEGIDX iSeg, RTUINTPTR off, uint32_t *piOrdinal)
@@ -1784 +1517 @@
 
 
-/**
- * Gets the line number count.
- *
- * This can be used together wtih RTDbgModLineByOrdinal or RTDbgModSymbolByLineA
- * to enumerate all the line number information.
- *
- * @returns The number of line numbers in the module.
- *          UINT32_MAX is returned if the module handle is invalid or some other
- *          error occurs.
- *
- * @param   hDbgMod             The module handle.
- */
 RTDECL(uint32_t) RTDbgModLineCount(RTDBGMOD hDbgMod)
 {
@@ -1810 +1531 @@
 
 
-/**
- * Queries line number information by ordinal number.
- *
- * This can be used to enumerate the line numbers for the module. Use
- * RTDbgModLineCount() to figure the end of the ordinals.
- *
- * @returns IPRT status code.
- * @retval  VERR_DBG_NO_LINE_NUMBERS if there aren't any line numbers.
- * @retval  VERR_DBG_LINE_NOT_FOUND if there is no line number with that
- *          ordinal.
- * @retval  VERR_INVALID_HANDLE if hDbgMod is invalid.
-
- * @param   hDbgMod             The module handle.
- * @param   iOrdinal            The line number ordinal number.
- * @param   pLineInfo           Where to store the information about the line
- *                              number.
- */
 RTDECL(int) RTDbgModLineByOrdinal(RTDBGMOD hDbgMod, uint32_t iOrdinal, PRTDBGLINE pLineInfo)
 {
@@ -1841 +1545 @@
 
 
-/**
- * Queries line number information by ordinal number.
- *
- * This can be used to enumerate the line numbers for the module. Use
- * RTDbgModLineCount() to figure the end of the ordinals.
- *
- * @returns IPRT status code.
- * @retval  VERR_DBG_NO_LINE_NUMBERS if there aren't any line numbers.
- * @retval  VERR_DBG_LINE_NOT_FOUND if there is no line number with that
- *          ordinal.
- * @retval  VERR_INVALID_HANDLE if hDbgMod is invalid.
- * @retval  VERR_NO_MEMORY if RTDbgLineAlloc fails.
- *
- * @param   hDbgMod             The module handle.
- * @param   iOrdinal            The line number ordinal number.
- * @param   ppLineInfo          Where to store the pointer to the returned line
- *                              number information. Always set. Free with
- *                              RTDbgLineFree.
- */
 RTDECL(int) RTDbgModLineByOrdinalA(RTDBGMOD hDbgMod, uint32_t iOrdinal, PRTDBGLINE *ppLineInfo)
 {
@@ -1880 +1565 @@
 
 
-/**
- * Queries line number information by address.
- *
- * The returned line number is what the debug info interpreter considers the
- * one most applicable to the specified address. This usually means a line
- * number with an address equal or lower than the requested.
- *
- * @returns IPRT status code.
- * @retval  VERR_DBG_NO_LINE_NUMBERS if there aren't any line numbers.
- * @retval  VERR_DBG_LINE_NOT_FOUND if no suitable line number was found.
- * @retval  VERR_INVALID_HANDLE if hDbgMod is invalid.
- * @retval  VERR_DBG_INVALID_RVA if an image relative address is specified and
- *          it's not inside any of the segments defined by the module.
- * @retval  VERR_DBG_INVALID_SEGMENT_INDEX if the segment index isn't valid.
- * @retval  VERR_DBG_INVALID_SEGMENT_OFFSET if the segment offset is beyond the
- *          end of the segment.
- *
- * @param   hDbgMod             The module handle.
- * @param   iSeg                The segment number.
- * @param   off                 The offset into the segment.
- * @param   poffDisp            Where to store the distance between the
- *                              specified address and the returned symbol.
- *                              Optional.
- * @param   pLineInfo           Where to store the line number information.
- */
 RTDECL(int) RTDbgModLineByAddr(RTDBGMOD hDbgMod, RTDBGSEGIDX iSeg, RTUINTPTR off, PRTINTPTR poffDisp, PRTDBGLINE pLineInfo)
 {
@@ -1938 +1598 @@
 
 
-/**
- * Queries line number information by address.
- *
- * The returned line number is what the debug info interpreter considers the
- * one most applicable to the specified address. This usually means a line
- * number with an address equal or lower than the requested.
- *
- * @returns IPRT status code.
- * @retval  VERR_DBG_NO_LINE_NUMBERS if there aren't any line numbers.
- * @retval  VERR_DBG_LINE_NOT_FOUND if no suitable line number was found.
- * @retval  VERR_INVALID_HANDLE if hDbgMod is invalid.
- * @retval  VERR_DBG_INVALID_RVA if an image relative address is specified and
- *          it's not inside any of the segments defined by the module.
- * @retval  VERR_DBG_INVALID_SEGMENT_INDEX if the segment index isn't valid.
- * @retval  VERR_DBG_INVALID_SEGMENT_OFFSET if the segment offset is beyond the
- *          end of the segment.
- * @retval  VERR_NO_MEMORY if RTDbgLineAlloc fails.
- *
- * @param   hDbgMod             The module handle.
- * @param   iSeg                The segment number.
- * @param   off                 The offset into the segment.
- * @param   poffDisp            Where to store the distance between the
- *                              specified address and the returned symbol.
- *                              Optional.
- * @param   ppLineInfo          Where to store the pointer to the returned line
- *                              number information. Always set. Free with
- *                              RTDbgLineFree.
- */
 RTDECL(int) RTDbgModLineByAddrA(RTDBGMOD hDbgMod, RTDBGSEGIDX iSeg, RTUINTPTR off, PRTINTPTR poffDisp, PRTDBGLINE *ppLineInfo)
 {

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

@@ -90 +90 @@
     /** Size of the header (IMAGE_OPTIONAL_HEADER32::SizeOfHeaders). */
     uint32_t                cbHeaders;
+    /** The image timestamp. */
+    uint32_t                uTimestamp;
     /** The import data directory entry. */
     IMAGE_DATA_DIRECTORY    ImportDir;
@@ -135 +137 @@
 static void rtldrPEConvert32BitOptionalHeaderTo64Bit(PIMAGE_OPTIONAL_HEADER64 pOptHdr);
 static void rtldrPEConvert32BitLoadConfigTo64Bit(PIMAGE_LOAD_CONFIG_DIRECTORY64 pLoadCfg);
-static int rtldrPEApplyFixups(PRTLDRMODPE pModPe, const void *pvBitsR, void *pvBitsW, RTUINTPTR BaseAddress, RTUINTPTR OldBaseAddress);
+static int  rtldrPEApplyFixups(PRTLDRMODPE pModPe, const void *pvBitsR, void *pvBitsW, RTUINTPTR BaseAddress, RTUINTPTR OldBaseAddress);
+
+
+
+/**
+ * Reads a section of a PE image given by RVA + size, using mapped bits if
+ * available or allocating heap memory and reading from the file.
+ *
+ * @returns IPRT status code.
+ * @param   pThis               Pointer to the PE loader module structure.
+ * @param   pvBits              Read only bits if available. NULL if not.
+ * @param   uRva                The RVA to read at.
+ * @param   cbMem               The number of bytes to read.
+ * @param   ppvMem              Where to return the memory on success (heap or
+ *                              inside pvBits).
+ */
+static int rtldrPEReadPartByRva(PRTLDRMODPE pThis, const void *pvBits, uint32_t uRva, uint32_t cbMem, void const **ppvMem)
+{
+    *ppvMem = NULL;
+    if (!cbMem)
+        return VINF_SUCCESS;
+
+    /*
+     * Use bits if we've got some.
+     */
+    if (pvBits)
+    {
+        *ppvMem = (uint8_t const *)pvBits + uRva;
+        return VINF_SUCCESS;
+    }
+    if (pThis->pvBits)
+    {
+        *ppvMem = (uint8_t const *)pThis->pvBits + uRva;
+        return VINF_SUCCESS;
+    }
+
+    /*
+     * Allocate a buffer and read the bits from the file (or whatever).
+     */
+    if (!pThis->Core.pReader)
+        return VERR_ACCESS_DENIED;
+
+    uint8_t *pbMem = (uint8_t *)RTMemAllocZ(cbMem);
+    if (!pbMem)
+        return VERR_NO_MEMORY;
+    *ppvMem = pbMem;
+
+    /* Do the reading on a per section base. */
+    RTFOFF const cbFile = pThis->Core.pReader->pfnSize(pThis->Core.pReader);
+    for (;;)
+    {
+        /* Translate the RVA into a file offset. */
+        uint32_t offFile  = uRva;
+        uint32_t cbToRead = cbMem;
+        uint32_t cbToAdv  = cbMem;
+
+        if (uRva < pThis->paSections[0].VirtualAddress)
+        {
+            /* Special header section. */
+            cbToRead = pThis->paSections[0].VirtualAddress - uRva;
+            if (cbToRead > cbMem)
+                cbToRead = cbMem;
+            cbToAdv = cbToRead;
+
+            /* The following capping is an approximation. */
+            uint32_t offFirstRawData = RT_ALIGN(pThis->cbHeaders, _4K);
+            if (   pThis->paSections[0].PointerToRawData > 0
+                && pThis->paSections[0].SizeOfRawData > 0)
+                offFirstRawData = pThis->paSections[0].PointerToRawData;
+            if (offFile > offFirstRawData)
+                cbToRead = 0;
+            else if (offFile + cbToRead > offFirstRawData)
+                cbToRead = offFile + cbToRead - offFirstRawData;
+        }
+        else
+        {
+            /* Find the matching section and its mapping size. */
+            uint32_t j         = 0;
+            uint32_t cbMapping = 0;
+            while (j < pThis->cSections)
+            {
+                cbMapping = (j + 1 < pThis->cSections ? pThis->paSections[j + 1].VirtualAddress : pThis->cbImage)
+                          - pThis->paSections[j].VirtualAddress;
+                if (uRva - pThis->paSections[j].VirtualAddress < cbMapping)
+                    break;
+                j++;
+            }
+            if (j >= cbMapping)
+                break; /* This shouldn't happen, just return zeros if it does. */
+
+            /* Adjust the sizes and calc the file offset. */
+            if (cbToAdv > cbMapping)
+                cbToAdv = cbToRead = cbMapping;
+            if (   pThis->paSections[j].PointerToRawData > 0
+                && pThis->paSections[j].SizeOfRawData > 0)
+            {
+                offFile = uRva - pThis->paSections[j].VirtualAddress;
+                if (offFile + cbToRead > pThis->paSections[j].SizeOfRawData)
+                    cbToRead = pThis->paSections[j].SizeOfRawData - offFile;
+                offFile += pThis->paSections[j].PointerToRawData;
+            }
+            else
+            {
+                offFile  = -1;
+                cbToRead = 0;
+            }
+        }
+
+        /* Perform the read after adjusting a little (paranoia). */
+        if (offFile > cbFile)
+            cbToRead = 0;
+        if (cbToRead)
+        {
+            if ((RTFOFF)offFile + cbToRead > cbFile)
+                cbToRead = cbFile - (RTFOFF)offFile;
+            int rc = pThis->Core.pReader->pfnRead(pThis->Core.pReader, pbMem, cbToRead, offFile);
+            if (RT_FAILURE(rc))
+            {
+                RTMemFree((void *)*ppvMem);
+                *ppvMem = NULL;
+                return rc;
+            }
+        }
+
+        /* Advance */
+        if (cbMem == cbToRead)
+            break;
+        cbMem -= cbToRead;
+        pbMem += cbToRead;
+        uRva  += cbToRead;
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Reads a part of a PE file from the file and into a heap block.
+ *
+ * @returns IRPT status code.
+ * @param   pThis               Pointer to the PE loader module structure..
+ * @param   offFile             The file offset.
+ * @param   cbMem               The number of bytes to read.
+ * @param   ppvMem              Where to return the heap block with the bytes on
+ *                              success.
+ */
+static int rtldrPEReadPartFromFile(PRTLDRMODPE pThis, uint32_t offFile, uint32_t cbMem, void const **ppvMem)
+{
+    *ppvMem = NULL;
+    if (!cbMem)
+        return VINF_SUCCESS;
+
+    /*
+     * Allocate a buffer and read the bits from the file (or whatever).
+     */
+    if (!pThis->Core.pReader)
+        return VERR_ACCESS_DENIED;
+
+    uint8_t *pbMem = (uint8_t *)RTMemAlloc(cbMem);
+    if (!pbMem)
+        return VERR_NO_MEMORY;
+
+    int rc = pThis->Core.pReader->pfnRead(pThis->Core.pReader, pbMem, cbMem, offFile);
+    if (RT_FAILURE(rc))
+    {
+        RTMemFree((void *)*ppvMem);
+        return rc;
+    }
+
+    *ppvMem = pbMem;
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Reads a part of a PE image into memory one way or another.
+ *
+ * Either the RVA or the offFile must be valid.  We'll prefer the RVA if
+ * possible.
+ *
+ * @returns IPRT status code.
+ * @param   pThis               Pointer to the PE loader module structure.
+ * @param   pvBits              Read only bits if available. NULL if not.
+ * @param   uRva                The RVA to read at.
+ * @param   offFile             The file offset.
+ * @param   cbMem               The number of bytes to read.
+ * @param   ppvMem              Where to return the memory on success (heap or
+ *                              inside pvBits).
+ */
+static int rtldrPEReadPart(PRTLDRMODPE pThis, const void *pvBits, RTFOFF offFile, RTLDRADDR uRva,
+                           uint32_t cbMem, void const **ppvMem)
+{
+    if (uRva == NIL_RTLDRADDR || uRva > pThis->cbImage)
+    {
+        if (offFile < 0)
+            return VERR_INVALID_PARAMETER;
+        return rtldrPEReadPartFromFile(pThis, offFile, cbMem, ppvMem);
+    }
+    return rtldrPEReadPartByRva(pThis, pvBits, uRva, cbMem, ppvMem);
+}
+
+
+/**
+ * Frees up memory returned by rtldrPEReadPart*.
+ *
+ * @param   pThis               Pointer to the PE loader module structure..
+ * @param   pvBits              Read only bits if available. NULL if not..
+ * @param   pvMem               The memory we were given by the reader method.
+ */
+static void rtldrPEFreePart(PRTLDRMODPE pThis, const void *pvBits, void const *pvMem)
+{
+    if (!pvMem)
+        return;
+
+    if (pvBits        && (uintptr_t)pvBits        - (uintptr_t)pvMem < pThis->cbImage)
+        return;
+    if (pThis->pvBits && (uintptr_t)pThis->pvBits - (uintptr_t)pvMem < pThis->cbImage)
+        return;
+
+    RTMemFree((void *)pvMem);
+}
 
 
@@ -788 +1010 @@
 
     /*
-     * No bits supplied? Do we need to read the bits?
+     * Get the debug directory.
      */
     if (!pvBits)
-    {
-        if (!pModPe->pvBits)
-        {
-            rc = rtldrPEReadBits(pModPe);
-            if (RT_FAILURE(rc))
-                return rc;
-        }
         pvBits = pModPe->pvBits;
-    }
+
+    PCIMAGE_DEBUG_DIRECTORY paDbgDir;
+    int rcRet = rtldrPEReadPartByRva(pModPe, pvBits, pModPe->DebugDir.VirtualAddress, pModPe->DebugDir.Size,
+                                     (void const **)&paDbgDir);
+    if (RT_FAILURE(rcRet))
+        return rcRet;
 
     /*
      * Enumerate the debug directory.
      */
-    PCIMAGE_DEBUG_DIRECTORY paDbgDir = PE_RVA2TYPE(pvBits, pModPe->DebugDir.VirtualAddress, PCIMAGE_DEBUG_DIRECTORY);
-    int                     rcRet    = VINF_SUCCESS;
-    uint32_t const          cEntries = pModPe->DebugDir.Size / sizeof(paDbgDir[0]);
+    uint32_t const cEntries = pModPe->DebugDir.Size / sizeof(paDbgDir[0]);
     for (uint32_t i = 0; i < cEntries; i++)
     {
@@ -814 +1032 @@
             continue;
 
-        char         szPath[RTPATH_MAX];
-        RTLDRDBGINFO DbgInfo;
+        void const     *pvPart = NULL;
+        char            szPath[RTPATH_MAX];
+        RTLDRDBGINFO    DbgInfo;
         RT_ZERO(DbgInfo.u);
         DbgInfo.iDbgInfo    = i;
@@ -825 +1044 @@
         DbgInfo.pszExtFile  = NULL;
 
+        rc = VINF_SUCCESS;
         switch (paDbgDir[i].Type)
         {
@@ -834 +1054 @@
                 if (   paDbgDir[i].SizeOfData < sizeof(szPath)
                     && paDbgDir[i].SizeOfData > 16
-                    && DbgInfo.LinkAddress != NIL_RTLDRADDR)
+                    && (   DbgInfo.LinkAddress != NIL_RTLDRADDR
+                        || DbgInfo.offFile > 0)
+                    )
                 {
-                    PCCVPDB20INFO pCv20 = PE_RVA2TYPE(pvBits, DbgInfo.LinkAddress, PCCVPDB20INFO);
-                    if (   pCv20->u32Magic   == CVPDB20INFO_MAGIC
-                        && pCv20->offDbgInfo == 0
-                        && paDbgDir[i].SizeOfData > RT_UOFFSETOF(CVPDB20INFO, szPdbFilename) )
+                    rc = rtldrPEReadPart(pModPe, pvBits, DbgInfo.offFile, DbgInfo.LinkAddress, paDbgDir[i].SizeOfData, &pvPart);
+                    if (RT_SUCCESS(rc))
                     {
-                        DbgInfo.enmType             = RTLDRDBGINFOTYPE_CODEVIEW_PDB20;
-                        DbgInfo.u.Pdb20.cbImage     = pModPe->cbImage;
-                        DbgInfo.u.Pdb20.uTimestamp  = pCv20->uTimestamp;
-                        DbgInfo.u.Pdb20.uAge        = pCv20->uAge;
-                        DbgInfo.pszExtFile          = (const char *)&pCv20->szPdbFilename[0];
+                        PCCVPDB20INFO pCv20 = (PCCVPDB20INFO)pvPart;
+                        if (   pCv20->u32Magic   == CVPDB20INFO_MAGIC
+                            && pCv20->offDbgInfo == 0
+                            && paDbgDir[i].SizeOfData > RT_UOFFSETOF(CVPDB20INFO, szPdbFilename) )
+                        {
+                            DbgInfo.enmType             = RTLDRDBGINFOTYPE_CODEVIEW_PDB20;
+                            DbgInfo.u.Pdb20.cbImage     = pModPe->cbImage;
+                            DbgInfo.u.Pdb20.uTimestamp  = pCv20->uTimestamp;
+                            DbgInfo.u.Pdb20.uAge        = pCv20->uAge;
+                            DbgInfo.pszExtFile          = (const char *)&pCv20->szPdbFilename[0];
+                        }
+                        else if (   pCv20->u32Magic == CVPDB70INFO_MAGIC
+                                 && paDbgDir[i].SizeOfData > RT_UOFFSETOF(CVPDB70INFO, szPdbFilename) )
+                        {
+                            PCCVPDB70INFO pCv70 = (PCCVPDB70INFO)pCv20;
+                            DbgInfo.enmType             = RTLDRDBGINFOTYPE_CODEVIEW_PDB70;
+                            DbgInfo.u.Pdb70.cbImage     = pModPe->cbImage;
+                            DbgInfo.u.Pdb70.Uuid        = pCv70->PdbUuid;
+                            DbgInfo.u.Pdb70.uAge        = pCv70->uAge;
+                            DbgInfo.pszExtFile          = (const char *)&pCv70->szPdbFilename[0];
+                        }
                     }
-                    else if (   pCv20->u32Magic == CVPDB70INFO_MAGIC
-                             && paDbgDir[i].SizeOfData > RT_UOFFSETOF(CVPDB70INFO, szPdbFilename) )
-                    {
-                        PCCVPDB70INFO pCv70 = (PCCVPDB70INFO)pCv20;
-                        DbgInfo.enmType             = RTLDRDBGINFOTYPE_CODEVIEW_PDB70;
-                        DbgInfo.u.Pdb70.cbImage     = pModPe->cbImage;
-                        DbgInfo.u.Pdb70.Uuid        = pCv70->PdbUuid;
-                        DbgInfo.u.Pdb70.uAge        = pCv70->uAge;
-                        DbgInfo.pszExtFile          = (const char *)&pCv70->szPdbFilename[0];
-                    }
+                    else
+                        rcRet = rc;
                 }
                 break;
 
             case IMAGE_DEBUG_TYPE_MISC:
+                DbgInfo.enmType = RTLDRDBGINFOTYPE_UNKNOWN;
                 if (   paDbgDir[i].SizeOfData < sizeof(szPath)
-                    && paDbgDir[i].SizeOfData > RT_UOFFSETOF(IMAGE_DEBUG_MISC, Data)
-                    && DbgInfo.LinkAddress != NIL_RTLDRADDR)
+                    && paDbgDir[i].SizeOfData > RT_UOFFSETOF(IMAGE_DEBUG_MISC, Data))
                 {
-                    PCIMAGE_DEBUG_MISC pMisc = PE_RVA2TYPE(pvBits, DbgInfo.LinkAddress, PCIMAGE_DEBUG_MISC);
-                    if (   pMisc->DataType == IMAGE_DEBUG_MISC_EXENAME
-                        && pMisc->Length   == paDbgDir[i].SizeOfData)
+                    DbgInfo.enmType             = RTLDRDBGINFOTYPE_CODEVIEW_DBG;
+                    DbgInfo.u.Dbg.cbImage       = pModPe->cbImage;
+                    if (DbgInfo.LinkAddress != NIL_RTLDRADDR)
+                        DbgInfo.u.Dbg.uTimestamp = paDbgDir[i].TimeDateStamp;
+                    else
+                        DbgInfo.u.Dbg.uTimestamp = pModPe->uTimestamp; /* NT4 SP1 ntfs.sys hack. Generic? */
+
+                    rc = rtldrPEReadPart(pModPe, pvBits, DbgInfo.offFile, DbgInfo.LinkAddress, paDbgDir[i].SizeOfData, &pvPart);
+                    if (RT_SUCCESS(rc))
                     {
-                        if (!pMisc->Unicode)
-                            DbgInfo.pszExtFile      = (const char *)&pMisc->Data[0];
-                        else
+                        PCIMAGE_DEBUG_MISC pMisc = (PCIMAGE_DEBUG_MISC)pvPart;
+                        if (   pMisc->DataType == IMAGE_DEBUG_MISC_EXENAME
+                            && pMisc->Length   == paDbgDir[i].SizeOfData)
                         {
-                            char *pszPath = szPath;
-                            rc = RTUtf16ToUtf8Ex((PCRTUTF16)&pMisc->Data[0],
-                                                 (pMisc->Length - RT_OFFSETOF(IMAGE_DEBUG_MISC, Data)) / sizeof(RTUTF16),
-                                                 &pszPath, sizeof(szPath), NULL);
-                            if (RT_FAILURE(rc))
+                            if (!pMisc->Unicode)
+                                DbgInfo.pszExtFile      = (const char *)&pMisc->Data[0];
+                            else
                             {
-                                rcRet = rc;
-                                continue;
+                                char *pszPath = szPath;
+                                rc = RTUtf16ToUtf8Ex((PCRTUTF16)&pMisc->Data[0],
+                                                     (pMisc->Length - RT_OFFSETOF(IMAGE_DEBUG_MISC, Data)) / sizeof(RTUTF16),
+                                                     &pszPath, sizeof(szPath), NULL);
+                                if (RT_SUCCESS(rc))
+                                    DbgInfo.pszExtFile = szPath;
+                                else
+                                    rcRet = rc; /* continue without a filename. */
                             }
-                            DbgInfo.pszExtFile      = szPath;
                         }
-                        DbgInfo.enmType             = RTLDRDBGINFOTYPE_CODEVIEW_DBG;
-                        DbgInfo.u.Dbg.cbImage       = pModPe->cbImage;
-                        DbgInfo.u.Dbg.uTimestamp    = paDbgDir[i].TimeDateStamp;
                     }
+                    else
+                        rcRet = rc; /* continue without a filename. */
                 }
                 break;
@@ -910 +1146 @@
             {
                 rcRet = rc;
-                continue;
+                DbgInfo.pszExtFile = NULL;
             }
         }
@@ -917 +1153 @@
 
         rc = pfnCallback(pMod, &DbgInfo, pvUser);
+        rtldrPEFreePart(pModPe, pvBits, pvPart);
         if (rc != VINF_SUCCESS)
-            return rc;
-    }
+        {
+            rcRet = rc;
+            break;
+        }
+    }
+
+    rtldrPEFreePart(pModPe, pvBits, paDbgDir);
     return rcRet;
 }
@@ -1330 +1572 @@
  * @param   pFileHdr    Pointer to the file header (valid).
  * @param   cbRawImage  The raw image size.
+ * @param   fFlags      Loader flags.
  */
 static int rtldrPEValidateOptionalHeader(const IMAGE_OPTIONAL_HEADER64 *pOptHdr, const char *pszLogName, RTFOFF offNtHdrs,
-                                         const IMAGE_FILE_HEADER *pFileHdr, RTFOFF cbRawImage)
+                                         const IMAGE_FILE_HEADER *pFileHdr, RTFOFF cbRawImage, uint32_t fFlags)
 {
     const uint16_t CorrectMagic = pFileHdr->SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER32)
@@ -1487 +1730 @@
             return VERR_BAD_EXE_FORMAT;
         }
-        if (pDir->Size > cb - pDir->VirtualAddress)
+        if (    pDir->Size > cb - pDir->VirtualAddress
+            && !(fFlags & RTLDR_O_FOR_DEBUG) /* NT4 SP1 ntfs.sys base relocs. */ )
         {
             Log(("rtldrPEOpen: %s: dir no. %d Size=%#x is invalid (rva=%#x, limit=%#x)!!!\n",
@@ -1858 +2102 @@
     if (FileHdr.SizeOfOptionalHeader != sizeof(OptHdr))
         rtldrPEConvert32BitOptionalHeaderTo64Bit(&OptHdr);
-    rc = rtldrPEValidateOptionalHeader(&OptHdr, pszLogName, offNtHdrs, &FileHdr, pReader->pfnSize(pReader));
+    rc = rtldrPEValidateOptionalHeader(&OptHdr, pszLogName, offNtHdrs, &FileHdr, pReader->pfnSize(pReader), fFlags);
     if (RT_FAILURE(rc))
         return rc;
@@ -1901 +2145 @@
                 pModPe->cbImage       = OptHdr.SizeOfImage;
                 pModPe->cbHeaders     = OptHdr.SizeOfHeaders;
+                pModPe->uTimestamp    = FileHdr.TimeDateStamp;
                 pModPe->ImportDir     = OptHdr.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT];
                 pModPe->RelocDir      = OptHdr.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC];

trunk/src/VBox/Runtime/common/string/strcache.cpp

@@ -167 +167 @@
 
 
+RTDECL(const char *) RTStrCacheEnterLowerN(RTSTRCACHE hStrCache, const char *pchString, size_t cchString)
+{
+    AssertPtr(pchString);
+    AssertReturn(cchString < _1G, NULL);
+    Assert(!RTStrEnd(pchString, cchString));
+
+    char *pszRet = (char *)RTMemPoolDupEx((RTMEMPOOL)hStrCache, pchString, cchString, 1);
+    if (!pszRet)
+        RTStrToLower(pszRet);
+    return pszRet;
+}
+RT_EXPORT_SYMBOL(RTStrCacheEnterLowerN);
+
+
+RTDECL(const char *) RTStrCacheEnterLower(RTSTRCACHE hStrCache, const char *psz)
+{
+    return RTStrCacheEnterLowerN(hStrCache, psz, strlen(psz));
+}
+RT_EXPORT_SYMBOL(RTStrCacheEnterLower);
+
+
 RTDECL(uint32_t) RTStrCacheRetain(const char *psz)
 {

trunk/src/VBox/Runtime/generic/strcache-stubs-generic.cpp

@@ -78 +78 @@
 
 
+RTDECL(const char *) RTStrCacheEnterLowerN(RTSTRCACHE hStrCache, const char *pchString, size_t cchString)
+{
+    AssertPtr(pchString);
+    AssertReturn(cchString < _1G, NULL);
+    Assert(!RTStrEnd(pchString, cchString));
+
+    char *pszRet = (char *)RTMemPoolDupEx((RTMEMPOOL)hStrCache, pchString, cchString, 1);
+    if (!pszRet)
+        RTStrToLower(pszRet);
+    return pszRet;
+}
+RT_EXPORT_SYMBOL(RTStrCacheEnterLowerN);
+
+
+RTDECL(const char *) RTStrCacheEnterLower(RTSTRCACHE hStrCache, const char *psz)
+{
+    return RTStrCacheEnterLowerN(hStrCache, psz, strlen(psz));
+}
+RT_EXPORT_SYMBOL(RTStrCacheEnterLower);
+
+
 RTDECL(uint32_t) RTStrCacheRetain(const char *psz)
 {

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;