Changeset 16933 in vbox for trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

Timestamp:

Feb 18, 2009 11:42:57 PM (16 years ago)

Author:

vboxsync

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

43082

Message:

IPRT/PDM,SUPLIb,REM: Extended RTLdrOpen with an architecture argument for use with FAT R0.r0 images later some day. Also added fFlags argument that's currently MBZ case.

File:

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

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

@@ -944 +944 @@
  * @param   pFileHdr    Pointer to the file header that needs validating.
  * @param   pszLogName  The log name to  prefix the errors with.
- */
-int rtldrPEValidateFileHeader(PIMAGE_FILE_HEADER pFileHdr, const char *pszLogName)
+ * @param   penmArch    Where to store the CPU architecture.
+ */
+int rtldrPEValidateFileHeader(PIMAGE_FILE_HEADER pFileHdr, const char *pszLogName, PRTLDRARCH penmArch)
 {
     size_t cbOptionalHeader;
@@ -952 +953 @@
         case IMAGE_FILE_MACHINE_I386:
             cbOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER32);
+            *penmArch = RTLDRARCH_X86_32;
             break;
         case IMAGE_FILE_MACHINE_AMD64:
             cbOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER64);
+            *penmArch = RTLDRARCH_AMD64;
             break;
 
@@ -960 +963 @@
             Log(("rtldrPEOpen: %s: Unsupported Machine=%#x\n",
                  pszLogName, pFileHdr->Machine));
+            *penmArch = RTLDRARCH_INVALID;
             return VERR_BAD_EXE_FORMAT;
     }
@@ -1417 +1421 @@
  * @returns iprt status code.
  * @param   pReader     The loader reader instance which will provide the raw image bits.
+ * @param   fFlags      Reserved, MBZ.
+ * @param   enmArch     Architecture specifier.
  * @param   offNtHdrs   The offset of the NT headers (where you find "PE\0\0").
  * @param   phLdrMod    Where to store the handle.
  */
-int rtldrPEOpen(PRTLDRREADER pReader, RTFOFF offNtHdrs, PRTLDRMOD phLdrMod)
+int rtldrPEOpen(PRTLDRREADER pReader, uint32_t fFlags, RTLDRARCH enmArch, RTFOFF offNtHdrs, PRTLDRMOD phLdrMod)
 {
     /*
@@ -1429 +1435 @@
     if (RT_FAILURE(rc))
         return rc;
+    RTLDRARCH enmArchImage;
     const char *pszLogName = pReader->pfnLogName(pReader);
-    rc = rtldrPEValidateFileHeader(&FileHdr, pszLogName);
+    rc = rtldrPEValidateFileHeader(&FileHdr, pszLogName, &enmArchImage);
     if (RT_FAILURE(rc))
         return rc;
+
+    /*
+     * Match the CPU architecture.
+     */
+    if (    enmArch != RTLDRARCH_WHATEVER
+        &&  enmArch != enmArchImage)
+        return VERR_LDR_ARCH_MISMATCH;
 
     /*