Changeset 49536 in vbox for trunk

Timestamp:

Nov 18, 2013 4:13:49 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90715

Message:

Windows host installer: Fixed invoking file extensions component.

File:

• trunk/src/VBox/Installer/win/VirtualBox.wxs (modified) (5 diffs)

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

@@ -3 +3 @@
     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
@@ -370 +370 @@
                     <!--
 
-                    <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" />
@@ -380 +380 @@
                     <!---->
 
-                    
                     <Component Id="cp_RegisterExtensions" Guid="FEB8943E-5D60-4E2D-846F-458207019D40" Win64="$(var.Property_Win64)">
                         <Condition>REGISTERFILEEXTENSIONS</Condition>
@@ -706 +705 @@
             <ComponentRef Id="cp_DesktopShortcut" />
             <ComponentRef Id="cp_QuickLaunchVBox" />
+            <ComponentRef Id="cp_RegisterExtensions" />
 
 <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?>
@@ -823 +823 @@
             <!-- 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>