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

Timestamp:

Jun 8, 2021 5:34:49 PM (4 years ago)

Author:

vboxsync

Message:

Main: bugref:9341: Fixed com initialization in the autostart service. Autostart service stops after VM started.

Location:

trunk/src/VBox/Frontends/VBoxAutostart

Files:

• VBoxAutostart-win.cpp (modified) (4 diffs)
• VBoxAutostartStart.cpp (modified) (1 diff)

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

@@ -45 +45 @@
 #include <iprt/initterm.h>
 #include <iprt/mem.h>
+#include <iprt/message.h>
 #include <iprt/process.h>
 #include <iprt/path.h>
@@ -940 +941 @@
                 {
                     LogFlow(("autostartSvcWinServiceMain: calling autostartStartVMs\n"));
-                    RTEXITCODE ec = autostartStartVMs();
-                    if (ec == RTEXITCODE_SUCCESS)
+
+                    /* check if we should stopped already, e.g. windows shutdown */
+                    rc = RTSemEventMultiWait(g_hSupSvcWinEvent, 1);
+                    if (RT_FAILURE(rc))
                     {
-                        LogFlow(("autostartSvcWinServiceMain: done string VMs\n"));
-                        err = NO_ERROR;
-                        rc = RTSemEventMultiWait(g_hSupSvcWinEvent, RT_INDEFINITE_WAIT);
-                        if (RT_SUCCESS(rc))
+                        /* No one signaled us to stop */
+                        RTEXITCODE ec = autostartStartVMs();
+                        if (ec == RTEXITCODE_SUCCESS)
                         {
-                            LogFlow(("autostartSvcWinServiceMain: woke up\n"));
-                            /** @todo Autostop part. */
+                            LogFlow(("autostartSvcWinServiceMain: done starting VMs\n"));
                             err = NO_ERROR;
                         }
-                        else
-                            autostartSvcLogError("RTSemEventWait failed, rc=%Rrc", rc);
+                        /* No reason to keep started. Shutdown the service*/
                     }
-
                     autostartShutdown();
                 }
@@ -1043 +1042 @@
     } while (0);
 
-
+    /*
+     * Init com here for first main thread initialization.
+     * Service main function called in another thread
+     * created by service manager.
+     */
+    HRESULT hrc = com::Initialize();
+# ifdef VBOX_WITH_XPCOM
+    if (hrc == NS_ERROR_FILE_ACCESS_DENIED)
+    {
+        char szHome[RTPATH_MAX] = "";
+        com::GetVBoxUserHomeDirectory(szHome, sizeof(szHome));
+        return RTMsgErrorExit(RTEXITCODE_FAILURE,
+               "Failed to initialize COM because the global settings directory '%s' is not accessible!", szHome);
+    }
+# endif
+    if (FAILED(hrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to initialize COM (%Rhrc)!", hrc);
 
     /*
@@ -1117 +1132 @@
             break;
     }
+
+    com::Shutdown();
+
     return RTEXITCODE_FAILURE;
 }

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartStart.cpp

@@ -175 +175 @@
                     }
                 }
-                g_pSession->UnlockMachine();
+                SessionState_T enmSessionState;
+                CHECK_ERROR(g_pSession, COMGETTER(State)(&enmSessionState));
+                if (SUCCEEDED(rc) && enmSessionState == SessionState_Locked)
+                    g_pSession->UnlockMachine();
             }
         }