Changeset 66325 in vbox

Timestamp:

Mar 29, 2017 9:27:17 AM (8 years ago)

Author:

vboxsync

Message:

Installer/win: fix conditions for VBoxNetAdp uninstall (both NDIS5 and NDIS6 variant), regression which crept in when the NDIS6 support was introduced. Does not affect the filter drivers.

Location:

trunk/src/VBox/Installer/win

Files:

• VBoxMergeNetAdp6Seq.wxi (modified) (1 diff)
• VBoxMergeNetAdpSeq.wxi (modified) (1 diff)

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

@@ -39 +39 @@
     <!-- First stop the existing host-only interfaces on update ... -->
     <Custom Action="ca_StopHostOnlyInterfacesNDIS6" After="InstallInitialize" >
-        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
+        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
     </Custom>
 
     <Custom Action="ca_UninstallNetAdp6Args" Before="ca_UninstallNetAdp6" >
-        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
+        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
     </Custom>
     <Custom Action="ca_UninstallNetAdp6" After="ca_StopHostOnlyInterfacesNDIS6" >
-        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
+        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
     </Custom>
 

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

@@ -39 +39 @@
     <!-- First stop the existing host-only interfaces on update ... -->
     <Custom Action="ca_StopHostOnlyInterfaces" After="InstallInitialize" >
-        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
+        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
     </Custom>
 
     <Custom Action="ca_UninstallNetAdpArgs" Before="ca_UninstallNetAdp" >
-        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
+        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
     </Custom>
     <Custom Action="ca_UninstallNetAdp" After="ca_StopHostOnlyInterfaces" >
-        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
+        <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
     </Custom>