Changeset 25959 in vbox

Timestamp:

Jan 21, 2010 2:02:36 PM (15 years ago)

Author:

vboxsync

Message:

VBoxService: Also set service description on new install, not only on update.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp (modified) (3 diffs)

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

@@ -135 +135 @@
 
     return SetServiceStatus(g_hWinServiceStatus, &ss);
+}
+
+
+int VBoxServiceWinSetDesc(SC_HANDLE hService)
+{
+    /* 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());
+        return 1;
+    }
+#endif
+    return VINF_SUCCESS;
 }
 
@@ -192 +212 @@
                                          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");
                 }
@@ -227 +233 @@
         VBoxServiceVerbose(0, "Service successfully installed!\n");
     }
+
+    if (RT_SUCCESS(rc))
+        rc = VBoxServiceWinSetDesc(hService);
 
     CloseServiceHandle(hService);