Changeset 69728 in vbox for trunk

Timestamp:

Nov 17, 2017 7:30:54 PM (7 years ago)

Author:

vboxsync

Message:

VBoxProxyStub: Untested SDS code cleanups.

File:

• trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c (modified) (6 diffs)

trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c

@@ -2317 +2317 @@
 
 
-BOOL vbpsInstallWindowsService(const WCHAR *pwszVBoxDir, const WCHAR *pwszServiceModule, const WCHAR *pwszServiceName,
-                               const WCHAR *pwszServiceDisplayName, const WCHAR *pwszServiceDescription)
+/**
+ * Worker for installing a SCM service.
+ *
+ * @returns Success indicator.
+ * @param   pwszVBoxDir         The VirtualBox install directory (unicode),
+ *                              trailing slash.
+ * @param   pwszModule          The service module.
+ * @param   pwszServiceName     The service name.
+ * @param   pwszDisplayName     The service display name.
+ * @param   pwszDescription     The service description.
+ */
+static BOOL vbpsInstallWindowsService(const WCHAR *pwszVBoxDir, const WCHAR *pwszModule, const WCHAR *pwszServiceName,
+                                      const WCHAR *pwszDisplayName, const WCHAR *pwszDescription)
 {
     BOOL fRet = vbpsIsInstalledWindowsService(pwszServiceName);
@@ -2329 +2340 @@
             rc = RTUtf16Cat(wszFilePath, RT_ELEMENTS(wszFilePath), pwszVBoxDir);
         if (RT_SUCCESS(rc))
-            rc = RTUtf16Cat(wszFilePath, RT_ELEMENTS(wszFilePath), pwszServiceModule);
+            rc = RTUtf16Cat(wszFilePath, RT_ELEMENTS(wszFilePath), pwszModule);
         if (RT_SUCCESS(rc))
             rc = RTUtf16CatAscii(wszFilePath, RT_ELEMENTS(wszFilePath), "\"");
@@ -2337 +2348 @@
             if (hSCM != NULL)
             {
-                SC_HANDLE hService = CreateService(hSCM, pwszServiceName, pwszServiceDisplayName,
+                SC_HANDLE hService = CreateService(hSCM, pwszServiceName, pwszDisplayName,
                                                    SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS,
                                                    SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL,
@@ -2344 +2355 @@
                 {
                     SERVICE_DESCRIPTION sd;
-                    sd.lpDescription = (WCHAR *)pwszServiceDescription;
+                    sd.lpDescription = (WCHAR *)pwszDescription;
                     if (ChangeServiceConfig2(hService, SERVICE_CONFIG_DESCRIPTION, &sd))
                         fRet = TRUE;
@@ -2365 +2376 @@
 
 
-BOOL vbpsUninstallWindowsService(const WCHAR *pwszServiceName)
+/**
+ * Worker for uninstalling a SCM service.
+ *
+ * @returns Success indicator.
+ * @param   pwszServiceName The name of the SCM service.
+ */
+static BOOL vbpsUninstallWindowsService(const WCHAR *pwszServiceName)
 {
     BOOL fRet = !vbpsIsInstalledWindowsService(pwszServiceName);
@@ -2404 +2421 @@
 
 
+/**
+ * Updates the VBoxSDS service with SCM.
+ *
+ * @param   pState              The registry modifier state.
+ * @param   pwszVBoxDir         The VirtualBox install directory (unicode),
+ *                              trailing slash.
+ */
 static void vbpsUpdateVBoxSDSWindowsService(VBPSREGSTATE *pState, const WCHAR *pwszVBoxDir)
 {