Changeset 18642 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 2, 2009 3:04:40 PM (16 years ago)

Author:

vboxsync

Message:

Guest Additions/common: Update.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

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

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

@@ -107 +107 @@
 #endif
              "    -i | --interval          The default interval.\n"
-#if !defined(RT_OS_WINDOWS)
              "    -f | --foreground        Don't daemonzie the program. For debugging.\n"
-#else
+#if defined(RT_OS_WINDOWS)
              "    -r | --register          Installs the service.\n"
              "    -u | --unregister        Uninstall service.\n"
@@ -419 +418 @@
         return VBoxServiceError("VbglR3Init failed with rc=%Rrc.\n", rc);
 
-#if !defined(RT_OS_WINDOWS)
     /*
      * Daemonize if requested.
@@ -426 +424 @@
     {
         VBoxServiceVerbose(1, "Daemonizing...\n");
+#if defined(RT_OS_WINDOWS)
+        /** @todo Replace StartServiceCtrlDispatcher() with
+                  VbglR3Daemonize() once this has been ported
+                  to Windows later. */
+        StartServiceCtrlDispatcher (gs_serviceTable);
+#else
         rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */);
         if (RT_FAILURE(rc))
             return VBoxServiceError("daemon failed: %Rrc\n", rc);
         /* in-child */
-    }
-#endif
+#endif
+    }
 
 /** @todo Make the main thread responsive to signal so it can shutdown/restart the threads on non-SIGKILL signals. */

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

@@ -125 +125 @@
     extern DWORD                 g_vboxServiceStatusCode;
     extern SERVICE_STATUS_HANDLE g_vboxServiceStatusHandle;
+    extern SERVICE_TABLE_ENTRY const gs_serviceTable[];
 #endif