VirtualBox

Changeset 105703 in vbox for trunk


Ignore:
Timestamp:
Aug 16, 2024 11:52:44 AM (5 months ago)
Author:
vboxsync
Message:

Windows host installer: Fixed installation of network drivers in the non-MSM case; the conditions in the modules weren't updated, as WIX v4 has a different scheme for component conditions. bugref:10644

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

Legend:

Unmodified
Added
Removed

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

    r104453 r105703  
    2626<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
    2727
    28     <Component Id="cp_NetAdpDriver" Guid="7adf3e12-af3c-4d36-8bec-36d5064cf84f" Bitness="$(var.Property_Bitness)" Condition="(localMSMNetworkType=&quot;NDIS5&quot;)">
     28    <Component Id="cp_NetAdpDriver" Guid="7adf3e12-af3c-4d36-8bec-36d5064cf84f" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS5&quot;)">
    2929        <File Id="file_VBoxNetAdp.sys" Name="VBoxNetAdp.sys" KeyPath="yes" Source="$(env.PATH_OUT)\bin\VBoxNetAdp.sys" Checksum="yes" />
    3030        <File Id="file_VBoxNetAdp.inf" Name="VBoxNetAdp.inf" Source="$(env.PATH_OUT)\bin\VBoxNetAdp.inf" />

  • trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs

    r104454 r105703  
    4141        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed" />
    4242        <Substitution Table="CustomAction" Row="setNetworkTypeADP" Column="Target" Value="[=passedNetworkType]" />
    43         <CustomAction Id="setNetworkTypeADP" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
    44         <CustomAction Id="correctNetworkTypeADP" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
     43        <CustomAction Id="setNetworkTypeADP" Property="NETWORKTYPE" Value="[localMSMNetworkType]" Execute="immediate" />
     44        <CustomAction Id="correctNetworkTypeADP" Property="NETWORKTYPE" Value="NDIS5" Execute="immediate" />
    4545<?endif?>
    4646

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

    r104453 r105703  
    2727
    2828<?if $(env.VBOX_SIGNING_MODE) != none ?>
    29     <Component Id="cp_NetAdp6DriverCat_PreW10" Guid="40aab6d8-a9ca-41bd-3c5e-bd768d44faa7" Bitness="$(var.Property_Bitness)" Condition="(localMSMNetworkType=&quot;NDIS6&quot;) AND (NOT VBOX_IS_WINDOWS_10)">
     29    <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)">
    3030        <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    3131        <File Id="file_VBoxNetAdp6_PreW10.cat" ShortName="NetAdp61.cat" Name="VBoxNetAdp6.cat" Source="$(env.PATH_OUT)\bin\VBoxNetAdp6-PreW10.cat" />
    3232    </Component>
    33     <Component Id="cp_NetAdp6DriverCat_W10" Guid="37431619-c0ac-4f6a-029e-6a8ac4cd58ad" Bitness="$(var.Property_Bitness)" Condition="(localMSMNetworkType=&quot;NDIS6&quot;) AND (VBOX_IS_WINDOWS_10)">
     33    <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)">
    3434        <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    3535        <File Id="file_VBoxNetAdp6_W10.cat" ShortName="NetAdp62.cat" Name="VBoxNetAdp6.cat" Source="$(env.PATH_OUT)\bin\VBoxNetAdp6.cat" />
    … …  
    3737<?endif?>
    3838
    39     <Component Id="cp_NetAdp6Driver" Guid="945d9537-e60d-4bbf-9422-239739e31092" Bitness="$(var.Property_Bitness)" Condition="(localMSMNetworkType=&quot;NDIS6&quot;)">
     39    <Component Id="cp_NetAdp6Driver" Guid="945d9537-e60d-4bbf-9422-239739e31092" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;)">
    4040        <File Id="file_VBoxNetAdp6.sys" Name="VBoxNetAdp6.sys" KeyPath="yes" Source="$(env.PATH_OUT)\bin\VBoxNetAdp6.sys" Checksum="yes" />
    4141        <File Id="file_VBoxNetAdp6.inf" Name="VBoxNetAdp6.inf" Source="$(env.PATH_OUT)\bin\VBoxNetAdp6.inf" />

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

    r104454 r105703  
    4141        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed" />
    4242        <Substitution Table="CustomAction" Row="setNetworkTypeADP6" Column="Target" Value="[=passedNetworkType]" />
    43         <CustomAction Id="setNetworkTypeADP6" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
    44         <CustomAction Id="correctNetworkTypeADP6" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
     43        <CustomAction Id="setNetworkTypeADP6" Property="NETWORKTYPE" Value="[localMSMNetworkType]" Execute="immediate" />
     44        <CustomAction Id="correctNetworkTypeADP6" Property="NETWORKTYPE" Value="NDIS5" Execute="immediate" />
    4545<?endif?>
    4646

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

    r104453 r105703  
    2727
    2828<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    29     <Component Id="cp_NetFltDriver" Guid="F0A02F6B-A349-42f8-A2EB-569DCAAAF846" Bitness="$(var.Property_Bitness)" Condition="(localMSMNetworkType=&quot;NDIS5&quot;)">
     29    <Component Id="cp_NetFltDriver" Guid="F0A02F6B-A349-42f8-A2EB-569DCAAAF846" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS5&quot;)">
    3030        <File Id="file_VBoxNetFlt.sys" Name="VBoxNetFlt.sys" KeyPath="yes" Source="$(env.PATH_OUT)\bin\VBoxNetFlt.sys" Checksum="yes" />
    3131        <File Id="file_VBoxNetFltNobj.sys" Name="VBoxNetFltNobj.dll" Source="$(env.PATH_OUT)\bin\VBoxNetFltNobj.dll" Checksum="yes" />

  • trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxs

    r104454 r105703  
    4141        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed" />
    4242        <Substitution Table="CustomAction" Row="setNetworkTypeFLT" Column="Target" Value="[=passedNetworkType]" />
    43         <CustomAction Id="setNetworkTypeFLT" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
    44         <CustomAction Id="correctNetworkTypeFLT" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
     43        <CustomAction Id="setNetworkTypeFLT" Property="NETWORKTYPE" Value="[localMSMNetworkType]" Execute="immediate" />
     44        <CustomAction Id="correctNetworkTypeFLT" Property="NETWORKTYPE" Value="NDIS5" Execute="immediate" />
    4545<?endif?>
    4646

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

    r104453 r105703  
    2929
    3030<?if $(env.VBOX_SIGNING_MODE) != none ?>
    31     <Component Id="cp_NetLwfDriverCat_PreW10" Guid="cede9469-b1bc-4194-348f-8799485a6283" Bitness="$(var.Property_Bitness)" Condition="(localMSMNetworkType=&quot;NDIS6&quot;) AND (NOT VBOX_IS_WINDOWS_10)">
     31    <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)">
    3232        <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    3333        <File Id="file_VBoxNetLwf_PreW10.cat" ShortName="NetLwf1.cat" Name="VBoxNetLwf.cat" Source="$(env.PATH_OUT)\bin\VBoxNetLwf-PreW10.cat" />
    3434    </Component>
    35     <Component Id="cp_NetLwfDriverCat_W10" Guid="0932500d-4d45-4d79-8693-3192528d7cae" Bitness="$(var.Property_Bitness)" Condition="(localMSMNetworkType=&quot;NDIS6&quot;) AND (VBOX_IS_WINDOWS_10)">
     35    <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)">
    3636        <!-- Note: ShortName is required to avoid naming collisions the the MSI file table. -->
    3737        <File Id="file_VBoxNetLwf_W10.cat" ShortName="NetLwf2.cat" Name="VBoxNetLwf.cat" Source="$(env.PATH_OUT)\bin\VBoxNetLwf.cat" />
    … …  
    3939<?endif?>
    4040
    41     <Component Id="cp_NetLwfDriver" Guid="831b909d-f09a-4281-b6b0-99393fa4769d" Bitness="$(var.Property_Bitness)" Condition="(localMSMNetworkType=&quot;NDIS6&quot;)">
     41    <Component Id="cp_NetLwfDriver" Guid="831b909d-f09a-4281-b6b0-99393fa4769d" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS6&quot;)">
    4242        <File Id="file_VBoxNetLwf.sys" Name="VBoxNetLwf.sys" KeyPath="yes" Source="$(env.PATH_OUT)\bin\VBoxNetLwf.sys" Checksum="yes" />
    4343        <File Id="file_VBoxNetLwf.inf" Name="VBoxNetLwf.inf" Source="$(env.PATH_OUT)\bin\VBoxNetLwf.inf" />

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

    r104454 r105703  
    4141        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed" />
    4242        <Substitution Table="CustomAction" Row="setNetworkTypeLWF" Column="Target" Value="[=passedNetworkType]" />
    43         <CustomAction Id="setNetworkTypeLWF" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
    44         <CustomAction Id="correctNetworkTypeLWF" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
    45 <?endif?>
     43        <CustomAction Id="setNetworkTypeLWF" Property="NETWORKTYPE" Value="[localMSMNetworkType]" Execute="immediate" />
     44        <CustomAction Id="correctNetworkTypeLWF" Property="NETWORKTYPE" Value="NDIS5" Execute="immediate" />
    4645
    4746        <!-- Here comes the file/directory list -->
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