Changeset 78744 in vbox for trunk/src

Timestamp:

May 25, 2019 2:21:47 PM (6 years ago)

Author:

vboxsync

Message:

Main/Guest::updateGuestAdditions: Cleanup similar to r130830. bugref:9320

File:

• trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp

@@ -492 +492 @@
         return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), fFlags);
 
-    int vrc = VINF_SUCCESS;
-
+
+    /* Copy arguments into aArgs: */
     ProcessArguments aArgs;
-    aArgs.resize(0);
-
-    if (aArguments.size())
-    {
-        try
-        {
-            for (size_t i = 0; i < aArguments.size(); ++i)
-                aArgs.push_back(aArguments[i]);
-        }
-        catch(std::bad_alloc &)
-        {
-            vrc = VERR_NO_MEMORY;
-        }
-    }
-
-    HRESULT hr = S_OK;
+    try
+    {
+        aArgs.resize(0);
+        for (size_t i = 0; i < aArguments.size(); ++i)
+            aArgs.push_back(aArguments[i]);
+    }
+    catch (std::bad_alloc &)
+    {
+        return E_OUTOFMEMORY;
+    }
+
 
     /*
@@ -522 +517 @@
     RT_ZERO(guestCreds);
 
+    HRESULT hrc;
     ComObjPtr<GuestSession> pSession;
+    int vrc = i_sessionCreate(startupInfo, guestCreds, pSession);
     if (RT_SUCCESS(vrc))
-        vrc = i_sessionCreate(startupInfo, guestCreds, pSession);
-    if (RT_FAILURE(vrc))
-    {
-        switch (vrc)
-        {
-            case VERR_MAX_PROCS_REACHED:
-                hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Maximum number of concurrent guest sessions (%d) reached"),
-                                  VBOX_GUESTCTRL_MAX_SESSIONS);
-                break;
-
-            /** @todo Add more errors here. */
-
-           default:
-                hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Could not create guest session: %Rrc"), vrc);
-                break;
-        }
-    }
-    else
     {
         Assert(!pSession.isNull());
-        int rcGuest;
+
+        int rcGuest = VERR_GSTCTL_GUEST_ERROR;
         vrc = pSession->i_startSession(&rcGuest);
-        if (RT_FAILURE(vrc))
-        {
-            /** @todo Handle rcGuest! */
-
-            hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Could not open guest session: %Rrc"), vrc);
-        }
-        else
-        {
-
-            ComObjPtr<Progress> pProgress;
+        if (RT_SUCCESS(vrc))
+        {
+            /*
+             * Create the update task.
+             */
             GuestSessionTaskUpdateAdditions *pTask = NULL;
             try
             {
+                pTask = new GuestSessionTaskUpdateAdditions(pSession /* GuestSession */, aSource, aArgs, fFlags);
+                hrc = S_OK;
+            }
+            catch (std::bad_alloc &)
+            {
+                hrc = setError(E_OUTOFMEMORY, tr("Failed to create SessionTaskUpdateAdditions object"));
+            }
+            if (SUCCEEDED(hrc))
+            {
                 try
                 {
-                    pTask = new GuestSessionTaskUpdateAdditions(pSession /* GuestSession */, aSource, aArgs, fFlags);
+                    hrc = pTask->Init(Utf8StrFmt(tr("Updating Guest Additions")));
                 }
-                catch(...)
+                catch (std::bad_alloc &)
                 {
-                    hr = setError(E_OUTOFMEMORY, tr("Failed to create SessionTaskUpdateAdditions object "));
-                    throw;
+                    hrc = E_OUTOFMEMORY;
                 }
-
-
-                hr = pTask->Init(Utf8StrFmt(tr("Updating Guest Additions")));
-                if (FAILED(hr))
+                if (SUCCEEDED(hrc))
                 {
-                    delete pTask;
-                    hr = setError(hr, tr("Creating progress object for SessionTaskUpdateAdditions object failed"));
-                    throw hr;
-                }
-
-                hr = pTask->createThreadWithType(RTTHREADTYPE_MAIN_HEAVY_WORKER);
-
-                if (SUCCEEDED(hr))
-                {
-                    /* Return progress to the caller. */
-                    pProgress = pTask->GetProgressObject();
-                    hr = pProgress.queryInterfaceTo(aProgress.asOutParam());
+                    ComPtr<Progress> ptrProgress = pTask->GetProgressObject();
+
+                    /*
+                     * Kick off the thread.  Note! consumes pTask!
+                     */
+                    hrc = pTask->createThreadWithType(RTTHREADTYPE_MAIN_HEAVY_WORKER);
+                    pTask = NULL;
+                    if (SUCCEEDED(hrc))
+                        hrc = ptrProgress.queryInterfaceTo(aProgress.asOutParam());
+                    else
+                        hrc = setError(hrc, tr("Starting thread for updating Guest Additions on the guest failed"));
                 }
                 else
-                    hr = setError(hr, tr("Starting thread for updating Guest Additions on the guest failed "));
+                {
+                    hrc = setError(hrc, tr("Failed to initialize SessionTaskUpdateAdditions object"));
+                    delete pTask;
+                }
             }
-            catch(std::bad_alloc &)
-            {
-                hr = E_OUTOFMEMORY;
-            }
-            catch(...)
-            {
-                LogFlowThisFunc(("Exception was caught in the function\n"));
-            }
-        }
-    }
-
-    LogFlowFunc(("Returning hr=%Rhrc\n", hr));
-    return hr;
+        }
+        else
+        {
+            if (vrc == VERR_GSTCTL_GUEST_ERROR)
+                vrc = rcGuest;
+            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Could not open guest session: %Rrc"), vrc);
+        }
+    }
+    else
+    {
+        switch (vrc)
+        {
+            case VERR_MAX_PROCS_REACHED:
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Maximum number of concurrent guest sessions (%d) reached"),
+                                  VBOX_GUESTCTRL_MAX_SESSIONS);
+                break;
+
+            /** @todo Add more errors here. */
+
+           default:
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Could not create guest session: %Rrc"), vrc);
+                break;
+        }
+    }
+
+    LogFlowFunc(("Returning hrc=%Rhrc\n", hrc));
+    return hrc;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }