Index: trunk/src/VBox/Installer/win/NLS/de_DE.wxl
===================================================================
--- trunk/src/VBox/Installer/win/NLS/de_DE.wxl	(revision 107282)
+++ trunk/src/VBox/Installer/win/NLS/de_DE.wxl	(revision 107296)
@@ -59,6 +59,4 @@
     <String Id="VB_USBDriver" Value="[ProductName] Treiber für USB Geräte-Unterstützung." />
     <String Id="VB_Network" Value="[ProductName] Treiber für Netzwerk-Unterstützung." />
-    <String Id="VB_NetFltDriver" Value="[ProductName] Treiber für Netzwerkbrücke." />
-    <String Id="VB_NetAdpDriver" Value="[ProductName] Treiber für virtuellen Netzwerk-Adapter für Host-only Netzwerke." />
     <String Id="VB_NetLwfDriver" Value="[ProductName] Treiber für NDIS6-Netzwerkbrücke." />
     <String Id="VB_NetAdp6Driver" Value="[ProductName] Treiber für virtuellen Netzwerk-Adapter für NDIS6-Host-only-Netzwerke." />
@@ -144,7 +142,5 @@
 
     <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Bitte den zu verwendenden Netzwerktreiber auswählen:" />
-    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 Netzwerktreiber.&#xA;Standard für ältere Windows-Versionen (vor Vista)." />
     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 Netzwerktreiber.&#xA;Standard für neuere Windows-Versionen (Vista und neuer)." />
-    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="NDIS5 Netzwerktreiber." />
     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="NDIS6 Netzwerktreiber." />
 
Index: trunk/src/VBox/Installer/win/NLS/el_GR.wxl
===================================================================
--- trunk/src/VBox/Installer/win/NLS/el_GR.wxl	(revision 107282)
+++ trunk/src/VBox/Installer/win/NLS/el_GR.wxl	(revision 107296)
@@ -59,6 +59,4 @@
     <String Id="VB_USBDriver" Value="Οδηγός συσκευών USB [ProductName] για υποστήριξη συσκευών USB." />
     <String Id="VB_Network" Value="Οδηγός συσκευών δικτύου [ProductName] για υποστήριξη δικτύου." />
-    <String Id="VB_NetFltDriver" Value="Οδηγός [ProductName] για γεφυρωμένη δικτύωση." />
-    <String Id="VB_NetAdpDriver" Value="Οδηγός [ProductName] εικονικής κάρτας δικτύου για μόνο-με-οικοδεσπότη δίκτυα." />
     <String Id="VB_NetLwfDriver" Value="Οδηγός [ProductName] για NDIS6 γεφυρωμένα δίκτυα." />
     <String Id="VB_NetAdp6Driver" Value="Οδηγός [ProductName] εικονικής κάρτας δικτύου για NDIS6 μόνο-με-οικοδεσπότη δίκτυα." />
@@ -149,7 +147,5 @@
 
     <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Επιλέξτε ποιο τύπο οδηγών δικτύου θα χρησιμοποιήσετε:" />
-    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="Οδηγός δικτύου NDIS5.&#xA;Αυτή είναι η προεπιλογή για παλαιότερες εκδόσεις των Windows (προ-Vista)." />
     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="Οδηγός δικτύου NDIS6.&#xA;Αυτό είναι η προεπιλογή για νεότερες εκδόσεις των Windows (Vista και νεώτερα)." />
-    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Χρησιμοποιήστε τον οδηγό δικτύου NDIS5." />
     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Χρησιμοποιήστε τον οδηγό δικτύου NDIS6." />
 
Index: trunk/src/VBox/Installer/win/NLS/en_US.wxl
===================================================================
--- trunk/src/VBox/Installer/win/NLS/en_US.wxl	(revision 107282)
+++ trunk/src/VBox/Installer/win/NLS/en_US.wxl	(revision 107296)
@@ -58,6 +58,4 @@
     <String Id="VB_USBDriver" Value="[ProductName] USB device drivers for USB device support." />
     <String Id="VB_Network" Value="[ProductName] network device drivers for networking support." />
-    <String Id="VB_NetFltDriver" Value="[ProductName] driver for Bridged Networking." />
-    <String Id="VB_NetAdpDriver" Value="[ProductName] virtual network adapter driver for Host-Only Networking." />
     <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
     <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
@@ -148,7 +146,5 @@
 
     <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Please choose which type of network drivers you will use:" />
-    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
-    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Use NDIS5 network drivers." />
     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Use NDIS6 network drivers." />
 
Index: trunk/src/VBox/Installer/win/NLS/fa_IR.wxl
===================================================================
--- trunk/src/VBox/Installer/win/NLS/fa_IR.wxl	(revision 107282)
+++ trunk/src/VBox/Installer/win/NLS/fa_IR.wxl	(revision 107296)
@@ -54,6 +54,4 @@
     <String Id="VB_USBDriver" Value="درایور دستگاه یو اِس بی [ProductName] برای پشتیبانی از دستگاه یو اِس بی." />
     <String Id="VB_Network" Value="درایور دستگاه شبکه [ProductName] برای پشتیبانی از شبکه." />
