Adding upstream version 6.0.4-dfsg.upstream/6.0.4-dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 43 insertions, 0 deletions

diff --git a/src/VBox/Installer/win/VBoxMergeNetFlt.wxi b/src/VBox/Installer/win/VBoxMergeNetFlt.wxi
new file mode 100644
index 00000000..568610ee
--- /dev/null
+++ b/src/VBox/Installer/win/VBoxMergeNetFlt.wxi
@@ -0,0 +1,43 @@
+<!--
+    VirtualBox Windows Installation Script (WiX)
+
+    Copyright (C) 2006-2016 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_NetFltDriver" Guid="F0A02F6B-A349-42f8-A2EB-569DCAAAF846" Win64="$(var.Property_Win64)">
+        <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 ?>
+
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+        <Condition><![CDATA[(localMSMNetworkType="NDIS5")]]></Condition>
+<?else ?>
+        <Condition><![CDATA[(NETWORKTYPE="NDIS5")]]></Condition>
+<?endif ?>
+
+    </Component>
+
+<?endif ?> <!-- VBOX_WITH_NETFLT -->
+
+</Include>