Changeset 18640 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Apr 2, 2009 2:26:00 PM (16 years ago)

Author:

vboxsync

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

45560

Message:

Guest Additions/common: Update.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (2 diffs)
• VBoxServiceInternal.h (modified) (2 diffs)

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

@@ -48 +48 @@
 /** The default service interval (the -i | --interval) option). */
 uint32_t g_DefaultInterval = 0;
-/** Shutdown the main thread. (later, for signals) */
+/** Shutdown the main thread. (later, for signals). */
 bool volatile g_fShutdown;
 
@@ -242 +242 @@
 int main(int argc, char **argv)
 {
-    int rc;
+    int rc = 0;
+
+#if defined(RT_OS_WINDOWS)
+    /* Do not use a global namespace ("Global\\") for mutex name here, will blow up NT4 compatibility! */
+    HANDLE hMutexAppRunning = CreateMutex (NULL, FALSE, VBOXSERVICE_NAME);
+    if (   (hMutexAppRunning != NULL)
+        && (GetLastError() == ERROR_ALREADY_EXISTS))
+    {
+        VBoxServiceError("%s is already running! Terminating.", g_pszProgName);
+
+        /* Close the mutex for this application instance. */
+        CloseHandle(hMutexAppRunning);
+        hMutexAppRunning = NULL;
+    }
+#endif
 
     /*

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

@@ -22 +22 @@
 #ifndef ___VBoxServiceInternal_h
 #define ___VBoxServiceInternal_h
+
+#if defined(RT_OS_WINDOWS)
+    #include <windows.h>
+    #include <tchar.h>
+    #include <process.h>
+#endif
 
 /** Name of this program. */
@@ -115 +121 @@
 extern VBOXSERVICE g_Control;
 
+/** Windows SCM stuff. */
+#if defined(RT_OS_WINDOWS)
+    extern DWORD                 g_vboxServiceStatusCode;
+    extern SERVICE_STATUS_HANDLE g_vboxServiceStatusHandle;
+#endif
+
 __END_DECLS