-    <String Id="VB_NetFltDriver" Value="درایور [ProductName] برای شبکه پل شده." />
-    <String Id="VB_NetAdpDriver" Value="درایور آداپتور شبکه مجازی [ProductName] برای شبکه فقط-میزبان." />
     <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
     <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
@@ -118,7 +116,5 @@
     <!---->
     <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Please choose which type of network drivers you will use:" />
-    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
-    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Use NDIS5 network drivers." />
     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Use NDIS6 network drivers." />
     <!---->
Index: trunk/src/VBox/Installer/win/NLS/fr_FR.wxl
===================================================================
--- trunk/src/VBox/Installer/win/NLS/fr_FR.wxl	(revision 107282)
+++ trunk/src/VBox/Installer/win/NLS/fr_FR.wxl	(revision 107296)
@@ -59,6 +59,4 @@
     <String Id="VB_USBDriver" Value="Pilotes USB [ProductName] pour le support de périphériques USB." />
     <String Id="VB_Network" Value="Pilotes [ProductName] pour le support réseau." />
-    <String Id="VB_NetFltDriver" Value="Pilote [ProductName] pour l'accès réseau par pont." />
-    <String Id="VB_NetAdpDriver" Value="Pilote de carte réseau virtuelle [ProductName] pour l'accès réseau privé hôte." />
     <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
     <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
@@ -144,7 +142,5 @@
 
     <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Veuillez choisir le type de pilotes réseau à utiliser :" />
-    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
-    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Utiliser pilotes réseau NDIS5." />
     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Utiliser pilotes réseau NDIS6." />
 
Index: trunk/src/VBox/Installer/win/NLS/it_IT.wxl
===================================================================
--- trunk/src/VBox/Installer/win/NLS/it_IT.wxl	(revision 107282)
+++ trunk/src/VBox/Installer/win/NLS/it_IT.wxl	(revision 107296)
@@ -54,6 +54,4 @@
     <String Id="VB_USBDriver" Value="Driver di [ProductName] per il supporto di dispositivi USB." />
     <String Id="VB_Network" Value="Driver di [ProductName] per il supporto di rete." />
-    <String Id="VB_NetFltDriver" Value="Driver di [ProductName] per la rete con bridge." />
-    <String Id="VB_NetAdpDriver" Value="Driver di [ProductName] per la scheda di rete virtuale per la rete solo host." />
     <String Id="VB_NetLwfDriver" Value="Driver di [ProductName] per la rete con bridge NDIS6." />
     <String Id="VB_NetAdp6Driver" Value="Driver di [ProductName] per la scheda di rete virtuale per la rete solo host NDIS6." />
@@ -118,7 +116,5 @@
     <!---->
     <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Scegli quale tipo di driver di rete utilizzerai:" />
-    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="Driver di rete NDIS5.&#xA;Questo è il tipo predefinito per le vecchie versioni di Windows (pre-Vista)." />
     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="Driver di rete NDIS6.&#xA;Questo è il tipo predefinito per le nuove versioni di Windows (Vista e successivi)." />
-    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Usa driver di rete NDIS5." />
     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Usa driver di rete NDIS6." />
     <!---->
Index: trunk/src/VBox/Installer/win/NLS/ru_RU.wxl
===================================================================
--- trunk/src/VBox/Installer/win/NLS/ru_RU.wxl	(revision 107282)
+++ trunk/src/VBox/Installer/win/NLS/ru_RU.wxl	(revision 107296)
@@ -59,6 +59,4 @@
     <String Id="VB_USBDriver" Value="[ProductName] USB device drivers for USB device support." />
     <String Id="VB_Network" Value="[ProductName] network device drivers for networking support." />
-    <String Id="VB_NetFltDriver" Value="[ProductName] driver for Bridged Networking." />
-    <String Id="VB_NetAdpDriver" Value="[ProductName] virtual network adapter driver for Host-Only Networking." />
     <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
     <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
@@ -149,7 +147,5 @@
 
     <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Please choose which type of network drivers you will use:" />
-    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
-    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Use NDIS5 network drivers." />
     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Use NDIS6 network drivers." />
 
Index: trunk/src/VBox/Installer/win/NLS/tr_TR.wxl
===================================================================
--- trunk/src/VBox/Installer/win/NLS/tr_TR.wxl	(revision 107282)
+++ trunk/src/VBox/Installer/win/NLS/tr_TR.wxl	(revision 107296)
@@ -59,6 +59,4 @@
     <String Id="VB_USBDriver" Value="USB aygıtı desteği için [ProductName] USB aygıtı sürücüleri." />
     <String Id="VB_Network" Value="Ağ oluşturma desteği için [ProductName] ağ aygıtı sürücüleri." />
-    <String Id="VB_NetFltDriver" Value="Köprü Ağı Oluşturma için [ProductName] sürücüsü." />
-    <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ü." />
     <String Id="VB_NetLwfDriver" Value="NDIS6 Köprü Ağı Oluşturma için [ProductName] sürücüsü." />
     <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ü." />
