Changeset 106984 in vbox for trunk

Timestamp:

Nov 13, 2024 12:54:01 PM (2 weeks ago)

Author:

vboxsync

Message:

Installer/win/Stub*: ARM64 changes. Kicked out unnecessary VBoxStub.h header file. jiraref:VBP-1442

Location:

trunk/src/VBox/Installer/win

Files:

• Stub/VBoxStub.cpp (modified) (6 diffs)
• Stub/VBoxStub.h (deleted)
• StubBld/VBoxStubBld.cpp (modified) (2 diffs)
• StubBld/VBoxStubBld.h (modified) (1 diff)

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

@@ -61 +61 @@
 #endif
 
-#include "VBoxStub.h"
 #include "../StubBld/VBoxStubBld.h"
 #include "resource.h"
@@ -74 +73 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
+#define VBOX_STUB_TITLE "VirtualBox Installer"
+
 #define MY_UNICODE_SUB(str) L ##str
 #define MY_UNICODE(str)     MY_UNICODE_SUB(str)
@@ -110 +111 @@
 /** Pointer to a cleanup record. */
 typedef STUBCLEANUPREC *PSTUBCLEANUPREC;
+
+typedef BOOL (WINAPI *PFNISWOW64PROCESS)(HANDLE, PBOOL);
+typedef BOOL (WINAPI *PFNISWOW64PROCESS2)(HANDLE, USHORT *, USHORT *);
 
 
@@ -472 +476 @@
  * Detects whether we're running on a 32- or 64-bit platform and returns the result.
  *
- * @returns TRUE if we're running on a 64-bit OS, FALSE if not.
- */
-static BOOL IsWow64(void)
-{
-    BOOL fIsWow64 = TRUE;
-    fnIsWow64Process = (LPFN_ISWOW64PROCESS)GetProcAddress(GetModuleHandle(TEXT("kernel32")), "IsWow64Process");
-    if (NULL != fnIsWow64Process)
-    {
-        if (!fnIsWow64Process(GetCurrentProcess(), &fIsWow64))
+ * @returns Returns the native package architecture.
+ */
+static VBOXSTUBPKGARCH GetNativePackageArch(void)
+{
+    HMODULE const      hModKernel32 = GetModuleHandleW(L"kernel32.dll");
+    PFNISWOW64PROCESS2 pfnIsWow64Process2 = (PFNISWOW64PROCESS2)GetProcAddress(hModKernel32, "IsWow64Process2");
+    if (pfnIsWow64Process2)
+    {
+        USHORT usWowMachine  = IMAGE_FILE_MACHINE_UNKNOWN;
+        USHORT usHostMachine = IMAGE_FILE_MACHINE_UNKNOWN;
+        if (pfnIsWow64Process2(GetCurrentProcess(), &usWowMachine, &usHostMachine))
         {
-            /* Error in retrieving process type - assume that we're running on 32bit. */
-            return FALSE;
+            if (usHostMachine == IMAGE_FILE_MACHINE_AMD64)
+                return VBOXSTUBPKGARCH_AMD64;
+            if (usHostMachine == IMAGE_FILE_MACHINE_ARM64)
+                return VBOXSTUBPKGARCH_ARM64;
+            if (usHostMachine == IMAGE_FILE_MACHINE_I386)
+                return VBOXSTUBPKGARCH_X86;
+            LogError("IsWow64Process2 return unknown host machine value: %#x (wow machine %#x)", usHostMachine, usWowMachine);
         }
-    }
-    return fIsWow64;
+        else
+            LogError("IsWow64Process2 failed: %u", GetLastError());
+    }
+    else
+    {
+        PFNISWOW64PROCESS pfnIsWow64Process = (PFNISWOW64PROCESS)GetProcAddress(hModKernel32, "IsWow64Process");
+        if (pfnIsWow64Process)
+        {
+            BOOL fIsWow64 = TRUE;
+            if (pfnIsWow64Process(GetCurrentProcess(), &fIsWow64))
+            {
+                if (fIsWow64)
+                    return VBOXSTUBPKGARCH_AMD64;
+            }
+            else
+                LogError("IsWow64Process failed: %u\n", GetLastError());
+        }
+        else
+            LogError("Neither IsWow64Process nor IsWow64Process2 was found!");
+    }
+
+#ifdef RT_ARCH_X86
+    return VBOXSTUBPKGARCH_X86;
+#elif defined(RT_ARCH_AMD64)
+    return VBOXSTUBPKGARCH_AMD64;
+#elif defined(RT_ARCH_ARM64)
+    return VBOXSTUBPKGARCH_ARM64;
+#else
+# error "port me"
+#endif
 }
 
@@ -501 +540 @@
     if (pPackage->enmArch == VBOXSTUBPKGARCH_ALL)
         return true;
-    VBOXSTUBPKGARCH enmArch = IsWow64() ? VBOXSTUBPKGARCH_AMD64 : VBOXSTUBPKGARCH_X86;
+    VBOXSTUBPKGARCH enmArch = GetNativePackageArch();
     return pPackage->enmArch == enmArch;
 }
@@ -1427 +1466 @@
     if (   !fExtractOnly
         && !g_fSilent
-        && !IsWow64())
+        && GetNativePackageArch() == VBOXSTUBPKGARCH_X86)
         rcExit = ShowError("32-bit Windows hosts are not supported by this VirtualBox release.");
     else

trunk/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp

@@ -181 +181 @@
             && strcmp(pszArg, "-target-all")
             && strcmp(pszArg, "-target-x86")
-            && strcmp(pszArg, "-target-amd64"))
+            && strcmp(pszArg, "-target-amd64")
+            && strcmp(pszArg, "-target-arm64"))
         {
             fprintf(stderr, "syntax error: Invalid parameter: %s\n", argv[i]);
@@ -212 +213 @@
             else if (strcmp(pszArg, "-target-amd64") == 0)
                 aBuildPkgs[StubHdr.cPackages].enmArch = VBOXSTUBPKGARCH_AMD64;
+            else if (strcmp(pszArg, "-target-arm64") == 0)
+                aBuildPkgs[StubHdr.cPackages].enmArch = VBOXSTUBPKGARCH_ARM64;
             else if (strcmp(pszArg, "-target-x86") == 0)
                 aBuildPkgs[StubHdr.cPackages].enmArch = VBOXSTUBPKGARCH_X86;

trunk/src/VBox/Installer/win/StubBld/VBoxStubBld.h

@@ -63 +63 @@
     VBOXSTUBPKGARCH_X86,
     /** Extract on AMD64 hosts. */
-    VBOXSTUBPKGARCH_AMD64
+    VBOXSTUBPKGARCH_AMD64,
+    /** Extract on ARM64 hosts. */
+    VBOXSTUBPKGARCH_ARM64
 } VBOXSTUBPKGARCH;