Changeset 107948 in vbox for trunk/src/VBox/Installer/win/InstallHelper

Timestamp:

Jan 27, 2025 4:57:39 PM (2 months ago)

Author:

vboxsync

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

167195

Message:

Host installer/win: Added GetPlatformArchitecture() to the VBoxInstallHelper.dll. bugref:10849

Location:

trunk/src/VBox/Installer/win/InstallHelper

Files:

• VBoxCommon.cpp (modified) (2 diffs)
• VBoxCommon.h (modified) (1 diff)
• VBoxInstallHelper.cpp (modified) (2 diffs)
• VBoxInstallHelper.def (modified) (1 diff)

trunk/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp

@@ -146 +146 @@
 }
 
+/**
+ * Sets a MSI property.
+ *
+ * @returns UINT
+ * @param   hMsi                MSI handle to use.
+ * @param   pwszName            Name of property to set.
+ * @param   pwszValue           Value to set.
+ */
 UINT VBoxMsiSetProp(MSIHANDLE hMsi, const WCHAR *pwszName, const WCHAR *pwszValue)
 {
     return MsiSetPropertyW(hMsi, pwszName, pwszValue);
 }
-#endif
-
+#endif /* TESTCASE */
+
+/**
+ * Sets a MSI property (in UTF-8).
+ *
+ * Convenience function for VBoxMsiSetProp().
+ *
+ * @returns VBox status code.
+ * @param   hMsi                MSI handle to use.
+ * @param   pszName             Name of property to set.
+ * @param   pszValue            Value to set.
+ */
+int VBoxMsiSetPropUtf8(MSIHANDLE hMsi, const char *pszName, const char *pszValue)
+{
+    AssertPtrReturn(pszName, VERR_INVALID_POINTER);
+    AssertPtrReturn(pszValue, VERR_INVALID_POINTER);
+
+    PRTUTF16 pwszName;
+    int rc = RTStrToUtf16(pszName, &pwszName);
+    if (RT_SUCCESS(rc))
+    {
+        PRTUTF16 pwszValue;
+        rc = RTStrToUtf16(pszValue, &pwszValue);
+        if (RT_SUCCESS(rc))
+        {
+            UINT const uRc = VBoxMsiSetProp(hMsi, pwszName, pwszValue);
+            if (uRc != ERROR_SUCCESS)
+                rc = RTErrConvertFromWin32(uRc);
+            RTUtf16Free(pwszValue);
+        }
+
+        RTUtf16Free(pwszName);
+    }
+
+    return rc;
+}
+
+/**
+ * Sets a MSI property (DWORD).
+ *
+ * Convenience function for VBoxMsiSetProp().
+ *
+ * @returns UINT
+ * @param   hMsi                MSI handle to use.
+ * @param   pwszName            Name of property to set.
+ * @param   dwVal               Value to set.
+ */
 UINT VBoxMsiSetPropDWORD(MSIHANDLE hMsi, const WCHAR *pwszName, DWORD dwVal)
 {
@@ -158 +211 @@
     return VBoxMsiSetProp(hMsi, pwszName, wszTemp);
 }
-

trunk/src/VBox/Installer/win/InstallHelper/VBoxCommon.h

@@ -41 +41 @@
 int  VBoxMsiQueryPropInt32(MSIHANDLE hMsi, const char *pszName, DWORD *pdwValue);
 UINT VBoxMsiSetProp(MSIHANDLE hMsi, const WCHAR *pwszName, const WCHAR *pwszValue);
+int VBoxMsiSetPropUtf8(MSIHANDLE hMsi, const char *pszName, const char *pszValue);
 UINT VBoxMsiSetPropDWORD(MSIHANDLE hMsi, const WCHAR *pwszName, DWORD dwVal);
 

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -65 +65 @@
 #include <iprt/string.h> /* RT_ZERO */
 #include <iprt/stream.h>
+#include <iprt/system.h>
 #include <iprt/thread.h>
 #include <iprt/utf16.h>
@@ -1579 +1580 @@
 }
 
+/**
+ * Returns the platform architecture as a string.
+ *
+ * Sets public property VBOX_PLATFORM_ARCH to "x86", "amd64" or "arm64" on success.
+ * Called from the MSI installer as custom action.
+ *
+ * @returns UINT as Windows error code.
+ * @retval  ERROR_INSTALL_PLATFORM_UNSUPPORTED if the platform is invalid or unsupported.
+ * @param   hModule             Windows installer module handle.
+ *
+ * @note    We don't use WIX' util.QueryNativeMachine, as it's apparently on available on Windows 10 >= 1709.
+ */
+UINT __stdcall GetPlatformArchitecture(MSIHANDLE hModule)
+{
+    const char *pszArch;
+
+RT_BREAKPOINT();
+
+    /* Only add supported platforms here. */
+    uint32_t const uNativeArch = RTSystemGetNativeArch();
+    switch (uNativeArch)
+    {
+        case RT_ARCH_VAL_X86:   pszArch = "x86";   break;
+        case RT_ARCH_VAL_AMD64: pszArch = "amd64"; break;
+        case RT_ARCH_VAL_ARM64: pszArch = "arm64"; break;
+        default:                pszArch = NULL;    break;
+    }
+
+    int rc;
+    if (pszArch)
+        rc = VBoxMsiSetPropUtf8(hModule, "VBOX_PLATFORM_ARCH", pszArch);
+    else
+        rc = VERR_NOT_SUPPORTED;
+
+   logStringF(hModule, "GetPlatformArchitecture: Detected '%s' (%Rrc)", pszArch ? pszArch : "<Unknown>", rc);
+
+    return RT_SUCCESS(rc) ? ERROR_SUCCESS : ERROR_INSTALL_PLATFORM_UNSUPPORTED;
+}
+
 #if defined(VBOX_WITH_NETFLT) || defined(VBOX_WITH_NETADP)
 

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.def

@@ -34 +34 @@
     IsPythonInstalled
     IsWindows10
+    GetPlatformArchitecture
     ArePythonAPIDepsInstalled
     InstallPythonAPI