@@ -149,7 +147,5 @@
 
     <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Lütfen hangi tür ağ sürücülerini kullanacağınızı seçin:" />
-    <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." />
     <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." />
-    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="NDIS5 ağ sürücülerini kullan." />
     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="NDIS6 ağ sürücülerini kullan." />
 
Index: trunk/src/VBox/Installer/win/NLS/zh_CN.wxl
===================================================================
--- trunk/src/VBox/Installer/win/NLS/zh_CN.wxl	(revision 107282)
+++ trunk/src/VBox/Installer/win/NLS/zh_CN.wxl	(revision 107296)
@@ -59,6 +59,4 @@
 <String Id="VB_USBDriver" Value="[ProductName] USB 设备驱动程序针对 USB 设备支持。" />
 <String Id="VB_Network" Value="[ProductName] 网络设备驱动程序针对网络支持。" />
-<String Id="VB_NetFltDriver" Value="[ProductName] 驱动程序针对桥接网络。" />
-<String Id="VB_NetAdpDriver" Value="[ProductName] 虚拟网络界面卡针对“仅主机”网络。" />
 <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
 <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
@@ -149,7 +147,5 @@
 
 <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Please choose which type of network drivers you will use:" />
-<String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
 <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
-<String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Use NDIS5 network drivers." />
 <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Use NDIS6 network drivers." />
 
Index: trunk/src/VBox/Installer/win/NLS/zh_TW.wxl
===================================================================
--- trunk/src/VBox/Installer/win/NLS/zh_TW.wxl	(revision 107282)
+++ trunk/src/VBox/Installer/win/NLS/zh_TW.wxl	(revision 107296)
@@ -59,6 +59,4 @@
     <String Id="VB_USBDriver" Value="[ProductName] USB 裝置驅動程式針對 USB 裝置支援。" />
     <String Id="VB_Network" Value="[ProductName] 網路裝置驅動程式針對網路支援。" />
-    <String Id="VB_NetFltDriver" Value="[ProductName] 驅動程式針對橋接網路。" />
-    <String Id="VB_NetAdpDriver" Value="[ProductName] 虛擬網路介面卡針對「僅限主機」網路。" />
     <String Id="VB_NetLwfDriver" Value="[ProductName] 驅動程式針對 NDIS6 橋接網路。" />
     <String Id="VB_NetAdp6Driver" Value="[ProductName] 虛擬網路介面卡針對 NDIS6 「僅限主機」網路。" />
@@ -149,7 +147,5 @@
 
     <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="請選擇您將使用的網路驅動程式類型:" />
-    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 網路驅動程式。&#xA;這是舊版 Windows 的預設值 (Vista 前)。" />
     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 網路驅動程式。&#xA;這是新版 Windows 的預設值 (Vista 和以上)。" />
-    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="使用  NDIS5 網路驅動程式。" />
     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="使用  NDIS6 網路驅動程式。" />
 
Index: trunk/src/VBox/Installer/win/UserInterface.wxi
===================================================================
--- trunk/src/VBox/Installer/win/UserInterface.wxi	(revision 107282)
+++ trunk/src/VBox/Installer/win/UserInterface.wxi	(revision 107296)
@@ -278,52 +278,4 @@
             </Control>
             <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
-            </Control>
-
-            <!-- Build number text drawn left bottom -->
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
-                <Text Value="[Version_text] $(var.Property_Version)" />
-            </Control>
-        </Dialog>
-
-        <!-- Dialog for selection network adapters type (NDIS5 or NDIS6) -->
-        <RadioButtonGroup Property="NETWORKTYPE">
-          <RadioButton Text="!(loc.SelectionNetworkTypeDlg_RadioButtonNDIS5)" Value="NDIS5" X="5" Y="0" Width="120" Height="20" />
-          <RadioButton Text="!(loc.SelectionNetworkTypeDlg_RadioButtonNDIS6)" Value="NDIS6" X="5" Y="20" Width="120" Height="20" />
-        </RadioButtonGroup>
-
-        <Dialog Id="VBoxSelectionNetworkTypeDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
-            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
-            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-            <Control Id="Title" Type="Text" X="15" Y="6" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
-                <Text Value="[DlgTitleFont]!(loc.CustomizeDlg_CustomSetup)" />
-            </Control>
-            <Control Id="Description" Type="Text" X="25" Y="23" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
-                <Text Value="!(loc.CustomizeDlg_SelFeatures)" />
-            </Control>
-
-            <Control Id="CommonDescription" Type="Text" X="25" Y="55" Width="325" Height="20" Transparent="yes" NoPrefix="yes">
-              <Text Value="!(loc.SelectionNetworkTypeDlg_CommonDescription)" />
-            </Control>
-
-            <!-- The radio button group used for choosing NDIS5 or NDIS6 network drivers -->
-            <Control Id="Buttons" Type="RadioButtonGroup" X="25" Y="100" Width="130" Height="60" Property="NETWORKTYPE" />
-
-            <!-- Description text -->
-            <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;">
-              <Text Value="!(loc.SelectionNetworkTypeDlg_DescriptionNDIS5)" />
-
-
-            </Control>
-            <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;">
-              <Text Value="!(loc.SelectionNetworkTypeDlg_DescriptionNDIS6)" />
-
-
-            </Control>
-
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Next)" />
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)" />
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Cancel)">
                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
             </Control>
Index: trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxi
===================================================================
--- trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxi	(revision 107282)
+++ 	(revision )
@@ -1,36 +1,0 @@
-﻿<!--
-    VirtualBox Windows Installation Script (WiX)
--->
-<!--
-    Copyright (C) 2006-2024 Oracle and/or its affiliates.
-
-    This file is part of VirtualBox base platform packages, as
-    available from https://www.virtualbox.org.
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation, in version 3 of the
-    License.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <https://www.gnu.org/licenses>.
-
-    SPDX-License-Identifier: GPL-3.0-only
--->
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-    <Component Id="cp_NetAdpDriver" Guid="7adf3e12-af3c-4d36-8bec-36d5064cf84f" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS5&quot;)">
-        <File Id="file_VBoxNetAdp.sys" Name="VBoxNetAdp.sys" KeyPath="yes" Source="$(env.PATH_OUT)\bin\VBoxNetAdp.sys" Checksum="yes" />
-        <File Id="file_VBoxNetAdp.inf" Name="VBoxNetAdp.inf" Source="$(env.PATH_OUT)\bin\VBoxNetAdp.inf" />
-<?if $(env.VBOX_SIGNING_MODE) != none ?>
-        <File Id="file_VBoxNetAdp.cat" Name="VBoxNetAdp.cat" Source="$(env.PATH_OUT)\bin\VBoxNetAdp.cat" />
-<?endif?>
-    </Component>
-
-</Include>
Index: trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs
===================================================================
--- trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs	(revision 107282)
+++ 	(revision )
@@ -1,69 +1,0 @@
-﻿<!--
-    VirtualBox Windows Installation Script (WiX)
--->
-<!--
-    Copyright (C) 2006-2024 Oracle and/or its affiliates.
-
-    This file is part of VirtualBox base platform packages, as
-    available from https://www.virtualbox.org.
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation, in version 3 of the
-    License.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <https://www.gnu.org/licenses>.
-
-    SPDX-License-Identifier: GPL-3.0-only
--->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-    <?include Defines.wxi ?>
-
-    <Module Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" Version="$(var.Property_Version)" Guid="248b9371-ab62-48ee-8f23-270fb319bb46" InstallerVersion="200">
-
-        <SummaryInformation Keywords="Installer, Setup"
-                            Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) NetAdp installation package"
-                            Manufacturer="$(env.VBOX_VENDOR)" />
-
-        <?include CommonProperties.wxi ?>
-        <?include PublicProperties.wxi ?>
-
-<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-        <Property Id="localMSMNetworkType" Value="Empty" />
-        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed" />
-        <Substitution Table="CustomAction" Row="setNetworkTypeADP" Column="Target" Value="[=passedNetworkType]" />
-        <CustomAction Id="setNetworkTypeADP" Property="NETWORKTYPE" Value="[localMSMNetworkType]" Execute="immediate" />
-        <CustomAction Id="correctNetworkTypeADP" Property="NETWORKTYPE" Value="NDIS5" Execute="immediate" />
-<?endif?>
-
-        <!-- Here comes the file/directory list -->
-         <!-- TARGETDIR -->
-
-        <!-- Custom actions -->
-        <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
-        <?include VBoxMergeNetAdpCA.wxi ?>
-
-        <InstallExecuteSequence>
-<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-            <Custom Action="setNetworkTypeADP" After="CostInitialize" />
-            <Custom Action="correctNetworkTypeADP" After="setNetworkTypeADP" Condition="(VersionNT &lt; 600)" />
-<?endif?>
-            <?include VBoxMergeNetAdpSeq.wxi ?>
-        </InstallExecuteSequence>
-
-
-            <Directory Id="msm_VBoxNetworkAdpFolder" FileSource=".">
-
-                <?include VBoxMergeNetAdp.wxi ?>
-
-            </Directory> <!-- msm_VBoxNetworkAdpFolder -->
-        </Module>
-</Wix>
Index: trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs
===================================================================
--- trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs	(revision 107282)
+++ trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs	(revision 107296)
@@ -42,5 +42,4 @@
         <Substitution Table="CustomAction" Row="setNetworkTypeADP6" Column="Target" Value="[=passedNetworkType]" />
         <CustomAction Id="setNetworkTypeADP6" Property="NETWORKTYPE" Value="[localMSMNetworkType]" Execute="immediate" />
-        <CustomAction Id="correctNetworkTypeADP6" Property="NETWORKTYPE" Value="NDIS5" Execute="immediate" />
 <?endif?>
 
@@ -55,5 +54,5 @@
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
             <Custom Action="setNetworkTypeADP6" After="CostInitialize" />
-            <Custom Action="correctNetworkTypeADP6" After="setNetworkTypeADP6" Condition="(VersionNT &lt; 600)" />
+            <Custom Action="correctNetworkTypeADP6" After="setNetworkTypeADP6" />
 <?endif?>
             <?include VBoxMergeNetAdp6Seq.wxi ?>
Index: trunk/src/VBox/Installer/win/VBoxMergeNetAdpCA.wxi
===================================================================
--- trunk/src/VBox/Installer/win/VBoxMergeNetAdpCA.wxi	(revision 107282)
+++ 	(revision )
@@ -1,37 +1,0 @@
-﻿<!--
-    VirtualBox Windows Installation Script (WiX)
--->
-<!--
-    Copyright (C) 2006-2024 Oracle and/or its affiliates.
-
-    This file is part of VirtualBox base platform packages, as
-    available from https://www.virtualbox.org.
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation, in version 3 of the
-    License.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <https://www.gnu.org/licenses>.
-
-    SPDX-License-Identifier: GPL-3.0-only
--->
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-    <CustomAction Id="ca_CreateHostOnlyInterface" DllEntry="CreateHostOnlyInterface" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
-    <CustomAction Id="ca_CreateHostOnlyInterfaceArgs" Property="ca_CreateHostOnlyInterface" Value="[msm_VBoxNetworkAdpFolder]" Execute="immediate" />
-    <CustomAction Id="ca_RemoveHostOnlyInterfaces" DllEntry="RemoveHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
-    <CustomAction Id="ca_StopHostOnlyInterfaces" DllEntry="StopHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
-    <CustomAction Id="ca_UpdateHostOnlyInterfacesArgs" Property="ca_UpdateHostOnlyInterfaces" Value="[msm_VBoxNetworkAdpFolder]" Execute="immediate" />
-    <CustomAction Id="ca_UpdateHostOnlyInterfaces" DllEntry="UpdateHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
-    <CustomAction Id="ca_UninstallNetAdp" DllEntry="UninstallNetAdp" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
-    <CustomAction Id="ca_UninstallNetAdpArgs" Property="ca_UninstallNetAdp" Value="[msm_VBoxNetworkAdpFolder]" Execute="immediate" />
-
-</Include>
Index: trunk/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi
===================================================================
--- trunk/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi	(revision 107282)
+++ 	(revision )
@@ -1,64 +1,0 @@
-﻿<!--
-    VirtualBox Windows Installation Script (WiX)
--->
-<!--
-    Copyright (C) 2006-2024 Oracle and/or its affiliates.
-
-    This file is part of VirtualBox base platform packages, as
-    available from https://www.virtualbox.org.
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation, in version 3 of the
-    License.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <https://www.gnu.org/licenses>.
-
-    SPDX-License-Identifier: GPL-3.0-only
--->
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
-
-    <!-- Create host-only interfaces on first-time install -->
-    <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface"
-            Condition="NOT Installed AND ($cp_NetAdpDriver=3)" />
-
-    <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize"
-            Condition="NOT Installed AND ($cp_NetAdpDriver=3)" />
-
-    <!-- Remove the host-only interfaces on uninstall only. Includes
-         VBoxNetAdp driver uninstall.
-         @todo r=klaus Clean up this inconsistency by changing what the
-         install helper DLL does. It's very surprising behavior and needs
-         digging through a lot of code to understand the where and why. -->
-    <Custom Action="ca_RemoveHostOnlyInterfaces" After="InstallInitialize"
-            Condition="NOT (UPGRADINGPRODUCTCODE) AND (Installed) AND (REMOVE=&quot;ALL&quot;)" />
-
-    <!-- Stop the host-only interfaces on update only. Driver still has to be
-         uninstalled, and the creation of interfaces in the new installer will
-         do the actual upgrading, preserving the interfaces. -->
-    <Custom Action="ca_StopHostOnlyInterfaces" After="InstallInitialize"
-            Condition="(UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
-
-    <!-- Uninstall the driver only on package upgrade, as for uninstall it is
-         included in ca_RemoveHostOnlyInterfaces.
-         @todo r=klaus Clean up this inconsistency by changing what the
-         install helper DLL does. It's very surprising behavior and needs
-         digging through a lot of code to understand the where and why. -->
-    <Custom Action="ca_UninstallNetAdpArgs" Before="ca_UninstallNetAdp"
-            Condition="(UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
-
-    <Custom Action="ca_UninstallNetAdp" After="ca_StopHostOnlyInterfaces"
-            Condition="(UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
-
-<?endif?>
-
-</Include>
Index: trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxi
===================================================================
--- trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxi	(revision 107282)
+++ 	(revision )
@@ -1,41 +1,0 @@
-﻿<!--
-    VirtualBox Windows Installation Script (WiX)
--->
-<!--
-    Copyright (C) 2006-2024 Oracle and/or its affiliates.
-
-    This file is part of VirtualBox base platform packages, as
-    available from https://www.virtualbox.org.
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation, in version 3 of the
-    License.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <https://www.gnu.org/licenses>.
-
-    SPDX-License-Identifier: GPL-3.0-only
--->
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
-    <Component Id="cp_NetFltDriver" Guid="F0A02F6B-A349-42f8-A2EB-569DCAAAF846" Bitness="$(var.Property_Bitness)" Condition="(NETWORKTYPE=&quot;NDIS5&quot;)">
-        <File Id="file_VBoxNetFlt.sys" Name="VBoxNetFlt.sys" KeyPath="yes" Source="$(env.PATH_OUT)\bin\VBoxNetFlt.sys" Checksum="yes" />
-        <File Id="file_VBoxNetFltNobj.sys" Name="VBoxNetFltNobj.dll" Source="$(env.PATH_OUT)\bin\VBoxNetFltNobj.dll" Checksum="yes" />
-        <File Id="file_VBoxNetFltM.inf" Name="VBoxNetFltM.inf" Source="$(env.PATH_OUT)\bin\VBoxNetFltM.inf" />
-        <File Id="file_VBoxNetFlt.inf" Name="VBoxNetFlt.inf" Source="$(env.PATH_OUT)\bin\VBoxNetFlt.inf" />
-<?if $(env.VBOX_SIGNING_MODE) != none ?>
-        <File Id="file_VBoxNetFlt.cat" Name="VBoxNetFlt.cat" Source="$(env.PATH_OUT)\bin\VBoxNetFlt.cat" />
-<?endif?>
-    </Component>
-
-<?endif?> <!-- VBOX_WITH_NETFLT -->
-
-</Include>
Index: trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxs
===================================================================
--- trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxs	(revision 107282)
+++ 	(revision )
@@ -1,69 +1,0 @@
-﻿<!--
-    VirtualBox Windows Installation Script (WiX)
--->
-<!--
-    Copyright (C) 2006-2024 Oracle and/or its affiliates.
-
-    This file is part of VirtualBox base platform packages, as
-    available from https://www.virtualbox.org.
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation, in version 3 of the
-    License.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <https://www.gnu.org/licenses>.
-
-    SPDX-License-Identifier: GPL-3.0-only
--->
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-    <?include Defines.wxi ?>
-
-    <Module Id="msm_VBoxNetworkFlt" Language="!(loc.LANG)" Version="$(var.Property_Version)" Guid="687c000b-c74b-4336-a449-dd8b3c6a060e" InstallerVersion="200">
-
-        <SummaryInformation Keywords="Installer, Setup"
-                            Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) NetFlt installation package"
-                            Manufacturer="$(env.VBOX_VENDOR)" />
-
-        <?include CommonProperties.wxi ?>
-        <?include PublicProperties.wxi ?>
-
-<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-        <Property Id="localMSMNetworkType" Value="Empty" />
-        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed" />
-        <Substitution Table="CustomAction" Row="setNetworkTypeFLT" Column="Target" Value="[=passedNetworkType]" />
-        <CustomAction Id="setNetworkTypeFLT" Property="NETWORKTYPE" Value="[localMSMNetworkType]" Execute="immediate" />
-        <CustomAction Id="correctNetworkTypeFLT" Property="NETWORKTYPE" Value="NDIS5" Execute="immediate" />
-<?endif?>
-
-        <!-- Here comes the file/directory list -->
-         <!-- TARGETDIR -->
-
-        <!-- Custom actions -->
-        <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
-        <?include VBoxMergeNetFltCA.wxi ?>
-
-        <InstallExecuteSequence>
-<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-            <Custom Action="setNetworkTypeFLT" After="CostInitialize" />
-            <Custom Action="correctNetworkTypeFLT" After="setNetworkTypeFLT" Condition="(VersionNT &lt; 600)" />
-<?endif?>
-            <?include VBoxMergeNetFltSeq.wxi ?>
-        </InstallExecuteSequence>
-
-
-            <Directory Id="msm_VBoxNetworkFltFolder" FileSource=".">
-
-                <?include VBoxMergeNetFlt.wxi ?>
-
-            </Directory> <!-- msm_VBoxNetworkFltFolder -->
-        </Module>
-</Wix>
Index: trunk/src/VBox/Installer/win/VBoxMergeNetFltCA.wxi
===================================================================
--- trunk/src/VBox/Installer/win/VBoxMergeNetFltCA.wxi	(revision 107282)
+++ 	(revision )
@@ -1,42 +1,0 @@
-﻿<!--
-    VirtualBox Windows Installation Script (WiX)
--->
-<!--
-    Copyright (C) 2006-2024 Oracle and/or its affiliates.
-
-    This file is part of VirtualBox base platform packages, as
-    available from https://www.virtualbox.org.
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation, in version 3 of the
-    License.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <https://www.gnu.org/licenses>.
-
-    SPDX-License-Identifier: GPL-3.0-only
--->
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
-    <CustomAction Id="ca_InstallNetFlt" DllEntry="InstallNetFlt" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
-    <CustomAction Id="ca_InstallNetFltArgs" Property="ca_InstallNetFlt" Value="[msm_VBoxNetworkFltFolder]" Execute="immediate" />
-
-    <CustomAction Id="ca_RollbackInstallNetFlt" DllEntry="UninstallNetFlt" Execute="rollback" Impersonate="no" BinaryRef="VBoxInstallHelper" />
-    <CustomAction Id="ca_RollbackInstallNetFltArgs" Property="ca_RollbackInstallNetFlt" Value="[msm_VBoxNetworkFltFolder]" Execute="immediate" />
-
-    <CustomAction Id="ca_UninstallNetFlt" DllEntry="UninstallNetFlt" Execute="deferred" Return="check" Impersonate="no" BinaryRef="VBoxInstallHelper" />
-    <CustomAction Id="ca_UninstallNetFltArgs" Property="ca_UninstallNetFlt" Value="[msm_VBoxNetworkFltFolder]" Execute="immediate" />
-
-    <CustomAction Id="ca_RollbackUninstallNetFlt" DllEntry="InstallNetFlt" Execute="rollback" Impersonate="no" BinaryRef="VBoxInstallHelper" />
-    <CustomAction Id="ca_RollbackUninstallNetFltArgs" Property="ca_RollbackUninstallNetFlt" Value="[msm_VBoxNetworkFltFolder]" Execute="immediate" />
-<?endif?>
-
-</Include>
Index: trunk/src/VBox/Installer/win/VBoxMergeNetFltSeq.wxi
===================================================================
--- trunk/src/VBox/Installer/win/VBoxMergeNetFltSeq.wxi	(revision 107282)
+++ 	(revision )
@@ -1,56 +1,0 @@
-﻿<!--
-    VirtualBox Windows Installation Script (WiX)
--->
-<!--
-    Copyright (C) 2006-2024 Oracle and/or its affiliates.
-
-    This file is part of VirtualBox base platform packages, as
-    available from https://www.virtualbox.org.
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation, in version 3 of the
-    License.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <https://www.gnu.org/licenses>.
-
-    SPDX-License-Identifier: GPL-3.0-only
--->
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
-
-    <Custom Action="ca_RollbackInstallNetFltArgs" Before="ca_RollbackInstallNetFlt"
-            Condition="$cp_NetFltDriver=3 AND (NOT Installed)" />
-
-    <Custom Action="ca_RollbackInstallNetFlt" Before="ca_InstallNetFlt"
-            Condition="$cp_NetFltDriver=3 AND (NOT Installed)" />
-
-    <Custom Action="ca_InstallNetFltArgs" Before="ca_InstallNetFlt"
-            Condition="$cp_NetFltDriver=3 AND (NOT Installed)" />
-
-    <Custom Action="ca_InstallNetFlt" Before="InstallFinalize"
-            Condition="$cp_NetFltDriver=3 AND (NOT Installed)" />
-
-    <Custom Action="ca_RollbackUninstallNetFltArgs" Before="ca_RollbackUninstallNetFlt"
-            Condition="(UPGRADINGPRODUCTCODE) OR (REMOVE=&quot;ALL&quot;)" />
-
-    <Custom Action="ca_RollbackUninstallNetFlt" Before="ca_UninstallNetFlt"
-            Condition="(UPGRADINGPRODUCTCODE) OR (REMOVE=&quot;ALL&quot;)" />
-
-    <Custom Action="ca_UninstallNetFltArgs" Before="ca_UninstallNetFlt"
-            Condition="(UPGRADINGPRODUCTCODE) OR (REMOVE=&quot;ALL&quot;)" />
-
-    <Custom Action="ca_UninstallNetFlt" After="InstallInitialize"
-            Condition="(UPGRADINGPRODUCTCODE) OR (REMOVE=&quot;ALL&quot;)" />
-
-<?endif?> <!-- VBOX_WITH_NETFLT -->
-
-</Include>
Index: trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs
===================================================================
--- trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs	(revision 107282)
+++ trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs	(revision 107296)
@@ -42,5 +42,4 @@
         <Substitution Table="CustomAction" Row="setNetworkTypeLWF" Column="Target" Value="[=passedNetworkType]" />
         <CustomAction Id="setNetworkTypeLWF" Property="NETWORKTYPE" Value="[localMSMNetworkType]" Execute="immediate" />
