Changeset 3530 for trunk

Timestamp:

Aug 20, 2007, 5:42:03 AM (18 years ago)

Author:

bird

Message:

Made the generic pe module build too.

Location:

trunk/kDbg

Files:

• Makefile.kmk (modified) (2 diffs)
• kDbg.h (modified) (1 diff)
• kDbgInternal.h (modified) (1 diff)
• kDbgModPE.cpp (moved) (moved from trunk/kDbg/kDbgModPE-generic.cpp ) (15 diffs)
• kDbgModWinDbgHelp.cpp (moved) (moved from trunk/kDbg/kDbgModPE-win.cpp ) (29 diffs)
• kDbgModule.cpp (modified) (1 diff)

trunk/kDbg/Makefile.kmk

@@ -37 +37 @@
 kDbg_SOURCES := \
         kDbgModule.cpp \
-        kDbgModPE-$(if $(eq $(BUILD_TARGET),win),win,generic).cpp \
+        kDbgModPE.cpp \
         \
         kDbgLine.cpp \
@@ -44 +44 @@
         \
         kDbgHlpCrt.cpp
+
+kDbg_SOURCES += \
+        kDbgModWinDbgHelp.cpp
+
 
 #

trunk/kDbg/kDbg.h

@@ -59 +59 @@
 /** The specified file was not found. */
 #define KDBG_ERR_FILE_NOT_FOUND                         (KDBG_ERR_BASE + 5)
+/** Hit some unimplemented functionality - feel free to implement it :-) . */
+#define KDBG_ERR_NOT_IMPLEMENTED                        (KDBG_ERR_BASE + 6)
 /** Generic error. */
 #define KDBG_ERR_GENERAL_FAILURE                        (KDBG_ERR_BASE + 9)

trunk/kDbg/kDbgInternal.h

@@ -112 +112 @@
 
 int kdbgModPEOpen(PKDBGHLPFILE pFile, KDBGADDR offHdr, const char *pszModulePath, PKDBGMOD *ppDbgMod);
+int kdbgModWinDbgHelpOpen(PKDBGHLPFILE pFile, KDBGADDR offHdr, const char *pszModulePath, PKDBGMOD *ppDbgMod);
 
 #ifdef __cplusplus

trunk/kDbg/kDbgModPE.cpp

@@ -31 +31 @@
 #include "kDbgInternal.h"
 #include <kLdrModPE.h>
+#include <string.h>
 
 
@@ -72 +73 @@
                         ("off=" PRI_KDBGADDR " VirtualSize=%x\n", off, pModPe->aSections[iSegment].Misc.VirtualSize),
                         KDBG_ERR_INVALID_ADDRESS);
-        *puRVA = pModPe->aSections[iSegment].VirtualAddress + off;
+        *puRVA = pModPe->aSections[iSegment].VirtualAddress + (uint32_t)off;
         return 0;
     }
@@ -80 +81 @@
         kDbgAssertMsgReturn(off < pModPe->cbImage, ("off=" PRI_KDBGADDR ", cbImage=%x\n", off, pModPe->cbImage),
                             KDBG_ERR_INVALID_ADDRESS);
-        *puRVA = off;
+        *puRVA = (uint32_t)off;
         return 0;
     }
@@ -119 +120 @@
  * @copydoc KDBGMODOPS::pfnQueryLine
  */
-static int rtDbgModPEQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine)
+static int kDbgModPeQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine)
 {
     PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
@@ -150 +151 @@
         }
 #endif
-        rc = VERR_NOT_IMPLEMENTED;
+        rc = KDBG_ERR_NOT_IMPLEMENTED;
     }
     return rc;
@@ -159 +160 @@
  * @copydoc KDBGMODOPS::pfnQuerySymbol
  */
