Changeset 46023 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

May 13, 2013 3:34:54 PM (12 years ago)

Author:

vboxsync

Message:

RTLdrOpen: Defined the first flag RTLDR_O_FOR_DEBUG for use with RTDbgMod.

Location:

trunk/src/VBox/Runtime/common/ldr

Files:

• ldrFile.cpp (modified) (2 diffs)
• ldrPE.cpp (modified) (4 diffs)

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

@@ -254 +254 @@
     LogFlow(("RTLdrOpen: pszFilename=%p:{%s} fFlags=%#x enmArch=%d phLdrMod=%p\n",
              pszFilename, pszFilename, fFlags, enmArch, phLdrMod));
-    AssertMsgReturn(!fFlags, ("%#x\n", fFlags), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(!(fFlags & ~RTLDR_O_VALID_MASK), ("%#x\n", fFlags), VERR_INVALID_PARAMETER);
     AssertMsgReturn(enmArch > RTLDRARCH_INVALID && enmArch < RTLDRARCH_END, ("%d\n", enmArch), VERR_INVALID_PARAMETER);
 
@@ -306 +306 @@
     LogFlow(("RTLdrOpenkLdr: pszFilename=%p:{%s} fFlags=%#x enmArch=%d phLdrMod=%p\n",
              pszFilename, pszFilename, fFlags, enmArch, phLdrMod));
+    AssertMsgReturn(!(fFlags & ~RTLDR_O_VALID_MASK), ("%#x\n", fFlags), VERR_INVALID_PARAMETER);
 
     /*

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

@@ -1153 +1153 @@
  * @returns iprt status code.
  * @param   pFileHdr    Pointer to the file header that needs validating.
+ * @param   fFlags      Valid RTLDR_O_XXX combination.
  * @param   pszLogName  The log name to  prefix the errors with.
  * @param   penmArch    Where to store the CPU architecture.
  */
-int rtldrPEValidateFileHeader(PIMAGE_FILE_HEADER pFileHdr, const char *pszLogName, PRTLDRARCH penmArch)
+static int rtldrPEValidateFileHeader(PIMAGE_FILE_HEADER pFileHdr, uint32_t fFlags, const char *pszLogName, PRTLDRARCH penmArch)
 {
     size_t cbOptionalHeader;
@@ -1183 +1184 @@
     }
     /* This restriction needs to be implemented elsewhere. */
-    if (pFileHdr->Characteristics & IMAGE_FILE_RELOCS_STRIPPED)
+    if (   (pFileHdr->Characteristics & IMAGE_FILE_RELOCS_STRIPPED)
+        && !(fFlags & RTLDR_O_FOR_DEBUG))
     {
         Log(("rtldrPEOpen: %s: IMAGE_FILE_RELOCS_STRIPPED\n", pszLogName));
@@ -1712 +1714 @@
 int rtldrPEOpen(PRTLDRREADER pReader, uint32_t fFlags, RTLDRARCH enmArch, RTFOFF offNtHdrs, PRTLDRMOD phLdrMod)
 {
-    AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
-
     /*
      * Read and validate the file header.
@@ -1723 +1723 @@
     RTLDRARCH enmArchImage;
     const char *pszLogName = pReader->pfnLogName(pReader);
-    rc = rtldrPEValidateFileHeader(&FileHdr, pszLogName, &enmArchImage);
+    rc = rtldrPEValidateFileHeader(&FileHdr, fFlags, pszLogName, &enmArchImage);
     if (RT_FAILURE(rc))
         return rc;