Changeset 58721 in vbox for trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs

Timestamp:

Nov 17, 2015 2:13:20 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8101. Windows MSM build is affected. It is passed public property NETWORKTYPE from outside into the merge modules now.

File:

• trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs (modified) (2 diffs)

trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs

@@ -34 +34 @@
                  SummaryCodepage="1252"/>
 
+
         <?include PublicProperties.wxi ?>
+
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+        <Property Id="localMSMNetworkType" Value="NDIS6" /> 
+        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/> 
+        <Substitution Table="CustomAction" Row="setNetworkTypeLWF" Column="Target" Value="[=passedNetworkType]"/> 
+        <CustomAction Id="setNetworkTypeLWF" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" /> 
+        <CustomAction Id="correctNetworkTypeLWF" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
+<?endif ?>
 
         <!-- Here comes the file/directory list -->
@@ -50 +59 @@
 
         <InstallExecuteSequence>
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <Custom Action="setNetworkTypeLWF" After="CostInitialize"/>
+            <Custom Action="correctNetworkTypeLWF" After="setNetworkTypeLWF">
+                <![CDATA[(VersionNT < 600)]]>
+            </Custom>
+<?endif ?>
             <?include VBoxMergeNetLwfSeq.wxi ?>
         </InstallExecuteSequence>