-        <CustomAction Id="correctNetworkTypeLWF" Property="NETWORKTYPE" Value="NDIS5" Execute="immediate" />
 <?endif?>
 
@@ -55,5 +54,4 @@
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
             <Custom Action="setNetworkTypeLWF" After="CostInitialize" />
-            <Custom Action="correctNetworkTypeLWF" After="setNetworkTypeLWF" Condition="(VersionNT &lt; 600)" />
 <?endif?>
             <?include VBoxMergeNetLwfSeq.wxi ?>
Index: trunk/src/VBox/Installer/win/VirtualBox.wxs
===================================================================
--- trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 107282)
+++ trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 107296)
@@ -37,11 +37,5 @@
         <?define Property_VBoxMergeUSB = "$(env.VBOX_WIN_INST_MERGE_USB)" ?>
     <?endif?>
-    <?if $(env.VBOX_WITH_NETFLT) = "yes" And $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
-        <?define Property_VBoxMergeNetworkFlt = "$(env.VBOX_WIN_INST_MERGE_NETFLT)" ?>
-    <?endif?>
     <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
-        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
-            <?define Property_VBoxMergeNetworkAdp  = "$(env.VBOX_WIN_INST_MERGE_NETADP)" ?>
-        <?endif?>
         <?define Property_VBoxMergeNetworkAdp6 = "$(env.VBOX_WIN_INST_MERGE_NETADP6)" ?>
     <?endif?>
