Changeset 100954 in vbox

Timestamp:

Aug 23, 2023 11:13:42 AM (15 months ago)

Author:

vboxsync

Message:

IPRT/dbgmod: Improved the logic for guessing the .pdb/.dbg filename.

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp (modified) (8 diffs)

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

@@ -583 +583 @@
 rtDbgModOpenDebugInfoExternalToImageCallback(RTLDRMOD hLdrMod, PCRTLDRDBGINFO pDbgInfo, void *pvUser)
 {
-    RTDBGMODOPENDIETI *pArgs = (RTDBGMODOPENDIETI *)pvUser;
+    RTDBGMODOPENDIETI * const pArgs   = (RTDBGMODOPENDIETI *)pvUser;
+    PRTDBGMODINT const        pDbgMod = pArgs->pDbgMod;
     RT_NOREF_PV(hLdrMod);
 
@@ -591 +592 @@
     {
         /*
-         * If a external debug type comes without a file name, calculate a
-         * likely debug filename for it. (Hack for NT4 drivers.)
+         * If a external debug type comes without a file name, calculate a likely
+         * debug filename for it. (Hack for NT4 drivers and the 'nt' module for
+         * NT and W2K.)  Prefer the image name rather than the module name, since
+         * the latter can be normalized or using a different name (e.g. 'nt').
          */
         const char *pszExt = NULL;
@@ -600 +603 @@
                  || 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)
+        if (pszExt)
+        {
+            const char * const pszName = pDbgMod->pszImgFile
+                                       ? RTPathFilenameEx(pDbgMod->pszImgFile, RTPATH_STR_F_STYLE_DOS)
+                                       : pDbgMod->pszName;
+            if (pszName)
             {
-                memcpy(psz, pArgs->pDbgMod->pszName, cchName + 1);
-                RTPathStripSuffix(psz);
-                pszExtFile = strcat(psz, pszExt);
+                size_t cchName = strlen(pszName);
+                char *pszExtFileBuf = (char *)alloca(cchName + strlen(pszExt) + 1);
+                if (pszExtFileBuf)
+                {
+                    memcpy(pszExtFileBuf, pszName, cchName + 1);
+                    RTPathStripSuffix(pszExtFileBuf);
+                    pszExtFile = strcat(pszExtFileBuf, pszExt);
+                }
             }
         }
-
         if (!pszExtFile)
         {
@@ -629 +637 @@
                                    &pDbgInfo->u.Pdb70.Uuid,
                                    pDbgInfo->u.Pdb70.uAge,
-                                   rtDbgModExtDbgInfoOpenCallback, pArgs->pDbgMod, (void *)pDbgInfo);
+                                   rtDbgModExtDbgInfoOpenCallback, pDbgMod, (void *)pDbgInfo);
             break;
 
@@ -637 +645 @@
                                    pDbgInfo->u.Pdb20.uTimestamp,
                                    pDbgInfo->u.Pdb20.uAge,
-                                   rtDbgModExtDbgInfoOpenCallback, pArgs->pDbgMod, (void *)pDbgInfo);
+                                   rtDbgModExtDbgInfoOpenCallback, pDbgMod, (void *)pDbgInfo);
             break;
 
@@ -644 +652 @@
                                  pDbgInfo->u.Dbg.cbImage,
                                  pDbgInfo->u.Dbg.uTimestamp,
-                                 rtDbgModExtDbgInfoOpenCallback, pArgs->pDbgMod, (void *)pDbgInfo);
+                                 rtDbgModExtDbgInfoOpenCallback, pDbgMod, (void *)pDbgInfo);
             break;
 
@@ -650 +658 @@
             rc = RTDbgCfgOpenDwo(pArgs->hDbgCfg, pszExtFile,
                                  pDbgInfo->u.Dwo.uCrc32,
-                                 rtDbgModExtDbgInfoOpenCallback, pArgs->pDbgMod, (void *)pDbgInfo);
+                                 rtDbgModExtDbgInfoOpenCallback, pDbgMod, (void *)pDbgInfo);
             break;
 
@@ -661 +669 @@
     {
         LogFlow(("RTDbgMod: Successfully opened external debug info '%s' for '%s'\n",
-                 pArgs->pDbgMod->pszDbgFile, pArgs->pDbgMod->pszImgFile));
+                 pDbgMod->pszDbgFile, pDbgMod->pszImgFile));
         return VINF_CALLBACK_RETURN;
     }
     Log(("rtDbgModOpenDebugInfoExternalToImageCallback: '%s' (enmType=%d) for '%s'  -> %Rrc\n",
-         pszExtFile, pDbgInfo->enmType, pArgs->pDbgMod->pszImgFile, rc));
+         pszExtFile, pDbgInfo->enmType, pDbgMod->pszImgFile, rc));
     return rc;
 }