Changeset 108602 in vbox for trunk/src/VBox/Installer/win/VirtualBox.wxs

Timestamp:

Mar 18, 2025 5:54:51 PM (2 months ago)

Author:

vboxsync

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

168010

Message:

Windows host installer: Fixed some more warnings (standard directory identifiers) which will hit us with WIX v5 at latest [build fix]. ​bugref:10644

File:

• trunk/src/VBox/Installer/win/VirtualBox.wxs (modified) (1 diff)

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

@@ -537 +537 @@
     <!-- Start menu entries -->
     <StandardDirectory Id="ProgramMenuFolder">
-        <StandardDirectory Id="StartMenuFolder">
-            <Directory Id="dir_StartMenuVBox" Name="$(env.VBOX_PRODUCT)">
-                <Component Id="cp_StartMenuVBox" Guid="C2DC321A-CE63-40EE-8A98-724DF8BD12FB" Condition="VBOX_INSTALLSTARTMENUENTRIES" Bitness="$(var.Property_Bitness)">
-                    <Shortcut Id="sc_StartMenuVBox" Directory="dir_StartMenuVBox" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)" Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR" />
-                    <RegistryValue Root="HKCU" Key="$(var.Property_RegKeyInstall)" Type="string" Value="installed" KeyPath="yes" />
-                    <?include $(env.PATH_TARGET)\Shortcuts_StartMenu.wxi ?>
-                    <RemoveFolder Id="rmf_ShortcutStartMenu" On="uninstall" />
-                </Component>
-            </Directory>
-        </StandardDirectory>
+        <Directory Id="dir_StartMenuVBox" Name="$(env.VBOX_PRODUCT)">
+            <Component Id="cp_StartMenuVBox" Guid="C2DC321A-CE63-40EE-8A98-724DF8BD12FB" Condition="VBOX_INSTALLSTARTMENUENTRIES" Bitness="$(var.Property_Bitness)">
+                <Shortcut Id="sc_StartMenuVBox" Directory="dir_StartMenuVBox" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)" Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR" />
+                <RegistryValue Root="HKCU" Key="$(var.Property_RegKeyInstall)" Type="string" Value="installed" KeyPath="yes" />
+                <?include $(env.PATH_TARGET)\Shortcuts_StartMenu.wxi ?>
+                <RemoveFolder Id="rmf_ShortcutStartMenu" On="uninstall" />
+            </Component>
+        </Directory>
     </StandardDirectory>
 
     <!-- Desktop shortcut -->
-    <StandardDirectory Id="DesktopFolder" Name="Desktop">
+    <StandardDirectory Id="DesktopFolder">
         <Component Id="cp_DesktopShortcut" Guid="668F8A1A-F5CE-48B3-BB1A-3042EE27B279" Condition="VBOX_INSTALLDESKTOPSHORTCUT" Bitness="$(var.Property_Bitness)">
             <Shortcut Id="sc_DesktopVBox" Directory="DesktopFolder" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)" Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR" />