Index: /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxi	(revision 54069)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxi	(revision 54069)
@@ -0,0 +1,33 @@
+<!--
+    VirtualBox Windows Installation Script (WiX)
+
+    Copyright (C) 2006-2014 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+-->
+
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
+         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
+
+<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
+    <Component Id="cp_NetLwfDriver" Guid="831b909d-f09a-4281-b6b0-99393fa4769d" Win64="$(var.Property_Win64)">
+        <File Id="file_VBoxNetLwf.sys" Name="VBoxNetLwf.sys"   KeyPath="yes"
+              Source="$(env.PATH_OUT)\bin\VBoxNetLwf.sys" Checksum="yes"/>
+        <File Id="file_VBoxNetLwf.inf" Name="VBoxNetLwf.inf"
+              Source="$(env.PATH_OUT)\bin\VBoxNetLwf.inf" />
+<?if $(env.VBOX_SIGNING_MODE) != none ?>
+        <File Id="file_VBoxNetLwf.cat" Name="VBoxNetLwf.cat"
+              Source="$(env.PATH_OUT)\bin\VBoxNetLwf.cat" />
+<?endif ?>
+        <Condition><![CDATA[NETWORKTYPE="NDIS6"]]></Condition>
+    </Component>
+
+<?endif ?> <!-- VBOX_WITH_NETFLT -->
+
+</Include>
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs	(revision 54069)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs	(revision 54069)
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!--
+    VirtualBox Windows Installation Script (WiX)
+
+    Copyright (C) 2006-2014 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+-->
+
+<?include Properties.wxi ?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
+
+    <Module Id="msm_VBoxNetworkLwf"
+            Language="!(loc.LANG)"
+            Version="$(var.Property_Version)">
+
+        <Package Id="5aca0331-4936-4c1b-820a-8359965d49a4"
+                 Keywords="Installer, Setup"
+                 Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) NetLwf installation package"
+                 Comments="$(env.VBOX_PRODUCT) NetLwf installation package"
+                 Manufacturer="$(env.VBOX_VENDOR)"
+                 InstallerVersion="200"
+                 AdminImage="yes"
+                 InstallPrivileges="elevated"
+                 Platform="$(var.Property_Platform)"
+                 SummaryCodepage="1252"/>
+
+        <!-- Here comes the file/directory list -->
+        <Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="msm_VBoxNetworkLwfFolder" FileSource=".">
+
+                <?include VBoxMergeNetLwf.wxi ?>
+
+            </Directory> <!-- msm_VBoxNetworkLwfFolder -->
+        </Directory> <!-- TARGETDIR -->
+
+        <!-- Custom actions -->
+        <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
+        <?include VBoxMergeNetLwfCA.wxi ?>
+
+        <InstallExecuteSequence>
+            <?include VBoxMergeNetLwfSeq.wxi ?>
+        </InstallExecuteSequence>
+
+    </Module>
+</Wix>
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetLwfCA.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetLwfCA.wxi	(revision 54069)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetLwfCA.wxi	(revision 54069)
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+    VirtualBox Windows Installation Script (WiX)
+
+    Copyright (C) 2006-2014 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+-->
+
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
+         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
+
+<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
+    <CustomAction Id="ca_InstallNetLwf" BinaryKey="VBoxInstallHelper" DllEntry="InstallNetLwf" Execute="deferred" Return="check" Impersonate="no"/>
+    <CustomAction Id="ca_InstallNetLwfArgs" Property="ca_InstallNetLwf" Value="[msm_VBoxNetworkLwfFolder]" Execute="immediate"/>
+
+    <CustomAction Id="ca_RollbackInstallNetLwf" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetLwf" Execute="rollback" Impersonate="no"/>
+    <CustomAction Id="ca_RollbackInstallNetLwfArgs" Property="ca_RollbackInstallNetLwf" Value="[msm_VBoxNetworkLwfFolder]" Execute="immediate"/>
+
+    <CustomAction Id="ca_UninstallNetLwf" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetLwf" Execute="deferred" Return="check" Impersonate="no"/>
+    <CustomAction Id="ca_UninstallNetLwfArgs" Property="ca_UninstallNetLwf" Value="[msm_VBoxNetworkLwfFolder]" Execute="immediate"/>
+
+    <CustomAction Id="ca_RollbackUninstallNetLwf" BinaryKey="VBoxInstallHelper" DllEntry="InstallNetLwf" Execute="rollback" Impersonate="no"/>
+    <CustomAction Id="ca_RollbackUninstallNetLwfArgs" Property="ca_RollbackUninstallNetLwf" Value="[msm_VBoxNetworkLwfFolder]" Execute="immediate"/>
+<?endif ?>
+
+</Include>
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetLwfSeq.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetLwfSeq.wxi	(revision 54069)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetLwfSeq.wxi	(revision 54069)
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!--
+    VirtualBox Windows Installation Script (WiX)
+
+    Copyright (C) 2006-2014 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+-->
+
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
+         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
+
+<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
+    <Custom Action="ca_RollbackInstallNetLwfArgs" Before="ca_RollbackInstallNetLwf" >
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <![CDATA[(VersionNT >= 600) AND $cp_NetLwfDriver=3 AND (NOT Installed)]]>
+        <?else ?>
+            <![CDATA[(VersionNT >= 600) AND $cp_NetLwfDriver=3 AND (NOT Installed)]]>
+        <?endif ?>
+    </Custom>
+    <Custom Action="ca_RollbackInstallNetLwf" Before="ca_InstallNetLwf" >
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <![CDATA[(VersionNT >= 600) AND $cp_NetLwfDriver=3 AND (NOT Installed)]]>
+        <?else ?>
+            <![CDATA[(VersionNT >= 600) AND $cp_NetLwfDriver=3 AND (NOT Installed)]]>
+        <?endif ?>
+    </Custom>
+    <Custom Action="ca_InstallNetLwfArgs" Before="ca_InstallNetLwf" >
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <![CDATA[(VersionNT >= 600) AND $cp_NetLwfDriver=3 AND (NOT Installed)]]>
+        <?else ?>
+            <![CDATA[(VersionNT >= 600) AND $cp_NetLwfDriver=3 AND (NOT Installed)]]>
+        <?endif ?>
+    </Custom>
+    <Custom Action="ca_InstallNetLwf" Before="InstallFinalize" >
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <![CDATA[(VersionNT >= 600) AND $cp_NetLwfDriver=3 AND (NOT Installed)]]>
+        <?else ?>
+            <![CDATA[(VersionNT >= 600) AND $cp_NetLwfDriver=3 AND (NOT Installed)]]>
+        <?endif ?>
+    </Custom>
+    <Custom Action="ca_RollbackUninstallNetLwfArgs" Before="ca_RollbackUninstallNetLwf" >
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
+        <?else ?>
+            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
+        <?endif ?>
+    </Custom>
+    <Custom Action="ca_RollbackUninstallNetLwf" Before="ca_UninstallNetLwf" >
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
+        <?else ?>
+            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
+        <?endif ?>
+    </Custom>
+    <Custom Action="ca_UninstallNetLwfArgs" Before="ca_UninstallNetLwf" >
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <![CDATA[((UPGRADINGPRODUCTCODE) OR (REMOVE="ALL"))]]>
+        <?else ?>
+            <![CDATA[((UPGRADINGPRODUCTCODE) OR (REMOVE="ALL"))]]>
+        <?endif ?>
+    </Custom>
+    <Custom Action="ca_UninstallNetLwf" After="InstallInitialize" >
+        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <![CDATA[((UPGRADINGPRODUCTCODE) OR (REMOVE="ALL"))]]>
+        <?else ?>
+            <![CDATA[((UPGRADINGPRODUCTCODE) OR (REMOVE="ALL"))]]>
+        <?endif ?>
+    </Custom>
+
+<?endif?> <!-- VBOX_WITH_NETFLT -->
+
+</Include>