@@ -70,9 +64,4 @@
 
     <Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes" />
-
-<?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
-    <!-- Force NDIS5 on pre-Vista -->
-    <SetProperty Id="NETWORKTYPE" After="LaunchConditions" Value="NDIS5" Condition="(VersionNT &lt; 600)" />
-<?endif?>
 
     <!-- Whether or not registering of known desktop shortcut for the Quick Launch Bar should be created -->
@@ -237,14 +226,6 @@
         <?include VBoxMergeCOM32On64CA.wxi ?>
     <?endif?>
-    <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
-        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
-            <?include VBoxMergeNetFltCA.wxi ?>
-        <?endif?>
+    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
         <?include VBoxMergeNetLwfCA.wxi ?>
-    <?endif?>
-    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
-        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
-            <?include VBoxMergeNetAdpCA.wxi ?>
-        <?endif?>
         <?include VBoxMergeNetAdp6CA.wxi ?>
     <?endif?>
@@ -367,12 +348,6 @@
             <Feature Id="VBoxNetworkFlt" Title="VirtualBox Bridged Networking" Level="1" Description="!(loc.VB_NetFltDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" AllowAdvertise="no">
     <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
-                <MergeRef Id="msm_VBoxNetworkFlt" />
-        <?endif?>
                 <MergeRef Id="msm_VBoxNetworkLwf" />
     <?else?>
