VirtualBox

Changeset 107296 in vbox for trunk/src/VBox/Installer


Ignore:
Timestamp:
Dec 12, 2024 11:07:22 AM (5 weeks ago)
Author:
vboxsync
Message:

Windows/Networking: Removed NDIS 5-based drivers, as we don't support Windows host OSes anymore which require this NDIS version -- only NDIS 6.0+ is supported now. bugref:10819

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Installer/win/NLS/de_DE.wxl

    r106061 r107296  
    5959    <String Id="VB_USBDriver" Value="[ProductName] Treiber für USB Geräte-Unterstützung." />
    6060    <String Id="VB_Network" Value="[ProductName] Treiber für Netzwerk-Unterstützung." />
    61     <String Id="VB_NetFltDriver" Value="[ProductName] Treiber für Netzwerkbrücke." />
    62     <String Id="VB_NetAdpDriver" Value="[ProductName] Treiber für virtuellen Netzwerk-Adapter für Host-only Netzwerke." />
    6361    <String Id="VB_NetLwfDriver" Value="[ProductName] Treiber für NDIS6-Netzwerkbrücke." />
    6462    <String Id="VB_NetAdp6Driver" Value="[ProductName] Treiber für virtuellen Netzwerk-Adapter für NDIS6-Host-only-Netzwerke." />
    … …  
    144142
    145143    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Bitte den zu verwendenden Netzwerktreiber auswählen:" />
    146     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 Netzwerktreiber.&#xA;Standard für ältere Windows-Versionen (vor Vista)." />
    147144    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 Netzwerktreiber.&#xA;Standard für neuere Windows-Versionen (Vista und neuer)." />
    148     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="NDIS5 Netzwerktreiber." />
    149145    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="NDIS6 Netzwerktreiber." />
    150146

  • trunk/src/VBox/Installer/win/NLS/el_GR.wxl

    r106061 r107296  
    5959    <String Id="VB_USBDriver" Value="Οδηγός συσκευών USB [ProductName] για υποστήριξη συσκευών USB." />
    6060    <String Id="VB_Network" Value="Οδηγός συσκευών δικτύου [ProductName] για υποστήριξη δικτύου." />
    61     <String Id="VB_NetFltDriver" Value="Οδηγός [ProductName] για γεφυρωμένη δικτύωση." />
    62     <String Id="VB_NetAdpDriver" Value="Οδηγός [ProductName] εικονικής κάρτας δικτύου για μόνο-με-οικοδεσπότη δίκτυα." />
    6361    <String Id="VB_NetLwfDriver" Value="Οδηγός [ProductName] για NDIS6 γεφυρωμένα δίκτυα." />
    6462    <String Id="VB_NetAdp6Driver" Value="Οδηγός [ProductName] εικονικής κάρτας δικτύου για NDIS6 μόνο-με-οικοδεσπότη δίκτυα." />
    … …  
    149147
    150148    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Επιλέξτε ποιο τύπο οδηγών δικτύου θα χρησιμοποιήσετε:" />
    151     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="Οδηγός δικτύου NDIS5.&#xA;Αυτή είναι η προεπιλογή για παλαιότερες εκδόσεις των Windows (προ-Vista)." />
    152149    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="Οδηγός δικτύου NDIS6.&#xA;Αυτό είναι η προεπιλογή για νεότερες εκδόσεις των Windows (Vista και νεώτερα)." />
    153     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Χρησιμοποιήστε τον οδηγό δικτύου NDIS5." />
    154150    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Χρησιμοποιήστε τον οδηγό δικτύου NDIS6." />
    155151

  • trunk/src/VBox/Installer/win/NLS/en_US.wxl

    r106061 r107296  
    5858    <String Id="VB_USBDriver" Value="[ProductName] USB device drivers for USB device support." />
    5959    <String Id="VB_Network" Value="[ProductName] network device drivers for networking support." />
    60     <String Id="VB_NetFltDriver" Value="[ProductName] driver for Bridged Networking." />
    61     <String Id="VB_NetAdpDriver" Value="[ProductName] virtual network adapter driver for Host-Only Networking." />
    6260    <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
    6361    <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
    … …  
    148146
    149147    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Please choose which type of network drivers you will use:" />
    150     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
    151148    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
    152     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Use NDIS5 network drivers." />
    153149    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Use NDIS6 network drivers." />
    154150

  • trunk/src/VBox/Installer/win/NLS/fa_IR.wxl

    r106061 r107296  
    5454    <String Id="VB_USBDriver" Value="درایور دستگاه یو اِس بی [ProductName] برای پشتیبانی از دستگاه یو اِس بی." />
    5555    <String Id="VB_Network" Value="درایور دستگاه شبکه [ProductName] برای پشتیبانی از شبکه." />
    56     <String Id="VB_NetFltDriver" Value="درایور [ProductName] برای شبکه پل شده." />
    57     <String Id="VB_NetAdpDriver" Value="درایور آداپتور شبکه مجازی [ProductName] برای شبکه فقط-میزبان." />
    5856    <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
    5957    <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
    … …  
    118116    <!---->
    119117    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Please choose which type of network drivers you will use:" />
    120     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
    121118    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
    122     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Use NDIS5 network drivers." />
    123119    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Use NDIS6 network drivers." />
    124120    <!---->

  • trunk/src/VBox/Installer/win/NLS/fr_FR.wxl

    r106061 r107296  
    5959    <String Id="VB_USBDriver" Value="Pilotes USB [ProductName] pour le support de périphériques USB." />
    6060    <String Id="VB_Network" Value="Pilotes [ProductName] pour le support réseau." />
    61     <String Id="VB_NetFltDriver" Value="Pilote [ProductName] pour l'accès réseau par pont." />
    62     <String Id="VB_NetAdpDriver" Value="Pilote de carte réseau virtuelle [ProductName] pour l'accès réseau privé hôte." />
    6361    <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
    6462    <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
    … …  
    144142
    145143    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Veuillez choisir le type de pilotes réseau à utiliser :" />
    146     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
    147144    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
    148     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Utiliser pilotes réseau NDIS5." />
    149145    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Utiliser pilotes réseau NDIS6." />
    150146

  • trunk/src/VBox/Installer/win/NLS/it_IT.wxl

    r106061 r107296  
    5454    <String Id="VB_USBDriver" Value="Driver di [ProductName] per il supporto di dispositivi USB." />
    5555    <String Id="VB_Network" Value="Driver di [ProductName] per il supporto di rete." />
    56     <String Id="VB_NetFltDriver" Value="Driver di [ProductName] per la rete con bridge." />
    57     <String Id="VB_NetAdpDriver" Value="Driver di [ProductName] per la scheda di rete virtuale per la rete solo host." />
    5856    <String Id="VB_NetLwfDriver" Value="Driver di [ProductName] per la rete con bridge NDIS6." />
    5957    <String Id="VB_NetAdp6Driver" Value="Driver di [ProductName] per la scheda di rete virtuale per la rete solo host NDIS6." />
    … …  
    118116    <!---->
    119117    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Scegli quale tipo di driver di rete utilizzerai:" />
    120     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="Driver di rete NDIS5.&#xA;Questo è il tipo predefinito per le vecchie versioni di Windows (pre-Vista)." />
    121118    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="Driver di rete NDIS6.&#xA;Questo è il tipo predefinito per le nuove versioni di Windows (Vista e successivi)." />
    122     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Usa driver di rete NDIS5." />
    123119    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Usa driver di rete NDIS6." />
    124120    <!---->

  • trunk/src/VBox/Installer/win/NLS/ru_RU.wxl

    r106061 r107296  
    5959    <String Id="VB_USBDriver" Value="[ProductName] USB device drivers for USB device support." />
    6060    <String Id="VB_Network" Value="[ProductName] network device drivers for networking support." />
    61     <String Id="VB_NetFltDriver" Value="[ProductName] driver for Bridged Networking." />
    62     <String Id="VB_NetAdpDriver" Value="[ProductName] virtual network adapter driver for Host-Only Networking." />
    6361    <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
    6462    <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
    … …  
    149147
    150148    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Please choose which type of network drivers you will use:" />
    151     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
    152149    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
    153     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Use NDIS5 network drivers." />
    154150    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Use NDIS6 network drivers." />
    155151

  • trunk/src/VBox/Installer/win/NLS/tr_TR.wxl

    r106061 r107296  
    5959    <String Id="VB_USBDriver" Value="USB aygıtı desteği için [ProductName] USB aygıtı sürücüleri." />
    6060    <String Id="VB_Network" Value="Ağ oluşturma desteği için [ProductName] ağ aygıtı sürücüleri." />
    61     <String Id="VB_NetFltDriver" Value="Köprü Ağı Oluşturma için [ProductName] sürücüsü." />
    62     <String Id="VB_NetAdpDriver" Value="Yalnızca-Anamakine Ağı Oluşturma için [ProductName] sanal ağ bağdaştırıcısı sürücüsü." />
    6361    <String Id="VB_NetLwfDriver" Value="NDIS6 Köprü Ağı Oluşturma için [ProductName] sürücüsü." />
    6462    <String Id="VB_NetAdp6Driver" Value="NDIS6 Yalnızca-Anamakine Ağı Oluşturma için [ProductName] sanal ağ bağdaştırıcısı sürücüsü." />
    … …  
    149147
    150148    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Lütfen hangi tür ağ sürücülerini kullanacağınızı seçin:" />
    151     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 ağ sürücüleri.&#xA;Bu, Windows'un (Vista öncesi) daha eski sürümleri için varsayılandır." />
    152149    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 ağ sürücüleri.&#xA;Bu, Windows'un (Vista ve daha yenisi) daha yeni sürümleri için varsayılandır." />
    153     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="NDIS5 ağ sürücülerini kullan." />
    154150    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="NDIS6 ağ sürücülerini kullan." />
    155151

  • trunk/src/VBox/Installer/win/NLS/zh_CN.wxl

    r106061 r107296  
    5959<String Id="VB_USBDriver" Value="[ProductName] USB 设备驱动程序针对 USB 设备支持。" />
    6060<String Id="VB_Network" Value="[ProductName] 网络设备驱动程序针对网络支持。" />
    61 <String Id="VB_NetFltDriver" Value="[ProductName] 驱动程序针对桥接网络。" />
    62 <String Id="VB_NetAdpDriver" Value="[ProductName] 虚拟网络界面卡针对“仅主机”网络。" />
    6361<String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
    6462<String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
    … …  
    149147
    150148<String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Please choose which type of network drivers you will use:" />
    151 <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
    152149<String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
    153 <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Use NDIS5 network drivers." />
    154150<String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Use NDIS6 network drivers." />
    155151

  • trunk/src/VBox/Installer/win/NLS/zh_TW.wxl

    r106061 r107296  
    5959    <String Id="VB_USBDriver" Value="[ProductName] USB 裝置驅動程式針對 USB 裝置支援。" />
    6060    <String Id="VB_Network" Value="[ProductName] 網路裝置驅動程式針對網路支援。" />
    61     <String Id="VB_NetFltDriver" Value="[ProductName] 驅動程式針對橋接網路。" />
    62     <String Id="VB_NetAdpDriver" Value="[ProductName] 虛擬網路介面卡針對「僅限主機」網路。" />
    6361    <String Id="VB_NetLwfDriver" Value="[ProductName] 驅動程式針對 NDIS6 橋接網路。" />
    6462    <String Id="VB_NetAdp6Driver" Value="[ProductName] 虛擬網路介面卡針對 NDIS6 「僅限主機」網路。" />
    … …  
    149147
    150148    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="請選擇您將使用的網路驅動程式類型:" />
    151     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 網路驅動程式。&#xA;這是舊版 Windows 的預設值 (Vista 前)。" />
    152149    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 網路驅動程式。&#xA;這是新版 Windows 的預設值 (Vista 和以上)。" />
    153     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="使用  NDIS5 網路驅動程式。" />
    154150    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="使用  NDIS6 網路驅動程式。" />
    155151

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

    r106061 r107296  
    278278            </Control>
    279279            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    280                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    281             </Control>
    282 
    283             <!-- Build number text drawn left bottom -->
    284             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    285             <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    286                 <Text Value="[Version_text] $(var.Property_Version)" />
    287             </Control>
    288         </Dialog>
    289 
    290         <!-- Dialog for selection network adapters type (NDIS5 or NDIS6) -->
    291         <RadioButtonGroup Property="NETWORKTYPE">
    292           <RadioButton Text="!(loc.SelectionNetworkTypeDlg_RadioButtonNDIS5)" Value="NDIS5" X="5" Y="0" Width="120" Height="20" />
    293           <RadioButton Text="!(loc.SelectionNetworkTypeDlg_RadioButtonNDIS6)" Value="NDIS6" X="5" Y="20" Width="120" Height="20" />
    294         </RadioButtonGroup>
    295 
    296         <Dialog Id="VBoxSelectionNetworkTypeDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
    297             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
    298             <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    299             <Control Id="Title" Type="Text" X="15" Y="6" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
    300                 <Text Value="[DlgTitleFont]!(loc.CustomizeDlg_CustomSetup)" />
    301             </Control>
    302             <Control Id="Description" Type="Text" X="25" Y="23" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
    303                 <Text Value="!(loc.CustomizeDlg_SelFeatures)" />
    304             </Control>
    305 
    306             <Control Id="CommonDescription" Type="Text" X="25" Y="55" Width="325" Height="20" Transparent="yes" NoPrefix="yes">
    307               <Text Value="!(loc.SelectionNetworkTypeDlg_CommonDescription)" />
    308             </Control>
    309 
    310             <!-- The radio button group used for choosing NDIS5 or NDIS6 network drivers -->
    311             <Control Id="Buttons" Type="RadioButtonGroup" X="25" Y="100" Width="130" Height="60" Property="NETWORKTYPE" />
    312 
    313             <!-- Description text -->
    314             <Control Id="DescriptionNDIS5" Type="Text" X="200" Y="105" Width="150" Height="60" Transparent="yes" NoPrefix="yes" HideCondition="NETWORKTYPE = &quot;NDIS6&quot;" ShowCondition="NETWORKTYPE = &quot;NDIS5&quot;">
    315               <Text Value="!(loc.SelectionNetworkTypeDlg_DescriptionNDIS5)" />
    316 
    317 
    318             </Control>
    319             <Control Id="DescriptionNDIS6" Type="Text" X="200" Y="105" Width="150" Height="60" Transparent="yes" NoPrefix="yes" HideCondition="NETWORKTYPE = &quot;NDIS5&quot;" ShowCondition="NETWORKTYPE = &quot;NDIS6&quot;">
    320               <Text Value="!(loc.SelectionNetworkTypeDlg_DescriptionNDIS6)" />
    321 
    322 
    323             </Control>
    324 
    325             <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Next)" />
    326             <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)" />
    327             <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Cancel)">
    328280                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    329281            </Control>

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

    r106061 r107296  
    4242        <Substitution Table="CustomAction" Row="setNetworkTypeADP6" Column="Target" Value="[=passedNetworkType]" />
    4343        <CustomAction Id="setNetworkTypeADP6" Property="NETWORKTYPE" Value="[localMSMNetworkType]" Execute="immediate" />
    44         <CustomAction Id="correctNetworkTypeADP6" Property="NETWORKTYPE" Value="NDIS5" Execute="immediate" />
    4544<?endif?>
    4645
    … …  
    5554<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    5655            <Custom Action="setNetworkTypeADP6" After="CostInitialize" />
    57             <Custom Action="correctNetworkTypeADP6" After="setNetworkTypeADP6" Condition="(VersionNT &lt; 600)" />
     56            <Custom Action="correctNetworkTypeADP6" After="setNetworkTypeADP6" />
    5857<?endif?>
    5958            <?include VBoxMergeNetAdp6Seq.wxi ?>

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

    r106061 r107296  
    4242        <Substitution Table="CustomAction" Row="setNetworkTypeLWF" Column="Target" Value="[=passedNetworkType]" />
    4343        <CustomAction Id="setNetworkTypeLWF" Property="NETWORKTYPE" Value="[localMSMNetworkType]" Execute="immediate" />
    44         <CustomAction Id="correctNetworkTypeLWF" Property="NETWORKTYPE" Value="NDIS5" Execute="immediate" />
    4544<?endif?>
    4645
    … …  
    5554<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    5655            <Custom Action="setNetworkTypeLWF" After="CostInitialize" />
    57             <Custom Action="correctNetworkTypeLWF" After="setNetworkTypeLWF" Condition="(VersionNT &lt; 600)" />
    5856<?endif?>
    5957            <?include VBoxMergeNetLwfSeq.wxi ?>

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

    r107015 r107296  
    3737        <?define Property_VBoxMergeUSB = "$(env.VBOX_WIN_INST_MERGE_USB)" ?>
    3838    <?endif?>
    39     <?if $(env.VBOX_WITH_NETFLT) = "yes" And $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    40         <?define Property_VBoxMergeNetworkFlt = "$(env.VBOX_WIN_INST_MERGE_NETFLT)" ?>
    41     <?endif?>
    4239    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    43         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    44             <?define Property_VBoxMergeNetworkAdp  = "$(env.VBOX_WIN_INST_MERGE_NETADP)" ?>
    45         <?endif?>
    4640        <?define Property_VBoxMergeNetworkAdp6 = "$(env.VBOX_WIN_INST_MERGE_NETADP6)" ?>
    4741    <?endif?>
    … …  
    7064
    7165    <Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes" />
    72 
    73 <?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
    74     <!-- Force NDIS5 on pre-Vista -->
    75     <SetProperty Id="NETWORKTYPE" After="LaunchConditions" Value="NDIS5" Condition="(VersionNT &lt; 600)" />
    76 <?endif?>
    7766
    7867    <!-- Whether or not registering of known desktop shortcut for the Quick Launch Bar should be created -->
    … …  
    237226        <?include VBoxMergeCOM32On64CA.wxi ?>
    238227    <?endif?>
    239     <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    240         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    241             <?include VBoxMergeNetFltCA.wxi ?>
    242         <?endif?>
     228    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    243229        <?include VBoxMergeNetLwfCA.wxi ?>
    244     <?endif?>
    245     <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    246         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    247             <?include VBoxMergeNetAdpCA.wxi ?>
    248         <?endif?>
    249230        <?include VBoxMergeNetAdp6CA.wxi ?>
    250231    <?endif?>
    … …  
    367348            <Feature Id="VBoxNetworkFlt" Title="VirtualBox Bridged Networking" Level="1" Description="!(loc.VB_NetFltDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" AllowAdvertise="no">
    368349    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    369         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    370                 <MergeRef Id="msm_VBoxNetworkFlt" />
    371         <?endif?>
    372350                <MergeRef Id="msm_VBoxNetworkLwf" />
    373351    <?else?>
    374         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    375                 <ComponentRef Id="cp_NetFltDriver" />
    376         <?endif?>
    377352        <?if $(env.VBOX_SIGNING_MODE) != none ?>
    378353            <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    … …  
    380355            <?endif?>
    381356                <ComponentRef Id="cp_NetLwfDriverCat_W10" />
    382         <?endif?>
     357            <?endif?>
    383358                <ComponentRef Id="cp_NetLwfDriver" />
    384     <?endif?>
     359        <?endif?>
    385360            </Feature>
    386361            <Feature Id="VBoxNetworkAdp" Title="VirtualBox Host-Only Networking" Level="1" Description="!(loc.VB_NetAdpDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" AllowAdvertise="no">
    387     <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    388         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    389                 <MergeRef Id="msm_VBoxNetworkAdp" />
    390         <?endif?>
     362        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    391363                <MergeRef Id="msm_VBoxNetworkAdp6" />
    392     <?else?>
    393         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    394                 <ComponentRef Id="cp_NetAdpDriver" />
    395         <?endif?>
     364        <?else?>
    396365        <?if $(env.VBOX_SIGNING_MODE) != none ?>
    397366            <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    … …  
    483452        <?include VBoxMergeCOM32On64Seq.wxi ?>
    484453    <?endif?>
    485     <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    486         <?if $(env.KBUILD_TARGET_ARCH) = amd64 ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
    487             <?include VBoxMergeNetFltSeq.wxi ?>
    488         <?endif?>
     454    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    489455        <?include VBoxMergeNetLwfSeq.wxi ?>
    490     <?endif?>
    491     <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    492         <?if $(env.KBUILD_TARGET_ARCH) = amd64 ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
    493             <?include VBoxMergeNetAdpSeq.wxi ?>
    494         <?endif?>
    495456        <?include VBoxMergeNetAdp6Seq.wxi ?>
    496457    <?endif?>
    … …  
    558519<?endif?>
    559520                    <Directory Id="dir_Network" Name="network">
    560 <?if $(env.VBOX_WITH_NETFLT) = "yes" And $(env.KBUILD_TARGET_ARCH) = "amd64" ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
    561                         <Directory Id="dir_NetFlt" Name="netflt">
    562     <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    563                             <Merge Id="msm_VBoxNetworkFlt" Language="0" SourceFile="$(var.Property_VBoxMergeNetworkFlt)" DiskId="1">
    564                             <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]" />
    565                             </Merge>
    566     <?else?>
    567                             <Directory Id="msm_VBoxNetworkFltFolder" FileSource=".">
    568                                 <?include VBoxMergeNetFlt.wxi ?>
    569                             </Directory>
    570     <?endif?>
    571                         </Directory>
    572 <?endif?>
    573 <?if $(env.VBOX_WITH_NETADP) = "yes" and $(env.KBUILD_TARGET_ARCH) = "amd64" ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
    574                         <Directory Id="dir_NetAdp" Name="netadp">
    575     <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    576                             <Merge Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp)" DiskId="1">
    577                             <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]" />
    578                             </Merge>
    579     <?else?>
    580                             <Directory Id="msm_VBoxNetworkAdpFolder" FileSource=".">
    581                                 <?include VBoxMergeNetAdp.wxi ?>
    582                             </Directory>
    583     <?endif?>
    584                         </Directory>
    585 <?endif?>
    586 
    587 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
     521<?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    588522                        <Directory Id="dir_NetLwf" Name="netlwf">
    589523    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    … …  
    598532                        </Directory>
    599533<?endif?>
    600 
    601534<?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    602535                        <Directory Id="dir_NetAdp6" Name="netadp6">
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