Changeset 18639 in vbox

Timestamp:

Apr 2, 2009 2:06:22 PM (15 years ago)

Author:

vboxsync

Message:

Guest Additions/common: Added basic Windows SCM handling for (un)installation.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxService.cpp (modified) (5 diffs)
• VBoxServiceInternal.h (modified) (3 diffs)

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

@@ -36 +36 @@
         VBoxService.cpp \
         VBoxServiceTimeSync.cpp
+VBoxService_SOURCES.win   = \
+        VBoxService-win.cpp
 VBoxService_SOURCES.os2   = \
         VBoxService-os2.def \

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

@@ -38 +38 @@
 #include <VBox/VBoxGuest.h>
 #include "VBoxServiceInternal.h"
-
 
 /*******************************************************************************
@@ -90 +89 @@
 static int VBoxServiceUsage(void)
 {
-    RTPrintf("usage: %s [-f|--foreground] [-v|--verbose] [-i|--interval <seconds>]\n"
-             "           [--disable-<service>] [--enable-<service>] [-h|-?|--help]\n", g_pszProgName);
-    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
-        RTPrintf("           %s\n", g_aServices[j].pDesc->pszUsage);
+    RTPrintf("usage: %s [-f|--foreground] [-i|--interval <seconds>]"
+             " [--disable-<service>] [--enable-<service>] [-h|-?|--help] [-v|--verbose]", g_pszProgName);
+
+#if defined(RT_OS_WINDOWS)
+    RTPrintf(" [-r|--register] [-u|--unregister]");
+#endif
+
+    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
+        RTPrintf(" %s\n", g_aServices[j].pDesc->pszUsage);
+
     RTPrintf("\n"
              "Options:\n"
 #if !defined(RT_OS_WINDOWS)
-             "    -f | --foreground   Don't daemonzie the program. For debugging.\n"
-#endif
-             "    -v | --verbose      Increment the verbosity level. For debugging.\n"
-             "    -i | --interval     The default interval.\n"
-             "    -h | -? | --help    Show this message and exit with status 1.\n");
+             "    -h | -? | --help         Show this message and exit with status 1.\n"
+#else
+             "    -h | -? | /? | --help    Show this message and exit with status 1.\n"
+#endif
+             "    -i | --interval          The default interval.\n"
+#if !defined(RT_OS_WINDOWS)
+             "    -f | --foreground        Don't daemonzie the program. For debugging.\n"
+#else
+             "    -r | --register          Installs the service.\n"
+             "    -u | --unregister        Uninstall service.\n"
+#endif
+             "    -v | --verbose           Increment the verbosity level. For debugging.\n");
+
+    RTPrintf("\n"
+             "Service specific options:\n");
     for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
     {
@@ -249 +264 @@
     {
         const char *psz = argv[i];
-        if (*psz != '-')
+        if(    (*psz != '-')
+#if defined(RT_OS_WINDOWS)
+            && (*psz != '/'))
+#endif
             return VBoxServiceSyntax("Unknown argument '%s'\n", psz);
         psz++;
@@ -268 +286 @@
             else if (MATCHES("interval"))
                 psz = "i";
+#if defined(RT_OS_WINDOWS)
+            else if (MATCHES("register"))
+                psz = "r";
+            else if (MATCHES("unregister"))
+                psz = "u";
+#endif
             else if (MATCHES("daemonized"))
             {
@@ -325 +349 @@
                     break;
 
+#if defined(RT_OS_WINDOWS)
+                case 'r':
+                    return VBoxServiceWinInstall();
+
+                case 'u':
+                    return VBoxServiceWinUninstall();
+#endif
+
                 case 'h':
+#if defined(RT_OS_WINDOWS)
+                case '?':
+#endif
                     return VBoxServiceUsage();
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2007 Sun Microsystems, Inc.
+ * Copyright (C) 2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 #ifndef ___VBoxServiceInternal_h
 #define ___VBoxServiceInternal_h
+
+/** Name of this program. */
+#if !defined(RT_OS_WINDOWS)
+    #define VBOXSERVICE_NAME "VBoxService"
+    #define VBOXSERVICE_FRIENDLY_NAME "VBoxService"
+#else
+    #define VBOXSERVICE_NAME _T("VBoxService")
+    #define VBOXSERVICE_FRIENDLY_NAME _T("VBoxService")
+#endif
 
 /**
@@ -97 +106 @@
 extern int VBoxServiceArgUInt32(int argc, char **argv, const char *psz, int *pi, uint32_t *pu32, uint32_t u32Min, uint32_t u32Max);
 
+#if defined(RT_OS_WINDOWS)
+    extern int VBoxServiceWinInstall ();
+    extern int VBoxServiceWinUninstall ();
+#endif
+
 extern VBOXSERVICE g_TimeSync;
 extern VBOXSERVICE g_Clipboard;