-static int rtDbgModPEQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
+static int kDbgModPeQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
 {
     PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
@@ -175 +176 @@
         {
             SYMBOL_INFO Sym;
-            char        achBuffer[sizeof(SYMBOL_INFO) + RTDBG_SYMBOL_MAX];
+            char        achBuffer[sizeof(SYMBOL_INFO) + KDBG_SYMBOL_MAX];
         } Buf;
         Buf.Sym.SizeOfStruct = sizeof(SYMBOL_INFO);
-        Buf.Sym.MaxNameLen = RTDBG_SYMBOL_MAX;
+        Buf.Sym.MaxNameLen = KDBG_SYMBOL_MAX;
         if (g_pfnSymFromAddr(pModPe->hSymInst, pModPe->ImageBase + uRVA, &off, &Buf.Sym))
         {
@@ -193 +194 @@
             if ((Buf.Sym.Flags & (SYMFLAG_VALUEPRESENT | SYMFLAG_CONSTANT)) == (SYMFLAG_VALUEPRESENT | SYMFLAG_CONSTANT))
             {
-                pSym->iSegment   = RTDBGSEG_ABS;
+                pSym->iSegment   = KDBGSEG_ABS;
                 pSym->offSegment = (KDBGADDR)Buf.Sym.Value;
                 pSym->RVA        = (KDBGADDR)Buf.Sym.Value;
@@ -214 +215 @@
         }
 #endif
-        rc = VERR_NOT_IMPLEMENTED;
+        rc = KDBG_ERR_NOT_IMPLEMENTED;
     }
     return rc;
@@ -223 +224 @@
  * @copydoc KDBGMODOPS::pfnClose
  */
-static int rtDbgModPEClose(PKDBGMOD pMod)
+static int kDbgModPeClose(PKDBGMOD pMod)
 {
     PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
@@ -234 +235 @@
     //kDbgAssertMsgFailed(("SymInitialize failed: Err=%d rc=%Rrc\n", Err, rc));
     //return rc;
-    return VERR_NOT_IMPLEMENTED;
+    return KDBG_ERR_NOT_IMPLEMENTED;
 }
 
@@ -241 +242 @@
  * Methods for a PE module.
  */
-static const KDBGMODOPS g_rtDbgModPEOps =
-{
-    "PE (dbghelp)",
-    rtDbgModPEClose,
-    rtDbgModPEQuerySymbol,
-    rtDbgModPEQueryLine
+static const KDBGMODOPS g_kDbgModPeOps =
+{
+    "PE",
+    kDbgModPeClose,
+    kDbgModPeQuerySymbol,
+    kDbgModPeQueryLine
 };
 
@@ -267 +268 @@
      */
     IMAGE_FILE_HEADER FHdr;
-    int rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr), NULL);
-    AssertRCReturn(rc, rc);
+    int rc = kDbgHlpReadAt(pFile, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr));
+    kDbgAssertRCReturn(rc, rc);
 
     uint32_t cbImage;
     if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER32))
-        rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
-                          &cbImage, sizeof(cbImage), NULL);
+        rc = kDbgHlpReadAt(pFile, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
+                           &cbImage, sizeof(cbImage));
     else if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER64))
-        rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
-                          &cbImage, sizeof(cbImage), NULL);
+        rc = kDbgHlpReadAt(pFile, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
+                           &cbImage, sizeof(cbImage));
     else
-        AssertFailedReturn(VERR_BAD_EXE_FORMAT);
-    AssertRCReturn(rc, rc);
+        kDbgAssertFailedReturn(KDBG_ERR_BAD_EXE_FORMAT);
+    kDbgAssertRCReturn(rc, rc);
 
     /*
      * Allocate the module and read/construct the section headers.
      */
