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

Timestamp:

May 31, 2022 9:11:39 AM (3 years ago)

Author:

vboxsync

Message:

Frontends + Main: Adjust to the new rules wrt. to rc -> hrc,vrc usage. This also fixes quite a few bugs wrt shadow variables, wrong return values and output error translations / exit codes. Also see @todos added. ​​bugref:10223

Location:

trunk/src/VBox/Frontends/VBoxAutostart

Files:

• VBoxAutostartStart.cpp (modified) (6 diffs)
• VBoxAutostartStop.cpp (modified) (11 diffs)

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

@@ -87 +87 @@
      */
     com::SafeIfaceArray<IMachine> machines;
-    HRESULT rc = g_pVirtualBox->COMGETTER(Machines)(ComSafeArrayAsOutParam(machines));
-    if (SUCCEEDED(rc))
+    HRESULT hrc = g_pVirtualBox->COMGETTER(Machines)(ComSafeArrayAsOutParam(machines));
+    if (SUCCEEDED(hrc))
     {
         /*
@@ -131 +131 @@
          * just to add this log, hence a bit of duplicate logic here.
          */
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
         {
             if (machines.size() == 0)
@@ -142 +142 @@
         }
         else
-            autostartSvcLogError("Enumerating virtual machines failed with %Rhrc\n", rc);
-
-        if (   SUCCEEDED(rc)
+            autostartSvcLogError("Enumerating virtual machines failed with %Rhrc\n", hrc);
+
+        if (   SUCCEEDED(hrc)
             && !listVM.empty())
         {
@@ -173 +173 @@
                 CHECK_ERROR_BREAK(machine, LaunchVMProcess(g_pSession, Bstr("headless").raw(),
                                                            ComSafeArrayNullInParam(), progress.asOutParam()));
-                if (SUCCEEDED(rc) && !progress.isNull())
+                if (SUCCEEDED(hrc) && !progress.isNull())
                 {
                     autostartSvcLogVerbose(1, "Waiting for machine '%ls' to power on ...\n", strName.raw());
                     CHECK_ERROR(progress, WaitForCompletion(-1));
-                    if (SUCCEEDED(rc))
+                    if (SUCCEEDED(hrc))
                     {
                         BOOL completed = true;
                         CHECK_ERROR(progress, COMGETTER(Completed)(&completed));
-                        if (SUCCEEDED(rc))
+                        if (SUCCEEDED(hrc))
                         {
                             ASSERT(completed);
@@ -187 +187 @@
                             LONG iRc;
                             CHECK_ERROR(progress, COMGETTER(ResultCode)(&iRc));
-                            if (SUCCEEDED(rc))
+                            if (SUCCEEDED(hrc))
                             {
                                 if (FAILED(iRc))
@@ -202 +202 @@
                 SessionState_T enmSessionState;
                 CHECK_ERROR(g_pSession, COMGETTER(State)(&enmSessionState));
-                if (SUCCEEDED(rc) && enmSessionState == SessionState_Locked)
+                if (SUCCEEDED(hrc) && enmSessionState == SessionState_Locked)
                     g_pSession->UnlockMachine();
             }

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

@@ -49 +49 @@
 static HRESULT autostartSaveVMState(ComPtr<IConsole> &console)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     ComPtr<IMachine> machine;
     ComPtr<IProgress> progress;
@@ -57 +57 @@
         /* first pause so we don't trigger a live save which needs more time/resources */
         bool fPaused = false;
-        rc = console->Pause();
-        if (FAILED(rc))
+        hrc = console->Pause();
+        if (FAILED(hrc))
         {
             bool fError = true;
-            if (rc == VBOX_E_INVALID_VM_STATE)
+            if (hrc == VBOX_E_INVALID_VM_STATE)
             {
                 /* check if we are already paused */
@@ -67 +67 @@
                 CHECK_ERROR_BREAK(console, COMGETTER(State)(&machineState));
                 /* the error code was lost by the previous instruction */
-                rc = VBOX_E_INVALID_VM_STATE;
+                hrc = VBOX_E_INVALID_VM_STATE;
                 if (machineState != MachineState_Paused)
                 {
@@ -85 +85 @@
         CHECK_ERROR(console, COMGETTER(Machine)(machine.asOutParam()));
         CHECK_ERROR(machine, SaveState(progress.asOutParam()));
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             if (!fPaused)
@@ -92 +92 @@
         }
 
-        rc = showProgress(progress);
+        hrc = showProgress(progress);
         CHECK_PROGRESS_ERROR(progress, ("Failed to save machine state"));
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             if (!fPaused)
@@ -101 +101 @@
     } while (0);
 
-    return rc;
+    return hrc;
 }
 
@@ -116 +116 @@
      */
     com::SafeIfaceArray<IMachine> machines;
-    HRESULT rc = g_pVirtualBox->COMGETTER(Machines)(ComSafeArrayAsOutParam(machines));
-    if (SUCCEEDED(rc))
+    HRESULT hrc = g_pVirtualBox->COMGETTER(Machines)(ComSafeArrayAsOutParam(machines));
+    if (SUCCEEDED(hrc))
     {
         /*
@@ -155 +155 @@
         }
 
-        if (   SUCCEEDED(rc)
+        if (   SUCCEEDED(hrc)
             && !listVM.empty())
         {
@@ -197 +197 @@
                         case AutostopType_SaveState:
                         {
-                            rc = autostartSaveVMState(console);
+                            hrc = autostartSaveVMState(console);
                             break;
                         }
@@ -204 +204 @@
                             CHECK_ERROR_BREAK(console, PowerDown(progress.asOutParam()));
 
-                            rc = showProgress(progress);
+                            hrc = showProgress(progress);
                             CHECK_PROGRESS_ERROR(progress, ("Failed to powering off machine '%ls'", strName.raw()));
-                            if (FAILED(rc))
-                                autostartSvcLogError("Powering off machine '%ls' failed with %Rhrc\n", strName.raw(), rc);
+                            if (FAILED(hrc))
+                                autostartSvcLogError("Powering off machine '%ls' failed with %Rhrc\n", strName.raw(), hrc);
                             break;
                         }
@@ -240 +240 @@
                                 autostartSvcLogWarning("The guest of machine '%ls' does not support ACPI shutdown or is currently paused, saving state...\n",
                                                        strName.raw());
-                                rc = autostartSaveVMState(console);
+                                hrc = autostartSaveVMState(console);
                             }
                             break;