Changeset 51225 in vbox for trunk/src/VBox/Installer/win/VBoxMergeNetFltCA.wxi

Timestamp:

May 9, 2014 1:08:07 PM (11 years ago)

Author:

vboxsync

Message:

Windows host installer: Fixes for non-MSM builds.

File:

• trunk/src/VBox/Installer/win/VBoxMergeNetFltCA.wxi (modified) (1 diff)

trunk/src/VBox/Installer/win/VBoxMergeNetFltCA.wxi

@@ -19 +19 @@
 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
     <CustomAction Id="ca_InstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="InstallNetFlt" Execute="deferred" Return="check" Impersonate="no"/>
-    <CustomAction Id="ca_InstallNetFltArgs" Property="ca_InstallNetFlt" Value="[MergeRedirectFolder]" Execute="immediate"/>
+    <CustomAction Id="ca_InstallNetFltArgs" Property="ca_InstallNetFlt" Value="[msm_VBoxNetworkFltFolder]" Execute="immediate"/>
 
     <CustomAction Id="ca_RollbackInstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetFlt" Execute="rollback" Impersonate="no"/>
-    <CustomAction Id="ca_RollbackInstallNetFltArgs" Property="ca_RollbackInstallNetFlt" Value="[MergeRedirectFolder]" Execute="immediate"/>
+    <CustomAction Id="ca_RollbackInstallNetFltArgs" Property="ca_RollbackInstallNetFlt" Value="[msm_VBoxNetworkFltFolder]" Execute="immediate"/>
 
     <CustomAction Id="ca_UninstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetFlt" Execute="deferred" Return="check" Impersonate="no"/>
-    <CustomAction Id="ca_UninstallNetFltArgs" Property="ca_UninstallNetFlt" Value="[MergeRedirectFolder]" Execute="immediate"/>
+    <CustomAction Id="ca_UninstallNetFltArgs" Property="ca_UninstallNetFlt" Value="[msm_VBoxNetworkFltFolder]" Execute="immediate"/>
 
     <CustomAction Id="ca_RollbackUninstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="InstallNetFlt" Execute="rollback" Impersonate="no"/>
-    <CustomAction Id="ca_RollbackUninstallNetFltArgs" Property="ca_RollbackUninstallNetFlt" Value="[MergeRedirectFolder]" Execute="immediate"/>
+    <CustomAction Id="ca_RollbackUninstallNetFltArgs" Property="ca_RollbackUninstallNetFlt" Value="[msm_VBoxNetworkFltFolder]" Execute="immediate"/>
 <?endif ?>