-    PKDBGMODPE pModPe = (PKDBGMODPE)RTMemAlloc(KDBG_OFFSETOF(KDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
-    AssertReturn(pModPe, KDBG_ERR_NO_MEMORY);
+    PKDBGMODPE pModPe = (PKDBGMODPE)kDbgHlpAlloc(KDBG_OFFSETOF(KDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
+    kDbgAssertReturn(pModPe, KDBG_ERR_NO_MEMORY);
     pModPe->Core.u32Magic   = KDBGMOD_MAGIC;
-    pModPe->Core.pOps       = &g_rtDbgModPEOps;
-    pModPe->Core.File       = File;
+    pModPe->Core.pOps       = &g_kDbgModPeOps;
+    pModPe->Core.pFile      = pFile;
     pModPe->cbImage         = cbImage;
     pModPe->cSections       = 1 + FHdr.NumberOfSections;
-    rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
-                      &pModPe->aSections[1], sizeof(pModPe->aSections[0]) * FHdr.NumberOfSections, NULL);
+    rc = kDbgHlpReadAt(pFile, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
+                       &pModPe->aSections[1], sizeof(pModPe->aSections[0]) * FHdr.NumberOfSections);
     if (!rc)
     {
@@ -345 +346 @@
             g_pfnSymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | SYMOPT_ALLOW_ABSOLUTE_SYMBOLS);
 
-            RTFileSeek(File, 0, RTFILE_SEEK_BEGIN, NULL); /* don't know if this is required or not... */
+            kDbgHlpSeek(pFile, 0); /* don't know if this is required or not... */
             DWORD64 ImageBase = g_pfnSymLoadModule64(hSymInst, (HANDLE)File, pszModulePath, NULL, 0x00400000, 0);
             if (ImageBase)
@@ -367 +368 @@
         }
 #endif
-        rc = VERR_NOT_IMPLEMENTED;
+        rc = KDBG_ERR_NOT_IMPLEMENTED;
     }
     else
-        AssertRC(rc);
+        kDbgAssertRC(rc);
 
     kDbgHlpFree(pModPe);

trunk/kDbg/kDbgModWinDbgHelp.cpp

@@ -63 +63 @@
  * A dbghelp based PE debug reader.
  */
-typedef struct KDBGMODPE
+typedef struct KDBGMODDBGHELP
 {
     /** The common module core. */
-    KDBGMOD    Core;
+    KDBGMOD     Core;
     /** The image base. */
     DWORD64     ImageBase;
@@ -78 +78 @@
      * implicit header section.*/
     IMAGE_SECTION_HEADER    aSections[1];
-} KDBGMODPE, *PKDBGMODPE;
+} KDBGMODDBGHELP, *PKDBGMODDBGHELP;
 
 
@@ -102 +102 @@
  * @returns IPRT status code.
  *
- * @param   pModPe      The PE debug module instance.
+ * @param   pModDH      The PE debug module instance.
  * @param   iSegment    The segment number. Special segments are dealt with as well.
  * @param   off         The segment offset.
  * @param   puRVA       Where to store the RVA on success.
  */
