vbox的更動 46078 路徑 trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

時間撮記:

2013-5-14 下午06:22:53 (12 年 以前)

作者:

vboxsync

訊息:

More debugging fixes.

檔案:

• trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp (修改) (5 筆差異)

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

@@ -942 +942 @@
     SegInfo.fProt       = RTMEM_PROT_READ;
     SegInfo.Alignment   = 1;
-    SegInfo.LinkAddress = 0;
-    SegInfo.RVA         = SegInfo.LinkAddress;
+    SegInfo.LinkAddress = pModPe->uImageBase;
+    SegInfo.RVA         = 0;
     SegInfo.offFile     = 0;
     SegInfo.cb          = pModPe->cbHeaders;
@@ -981 +981 @@
         else
         {
-            SegInfo.LinkAddress = pSh->VirtualAddress;
-            SegInfo.RVA         = SegInfo.LinkAddress;
+            SegInfo.LinkAddress = pSh->VirtualAddress + pModPe->uImageBase ;
+            SegInfo.RVA         = pSh->VirtualAddress;
             SegInfo.cbMapped    = RT_ALIGN(SegInfo.cb, SegInfo.Alignment);
             if (i + 1 < pModPe->cSections && !(pSh[1].Characteristics & IMAGE_SCN_TYPE_NOLOAD))
@@ -1012 +1012 @@
     PRTLDRMODPE pModPe = (PRTLDRMODPE)pMod;
 
-    /* Note! LinkAddress == RVA */
+    LinkAddress -= pModPe->uImageBase;
 
     /* Special header segment. */
@@ -1051 +1051 @@
     PRTLDRMODPE pModPe = (PRTLDRMODPE)pMod;
 
+    LinkAddress -= pModPe->uImageBase;
     if (LinkAddress > pModPe->cbImage)
         return VERR_LDR_INVALID_LINK_ADDRESS;
     *pRva = LinkAddress;
+
     return VINF_SUCCESS;
 }
@@ -1082 +1084 @@
                                                 uint32_t *piSeg, PRTLDRADDR poffSeg)
 {
-    int rc = rtldrPE_LinkAddressToSegOffset(pMod, Rva, piSeg, poffSeg);
+    PRTLDRMODPE pModPe = (PRTLDRMODPE)pMod;
+    int rc = rtldrPE_LinkAddressToSegOffset(pMod, Rva + pModPe->uImageBase, piSeg, poffSeg);
     if (RT_FAILURE(rc))
         rc = VERR_LDR_INVALID_RVA;