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

Timestamp:

Aug 23, 2022 7:27:21 AM (3 years ago)

Author:

vboxsync

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

153258

Message:

Installer/win: Added new build define VBOX_WITH_CRT_PACKING, which leaves out packing the MSCRT with the Windows installer and also checks if the MSCRT 2019 Redistributable Package is installed on the system as a prerequisite (via a custom action). bugref:10284

Location:

trunk/src/VBox/Installer/win/InstallHelper

Files:

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

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

@@ -55 +55 @@
 #endif
 
-UINT VBoxGetMsiProp(MSIHANDLE hMsi, WCHAR *pwszName, WCHAR *pwszValue, DWORD dwSize)
+UINT VBoxGetMsiProp(MSIHANDLE hMsi, const WCHAR *pwszName, WCHAR *pwszValue, DWORD dwSize)
 {
     DWORD dwBuffer = 0;
@@ -105 +105 @@
 #endif
 
-UINT VBoxSetMsiProp(MSIHANDLE hMsi, WCHAR *pwszName, WCHAR *pwszValue)
+UINT VBoxSetMsiProp(MSIHANDLE hMsi, const WCHAR *pwszName, const WCHAR *pwszValue)
 {
     return MsiSetPropertyW(hMsi, pwszName, pwszValue);
 }
 
+UINT VBoxSetMsiPropDWORD(MSIHANDLE hMsi, const WCHAR *pwszName, DWORD dwVal)
+{
+    wchar_t wszTemp[32];
+    swprintf(wszTemp, sizeof(wszTemp) / sizeof(wchar_t), L"%ld", dwVal);
+    return VBoxSetMsiProp(hMsi, pwszName, wszTemp);
+}
+

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

@@ -36 +36 @@
 #endif
 
-UINT VBoxGetMsiProp(MSIHANDLE hMsi, WCHAR *pwszName, WCHAR *pwszValue, DWORD dwSize);
+UINT VBoxGetMsiProp(MSIHANDLE hMsi, const WCHAR *pwszName, WCHAR *pwszValue, DWORD dwSize);
 int  VBoxGetMsiPropUtf8(MSIHANDLE hMsi, const char *pcszName, char **ppszValue);
-UINT VBoxSetMsiProp(MSIHANDLE hMsi, WCHAR *pwszName, WCHAR *pwszValue);
+UINT VBoxSetMsiProp(MSIHANDLE hMsi, const WCHAR *pwszName, const WCHAR *pwszValue);
+UINT VBoxSetMsiPropDWORD(MSIHANDLE hMsi, const WCHAR *pwszName, DWORD dwVal);
 
 #endif /* !VBOX_INCLUDED_SRC_InstallHelper_VBoxCommon_h */

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

@@ -441 +441 @@
 
     VBoxSetMsiProp(hModule, L"VBOX_PYTHON_DEPS_INSTALLED", dwErr == ERROR_SUCCESS ? L"1" : L"0");
+    return ERROR_SUCCESS; /* Never return failure. */
+}
+
+/**
+ * Checks if all required MS CRTs (Visual Studio Redistributable Package) are installed on the system.
+ *
+ * Called from the MSI installer as custom action.
+ *
+ * @returns Always ERROR_SUCCESS.
+ *          Sets public property VBOX_MSCRT_INSTALLED to "" (false, to use "NOT" in WiX) or "1" (success).
+ *
+ *          Also exposes public properties VBOX_MSCRT_VER_MIN + VBOX_MSCRT_VER_MAJ strings
+ *          with the most recent MSCRT version detected.
+ *
+ * @param   hModule             Windows installer module handle.
+ *
+ * @sa      https://docs.microsoft.com/en-us/cpp/windows/redistributing-visual-cpp-files?view=msvc-170
+ */
+UINT __stdcall IsMSCRTInstalled(MSIHANDLE hModule)
+{
+    HKEY hKeyVS = NULL;
+    LSTATUS dwErr = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                                  L"SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X64",
+                                  0, KEY_READ, &hKeyVS);
+    if (dwErr == ERROR_SUCCESS)
+    {
+        DWORD dwVal = 0;
+        DWORD cbVal = sizeof(dwVal);
+        DWORD dwValueType = REG_DWORD;
+
+        dwErr = RegQueryValueExW(hKeyVS, L"Installed", NULL, &dwValueType, (LPBYTE)&dwVal, &cbVal);
+        if (dwErr == ERROR_SUCCESS)
+        {
+            if (dwVal >= 1)
+            {
+                DWORD dwMin, dwMaj;
+                dwErr = RegQueryValueExW(hKeyVS, L"Major", NULL, &dwValueType, (LPBYTE)&dwMaj, &cbVal);
+                if (dwErr == ERROR_SUCCESS)
+                {
+                    VBoxSetMsiPropDWORD(hModule, L"VBOX_MSCRT_VER_MAJ", dwMaj);
+
+                    dwErr = RegQueryValueExW(hKeyVS, L"Minor", NULL, &dwValueType, (LPBYTE)&dwMin, &cbVal);
+                    if (dwErr == ERROR_SUCCESS)
+                    {
+                        VBoxSetMsiPropDWORD(hModule, L"VBOX_MSCRT_VER_MIN", dwMin);
+
+                        logStringF(hModule, L"IsMSCRTInstalled: Found v%ld.%ld\n", dwMaj, dwMin);
+
+                        /* Check for at least 2019. */
+                        if (dwMaj >= 14 && dwMin >= 20)
+                            VBoxSetMsiProp(hModule, L"VBOX_MSCRT_INSTALLED", L"1");
+                    }
+                    else
+                        logStringF(hModule, L"IsMSCRTInstalled: Found, but 'Minor' key not present");
+                }
+                else
+                    logStringF(hModule, L"IsMSCRTInstalled: Found, but 'Major' key not present");
+            }
+            else
+            {
+                logStringF(hModule, L"IsMSCRTInstalled: Found, but not marked as installed");
+                dwErr = ERROR_NOT_INSTALLED;
+            }
+        }
+        else
+            logStringF(hModule, L"IsMSCRTInstalled: Found, but 'Installed' key not present");
+    }
+
+    if (dwErr != ERROR_SUCCESS)
+        logStringF(hModule, L"IsMSCRTInstalled: Failed with dwErr=%ld", dwErr);
+
     return ERROR_SUCCESS; /* Never return failure. */
 }

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

@@ -30 +30 @@
     IsSerialCheckNeeded
     CheckSerial
+    IsMSCRTInstalled
     IsPythonInstalled
     IsWindows10