Changeset 106893 in vbox for trunk/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp

Timestamp:

Nov 8, 2024 3:54:01 PM (4 months ago)

Author:

vboxsync

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

165814

Message:

SUPHardNt: Rough and untested port of the C code to win.arm64 so the extpack builds. VBP-1447

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp

@@ -64 +64 @@
 #endif
 #include "win/SUPHardenedVerify-win.h"
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+#if defined(RT_ARCH_ARM64)
+AssertCompile(PAGE_SIZE == _4K);
+# define g_abRTZeroPage     g_abRTZero4K
+#endif
+
 
 
@@ -770 +780 @@
      */
 #ifdef RT_ARCH_AMD64
-    if (pNtHdrs->FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64 && !pImage->f32bitResourceDll)
+    const uint16_t uExpectedMachine = IMAGE_FILE_MACHINE_AMD64;
+#elif defined(RT_ARCH_ARM64)
+    const uint16_t uExpectedMachine = IMAGE_FILE_MACHINE_ARM64;
+#elif defined(RT_ARCH_X86)
+    const uint16_t uExpectedMachine = IMAGE_FILE_MACHINE_I386;
 #else
-    if (pNtHdrs->FileHeader.Machine != IMAGE_FILE_MACHINE_I386)
+# error "port me"
+#endif
+#if ARCH_BITS == 64
+    if (pNtHdrs->FileHeader.Machine != uExpectedMachine && !pImage->f32bitResourceDll)
+#elif defined
+    if (pNtHdrs->FileHeader.Machine != uExpectedMachine)
 #endif
         return supHardNtVpSetInfo2(pThis, VERR_SUP_VP_UNEXPECTED_IMAGE_MACHINE,
-                                   "%s: Unexpected machine: %#x", pImage->pszName, pNtHdrs->FileHeader.Machine);
+                                   "%s: Unexpected machine: %#x (expected %#x)",
+                                   pImage->pszName, pNtHdrs->FileHeader.Machine, uExpectedMachine);
     bool const fIs32Bit = pNtHdrs->FileHeader.Machine == IMAGE_FILE_MACHINE_I386;