Changeset 8850 in vbox

Timestamp:

May 15, 2008 1:45:38 PM (17 years ago)

Author:

vboxsync

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

30871

Message:

Windows Guest Additions: Renamed VBoxService.exe to VBoxTray.exe. Internals left unchanged, because of moving these parts eventually to the new "real" VBoxService later.

Location:

trunk/src/VBox/Additions/WINNT/VBoxService

Files:

• Makefile.kmk (modified) (4 diffs)
• VBoxClipboard.cpp (modified) (1 diff)
• VBoxDisplay.cpp (modified) (1 diff)
• VBoxMemBalloon.cpp (modified) (1 diff)
• VBoxRestore.cpp (modified) (1 diff)
• VBoxSeamless.cpp (modified) (1 diff)
• VBoxStatistics.cpp (modified) (1 diff)
• VBoxTray.cpp (moved) (moved from trunk/src/VBox/Additions/WINNT/VBoxService/VBoxService.cpp ) (2 diffs)
• VBoxTray.h (moved) (moved from trunk/src/VBox/Additions/WINNT/VBoxService/VBoxService.h )
• VBoxTray.rc (moved) (moved from trunk/src/VBox/Additions/WINNT/VBoxService/VBoxService.rc ) (2 diffs)
• VBoxVRDP.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxService/Makefile.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# Sub-Makefile for VBoxService.
+# Sub-Makefile for VBoxTray.
 #
 
@@ -24 +24 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-PROGRAMS += VBoxService
-VBoxService_TEMPLATE = VBOXW32GUESTR3
+PROGRAMS += VBoxTray
+VBoxTray_TEMPLATE = VBOXW32GUESTR3
 ifdef VBOX_SIGN_ADDITIONS
- VBoxService_NOINST  = true
+ VBoxTray_NOINST  = true
 endif
-VBoxService_DEFS     = VBOX_HGCM LOG_TO_BACKDOOR
-VBoxService_INCS     = ../include
-VBoxService_SOURCES  = \
-        VBoxService.cpp \
+VBoxTray_DEFS     = VBOX_HGCM LOG_TO_BACKDOOR
+VBoxTray_INCS     = ../include
+VBoxTray_SOURCES  = \
+        VBoxTray.cpp \
         VBoxSeamless.cpp \
         VBoxClipboard.cpp \
@@ -41 +41 @@
         VBoxMemBalloon.cpp \
         helpers.cpp \
-        VBoxService.rc
+        VBoxTray.rc
 
-VBoxService_LIBS     = \
+VBoxTray_LIBS     = \
         $(PATH_LIB)/additions/RuntimeW32GuestR3.lib
 
-# VBoxService.cpp uses VBOX_SVN_REV.
-VBoxService.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
-VBoxService.cpp_DEPS = $(VBOX_SVN_REV_KMK)
+# VBoxTray.cpp uses VBOX_SVN_REV.
+VBoxTray.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
+VBoxTray.cpp_DEPS = $(VBOX_SVN_REV_KMK)
 
 # The icon location is configurable.
-VBoxService.rc_INCS = $(PATH_VBoxService)
-VBoxService.rc_DEPS = $(PATH_VBoxService)/VBoxService-icon.rc
-VBoxService.rc_CLEAN = $(PATH_VBoxService)/VBoxService-icon.rc
+VBoxTray.rc_INCS = $(PATH_VBoxTray)
+VBoxTray.rc_DEPS = $(PATH_VBoxTray)/VBoxTray-icon.rc
+VBoxTray.rc_CLEAN = $(PATH_VBoxTray)/VBoxTray-icon.rc
 
 
@@ -59 +59 @@
 
 # Icon include file.
-$(PATH_VBoxService)/VBoxService-icon.rc: $(VBOX_WINDOWS_ICON_FILE) Makefile.kmk | $$(call DIRDEP,$$(@D))
+$(PATH_VBoxTray)/VBoxTray-icon.rc: $(VBOX_WINDOWS_ICON_FILE) Makefile.kmk | $$(call DIRDEP,$$(@D))
         $(RM) -f $@
         $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxClipboard.cpp

@@ -21 +21 @@
  */
 
-#include "VBoxService.h"
+#include "VBoxTray.h"
 #include <VBox/HostServices/VBoxClipboardSvc.h>
 #include "helpers.h"

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxDisplay.cpp

@@ -22 +22 @@
 #define _WIN32_WINNT 0x0500
 #include <windows.h>
-#include "VBoxService.h"
+#include "VBoxTray.h"
 #include "VBoxSeamless.h"
 #include <VBoxHook.h>

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxMemBalloon.cpp

@@ -23 +23 @@
 #include <windows.h>
 #include <psapi.h>
-#include "VBoxService.h"
+#include "VBoxTray.h"
 #include "VBoxMemBalloon.h"
 #include <VBoxDisplay.h>

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxRestore.cpp

@@ -22 +22 @@
 #define _WIN32_WINNT 0x0500
 #include <windows.h>
-#include "VBoxService.h"
+#include "VBoxTray.h"
 #include "VBoxRestore.h"
 #include <VBoxDisplay.h>

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxSeamless.cpp

@@ -22 +22 @@
 #define _WIN32_WINNT 0x0500
 #include <windows.h>
-#include "VBoxService.h"
+#include "VBoxTray.h"
 #include "VBoxSeamless.h"
 #include <VBoxHook.h>

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxStatistics.cpp

@@ -23 +23 @@
 #include <windows.h>
 #include <psapi.h>
-#include "VBoxService.h"
+#include "VBoxTray.h"
 #include "VBoxStatistics.h"
 #include "VBoxMemBalloon.h"

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxTray.cpp

@@ -1 +1 @@
 /** @file
- * VBoxService - Guest Additions Service
+ * VBoxTray - Guest Additions Tray Application
  */
 
@@ -19 +19 @@
  */
 
-#include "VBoxService.h"
+#include "VBoxTray.h"
 #include "VBoxSeamless.h"
 #include "VBoxClipboard.h"

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxTray.rc

@@ -37 +37 @@
       BEGIN
          VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
-         VALUE "FileDescription",  "VirtualBox Guest Additions Service\0"
+         VALUE "FileDescription",  "VirtualBox Guest Additions Tray Application\0"
          VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
-         VALUE "InternalName",     "VBoxService\0"
+         VALUE "InternalName",     "VBoxTray\0"
          VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
-         VALUE "OriginalFilename", "VBoxService.exe\0"
+         VALUE "OriginalFilename", "VBoxTray.exe\0"
          VALUE "ProductName",      "VirtualBox Guest Additions\0"
          VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
@@ -52 +52 @@
 END
 
-#include "VBoxService-icon.rc"
+#include "VBoxTray-icon.rc"
 

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxVRDP.cpp

@@ -24 +24 @@
 #define _WIN32_WINNT 0x0501
 #include <windows.h>
-#include "VBoxService.h"
+#include "VBoxTray.h"
 #include "VBoxVRDP.h"
 #include <VBox/VBoxDev.h>