VirtualBox

Changeset 72028 in vbox for trunk


Ignore:
Timestamp:
Apr 25, 2018 10:11:56 PM (7 years ago)
Author:
vboxsync
Message:

Installer/win: Sigh, another W10 detection fix (stupid stupid MSI). bugref:8691

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

Legend:

Unmodified
Added
Removed

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

    r72024 r72028  
    1717         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
    1818
    19   <Property Id="VBOX_IS_WINDOW_10" >
     19  <!-- MSI is soo messed up wrt NT versioning on Windows 10.  msiexec runs in
     20       Windows 8.1 compatibility mode, so everything returns 6.3 as the
     21       version.  This unfortunately include all system DLLs.  Fortunately,
     22       the build number is left as-is, so we ASSUME build numbers above 10000
     23       means its Windows 10.
     24       Note! "HKLM\Software\Microsoft\Windows NT\CurrentVersion\CurrentBuild" could
     25             probably be read here as well (CurrentVersion is "6.3" of course). -->
     26  <Property Id="VBOX_IS_WINDOWS_10" >
    2027    <DirectorySearch Id="DirSearchForWindows10NtDll" Path="[SystemFolder]" >
    21       <FileSearch Name="ntdll.dll" MinVersion="6.4.00000.0"/>
     28      <FileSearch Name="kernelbase.dll" MinVersion="6.3.10000.000" />
    2229    </DirectorySearch>
    2330  </Property>

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

    r72020 r72028  
    3838<?if $(env.VBOX_SIGNING_MODE) != none ?>
    3939            <Component Id="cp_VBoxDrvCat_PreW10" Guid="673195c2-f315-42e7-ff00-5acbd91ea0bd" Win64="$(var.Property_Win64)">
    40                 <Condition><![CDATA[(NOT VBOX_IS_WINDOW_10)]]></Condition>
     40                <Condition><![CDATA[(NOT VBOX_IS_WINDOWS_10)]]></Condition>
    4141                <File Id="file_VBoxDrv_PreW10.cat" Name="VBoxDrv.cat" Source="$(env.PATH_OUT)\bin\VBoxDrv-PreW10.cat" />
    4242            </Component>
    4343            <Component Id="cp_VBoxDrvCat_W10" Guid="589be90d-0286-4684-503d-a1681f9587bc" Win64="$(var.Property_Win64)">
    44                 <Condition><![CDATA[(VBOX_IS_WINDOW_10)]]></Condition>
     44                <Condition><![CDATA[(VBOX_IS_WINDOWS_10)]]></Condition>
    4545                <File Id="file_VBoxDrv.cat" Name="VBoxDrv.cat" Source="$(env.PATH_OUT)\bin\VBoxDrv.cat" />
    4646            </Component>

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

    r72020 r72028  
    2020        <File Id="file_VBoxNetAdp6_PreW10.cat" Name="VBoxNetAdp6.cat" Source="$(env.PATH_OUT)\bin\VBoxNetAdp6-PreW10.cat" />
    2121    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    22         <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (NOT VBOX_IS_WINDOW_10)]]></Condition>
     22        <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (NOT VBOX_IS_WINDOWS_10)]]></Condition>
    2323    <?else ?>
    24         <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (NOT VBOX_IS_WINDOW_10)]]></Condition>
     24        <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (NOT VBOX_IS_WINDOWS_10)]]></Condition>
    2525    <?endif ?>
    2626    </Component>
    … …  
    2828        <File Id="file_VBoxNetAdp6_W10.cat" Name="VBoxNetAdp6.cat" Source="$(env.PATH_OUT)\bin\VBoxNetAdp6.cat" />
    2929    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    30         <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (VBOX_IS_WINDOW_10)]]></Condition>
     30        <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (VBOX_IS_WINDOWS_10)]]></Condition>
    3131    <?else ?>
    32         <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (VBOX_IS_WINDOW_10)]]></Condition>
     32        <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (VBOX_IS_WINDOWS_10)]]></Condition>
    3333    <?endif ?>
    3434    </Component>

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

    r72020 r72028  
    2222        <File Id="file_VBoxNetLwf_PreW10.cat" Name="VBoxNetLwf.cat" Source="$(env.PATH_OUT)\bin\VBoxNetLwf-PreW10.cat" />
    2323    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    24         <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (NOT VBOX_IS_WINDOW_10)]]></Condition>
     24        <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (NOT VBOX_IS_WINDOWS_10)]]></Condition>
    2525    <?else ?>
    26         <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (NOT VBOX_IS_WINDOW_10)]]></Condition>
     26        <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (NOT VBOX_IS_WINDOWS_10)]]></Condition>
    2727    <?endif ?>
    2828    </Component>
    … …  
    3030        <File Id="file_VBoxNetLwf_W10.cat" Name="VBoxNetLwf.cat" Source="$(env.PATH_OUT)\bin\VBoxNetLwf.cat" />
    3131    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    32         <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (VBOX_IS_WINDOW_10)]]></Condition>
     32        <Condition><![CDATA[(localMSMNetworkType="NDIS6") AND (VBOX_IS_WINDOWS_10)]]></Condition>
    3333    <?else ?>
    34         <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (VBOX_IS_WINDOW_10)]]></Condition>
     34        <Condition><![CDATA[(NETWORKTYPE="NDIS6") AND (VBOX_IS_WINDOWS_10)]]></Condition>
    3535    <?endif ?>
    3636    </Component>

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

    r72020 r72028  
    2020<?if $(env.VBOX_SIGNING_MODE)!= none ?>
    2121        <Component Id="cp_USBFilterDriverCat_PreW10" Guid="ef18fb4d-4530-40db-2957-de2dc90243ab" Win64="$(var.Property_Win64)">
    22             <Condition><![CDATA[(NOT VBOX_IS_WINDOW_10)]]></Condition>
     22            <Condition><![CDATA[(NOT VBOX_IS_WINDOWS_10)]]></Condition>
    2323            <File Id="file_VBoxUSBMon_PreW10.cat" Name="VBoxUSBMon.cat" Source="$(env.PATH_OUT)\bin\VBoxUSBMon-PreW10.cat" />
    2424        </Component>
    2525        <Component Id="cp_USBFilterDriverCat_W10" Guid="341ce4ca-d00e-4a43-f4e3-453eacc6b493" Win64="$(var.Property_Win64)">
    26             <Condition><![CDATA[(VBOX_IS_WINDOW_10)]]></Condition>
     26            <Condition><![CDATA[(VBOX_IS_WINDOWS_10)]]></Condition>
    2727            <File Id="file_VBoxUSBMon_W10.cat" Name="VBoxUSBMon.cat" Source="$(env.PATH_OUT)\bin\VBoxUSBMon.cat" />
    2828        </Component>
    … …  
    4141<?if $(env.VBOX_SIGNING_MODE)!= none ?>
    4242        <Component Id="cp_USBDeviceDriverCat_PreW10" Guid="43cc14cb-06e9-46c2-d507-20423150ccbd" Win64="$(var.Property_Win64)">
    43             <Condition><![CDATA[(NOT VBOX_IS_WINDOW_10)]]></Condition>
     43            <Condition><![CDATA[(NOT VBOX_IS_WINDOWS_10)]]></Condition>
    4444            <File Id="file_VBoxUSB_PreW10.cat" Name="VBoxUSB.cat" Source="$(env.PATH_OUT)\bin\VBoxUSB-PreW10.cat" />
    4545        </Component>
    4646        <Component Id="cp_USBDeviceDriverCat_W10" Guid="2127015e-7a96-4b8d-6015-b1e51a75b5ba" Win64="$(var.Property_Win64)">
    47             <Condition><![CDATA[(VBOX_IS_WINDOW_10)]]></Condition>
     47            <Condition><![CDATA[(VBOX_IS_WINDOWS_10)]]></Condition>
    4848            <File Id="file_VBoxUSB_W10.cat" Name="VBoxUSB.cat" Source="$(env.PATH_OUT)\bin\VBoxUSB.cat" />
    4949        </Component>
Note: See TracChangeset for help on using the changeset viewer.

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