Changeset 104632 in vbox for trunk/src/VBox/Installer

Timestamp:

May 14, 2024 4:04:18 PM (9 months ago)

Author:

vboxsync

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

163177

Message:

Windows/Host Installer: Fixed registering known file extensions. bugref:10644

Location:

trunk/src/VBox/Installer/win

Files:

• UserInterface.wxi (modified) (2 diffs)
• VBoxMergeApp.wxi (modified) (1 diff)
• VBoxMergeApp.wxs (modified) (1 diff)

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

@@ -348 +348 @@
                 <Text Value="!(loc.Customize2Dlg_Desc)" />
             </Control>
-<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
             <!-- Note the gray background behind the checkboxes. Unfortunately there's no easy way to
                  fix this, without fixing it in the WiX source code. Because the control's background
@@ -368 +367 @@
                 <Text Value="!(loc.Customize2Dlg_RegisterFileExtensions)" />
             </Control>
-<?endif?> <!-- VBOX_WITH_QTGUI -->
             <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Next)" />
             <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)" />
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
+            </Control>
 
             <!-- Build number text drawn left bottom -->

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

@@ -148 +148 @@
 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
     <Component Id="cp_RegisterExtensions" Guid="FEB8943E-5D60-4E2D-846F-458207019D40" Bitness="$(var.Property_Bitness)" KeyPath="yes"
-               Condition="(local_VBOX_REGISTERFILEEXTENSIONS=&quot;1&quot;)">
+               Condition="(VBOX_REGISTERFILEEXTENSIONS=&quot;1&quot;)">
         <!-- Register file extensions. Note: Extension IDs *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.

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

@@ -53 +53 @@
         <?include PublicProperties.wxi ?>
 
-        <Property Id="local_VBOX_REGISTERFILEEXTENSIONS" Value="Empty" />
+        <Property Id="VBOX_REGISTERFILEEXTENSIONS" Value="Empty" />
         <Configuration Name="argRegisterExtensions" Format="Text" DefaultValue="Not passed" />
         <Substitution Table="CustomAction" Row="registerExtensions" Column="Target" Value="[=argRegisterExtensions]" />
-        <CustomAction Id="registerExtensions" Property="local_VBOX_REGISTERFILEEXTENSIONS" Value="[local_VBOX_REGISTERFILEEXTENSIONS]" Execute="immediate" />
+        <CustomAction Id="registerExtensions" Property="VBOX_REGISTERFILEEXTENSIONS" Value="[VBOX_REGISTERFILEEXTENSIONS]" Execute="immediate" />
 
         <!-- Here comes the file/directory list -->