Changeset 25795 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jan 13, 2010 8:43:46 AM (15 years ago)

Author:

vboxsync

Message:

VBoxService: Added service description for SCM running on W2K+.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService-win.cpp (modified) (5 diffs)
• VBoxServiceInternal.h (modified) (1 diff)

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

@@ -26 +26 @@
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/ldr.h>
 #include <VBox/VBoxGuestLib.h>
 #include "VBoxServiceInternal.h"
@@ -35 +36 @@
 DWORD                 g_rcWinService = 0;
 SERVICE_STATUS_HANDLE g_hWinServiceStatus = NULL;
+
+/** Dynamically loaded function ChangeServiceConfig2() which is not available in NT4. */
+typedef BOOL (WINAPI FNCHANGESERVICECONFIG2) (SC_HANDLE hService, DWORD dwInfoLevel, LPVOID lpInfo);
+/** Pointer to FNCHANGESERVICECONFIG2. */
+typedef FNCHANGESERVICECONFIG2 *PFNCHANGESERVICECONFIG2;
 
 void WINAPI VBoxServiceWinMain (DWORD argc, LPTSTR *argv);
@@ -146 +152 @@
     VBoxServiceVerbose(1, "Installing service ...\n");
 
-    hSCManager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS);
-
-    if (NULL == hSCManager) {
-        VBoxServiceError("Could not open SCM! Error: %d\n", GetLastError());
+    hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+
+    if (NULL == hSCManager)
+    {
+        VBoxServiceError("Could not open SCM! Error: %ld\n", GetLastError());
         return 1;
     }
@@ -157 +164 @@
                                 SERVICE_ALL_ACCESS,
                                 SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS,
-                                SERVICE_DEMAND_START,SERVICE_ERROR_NORMAL,
+                                SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL,
                                 imagePath, NULL, NULL, NULL, NULL, NULL);
-
-    if (NULL == hService) {
-        VBoxServiceError("Could not create service! Error: %d\n", GetLastError());
-        CloseServiceHandle(hSCManager);
-        return 1;
+    int rc = VINF_SUCCESS;
+    if (NULL == hService) 
+    {
+        DWORD dwErr = GetLastError();
+        switch (dwErr)
+        {
+
+        case ERROR_SERVICE_EXISTS:
+
+            VBoxServiceVerbose(1, "Service already exists, just updating the service config.\n");
+            hService = OpenService (hSCManager,
+                                    VBOXSERVICE_NAME,
+                                    SERVICE_ALL_ACCESS);
+            if (NULL == hService)
+            {
+                VBoxServiceError("Could not open service! Error: %ld\n", GetLastError());
+                rc = 1;
+            }
+            else
+            {
+                if (ChangeServiceConfig (hService,
+                                         SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS,
+                                         SERVICE_DEMAND_START,
+                                         SERVICE_ERROR_NORMAL,
+                                         imagePath,
+                                         NULL,
+                                         NULL,
+                                         NULL,
+                                         NULL,
+                                         NULL,
+                                         VBOXSERVICE_FRIENDLY_NAME))
+                {
+                    /* On W2K+ there's ChangeServiceConfig2() which lets us set some fields 
+                       like a longer service description. */
+                    #ifndef TARGET_NT4
+                        SERVICE_DESCRIPTION desc;
+                        /** @todo On Vista+ SERVICE_DESCRIPTION also supports localized strings! */
+                        desc. lpDescription = VBOXSERVICE_DESCRIPTION;
+                        if (FALSE == ChangeServiceConfig2(hService, 
+                                                             SERVICE_CONFIG_DESCRIPTION, /* Service info level */  
+                                                             &desc))
+                        {
+                            VBoxServiceError("Cannot set the service description! Error: %ld\n", GetLastError());
+                        }
+                    #endif
+
+                    VBoxServiceVerbose(1, "The service config has been successfully updated.\n");
+                }
+                else
+                {
+                    VBoxServiceError("Could not change service config! Error: %ld\n", GetLastError());
+                    rc = 1;
+                }
+            }
+            break;
+
+        default:
+
+            VBoxServiceError("Could not create service! Error: %ld\n", dwErr);
+            rc = 1;
+            break;
+        }
     }
     else
@@ -172 +236 @@
     CloseServiceHandle(hService);
     CloseServiceHandle(hSCManager);
-
-    return 0;
+    return rc;
 }
 

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

@@ -97 +97 @@
 #define VBOXSERVICE_NAME          "VBoxService"
 /** The friendly service name. */
-#define VBOXSERVICE_FRIENDLY_NAME "VBoxService"
+#define VBOXSERVICE_FRIENDLY_NAME "VirtualBox Guest Additions Service"
+/** The service description (only W2K+ atm) */
+#define VBOXSERVICE_DESCRIPTION   "Manages VM runtime information, time synchronization, remote sysprep execution and miscellaneous utilities for guest operating systems."
 /** The following constant may be defined by including NtStatus.h. */
 #define STATUS_SUCCESS ((NTSTATUS)0x00000000L)