Changeset 106398 in vbox for trunk

Timestamp:

Oct 16, 2024 8:53:42 PM (6 weeks ago)

Author:

vboxsync

Message:

bldprogs: Add support for arm64 for VBoxEditCoffLib and VBoxPeSetVersion, bugref:10734

Location:

trunk/src/bldprogs

Files:

• VBoxEditCoffLib.cpp (modified) (1 diff)
• VBoxPeSetVersion.cpp (modified) (2 diffs)

trunk/src/bldprogs/VBoxEditCoffLib.cpp

@@ -333 +333 @@
         return error("member too small for COFF\n");
     if (   pHdr->Machine != IMAGE_FILE_MACHINE_AMD64
-        && pHdr->Machine != IMAGE_FILE_MACHINE_I386)
+        && pHdr->Machine != IMAGE_FILE_MACHINE_I386
+        && pHdr->Machine != IMAGE_FILE_MACHINE_ARM64
+        && pHdr->Machine != IMAGE_FILE_MACHINE_ARM)
         return error("Unsupported COFF machine: %#x\n", pHdr->Machine);
     if (   pHdr->PointerToSymbolTable >= g_cbMember

trunk/src/bldprogs/VBoxPeSetVersion.cpp

@@ -273 +273 @@
         return Error("Invalid PE signature: %#x", NtHdrs.x32.Signature);
     uint32_t cbNewHdrs;
-    if (NtHdrs.x32.FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64)
+    if (NtHdrs.x32.FileHeader.Machine == IMAGE_FILE_MACHINE_ARM64)
+    {
+        if (NtHdrs.x64.FileHeader.SizeOfOptionalHeader != sizeof(NtHdrs.x64.OptionalHeader))
+            return Error("Invalid optional header size: %#x", NtHdrs.x64.FileHeader.SizeOfOptionalHeader);
+        if (NtHdrs.x64.OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC)
+            return Error("Invalid optional header magic: %#x", NtHdrs.x64.OptionalHeader.Magic);
+        if (!uNtVersion)
+            uNtVersion = MK_VER(10, 0);
+        else if (uNtVersion < MK_VER(10, 0))
+            return Error("Selected version is too old for ARM64: %u.%u", uNtVersion >> 8, uNtVersion & 0xff);
+        cbNewHdrs = sizeof(NtHdrsNew.x64);
+    }
+    else if (NtHdrs.x32.FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64)
     {
         if (NtHdrs.x64.FileHeader.SizeOfOptionalHeader != sizeof(NtHdrs.x64.OptionalHeader))
@@ -286 +298 @@
     }
     else if (NtHdrs.x32.FileHeader.Machine != IMAGE_FILE_MACHINE_I386)
-        return Error("Not I386 or AMD64 machine: %#x", NtHdrs.x32.FileHeader.Machine);
+        return Error("Not I386, AMD64 or ARM64 machine: %#x", NtHdrs.x32.FileHeader.Machine);
     else
     {