Changeset 106861 in vbox

Timestamp:

Nov 7, 2024 3:18:57 AM (2 months ago)

Author:

vboxsync

Message:

IPRT/ldrPE.cpp: Don't be so strict about SizeOfStackReserve/SizeOfStackCommit and SizeOfHeapReserve/SizeOfHeapCommit. Ran into this with wsock32.dll from NT 3.1. Also fixed the RTLDRTYPE classification (nobody uses this), which swapped DLLs and EXEs.

File:

• trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp (modified) (2 diffs)

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

@@ -4381 +4381 @@
         Log(("rtldrPEOpen: %s: SizeOfStackReserve %#x < SizeOfStackCommit %#x!!!\n",
              pszLogName, pOptHdr->SizeOfStackReserve, pOptHdr->SizeOfStackCommit));
-        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "SizeOfStackReserve %#x < SizeOfStackCommit %#x",
-                                   pOptHdr->SizeOfStackReserve, pOptHdr->SizeOfStackCommit);
+        if (   !(fFlags & (RTLDR_O_FOR_DEBUG | RTLDR_O_FOR_VALIDATION))
+            && !(pFileHdr->Characteristics & IMAGE_FILE_DLL))
+            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "SizeOfStackReserve %#x < SizeOfStackCommit %#x",
+                                       pOptHdr->SizeOfStackReserve, pOptHdr->SizeOfStackCommit);
     }
     if (pOptHdr->SizeOfHeapReserve < pOptHdr->SizeOfHeapCommit)
     {
-        Log(("rtldrPEOpen: %s: SizeOfStackReserve %#x < SizeOfStackCommit %#x!!!\n",
-             pszLogName, pOptHdr->SizeOfStackReserve, pOptHdr->SizeOfStackCommit));
-        return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "SizeOfStackReserve %#x < SizeOfStackCommit %#x\n",
-                                   pOptHdr->SizeOfStackReserve, pOptHdr->SizeOfStackCommit);
+        Log(("rtldrPEOpen: %s: SizeOfHeapReserve %#x < SizeOfHeapCommit %#x!!!\n",
+             pszLogName, pOptHdr->SizeOfHeapReserve, pOptHdr->SizeOfHeapCommit));
+        if (   !(fFlags & (RTLDR_O_FOR_DEBUG | RTLDR_O_FOR_VALIDATION))
+            && !(pFileHdr->Characteristics & IMAGE_FILE_DLL))
+            return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "SizeOfHeapReserve %#x < SizeOfHeapCommit %#x\n",
+                                       pOptHdr->SizeOfHeapReserve, pOptHdr->SizeOfHeapCommit);
     }
 
@@ -5152 +5156 @@
                 pModPe->Core.pReader  = pReader;
                 pModPe->Core.enmFormat= RTLDRFMT_PE;
-                pModPe->Core.enmType  = FileHdr.Characteristics & IMAGE_FILE_DLL
+                pModPe->Core.enmType  = !(FileHdr.Characteristics & IMAGE_FILE_DLL)
                                       ? FileHdr.Characteristics & IMAGE_FILE_RELOCS_STRIPPED
                                         ? RTLDRTYPE_EXECUTABLE_FIXED