Changeset 95255 in vbox for trunk/src/VBox/Frontends/VBoxAutostart

Timestamp:

Jun 13, 2022 9:55:08 AM (3 years ago)

Author:

vboxsync

Message:

FE/VBoxAutoStart: Fixed more RTEXITCODE vs. int return codes in autostartSetup(). Added some docs.

Location:

trunk/src/VBox/Frontends/VBoxAutostart

Files:

• VBoxAutostart.h (modified) (1 diff)
• VBoxAutostartUtils.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart.h

@@ -357 +357 @@
 DECLHIDDEN(RTEXITCODE) autostartSvcDisplayGetOptError(const char *pszAction, int rc, PCRTGETOPTUNION pValue);
 
+/**
+ * Starts the autostart environment by initializing all needed (global) objects.
+ *
+ * @returns VBox status code.
+ *
+ * @note    This currently does NOT support multiple instances, be aware of this!
+ */
 DECLHIDDEN(int) autostartSetup(void);
 
+/**
+ * Stops the autostart environment.
+ *
+ * @note    This currently does NOT support multiple instances, be aware of this!
+ */
 DECLHIDDEN(void) autostartShutdown(void);
 

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

@@ -263 +263 @@
 }
 
-DECLHIDDEN(int) autostartSetup()
+DECLHIDDEN(int) autostartSetup(void)
 {
     autostartSvcOsLogStr("Setting up ...\n", AUTOSTARTLOGTYPE_VERBOSE);
@@ -277 +277 @@
         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);
+        autostartSvcLogError("Failed to initialize COM because the global settings directory '%s' is not accessible!", szHome);
+        return VERR_COM_FILE_ERROR;
     }
 # endif
     if (FAILED(hrc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to initialize COM (%Rhrc)!", hrc);
+    {
+        autostartSvcLogError("Failed to initialize COM (%Rhrc)!", hrc);
+        return VERR_COM_UNEXPECTED;
+    }
 
     hrc = g_pVirtualBoxClient.createInprocObject(CLSID_VirtualBoxClient);
@@ -292 +295 @@
         {
             com::GluePrintRCMessage(hrc);
-            RTMsgError("Most likely, the VirtualBox COM server is not running or failed to start.");
+            autostartSvcLogError("Most likely, the VirtualBox COM server is not running or failed to start.");
         }
         else
             com::GluePrintErrorInfo(info);
-        return RTEXITCODE_FAILURE;
+        return VERR_COM_UNEXPECTED;
     }
 
@@ -302 +305 @@
      * Setup VirtualBox + session interfaces.
      */
-    HRESULT rc = g_pVirtualBoxClient->COMGETTER(VirtualBox)(g_pVirtualBox.asOutParam());
-    if (SUCCEEDED(rc))
-    {
-        rc = g_pSession.createInprocObject(CLSID_Session);
-        if (FAILED(rc))
-            RTMsgError("Failed to create a session object (rc=%Rhrc)!", rc);
+    hrc = g_pVirtualBoxClient->COMGETTER(VirtualBox)(g_pVirtualBox.asOutParam());
+    if (SUCCEEDED(hrc))
+    {
+        hrc = g_pSession.createInprocObject(CLSID_Session);
+        if (FAILED(hrc))
+            autostartSvcLogError("Failed to create a session object (rc=%Rhrc)!", hrc);
     }
     else
-        RTMsgError("Failed to get VirtualBox object (rc=%Rhrc)!", rc);
-
-    if (FAILED(rc))
+        autostartSvcLogError("Failed to get VirtualBox object (rc=%Rhrc)!", hrc);
+
+    if (FAILED(hrc))
         return VERR_COM_OBJECT_NOT_FOUND;
 
@@ -318 +321 @@
 }
 
-DECLHIDDEN(void) autostartShutdown()
+DECLHIDDEN(void) autostartShutdown(void)
 {
     autostartSvcOsLogStr("Shutting down ...\n", AUTOSTARTLOGTYPE_VERBOSE);