Changeset 38609 in vbox

Timestamp:

Sep 2, 2011 11:47:12 AM (13 years ago)

Author:

vboxsync

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

73815

Message:

VBoxHeadless/win: enable SVC in VBoxSVC, add SVC to host installer

Location:

trunk/src/VBox

Files:

• Installer/win/VirtualBox.wxs (modified) (1 diff)
• Main/src-server/MachineImpl.cpp (modified) (2 diffs)

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

@@ -421 +421 @@
                         <File Id="file_VBoxHeadless.exe" Name="VBoxHeadless.exe"
                               Source="$(env.PATH_OUT)\bin\VBoxHeadless.exe">
+                        <File Id="file_VBoxHeadlessSVC.exe" Name="VBoxHeadlessSVC.exe"
+                              Source="$(env.PATH_OUT)\bin\VBoxHeadlessSVC.exe">
                             <!-- Create a simple shortcut for VBoxVRDP, which is not present anymore, pointing to VBoxHeadless.exe -->
                        <!--     <Shortcut Id="ShortcutVBoxVRDP" Directory="INSTALLDIR" Name="VBoxVRDP" Show="normal" WorkingDirectory="INSTALLDIR"/> -->

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -96 +96 @@
 # define HOSTSUFF_EXE ""
 #endif /* !RT_OS_WINDOWS */
+
+#if defined(RT_OS_WINDOWS)
+# define VBOXHEADLESS_NAME "VBoxHeadlessSVC"
+#else
+# define VBOXHEADLESS_NAME "VBoxHeadless"
+#endif
 
 // defines / prototypes
@@ -6618 +6624 @@
          * differently in 4.0 and 3.x.
          */
-        const char VBoxHeadless_exe[] = "VBoxHeadless" HOSTSUFF_EXE;
+        const char VBoxHeadless_exe[] = VBOXHEADLESS_NAME HOSTSUFF_EXE;
         Assert(sz >= sizeof(VBoxHeadless_exe));
         strcpy(cmd, VBoxHeadless_exe);