Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

1 files changed, 38 insertions, 11 deletions

diff --git a/src/VBox/Installer/win/VirtualBox.wxs b/src/VBox/Installer/win/VirtualBox.wxs
index 9823155a..176c1e17 100644
--- a/src/VBox/Installer/win/VirtualBox.wxs
+++ b/src/VBox/Installer/win/VirtualBox.wxs
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2012 Oracle Corporation
+    Copyright (C) 2006-2013 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
@@ -116,6 +116,7 @@
         <Property Id="ARPURLUPDATEINFO">http://www.virtualbox.org</Property>
         <Property Id="INSTALLDESKTOPSHORTCUT" Value="1"></Property>
         <Property Id="INSTALLQUICKLAUNCHSHORTCUT" Value="1"></Property>
+        <Property Id="REGISTERFILEEXTENSIONS" Value="1"></Property>
         <Property Id="STARTVBOX" Value="1"></Property>
 
         <!-- Install the product for all users on the system -->
@@ -334,6 +335,16 @@
                         </Component>
                     </Directory>
 
+<?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
+                    <!-- The 32-bit client COM component (see also cp_MainCom below). -->
+                    <Component Id="cp_MainCOM_x86" Guid="B600824E-4A25-2EB3-4B44-3D8CB7F9B92D" Win64="no">
+                        <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll"
+                            Source="$(env.PATH_OUT)\bin\VBoxClient-x86.dll" KeyPath="yes">
+                        </File>
+                        <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?>
+                    </Component>
+<?endif?>
+
                     <!-- COM components have a separate entry mainly because of the KeyPath attribute (that hints the
                          TypeLib element where to take the TLB resource from) may appear only once per Component. -->
                     <Component Id="cp_MainCOM" Guid="CD4A3C6C-C2D5-428D-90A1-B6DA3D0777D6" Win64="$(var.Property_Win64)">
@@ -358,7 +369,7 @@
 
                     <!--
 
-                    <Component Id="Cp_StartMenuShortcut" Guid="1C137D24-E599-47BD-98D0-2F62F202A8EA" Win64="$(var.Property_Win64)">
+                    <Component Id="cp_StartMenuShortcut" Guid="1C137D24-E599-47BD-98D0-2F62F202A8EA" Win64="$(var.Property_Win64)">
                         <RegistryValue Root="HKCU" Key="$(var.Property_RegKeyInstall)" Type="string"
                                        Value="installed" KeyPath="yes" />
                         <Shortcut Id="ShortcutStartMenuVBox" Directory="ProgramMenuDir"
@@ -368,14 +379,8 @@
 
                     <!---->
 
-                    <!-- All Binaries, DLLs (except COM) and drivers are in one component because they belong together. Additional
-                         binaries e.g. test tools, utilities etc. should be in another component so they"re clearly separated. -->
-                    <Component Id="cp_MainBinaries" Guid="5C8FE57A-F744-4DE0-AA3F-A563F486AD98" Win64="$(var.Property_Win64)">
-
-                        <!-- Set required environment variables. -->
-                        <Environment Id="env_VBoxInstallDir" Action="set" Name="VBOX_INSTALL_PATH"
-                                     System="yes" Part="last" Permanent="no" Value="[INSTALLDIR]" />
-
+                    <Component Id="cp_RegisterExtensions" Guid="FEB8943E-5D60-4E2D-846F-458207019D40" Win64="$(var.Property_Win64)">
+                        <Condition>REGISTERFILEEXTENSIONS</Condition>
                         <!-- Register file extensions. Note: Extension Id's *must not* be changed! These specify the actual
                              file extension to handle. Also, here would be the place to add more fancy DDE stuff later.
                              Important: The IDs in "IconIndex" *must* be matching "Resources\resource.h". -->
@@ -411,6 +416,15 @@
                         <ProgId Id="progId_VirtualBox.Shell.hdd" Description="Virtual Hard Disk" Icon="file_VBoxRes.dll" IconIndex="-306">
                             <Extension Id="hdd" ContentType="application/x-virtualbox-hdd" />
                         </ProgId>
