VirtualBox

Changeset 108074 in vbox for trunk


Ignore:
Timestamp:
Feb 5, 2025 3:06:51 PM (3 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
167367
Message:

Windows/InstallHelper: Renamed IsWindows10() -> IsWindowsSupported(), as we also run on Windows 11 hosts nowadays. No actual code changes. bugref:10762

Location:
trunk/src/VBox/Installer/win
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r108073 r108074  
    11081108
    11091109/**
    1110  * Checks if the running OS is (at least) Windows 10 (e.g. >= build 10000).
     1110 * Checks if the running OS is supported for installing (at least Windows 10 (e.g. >= build 10000)).
    11111111 *
    11121112 * Called from the MSI installer as custom action.
    11131113 *
    11141114 * @returns Always ERROR_SUCCESS.
    1115  *          Sets public property VBOX_IS_WINDOWS_10 to "" (empty / false) or "1" (success).
     1115 *          Sets public property VBOX_IS_WINDOWS_SUPPORTED to "" (empty / false) or "1" (success).
     1116 *          Sets public property VBOX_WIN_VER_MAJOR to the Windows major version.
     1117 *          Sets public property VBOX_WIN_VER_MINOR to the Windows minor version.
    11161118 *
    11171119 * @param   hModule             Windows installer module handle.
    11181120 */
    1119 UINT __stdcall IsWindows10(MSIHANDLE hModule)
     1121UINT __stdcall IsWindowsSupported(MSIHANDLE hModule)
    11201122{
    11211123    /*
    … …  
    11321134        if (RT_SUCCESS(rc))
    11331135        {
    1134             VBoxMsiSetProp(hModule, L"VBOX_IS_WINDOWS_10", dwMaj >= 10 ? L"1" : L"");
     1136            /* We support installing on Windows 10 or newer. */
     1137            VBoxMsiSetProp(hModule, L"VBOX_IS_WINDOWS_SUPPORTED", dwMaj >= 10 ? L"1" : L"");
    11351138            VBoxMsiSetPropDWORD(hModule, L"VBOX_WIN_VER_MAJOR", dwMaj);
    11361139
    … …  
    11411144                VBoxMsiSetPropDWORD(hModule, L"VBOX_WIN_VER_MINOR", dwMin);
    11421145
    1143                 logStringF(hModule, "IsWindows10: Detected Windows %u.%u", dwMaj, dwMin);
     1146                logStringF(hModule, "IsWindowsSupported: Detected Windows %u.%u", dwMaj, dwMin);
    11441147            }
    11451148            else
    1146                 logStringF(hModule, "IsWindows10: Error reading CurrentMinorVersionNumber (%Rrc)", rc);
     1149                logStringF(hModule, "IsWindowsSupported: Error reading CurrentMinorVersionNumber (%Rrc)", rc);
    11471150        }
    11481151        else
    1149             logStringF(hModule, "IsWindows10: Error reading CurrentMajorVersionNumber (%Rrc)", rc);
     1152            logStringF(hModule, "IsWindowsSupported: Error reading CurrentMajorVersionNumber (%Rrc)", rc);
    11501153
    11511154        RegCloseKey(hKey);
    11521155    }
    11531156    else
    1154         logStringF(hModule, "IsWindows10/RegOpenKeyExW: Error opening CurrentVersion key (%ld)", lrc);
     1157        logStringF(hModule, "IsWindowsSupported/RegOpenKeyExW: Error opening CurrentVersion key (%ld)", lrc);
    11551158
    11561159    return ERROR_SUCCESS; /* Never return failure. */

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

    r107990 r108074  
    3333    IsMSCRTInstalled
    3434    IsPythonInstalled
    35     IsWindows10
     35    IsWindowsSupported
    3636    GetPlatformArchitecture
    3737    ArePythonAPIDepsInstalled

  • trunk/src/VBox/Installer/win/UserInterface.wxi

    r108038 r108074  
    11851185            <Custom Action="ca_OriginalTargetDir" After="FileCost" Condition="(NOT INSTALLDIR) AND (NOT EXISTINGINSTALLDIR)" />
    11861186            <Custom Action="ca_DefaultTargetDir" After="FileCost" Condition="NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR" />
    1187             <Custom Action="ca_IsWindows10" After="CostFinalize" />
     1187            <Custom Action="ca_IsWindowsSupported" After="CostFinalize" />
    11881188
    11891189<?if $(env.VBOX_WITH_PYTHON) = "yes" ?>

  • trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

    r107383 r108074  
    5151<?if $(env.VBOX_SIGNING_MODE) != "none" ?>
    5252 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    53             <Component Id="cp_VBoxSupCat_PreW10" Guid="673195c2-f315-42e7-ff00-5acbd91ea0bd" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_10)">
     53            <Component Id="cp_VBoxSupCat_PreW10" Guid="673195c2-f315-42e7-ff00-5acbd91ea0bd" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_SUPPORTED)">
    5454                <File Id="file_VBoxSup_PreW10.cat" Name="VBoxSup.cat" Source="$(env.PATH_OUT)\bin\VBoxSup-PreW10.cat" />
    5555            </Component>
    5656 <?endif?>
    57             <Component Id="cp_VBoxSupCat_W10" Guid="589be90d-0286-4684-503d-a1681f9587bc" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_10)">
     57            <Component Id="cp_VBoxSupCat_W10" Guid="589be90d-0286-4684-503d-a1681f9587bc" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_SUPPORTED)">
    5858                <File Id="file_VBoxSup.cat" Name="VBoxSup.cat" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxSup.cat" />
    5959            </Component>

  • trunk/src/VBox/Installer/win/VBoxMergeAppCA.wxi

    r108038 r108074  
    4444<?endif?>
    4545
    46     <CustomAction Id="ca_IsWindows10" DllEntry="IsWindows10" Execute="immediate" Return="ignore" Impersonate="no" BinaryRef="VBoxInstallHelper" />
     46    <CustomAction Id="ca_IsWindowsSupported" DllEntry="IsWindowsSupported" Execute="immediate" Return="ignore" Impersonate="no" BinaryRef="VBoxInstallHelper" />
    4747
    4848    <!-- Makes sure we check if the chosen target directory is valid before allowing to install. See @bugref{10616} -->

  • trunk/src/VBox/Installer/win/VBoxMergeAppSeq.wxi

    r108038 r108074  
    5252    <Custom Action="ca_CheckTargetDirPost" After="InstallFinalize" Condition="NOT REMOVE"/>
    5353
    54     <Custom Action="ca_IsWindows10" After="FileCost"/>
     54    <Custom Action="ca_IsWindowsSupported" After="FileCost"/>
    5555
    5656</Include>

  • trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxi

    r107006 r108074  
    2828<?if $(env.VBOX_SIGNING_MODE) != "none" ?>
    2929    <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    30         <Component Id="cp_NetAdp6DriverCat_PreW10" Guid="40aab6d8-a9ca-41bd-3c5e-bd768d44faa7" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;) AND (NOT VBOX_IS_WINDOWS_10)">
     30        <Component Id="cp_NetAdp6DriverCat_PreW10" Guid="40aab6d8-a9ca-41bd-3c5e-bd768d44faa7" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;) AND (NOT VBOX_IS_WINDOWS_SUPPORTED)">
    3131            <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    3232            <File Id="file_VBoxNetAdp6_PreW10.cat" ShortName="NetAdp61.cat" Name="VBoxNetAdp6.cat" Source="$(env.PATH_OUT)\bin\VBoxNetAdp6-PreW10.cat" />
    3333        </Component>
    3434    <?endif?>
    35     <Component Id="cp_NetAdp6DriverCat_W10" Guid="37431619-c0ac-4f6a-029e-6a8ac4cd58ad" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;) AND (VBOX_IS_WINDOWS_10)">
     35    <Component Id="cp_NetAdp6DriverCat_W10" Guid="37431619-c0ac-4f6a-029e-6a8ac4cd58ad" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;) AND (VBOX_IS_WINDOWS_SUPPORTED)">
    3636        <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    3737        <File Id="file_VBoxNetAdp6_W10.cat" ShortName="NetAdp62.cat" Name="VBoxNetAdp6.cat" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxNetAdp6.cat" />

  • trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxi

    r107006 r108074  
    3030    <?if $(env.VBOX_SIGNING_MODE) != "none" ?>
    3131        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    32             <Component Id="cp_NetLwfDriverCat_PreW10" Guid="cede9469-b1bc-4194-348f-8799485a6283" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;) AND (NOT VBOX_IS_WINDOWS_10)">
     32            <Component Id="cp_NetLwfDriverCat_PreW10" Guid="cede9469-b1bc-4194-348f-8799485a6283" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;) AND (NOT VBOX_IS_WINDOWS_SUPPORTED)">
    3333                <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    3434                <File Id="file_VBoxNetLwf_PreW10.cat" ShortName="NetLwf1.cat" Name="VBoxNetLwf.cat" Source="$(env.PATH_OUT)\bin\VBoxNetLwf-PreW10.cat" />
    3535            </Component>
    3636        <?endif?>
    37         <Component Id="cp_NetLwfDriverCat_W10" Guid="0932500d-4d45-4d79-8693-3192528d7cae" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;) AND (VBOX_IS_WINDOWS_10)">
     37        <Component Id="cp_NetLwfDriverCat_W10" Guid="0932500d-4d45-4d79-8693-3192528d7cae" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;) AND (VBOX_IS_WINDOWS_SUPPORTED)">
    3838            <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    3939            <File Id="file_VBoxNetLwf_W10.cat" ShortName="NetLwf2.cat" Name="VBoxNetLwf.cat" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxNetLwf.cat" />

  • trunk/src/VBox/Installer/win/VBoxMergeUSB.wxi

    r107006 r108074  
    2929<?if $(env.VBOX_SIGNING_MODE) != "none" ?>
    3030    <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    31         <Component Id="cp_USBFilterDriverCat_PreW10" Guid="ef18fb4d-4530-40db-2957-de2dc90243ab" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_10)">
     31        <Component Id="cp_USBFilterDriverCat_PreW10" Guid="ef18fb4d-4530-40db-2957-de2dc90243ab" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_SUPPORTED)">
    3232            <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    3333            <File Id="file_VBoxUSBMon_PreW10.cat" ShortName="UsbMon1.cat" Name="VBoxUSBMon.cat" Source="$(env.PATH_OUT)\bin\VBoxUSBMon-PreW10.cat" />
    3434        </Component>
    3535    <?endif?>
    36         <Component Id="cp_USBFilterDriverCat_W10" Guid="341ce4ca-d00e-4a43-f4e3-453eacc6b493" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_10)">
     36        <Component Id="cp_USBFilterDriverCat_W10" Guid="341ce4ca-d00e-4a43-f4e3-453eacc6b493" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_SUPPORTED)">
    3737            <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    3838            <File Id="file_VBoxUSBMon_W10.cat" ShortName="UsbMon2.cat" Name="VBoxUSBMon.cat" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxUSBMon.cat" />
    … …  
    4848<?if $(env.VBOX_SIGNING_MODE) != "none" ?>
    4949    <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    50         <Component Id="cp_USBDeviceDriverCat_PreW10" Guid="43cc14cb-06e9-46c2-d507-20423150ccbd" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_10)">
     50        <Component Id="cp_USBDeviceDriverCat_PreW10" Guid="43cc14cb-06e9-46c2-d507-20423150ccbd" Bitness="$(var.Property_Bitness)" Condition="(NOT VBOX_IS_WINDOWS_SUPPORTED)">
    5151            <File Id="file_VBoxUSB_PreW10.cat" Name="VBoxUSB.cat" Source="$(env.PATH_OUT)\bin\VBoxUSB-PreW10.cat" />
    5252        </Component>
    5353    <?endif?>
    54         <Component Id="cp_USBDeviceDriverCat_W10" Guid="2127015e-7a96-4b8d-6015-b1e51a75b5ba" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_10)">
     54        <Component Id="cp_USBDeviceDriverCat_W10" Guid="2127015e-7a96-4b8d-6015-b1e51a75b5ba" Bitness="$(var.Property_Bitness)" Condition="(VBOX_IS_WINDOWS_SUPPORTED)">
    5555            <File Id="file_VBoxUSB_W10.cat" Name="VBoxUSB.cat" Source="$(env.VBOX_PATH_ATTESTATION_SIGNED)\VBoxUSB.cat" />
    5656        </Component>
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette