Changeset 3529 for trunk/kDbg/kDbgModPE-generic.cpp

Timestamp:

Aug 20, 2007, 5:25:44 AM (18 years ago)

Author:

bird

Message:

it builds.

File:

• trunk/kDbg/kDbgModPE-generic.cpp (modified) (18 diffs)

trunk/kDbg/kDbgModPE-generic.cpp

@@ -63 +63 @@
  * @param   puRVA       Where to store the RVA on success.
  */
-static int rtDbgModPeSegOffToRVA(PKDBGMODPE pModPe, int32_t iSegment, KDBGADDR off, uint32_t *puRVA)
+static int kDbgModPeSegOffToRVA(PKDBGMODPE pModPe, int32_t iSegment, KDBGADDR off, uint32_t *puRVA)
 {
     if (iSegment >= 0)
@@ -83 +83 @@
         return 0;
     }
-    AssertMsgFailedReturn(("iSegment=%RI32\n", iSegment), KDBG_ERR_INVALID_ADDRESS);
+    kDbgAssertMsgFailedReturn(("iSegment=%d\n", iSegment), KDBG_ERR_INVALID_ADDRESS);
 }
 
@@ -97 +97 @@
  * @param   poff        Where to store the segment offset.
  */
-static int rtDbgModPeRVAToSegOff(PKDBGMODPE pModPe, uint32_t uRVA, int32_t *piSegment, KDBGADDR *poff)
+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),
@@ -112 +112 @@
         }
     }
-    AssertMsgFailedReturn(("uRVA=%x\n", uRVA), KDBG_ERR_INVALID_ADDRESS);
+    kDbgAssertMsgFailedReturn(("uRVA=%x\n", uRVA), KDBG_ERR_INVALID_ADDRESS);
 }
 
@@ -119 +119 @@
  * @copydoc KDBGMODOPS::pfnQueryLine
  */
-static DECLCALLBACK(int) rtDbgModPEQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine)
+static int rtDbgModPEQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine)
 {
     PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
@@ -127 +127 @@
      */
     uint32_t uRVA;
-    int rc = rtDbgModPeSegOffToRVA(pModPe, iSegment, off, &uRVA);
+    int rc = kDbgModPeSegOffToRVA(pModPe, iSegment, off, &uRVA);
     if (!rc)
     {
@@ -137 +137 @@
         {
             pLine->RVA = (KDBGADDR)(Line.Address - pModPe->ImageBase);
-            rc = rtDbgModPeRVAToSegOff(pModPe, pLine->RVA, &pLine->iSegment, &pLine->offSegment);
+            rc = kDbgModPeRVAToSegOff(pModPe, pLine->RVA, &pLine->iSegment, &pLine->offSegment);
             pLine->iLine = Line.LineNumber;
             pLine->cchFile = strlen(Line.FileName);
@@ -147 +147 @@
         {
             DWORD Err = GetLastError();
-            rc = RTErrConvertFromWin32(Err);
+            rc = kDbgModPeConvWinError(Err);
         }
 #endif
@@ -159 +159 @@
  * @copydoc KDBGMODOPS::pfnQuerySymbol
  */
-static DECLCALLBACK(int) rtDbgModPEQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
+static int rtDbgModPEQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
 {
     PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
@@ -167 +167 @@
      */
     uint32_t uRVA;
-    int rc = rtDbgModPeSegOffToRVA(pModPe, iSegment, off, &uRVA);
+    int rc = kDbgModPeSegOffToRVA(pModPe, iSegment, off, &uRVA);
     if (!rc)
     {
@@ -200 +200 @@
             {
                 pSym->RVA        = (KDBGADDR)(Buf.Sym.Address - pModPe->ImageBase);
-                rc = rtDbgModPeRVAToSegOff(pModPe, pSym->RVA, &pSym->iSegment, &pSym->offSegment);
+                rc = kDbgModPeRVAToSegOff(pModPe, pSym->RVA, &pSym->iSegment, &pSym->offSegment);
             }
             pSym->cchName = (uint16_t)Buf.Sym.NameLen;
@@ -211 +211 @@
         {
             DWORD Err = GetLastError();
-            rc = RTErrConvertFromWin32(Err);
+            rc = kDbgModPeConvWinError(Err);
         }
 #endif
@@ -223 +223 @@
  * @copydoc KDBGMODOPS::pfnClose
  */
-static DECLCALLBACK(int) rtDbgModPEClose(PKDBGMOD pMod)
+static int rtDbgModPEClose(PKDBGMOD pMod)
 {
     PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
@@ -231 +231 @@
     //
     //DWORD Err = GetLastError();
-    //int rc = RTErrConvertFromWin32(Err);
-    //AssertMsgFailed(("SymInitialize failed: Err=%d rc=%Rrc\n", Err, rc));
+    //int rc = kDbgModPeConvWinError(Err);
+    //kDbgAssertMsgFailed(("SymInitialize failed: Err=%d rc=%Rrc\n", Err, rc));
     //return rc;
     return VERR_NOT_IMPLEMENTED;
@@ -255 +255 @@
  * @returns IPRT status code.
  *
- * @param   File                The handle to the module.
+ * @param   pFile               The handle to the module.
  * @param   offHdr              The offset of the PE header.
  * @param   pszModulePath       The path to the module.
@@ -261 +261 @@
  *
  */
-int kdbgModPEOpen(RTFILE File, int64_t offHdr, const char *pszModulePath, PKDBGMOD *ppDbgMod)
+int kdbgModPEOpen(PKDBGHLPFILE pFile, int64_t offHdr, const char *pszModulePath, PKDBGMOD *ppDbgMod)
 {
     /*
@@ -356 +356 @@
 
             DWORD Err = GetLastError();
-            rc = RTErrConvertFromWin32(Err);
-            AssertMsgFailed(("SymLoadModule64 failed: Err=%d rc=%Rrc\n", Err, rc));
+            rc = kDbgModPeConvWinError(Err);
+            kDbgAssertMsgFailed(("SymLoadModule64 failed: Err=%d rc=%Rrc\n", Err, rc));
             g_pfnSymCleanup(hSymInst);
         }
@@ -363 +363 @@
         {
             DWORD Err = GetLastError();
-            rc = RTErrConvertFromWin32(Err);
-            AssertMsgFailed(("SymInitialize failed: Err=%d rc=%Rrc\n", Err, rc));
+            rc = kDbgModPeConvWinError(Err);
+            kDbgAssertMsgFailed(("SymInitialize failed: Err=%d rc=%Rrc\n", Err, rc));
         }
 #endif