-static int kDbgModPeSegOffToRVA(PKDBGMODPE pModPe, int32_t iSegment, KDBGADDR off, uint32_t *puRVA)
+static int kDbgModPeSegOffToRVA(PKDBGMODDBGHELP pModDH, int32_t iSegment, KDBGADDR off, uint32_t *puRVA)
 {
     if (iSegment >= 0)
     {
-        kDbgAssertMsgReturn(iSegment < pModPe->cSections, ("iSegment=%x cSections=%x\n", iSegment, pModPe->cSections),
+        kDbgAssertMsgReturn(iSegment < pModDH->cSections, ("iSegment=%x cSections=%x\n", iSegment, pModDH->cSections),
                             KDBG_ERR_INVALID_ADDRESS);
-        kDbgAssertMsgReturn(off < pModPe->aSections[iSegment].Misc.VirtualSize,
-                            ("off=" PRI_KDBGADDR " VirtualSize=%x\n", off, pModPe->aSections[iSegment].Misc.VirtualSize),
+        kDbgAssertMsgReturn(off < pModDH->aSections[iSegment].Misc.VirtualSize,
+                            ("off=" PRI_KDBGADDR " VirtualSize=%x\n", off, pModDH->aSections[iSegment].Misc.VirtualSize),
                             KDBG_ERR_INVALID_ADDRESS);
-        *puRVA = pModPe->aSections[iSegment].VirtualAddress + (uint32_t)off;
+        *puRVA = pModDH->aSections[iSegment].VirtualAddress + (uint32_t)off;
         return 0;
     }
@@ -122 +122 @@
     if (iSegment == KDBGSEG_RVA)
     {
-        kDbgAssertMsgReturn(off < pModPe->cbImage, ("off=" PRI_KDBGADDR ", cbImage=%x\n", off, pModPe->cbImage),
+        kDbgAssertMsgReturn(off < pModDH->cbImage, ("off=" PRI_KDBGADDR ", cbImage=%x\n", off, pModDH->cbImage),
                             KDBG_ERR_INVALID_ADDRESS);
         *puRVA = (uint32_t)off;
@@ -136 +136 @@
  * @returns IPRT status code.
  *
- * @param   pModPe      The PE debug module instance.
+ * @param   pModDH      The PE debug module instance.
  * @param   uRVA        The RVA.
  * @param   piSegment   Where to store the segment number.
  * @param   poff        Where to store the segment offset.
  */
-static int kDbgModPeRVAToSegOff(PKDBGMODPE pModPe, uint32_t uRVA, int32_t *piSegment, KDBGADDR *poff)
-{
-    kDbgAssertMsgReturn(uRVA < pModPe->cbImage, ("uRVA=%x, cbImage=%x\n", uRVA, pModPe->cbImage),
-                    KDBG_ERR_INVALID_ADDRESS);
-    for (int32_t iSegment = 0; iSegment < pModPe->cSections; iSegment++)
+static int kDbgModPeRVAToSegOff(PKDBGMODDBGHELP pModDH, uint32_t uRVA, int32_t *piSegment, KDBGADDR *poff)
+{
+    kDbgAssertMsgReturn(uRVA < pModDH->cbImage, ("uRVA=%x, cbImage=%x\n", uRVA, pModDH->cbImage),
+                        KDBG_ERR_INVALID_ADDRESS);
+    for (int32_t iSegment = 0; iSegment < pModDH->cSections; iSegment++)
     {
         /** @todo should probably be less strict about address in the alignment gaps. */
-        uint32_t off = uRVA - pModPe->aSections[iSegment].VirtualAddress;
-        if (off < pModPe->aSections[iSegment].Misc.VirtualSize)
+        uint32_t off = uRVA - pModDH->aSections[iSegment].VirtualAddress;
+        if (off < pModDH->aSections[iSegment].Misc.VirtualSize)
         {
             *poff = off;
@@ -163 +163 @@
  * @copydoc KDBGMODOPS::pfnQueryLine
  */
-static int rtDbgModPEQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine)
-{
-    PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
+static int kdbgModDHQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine)
+{
+    PKDBGMODDBGHELP pModDH = (PKDBGMODDBGHELP)pMod;
 
     /*
@@ -171 +171 @@
      */
     uint32_t uRVA;
-    int rc = kDbgModPeSegOffToRVA(pModPe, iSegment, off, &uRVA);
+    int rc = kDbgModPeSegOffToRVA(pModDH, iSegment, off, &uRVA);
     if (!rc)
     {
@@ -177 +177 @@
         IMAGEHLP_LINE64 Line;
         Line.SizeOfStruct = sizeof(Line);
-        if (g_pfnSymGetLineFromAddr64(pModPe->hSymInst, pModPe->ImageBase + uRVA, &off, &Line))
-        {
-            pLine->RVA = (KDBGADDR)(Line.Address - pModPe->ImageBase);
-            rc = kDbgModPeRVAToSegOff(pModPe, (uint32_t)pLine->RVA, &pLine->iSegment, &pLine->offSegment);
+        if (g_pfnSymGetLineFromAddr64(pModDH->hSymInst, pModDH->ImageBase + uRVA, &off, &Line))
+        {
+            pLine->RVA = (KDBGADDR)(Line.Address - pModDH->ImageBase);
+            rc = kDbgModPeRVAToSegOff(pModDH, (uint32_t)pLine->RVA, &pLine->iSegment, &pLine->offSegment);
             pLine->iLine = Line.LineNumber;
             size_t cchFile = strlen(Line.FileName);
@@ -202 +202 @@
  * @copydoc KDBGMODOPS::pfnQuerySymbol
  */
-static int rtDbgModPEQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
-{
-    PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
+static int kdbgModDHQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
+{
+    PKDBGMODDBGHELP pModDH = (PKDBGMODDBGHELP)pMod;
 
     /*
@@ -210 +210 @@
      */
     uint32_t uRVA;
-    int rc = kDbgModPeSegOffToRVA(pModPe, iSegment, off, &uRVA);
+    int rc = kDbgModPeSegOffToRVA(pModDH, iSegment, off, &uRVA);
     if (!rc)
     {
@@ -221 +221 @@
         Buf.Sym.SizeOfStruct = sizeof(SYMBOL_INFO);
         Buf.Sym.MaxNameLen = KDBG_SYMBOL_MAX;
-        if (g_pfnSymFromAddr(pModPe->hSymInst, pModPe->ImageBase + uRVA, &off, &Buf.Sym))
+        if (g_pfnSymFromAddr(pModDH->hSymInst, pModDH->ImageBase + uRVA, &off, &Buf.Sym))
         {
             pSym->cb     = Buf.Sym.Size;
@@ -241 +241 @@
             else
             {
-                pSym->RVA        = (KDBGADDR)(Buf.Sym.Address - pModPe->ImageBase);
-                rc = kDbgModPeRVAToSegOff(pModPe, (uint32_t)pSym->RVA, &pSym->iSegment, &pSym->offSegment);
+                pSym->RVA        = (KDBGADDR)(Buf.Sym.Address - pModDH->ImageBase);
+                rc = kDbgModPeRVAToSegOff(pModDH, (uint32_t)pSym->RVA, &pSym->iSegment, &pSym->offSegment);
             }
             pSym->cchName = (uint16_t)Buf.Sym.NameLen;
@@ -263 +263 @@
  * @copydoc KDBGMODOPS::pfnClose
  */
-static int rtDbgModPEClose(PKDBGMOD pMod)
-{
-    PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
-
-    if (g_pfnSymCleanup(pModPe->hSymInst))
+static int kdbgModDHClose(PKDBGMOD pMod)
+{
+    PKDBGMODDBGHELP pModDH = (PKDBGMODDBGHELP)pMod;
+
+    if (g_pfnSymCleanup(pModDH->hSymInst))
         return 0;
 
@@ -280 +280 @@
  * Methods for a PE module.
  */
-static const KDBGMODOPS g_rtDbgModPEOps =
+static const KDBGMODOPS g_kdbgModDHOps =
 {
     "PE (dbghelp)",
-    rtDbgModPEClose,
-    rtDbgModPEQuerySymbol,
-    rtDbgModPEQueryLine
+    kdbgModDHClose,
+    kdbgModDHQuerySymbol,
+    kdbgModDHQueryLine
 };
 
@@ -296 +296 @@
  * @param   pszPath     the path to the dbghelp.dll.
  */
-static int rtDbgModPETryDbgHelp(const char *pszPath, uint32_t *pu32FileVersionMS, uint32_t *pu32FileVersionLS)
+static int kdbgModDHTryDbgHelp(const char *pszPath, uint32_t *pu32FileVersionMS, uint32_t *pu32FileVersionLS)
 {
     int rc;
@@ -337 +337 @@
  * Find the dbghelp.dll
  */
-static int rtDbgModPEFindDbgHelp(char *pszPath, size_t cchPath)
+static int kdbgModDHFindDbgHelp(char *pszPath, size_t cchPath)
 {
     /*
@@ -349 +349 @@
     {
         strcat(pszPath, s_szDbgHelp);
-        int rc2 = rtDbgModPETryDbgHelp(pszPath, &FileVersionMS, &FileVersionLS);
+        int rc2 = kdbgModDHTryDbgHelp(pszPath, &FileVersionMS, &FileVersionLS);
         if (!rc2)
             return rc2;
@@ -362 +362 @@
     {
         strcat(strrchr(pszPath, '\\'), s_szDbgHelp);
-        int rc2 = rtDbgModPETryDbgHelp(pszPath, &FileVersionMS, &FileVersionLS);
+        int rc2 = kdbgModDHTryDbgHelp(pszPath, &FileVersionMS, &FileVersionLS);
         if (!rc)
             return rc2;
@@ -375 +375 @@
     {
         strcat(pszPath, s_szDbgHelp);
-        int rc2 = rtDbgModPETryDbgHelp(pszPath, &FileVersionMS, &FileVersionLS);
+        int rc2 = kdbgModDHTryDbgHelp(pszPath, &FileVersionMS, &FileVersionLS);
         if (!rc2)
             return rc2;
@@ -388 +388 @@
     {
         strcat(pszPath, s_szDbgHelp);
-        int rc2 = rtDbgModPETryDbgHelp(pszPath, &FileVersionMS, &FileVersionLS);
+        int rc2 = kdbgModDHTryDbgHelp(pszPath, &FileVersionMS, &FileVersionLS);
         if (!rc2)
             return rc2;
@@ -415 +415 @@
                 memcpy(pszPath, psz, pszEnd - psz);
                 memcpy(&pszPath[pszEnd - psz], s_szDbgHelp, sizeof(s_szDbgHelp));
-                int rc2 = rtDbgModPETryDbgHelp(pszPath, &FileVersionMS, &FileVersionLS);
+                int rc2 = kdbgModDHTryDbgHelp(pszPath, &FileVersionMS, &FileVersionLS);
                 if (!rc2)
                     return rc2;
@@ -447 +447 @@
  * @returns IPRT status code.
  */
-static int rtDbgModPELoadDbgHelp(void)
+static int kdbgModDHLoadDbgHelp(void)
 {
     if (g_hDbgHelp)
@@ -467 +467 @@
      */
     char szPath[260];
-    int rc = rtDbgModPEFindDbgHelp(szPath, sizeof(szPath));
+    int rc = kdbgModDHFindDbgHelp(szPath, sizeof(szPath));
     if (rc)
     {
@@ -566 +566 @@
  *
  */
-int kdbgModPEOpen(PKDBGHLPFILE pFile, int64_t offHdr, const char *pszModulePath, PKDBGMOD *ppDbgMod)
+int kdbgModWinDbgHelpOpen(PKDBGHLPFILE pFile, int64_t offHdr, const char *pszModulePath, PKDBGMOD *ppDbgMod)
 {
     /*
@@ -589 +589 @@
      * Load dbghelp.dll.
      */
-    rc = rtDbgModPELoadDbgHelp();
+    rc = kdbgModDHLoadDbgHelp();
     if (rc)
         return rc;
@@ -596 +596 @@
      * Allocate the module and read/construct the section headers.
      */
-    PKDBGMODPE pModPe = (PKDBGMODPE)kDbgHlpAlloc(KDBG_OFFSETOF(KDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
-    kDbgAssertReturn(pModPe, KDBG_ERR_NO_MEMORY);
-    pModPe->Core.u32Magic   = KDBGMOD_MAGIC;
-    pModPe->Core.pOps       = &g_rtDbgModPEOps;
-    pModPe->Core.pFile      = pFile;
-    pModPe->cbImage         = cbImage;
-    pModPe->cSections       = 1 + FHdr.NumberOfSections;
+    PKDBGMODDBGHELP pModDH = (PKDBGMODDBGHELP)kDbgHlpAlloc(KDBG_OFFSETOF(KDBGMODDBGHELP, aSections[FHdr.NumberOfSections + 2]));
+    kDbgAssertReturn(pModDH, KDBG_ERR_NO_MEMORY);
+    pModDH->Core.u32Magic   = KDBGMOD_MAGIC;
+    pModDH->Core.pOps       = &g_kdbgModDHOps;
+    pModDH->Core.pFile      = pFile;
+    pModDH->cbImage         = cbImage;
+    pModDH->cSections       = 1 + FHdr.NumberOfSections;
     rc = kDbgHlpReadAt(pFile, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
-                       &pModPe->aSections[1], sizeof(pModPe->aSections[0]) * FHdr.NumberOfSections);
+                       &pModDH->aSections[1], sizeof(pModDH->aSections[0]) * FHdr.NumberOfSections);
     if (!rc)
     {
-        PIMAGE_SECTION_HEADER pSH = &pModPe->aSections[0];
+        PIMAGE_SECTION_HEADER pSH = &pModDH->aSections[0];
         memcpy(pSH->Name, "headers", sizeof(pSH->Name));
-        pSH->Misc.VirtualSize       = pModPe->aSections[1].VirtualAddress;
+        pSH->Misc.VirtualSize       = pModDH->aSections[1].VirtualAddress;
         pSH->VirtualAddress         = 0;
         pSH->SizeOfRawData          = pSH->Misc.VirtualSize;
@@ -619 +619 @@
         pSH->Characteristics        = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_ALIGN_4BYTES | IMAGE_SCN_MEM_READ;
 
-        uint32_t uTheEnd = pModPe->aSections[FHdr.NumberOfSections].VirtualAddress
-                         + pModPe->aSections[FHdr.NumberOfSections].Misc.VirtualSize;
+        uint32_t uTheEnd = pModDH->aSections[FHdr.NumberOfSections].VirtualAddress
+                         + pModDH->aSections[FHdr.NumberOfSections].Misc.VirtualSize;
         if (uTheEnd < cbImage)
         {
-            pSH = &pModPe->aSections[pModPe->cSections++];
+            pSH = &pModDH->aSections[pModDH->cSections++];
             memcpy(pSH->Name, "tail\0\0\0", sizeof(pSH->Name));
             pSH->Misc.VirtualSize       = cbImage - uTheEnd;
@@ -661 +661 @@
             if (ImageBase)
             {
-                pModPe->hSymInst    = hSymInst;
-                pModPe->ImageBase   = ImageBase;
-                *ppDbgMod = &pModPe->Core;
+                pModDH->hSymInst    = hSymInst;
+                pModDH->ImageBase   = ImageBase;
+                *ppDbgMod = &pModDH->Core;
                 return rc;
             }
@@ -682 +682 @@
         kDbgAssertRC(rc);
 
-    kDbgHlpFree(pModPe);
+    kDbgHlpFree(pModDH);
     return rc;
 }

trunk/kDbg/kDbgModule.cpp

@@ -104 +104 @@
 #ifdef IMAGE_NT_SIGNATURE
         else if (Buf.au32[0] == IMAGE_NT_SIGNATURE)
+        {
+# ifdef KS_OS_WINDOWS
+            rc = kdbgModWinDbgHelpOpen(pFile, offHdr, pszModulePath, ppDbgMod);
+            if (    rc
+                &&  !kdbgModPEOpen(pFile, offHdr, pszModulePath, ppDbgMod))
+                rc = 0;
+# endif
             rc = kdbgModPEOpen(pFile, offHdr, pszModulePath, ppDbgMod);
+        }
 #endif
         /** @todo there are a number of text file formats too which I want to support. */