+                    </Component> <!-- RegisterExtensions -->
+
+                    <!-- All Binaries, DLLs (except COM) and drivers are in one component because they belong together. Additional
+                         binaries e.g. test tools, utilities etc. should be in another component so they"re clearly separated. -->
+                    <Component Id="cp_MainBinaries" Guid="5C8FE57A-F744-4DE0-AA3F-A563F486AD98" Win64="$(var.Property_Win64)">
+
+                        <!-- Set required environment variables. -->
+                        <Environment Id="env_VBoxInstallDir" Action="set" Name="VBOX_INSTALL_PATH"
+                                     System="yes" Part="last" Permanent="no" Value="[INSTALLDIR]" />
 
                         <!-- Files -->
 <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?>
@@ -434,6 +448,8 @@
                         <!-- Misc tools -->
                         <File Id="file_VBoxNetDHCP.exe" Name="VBoxNetDHCP.exe"
                               Source="$(env.PATH_OUT)\bin\VBoxNetDHCP.exe"/>
+			<File Id="file_VBoxNetNAT.exe" Name="VBoxNetNAT.exe"
+                              Source="$(env.PATH_OUT)\bin\VBoxNetNAT.exe"/>
 <?if $(env.VBOX_WITH_EXTPACK) = "yes" ?>
                         <File Id="file_VBoxExtPackHelperApp.exe" Name="VBoxExtPackHelperApp.exe"
                               Source="$(env.PATH_OUT)\bin\VBoxExtPackHelperApp.exe"/>
@@ -624,6 +640,12 @@
                     </Component>
 <?endif?>
 
+                    <!-- C API (glue) binding -->
+                    <Component Id="cp_VBoxCAPI" Guid="097F7F53-7111-467F-8E0C-257D9926FDA0">
+                        <File Id="file_VBoxCAPI.dll" Name="VBoxCAPI.dll"
+                              Source="$(env.PATH_OUT)\bin\VBoxCAPI.dll" />
+                    </Component>
+
 <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
                     <Component Id="cp_VBoxPythonBinding" Guid="293D7E11-78DA-4C31-AEED-AE2FE42F6881">
                         <Condition>PYTHON_INSTALLED</Condition>
@@ -688,11 +710,15 @@
             <ComponentRef Id="cp_StartMenuVBox" />
             <ComponentRef Id="cp_DesktopShortcut" />
             <ComponentRef Id="cp_QuickLaunchVBox" />
+            <ComponentRef Id="cp_RegisterExtensions" />
 
 <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?>
             <ComponentRef Id="cp_Docs" />
 <?endif?>
             <ComponentRef Id="cp_NLS" />
+<?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
+            <ComponentRef Id="cp_MainCOM_x86" />
+<?endif?>
             <ComponentRef Id="cp_MainCOM" />
             <ComponentRef Id="cp_MainBinaries" />
 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
@@ -710,6 +736,7 @@
 <?if $(env.VBOX_WITH_WEBSERVICES) = "yes" ?>
             <ComponentRef Id="cp_VBoxWebService" />
 <?endif?>
+            <ComponentRef Id="cp_VBoxCAPI" />
             <ComponentRef Id="cp_VBoxDrv" />
 
             <Feature Id="VBoxUSB" Title="VirtualBox USB Support" Level="1"
@@ -802,7 +829,7 @@
 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
             <!-- Create host-only interfaces on first-time install. -->
             <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" ><![CDATA[&VBoxNetworkAdp=3]]></Custom>
-            <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" ><![CDATA[&VBoxNetworkAdp=3]]></Custom>            
+            <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" ><![CDATA[&VBoxNetworkAdp=3]]></Custom>
             <!-- Don't remove the host-only interfaces on update, only on uninstall. -->
             <Custom Action="ca_RemoveHostOnlyInterfaces" After="ca_UninstallNetFlt" ><![CDATA[(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]></Custom>
             <!-- First stop the existing host-only interfaces on update ... -->