Changeset 33128 in vbox

Timestamp:

Oct 14, 2010 12:12:09 PM (14 years ago)

Author:

vboxsync

Message:

VBoxService: Added simple 'cat' functionality to new internal toolbox (only enabled on Windows yet).

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxService.cpp (modified) (1 diff)
• VBoxServiceInternal.h (modified) (1 diff)
• VBoxServiceToolBox.cpp (added)

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

@@ -35 +35 @@
 VBoxService_TEMPLATE      = VBOXGUESTR3EXE
 VBoxService_DEFS          = VBOX_WITH_HGCM VBOXSERVICE_TIMESYNC VBOXSERVICE_MANAGEMENT
-VBoxService_DEFS.win     += _WIN32_WINNT=0x0501
+VBoxService_DEFS.win     += _WIN32_WINNT=0x0501 VBOXSERVICE_TOOLBOX
 VBoxService_DEFS.os2      = VBOX_WITH_HGCM VBOXSERVICE_CLIPBOARD
 ifdef VBOX_WITH_GUEST_PROPS
@@ -104 +104 @@
 VBoxService_SOURCES.win  += \
         VBoxService-win.rc \
-        VBoxService-win.cpp
+        VBoxService-win.cpp \
+        VBoxServiceToolBox.cpp
 
 VBoxService_SOURCES.os2   = \

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -558 +558 @@
          *        is running... */
     }
+#endif
+
+#ifdef VBOXSERVICE_TOOLBOX
+    rc = VBoxServiceToolboxMain(argc, argv);
+    if (rc != VERR_NOT_FOUND) /* Internal tool found? Then bail out. */
+        return rc;
 #endif
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -264 +264 @@
 #endif
 
+#ifdef VBOXSERVICE_TOOLBOX
+extern int VBoxServiceToolboxMain(int argc, char **argv);
+#endif
+
 #ifdef RT_OS_WINDOWS
 # ifdef VBOX_WITH_GUEST_PROPS