Changeset 46118 in vbox

Timestamp:

May 16, 2013 9:51:42 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

85806

Message:

Make 32-bit Windows 8 symbols appear.

Location:

trunk/src/VBox

Files:

• Debugger/DBGPlugInWinNt.cpp (modified) (2 diffs)
• Runtime/common/ldr/ldrPE.cpp (modified) (5 diffs)

trunk/src/VBox/Debugger/DBGPlugInWinNt.cpp

@@ -427 +427 @@
         /* Check that sizes are within the same range and that both sizes and
            addresses are within reasonable limits. */
-        if (   RT_ALIGN(paShs[i].Misc.VirtualSize, _64K) > RT_ALIGN(paShs[i].SizeOfRawData, _64K)
+        if (   RT_ALIGN(paShs[i].Misc.VirtualSize, _64K) < RT_ALIGN(paShs[i].SizeOfRawData, _64K)
             || paShs[i].Misc.VirtualSize >= _1G
             || paShs[i].SizeOfRawData    >= _1G)
@@ -969 +969 @@
                 &&  !(u.MzHdr.e_lfanew & 0x7)
                 &&  u.MzHdr.e_lfanew >= 0x080
-                &&  u.MzHdr.e_lfanew <= 0x200)
+                &&  u.MzHdr.e_lfanew <= 0x400) /* W8 is at 0x288*/
             {
                 IMAGE_NT_HEADERS32 const *pHdrs = (IMAGE_NT_HEADERS32 const *)&u.au8[u.MzHdr.e_lfanew];

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

@@ -1705 +1705 @@
                     return VERR_LDRPE_CERT_MALFORMED;
                 }
+                /* When using the in-memory reader with a debugger, we may get
+                   into trouble here since we might not have access to the whole
+                   physical file.  So skip the tests below. Makes VBoxGuest.sys
+                   load and check out just fine, for instance. */
+                if (fFlags & RTLDR_O_FOR_DEBUG)
+                    continue;
                 break;
 
@@ -1727 +1733 @@
                 return VERR_BAD_EXE_FORMAT;
         }
-        if (   pDir->VirtualAddress >= cb
-            && (   !(fFlags & RTLDR_O_FOR_DEBUG) /* Happens with signed drivers like VBoxGuest.sys. :-) */
-                || i != IMAGE_DIRECTORY_ENTRY_SECURITY) )
+        if (pDir->VirtualAddress >= cb)
         {
             Log(("rtldrPEOpen: %s: dir no. %d VirtualAddress=%#x is invalid (limit %#x)!!!\n",
@@ -1939 +1943 @@
  * @param   pModPe      The PE module instance.
  * @param   pOptHdr     Pointer to the optional header (valid).
+ * @param   fFlags      Loader flags, RTLDR_O_XXX.
  */
-int rtldrPEValidateDirectories(PRTLDRMODPE pModPe, const IMAGE_OPTIONAL_HEADER64 *pOptHdr)
+static int rtldrPEValidateDirectories(PRTLDRMODPE pModPe, const IMAGE_OPTIONAL_HEADER64 *pOptHdr, uint32_t fFlags)
 {
     const char *pszLogName = pModPe->Core.pReader->pfnLogName(pModPe->Core.pReader); NOREF(pszLogName);
@@ -2008 +2013 @@
 
     /*
-     * If the image is signed, take a look at the signature.
+     * If the image is signed and we're not doing this for debug purposes,
+     * take a look at the signature.
      */
     Dir = pOptHdr->DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY];
-    if (Dir.Size)
+    if (Dir.Size && !(fFlags & RTLDR_O_FOR_DEBUG))
     {
         PWIN_CERTIFICATE pFirst = (PWIN_CERTIFICATE)RTMemTmpAlloc(Dir.Size);
@@ -2163 +2169 @@
                  * inspection of the actual data.
                  */
-                rc = rtldrPEValidateDirectories(pModPe, &OptHdr);
+                rc = rtldrPEValidateDirectories(pModPe, &OptHdr, fFlags);
                 if (RT_SUCCESS(rc))
                 {