Changeset 34315 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Nov 24, 2010 12:46:52 PM (14 years ago)

Author:

vboxsync

Message:

Windows host installer: Now using VBoxRes.dll for own icons of ".vbox", ".vbox-extpack", ".ova" and ".ovf" file extensions.

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (2 diffs)
• VirtualBox.wxs (modified) (5 diffs)

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -23 +23 @@
 endif
 
+
 #
 # Include Sub-Makefiles.
@@ -41 +42 @@
  endif
 endif
+
+include $(PATH_SUB_CURRENT)/Resources/Makefile.kmk
+
 
 #

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

@@ -365 +365 @@
                         <Environment Id="EnvVBoxInstallDir" Action="set" Name="VBOX_INSTALL_PATH"
                             System="yes" Part="last" Permanent="no" Value="[INSTALLDIR]" />
-                        <!-- Register file extensions. Note: Extension Id's *must not* be changed! -->
-                        <ProgId Id="ProgIdVirtualBox" Description="VirtualBox Machine Description" Icon="[#vbox]">
+                        <!-- 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". -->
+                        <ProgId Id="VirtualBox.Shell.vbox" Description="VirtualBox Machine Description" Icon="[#vboxresdll]" IconIndex="-201">
                             <Extension Id="vbox" ContentType="application/x-virtualbox-vbox">
-                                <Verb Id="open" Command="Open" Target="[#vbox]" Argument="%1" />
+                                <Verb Id="open" Sequence="1" Command="Open" Target="[#vbox]" Argument="%1" />
                             </Extension>
                         </ProgId>
-                        <ProgId Id="ProgIdVirtualBoxExtPack" Description="VirtualBox Extension Pack" Icon="[#vbox]">
+                        <ProgId Id="VirtualBox.Shell.vbox-extpack" Description="VirtualBox Extension Pack" Icon="[#vboxresdll]" IconIndex="-202">
                             <Extension Id="vbox-extpack" ContentType="application/x-virtualbox-vbox-extpack">
-                                <Verb Id="open" Command="Open" Target="[#vbox]" Argument="%1" />
+                                <Verb Id="open" Sequence="1" Command="Open" Target="[#vbox]" Argument="%1" />
                             </Extension>
                         </ProgId>
-                        <ProgId Id="ProgIdOVF" Description="Open Virtualization Format" Icon="[#vbox]">
+                        <ProgId Id="VirtualBox.Shell.ovf" Description="Open Virtualization Format" Icon="[#vboxresdll]" IconIndex="-301">
                             <Extension Id="ovf" ContentType="application/x-virtualbox-ovf">
-                                <Verb Id="open" Command="Open" Target="[#vbox]" Argument="%1" />
+                                <Verb Id="open" Sequence="1" Command="Open" Target="[#vbox]" Argument="%1" />
                             </Extension>
                         </ProgId>
-                        <ProgId Id="ProgIdOVA" Description="Open Virtualization Format Archive" Icon="[#vbox]">
+                        <ProgId Id="VirtualBox.Shell.ova" Description="Open Virtualization Format Archive" Icon="[#vboxresdll]" IconIndex="-302">
                             <Extension Id="ova" ContentType="application/x-virtualbox-ova">
-                                <Verb Id="open" Command="Open" Target="[#vbox]" Argument="%1" />
+                                <Verb Id="open" Sequence="1" Command="Open" Target="[#vbox]" Argument="%1" />
                             </Extension>
                         </ProgId>
@@ -461 +463 @@
                         <File Id="vboxauthsimpledll" Name="VBoxASim.dll" LongName="VBoxAuthSimple.dll" DiskId="1"  Vital="yes"
                               Source="$(env.PATH_OUT)\bin\VBoxAuthSimple.dll" />
+
+                        <!-- Include resource DLL (icons, ...). -->
+                        <File Id="vboxresdll" LongName="VBoxRes.dll" Name="VBoxRes.dll" DiskId="2" Vital="yes"
+                              Source="$(env.PATH_OUT)\bin\VBoxRes.dll" />
+
                         <File Id="vmmgc" Name="VMMGC.gc" DiskId="1"  Vital="yes"
                               Source="$(env.PATH_OUT)\bin\VMMGC.gc" />
@@ -536 +543 @@
     <?endif ?>
 <?endif ?>
-
                         <!-- Include key for VBox version -->
                         <?include $(env.PATH_TARGET)\VBoxKey.wxi ?>
@@ -551 +557 @@
                     </Directory> <!-- Qt accessible plugins -->
 <?endif?>
-
 
 <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
@@ -574 +579 @@
 <?endif?>
 
-
 <?if $(env.VBOX_WITH_CROGL) = "yes" ?>
                     <Component Id="VBoxCROpenGL" Guid="874A1297-835A-491D-8A9D-7E723BC29EE7" Win64="$(var.Property_Win64)">