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

Timestamp:

Mar 21, 2011 4:45:21 PM (14 years ago)

Author:

vboxsync

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

70659

Message:

VBoxService.cpp: Re r70385: Check if CreateMutex fails. Minor cleanups.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp (modified) (9 diffs)

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

@@ -122 +122 @@
  * @returns 1.
  */
-static int VBoxServiceUsage(void)
+static int vboxServiceUsage(void)
 {
     RTPrintf("Usage:\n"
@@ -287 +287 @@
  * @param   pvUser          The service index.
  */
-static DECLCALLBACK(int) VBoxServiceThread(RTTHREAD ThreadSelf, void *pvUser)
+static DECLCALLBACK(int) vboxServiceThread(RTTHREAD ThreadSelf, void *pvUser)
 {
     const unsigned i = (uintptr_t)pvUser;
@@ -308 +308 @@
 
 /**
- * Check if at least one service should be started.
- */
-static bool VBoxServiceCheckStartedServices(void)
-{
-    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
-        if (g_aServices[j].fEnabled)
-            return true;
-
-   return false;
+ * Count the number of enabled services.
+ */
+static unsigned vboxServiceCountEnabledServices(void)
+{
+    unsigned cEnabled = 0;
+    for (unsigned i = 0; i < RT_ELEMENTS(g_aServices); i++)
+        cEnabled += g_aServices[i].fEnabled;
+   return cEnabled;
 }
 
@@ -365 +364 @@
 
         VBoxServiceVerbose(2, "Starting service     '%s' ...\n", g_aServices[j].pDesc->pszName);
-        rc = RTThreadCreate(&g_aServices[j].Thread, VBoxServiceThread, (void *)(uintptr_t)j, 0,
+        rc = RTThreadCreate(&g_aServices[j].Thread, vboxServiceThread, (void *)(uintptr_t)j, 0,
                             RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, g_aServices[j].pDesc->pszName);
         if (RT_FAILURE(rc))
@@ -585 +584 @@
 
     /*
-     * Parse the arguments.
+     * Parse the arguments                                       .
+     *                                                           .
+     * Note! This code predates RTGetOpt, thus the manual parsing.
      */
     bool fDaemonize = true;
@@ -682 +683 @@
                 case 'h':
                 case '?':
-                    return VBoxServiceUsage();
+                    return vboxServiceUsage();
 
 #ifdef RT_OS_WINDOWS
@@ -716 +717 @@
     }
 
+    /* Check that at least one service is enabled. */
+    if (vboxServiceCountEnabledServices() == 0)
+        return VBoxServiceSyntax("At least one service must be enabled.\n");
+
 #ifdef RT_OS_WINDOWS
     /*
      * Make sure only one instance of VBoxService runs at a time.  Create a
      * global mutex for that.
+     *
+     * Note! The \\Global\ namespace was introduced with Win2K, thus the
+     *       version check.
+     * Note! If the mutex exists CreateMutex will open it and set last error to
+     *       ERROR_ALREADY_EXISTS.
      */
     OSVERSIONINFOEX OSInfoEx;
@@ -725 +735 @@
     OSInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
 
+    SetLastError(NO_ERROR);
     HANDLE hMutexAppRunning;
-    if (    GetVersionEx((LPOSVERSIONINFO) &OSInfoEx)
+    if (    GetVersionEx((LPOSVERSIONINFO)&OSInfoEx)
         &&  OSInfoEx.dwPlatformId == VER_PLATFORM_WIN32_NT
         &&  OSInfoEx.dwMajorVersion >= 5 /* NT 5.0 a.k.a W2K */)
-    {
         hMutexAppRunning = CreateMutex(NULL, FALSE, VBOXSERVICE_NAME_GLOBAL);
-    }
     else
-    {
-        /* On older Windows OSes (like NT4) don't use the global namespace
-         * needed for terminal servers on Win2K+. */
         hMutexAppRunning = CreateMutex(NULL, FALSE, VBOXSERVICE_NAME);
-    }
-    if (   hMutexAppRunning != NULL
-        && GetLastError() == ERROR_ALREADY_EXISTS)
+    if (hMutexAppRunning == NULL)
+    {
+        VBoxServiceError("CreateMutex failed with last error %u! Terminating", GetLastError());
+        return RTEXITCODE_FAILURE;
+    }
+    if (GetLastError() == ERROR_ALREADY_EXISTS)
     {
         VBoxServiceError("%s is already running! Terminating.", g_pszProgName);
-
-        /* Close the mutex for this application instance. */
         CloseHandle(hMutexAppRunning);
-        hMutexAppRunning = NULL;
-
         return RTEXITCODE_FAILURE;
     }
-#else /* !RT_OS_WINDOWS */
-    /** @todo Add PID file creation here. */
-#endif /* RT_OS_WINDOWS */
-
-    /*
-     * Check that at least one service is enabled.
-     */
-    if (!VBoxServiceCheckStartedServices())
-        return VBoxServiceSyntax("At least one service must be enabled.\n");
+#else  /* !RT_OS_WINDOWS */
+    /** @todo Add PID file creation here? */
+#endif /* !RT_OS_WINDOWS */
 
     VBoxServiceVerbose(0, "%s r%s started. Verbose level = %d\n",
@@ -807 +806 @@
 #ifdef RT_OS_WINDOWS
     /*
-     * Release instance mutex if we got it.
-     */
-    if (hMutexAppRunning != NULL)
-    {
-        ::CloseHandle(hMutexAppRunning);
-        hMutexAppRunning = NULL;
-    }
+     * Cleanup mutex.
+     */
+    CloseHandle(hMutexAppRunning);
 #endif