Changeset 89320 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 27, 2021 1:59:25 PM (4 years ago)

Author:

vboxsync

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

144667

Message:

VBoxAutostart: bugref:9341: Since we ignore service arguments anyway,
don't even bother to check their number, and don't crash trying to
complain about there being too much.

File:

• trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp

@@ -907 +907 @@
     LogFlowFuncEnter();
 
+#if 0
+    for (size_t i = 0; i < cArgs; ++i)
+        LogRel(("arg[%zu] = %ls\n", i, papwszArgs[i]));
+#endif
+
     /*
      * Register the control handler function for the service and report to SCM.
@@ -917 +922 @@
         if (autostartSvcWinSetServiceStatus(SERVICE_START_PENDING, 3000, NO_ERROR))
         {
-            if (cArgs == 1)
+            /*
+             * Create the event semaphore we'll be waiting on and
+             * then instantiate the actual services.
+             */
+            int rc = RTSemEventMultiCreate(&g_hSupSvcWinEvent);
+            if (RT_SUCCESS(rc))
             {
                 /*
-                 * Create the event semaphore we'll be waiting on and
-                 * then instantiate the actual services.
+                 * Update the status and enter the work loop.
                  */
-                int rc = RTSemEventMultiCreate(&g_hSupSvcWinEvent);
-                if (RT_SUCCESS(rc))
+                if (autostartSvcWinSetServiceStatus(SERVICE_RUNNING, 0, 0))
                 {
-                    /*
-                     * Update the status and enter the work loop.
-                     */
-                    if (autostartSvcWinSetServiceStatus(SERVICE_RUNNING, 0, 0))
+                    LogFlow(("autostartSvcWinServiceMain: calling autostartStartVMs\n"));
+                    RTEXITCODE ec = autostartStartVMs();
+                    if (ec == RTEXITCODE_SUCCESS)
                     {
-                        LogFlow(("autostartSvcWinServiceMain: calling autostartStartVMs\n"));
-                        RTEXITCODE ec = autostartStartVMs();
-                        if (ec == RTEXITCODE_SUCCESS)
+                        LogFlow(("autostartSvcWinServiceMain: done string VMs\n"));
+                        err = NO_ERROR;
+                        rc = RTSemEventMultiWait(g_hSupSvcWinEvent, RT_INDEFINITE_WAIT);
+                        if (RT_SUCCESS(rc))
                         {
-                            LogFlow(("autostartSvcWinServiceMain: done string VMs\n"));
+                            LogFlow(("autostartSvcWinServiceMain: woke up\n"));
+                            /** @todo Autostop part. */
                             err = NO_ERROR;
-                            rc = RTSemEventMultiWait(g_hSupSvcWinEvent, RT_INDEFINITE_WAIT);
-                            if (RT_SUCCESS(rc))
-                            {
-                                LogFlow(("autostartSvcWinServiceMain: woke up\n"));
-                                /** @todo Autostop part. */
-                                err = NO_ERROR;
-                            }
-                            else
-                                autostartSvcLogError("RTSemEventWait failed, rc=%Rrc", rc);
                         }
-
-                        autostartShutdown();
+                        else
+                            autostartSvcLogError("RTSemEventWait failed, rc=%Rrc", rc);
                     }
-                    else
-                    {
-                        err = GetLastError();
-                        autostartSvcLogError("SetServiceStatus failed, err=%u", err);
-                    }
-
-                    RTSemEventMultiDestroy(g_hSupSvcWinEvent);
-                    g_hSupSvcWinEvent = NIL_RTSEMEVENTMULTI;
+
+                    autostartShutdown();
                 }
                 else
-                    autostartSvcLogError("RTSemEventMultiCreate failed, rc=%Rrc", rc);
+                {
+                    err = GetLastError();
+                    autostartSvcLogError("SetServiceStatus failed, err=%u", err);
+                }
+
+                RTSemEventMultiDestroy(g_hSupSvcWinEvent);
+                g_hSupSvcWinEvent = NIL_RTSEMEVENTMULTI;
             }
             else
-                autostartSvcLogTooManyArgsError("main", cArgs, NULL, 0);
+                autostartSvcLogError("RTSemEventMultiCreate failed, rc=%Rrc", rc);
         }
         else