-        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
-                <ComponentRef Id="cp_NetFltDriver" />
-        <?endif?>
         <?if $(env.VBOX_SIGNING_MODE) != none ?>
             <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
@@ -380,18 +355,12 @@
             <?endif?>
                 <ComponentRef Id="cp_NetLwfDriverCat_W10" />
-        <?endif?>
+            <?endif?>
                 <ComponentRef Id="cp_NetLwfDriver" />
-    <?endif?>
+        <?endif?>
             </Feature>
             <Feature Id="VBoxNetworkAdp" Title="VirtualBox Host-Only Networking" Level="1" Description="!(loc.VB_NetAdpDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" AllowAdvertise="no">
-    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
-                <MergeRef Id="msm_VBoxNetworkAdp" />
-        <?endif?>
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
                 <MergeRef Id="msm_VBoxNetworkAdp6" />
-    <?else?>
-        <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
-                <ComponentRef Id="cp_NetAdpDriver" />
-        <?endif?>
+        <?else?>
         <?if $(env.VBOX_SIGNING_MODE) != none ?>
             <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
@@ -483,14 +452,6 @@
         <?include VBoxMergeCOM32On64Seq.wxi ?>
     <?endif?>
-    <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
-        <?if $(env.KBUILD_TARGET_ARCH) = amd64 ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
-            <?include VBoxMergeNetFltSeq.wxi ?>
-        <?endif?>
+    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
         <?include VBoxMergeNetLwfSeq.wxi ?>
-    <?endif?>
-    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
-        <?if $(env.KBUILD_TARGET_ARCH) = amd64 ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
-            <?include VBoxMergeNetAdpSeq.wxi ?>
-        <?endif?>
         <?include VBoxMergeNetAdp6Seq.wxi ?>
     <?endif?>
@@ -558,32 +519,5 @@
 <?endif?>
                     <Directory Id="dir_Network" Name="network">
-<?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. -->
-                        <Directory Id="dir_NetFlt" Name="netflt">
-    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-                            <Merge Id="msm_VBoxNetworkFlt" Language="0" SourceFile="$(var.Property_VBoxMergeNetworkFlt)" DiskId="1">
-                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]" />
-                            </Merge>
-    <?else?>
-                            <Directory Id="msm_VBoxNetworkFltFolder" FileSource=".">
-                                <?include VBoxMergeNetFlt.wxi ?>
-                            </Directory>
-    <?endif?>
-                        </Directory>
-<?endif?>
-<?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. -->
-                        <Directory Id="dir_NetAdp" Name="netadp">
-    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-                            <Merge Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp)" DiskId="1">
-                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]" />
-                            </Merge>
-    <?else?>
-                            <Directory Id="msm_VBoxNetworkAdpFolder" FileSource=".">
-                                <?include VBoxMergeNetAdp.wxi ?>
-                            </Directory>
-    <?endif?>
-                        </Directory>
-<?endif?>
-
-<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
+<?if $(env.VBOX_WITH_NETADP) = "yes" ?>
                         <Directory Id="dir_NetLwf" Name="netlwf">
     <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
@@ -598,5 +532,4 @@
                         </Directory>
 <?endif?>
-
 <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
                         <Directory Id="dir_NetAdp6" Name="netadp6">
