Changeset 43170 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Sep 4, 2012 4:37:40 PM (12 years ago)

Author:

vboxsync

Message:

GuestCtrl: Handle bad_alloc, warnings.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestCtrlImpl.cpp (modified) (1 diff)
• GuestProcessImpl.cpp (modified) (5 diffs)
• GuestSessionImpl.cpp (modified) (2 diffs)
• GuestSessionImplTasks.cpp (modified) (4 diffs)

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

@@ -196 +196 @@
         else
         {
-            ComObjPtr<Progress> pProgress;
-            SessionTaskUpdateAdditions *pTask = new SessionTaskUpdateAdditions(pSession /* GuestSession */,
-                                                                               Utf8Str(aSource), fFlags);
-            AssertPtrReturn(pTask, VERR_NO_MEMORY);
-            rc = pSession->startTaskAsync(tr("Updating Guest Additions"), pTask, pProgress);
-            if (RT_SUCCESS(rc))
+            try
             {
-                /* Return progress to the caller. */
-                hr = pProgress.queryInterfaceTo(aProgress);
+                ComObjPtr<Progress> pProgress;
+                SessionTaskUpdateAdditions *pTask = new SessionTaskUpdateAdditions(pSession /* GuestSession */,
+                                                                                   Utf8Str(aSource), fFlags);
+                rc = pSession->startTaskAsync(tr("Updating Guest Additions"), pTask, pProgress);
+                if (RT_SUCCESS(rc))
+                {
+                    /* Return progress to the caller. */
+                    hr = pProgress.queryInterfaceTo(aProgress);
+                }
+                else
+                    hr = setError(VBOX_E_IPRT_ERROR,
+                                  tr("Starting task for updating Guest Additions on the guest failed: %Rrc"), rc);
             }
-            else
-                hr = setError(VBOX_E_IPRT_ERROR,
-                              tr("Starting task for updating Guest Additions on the guest failed: %Rrc"), rc);
+            catch(std::bad_alloc &)
+            {
+                hr = E_OUTOFMEMORY;
+            }
         }
     }

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

@@ -940 +940 @@
     {
         pCallbackRead = new GuestCtrlCallback();
-        AssertPtr(pCallbackRead);
     }
     catch(std::bad_alloc &)
@@ -1108 +1107 @@
     {
         pCallbackStart = new GuestCtrlCallback();
-        AssertPtr(pCallbackStart);
     }
     catch(std::bad_alloc &)
@@ -1519 +1517 @@
     {
         pCallbackWrite = new GuestCtrlCallback();
-        AssertPtr(pCallbackWrite);
     }
     catch(std::bad_alloc &)
@@ -1610 +1607 @@
     alock.acquire();
 
-    AssertPtr(pCallbackWrite);
     int rc2 = callbackRemove(uContextID);
     if (RT_SUCCESS(vrc))
@@ -1970 +1966 @@
 int GuestProcessTool::WaitEx(uint32_t fFlags, GuestProcessStreamBlock *pStreamBlock, int *pGuestRc)
 {
-    LogFlowThisFunc(("pSession=%p, pProcess=%p, fFlags=0x%x, pStreamBlock=%p, pGuestRc=%p\n",
-                     pSession, pProcess, fFlags, pStreamBlock, pGuestRc));
+    LogFlowThisFunc(("pSession=%p, fFlags=0x%x, pStreamBlock=%p, pGuestRc=%p\n",
+                     pSession, fFlags, pStreamBlock, pGuestRc));
 
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);

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

@@ -1077 +1077 @@
     HRESULT hr = S_OK;
 
-    ComObjPtr<Progress> pProgress;
-    SessionTaskCopyFrom *pTask = new SessionTaskCopyFrom(this /* GuestSession */,
-                                                         Utf8Str(aSource), Utf8Str(aDest), fFlags);
-    AssertPtrReturn(pTask, VERR_NO_MEMORY);
-    int rc = startTaskAsync(Utf8StrFmt(tr("Copying \"%ls\" from guest to \"%ls\" on the host"), aSource, aDest),
-                            pTask, pProgress);
-    if (RT_SUCCESS(rc))
-    {
-        /* Return progress to the caller. */
-        hr = pProgress.queryInterfaceTo(aProgress);
-    }
-    else
-        hr = setError(VBOX_E_IPRT_ERROR,
-                      tr("Starting task for copying file \"%ls\" from guest to \"%ls\" on the host failed: %Rrc"), rc);
+    try
+    {
+        ComObjPtr<Progress> pProgress;
+        SessionTaskCopyFrom *pTask = new SessionTaskCopyFrom(this /* GuestSession */,
+                                                             Utf8Str(aSource), Utf8Str(aDest), fFlags);
+        int rc = startTaskAsync(Utf8StrFmt(tr("Copying \"%ls\" from guest to \"%ls\" on the host"), aSource, aDest),
+                                pTask, pProgress);
+        if (RT_SUCCESS(rc))
+        {
+            /* Return progress to the caller. */
+            hr = pProgress.queryInterfaceTo(aProgress);
+        }
+        else
+            hr = setError(VBOX_E_IPRT_ERROR,
+                          tr("Starting task for copying file \"%ls\" from guest to \"%ls\" on the host failed: %Rrc"), rc);
+    }
+    catch(std::bad_alloc &)
+    {
+        hr = E_OUTOFMEMORY;
+    }
+
     return hr;
 #endif /* VBOX_WITH_GUEST_CONTROL */
@@ -1126 +1133 @@
     HRESULT hr = S_OK;
 
-    ComObjPtr<Progress> pProgress;
-    SessionTaskCopyTo *pTask = new SessionTaskCopyTo(this /* GuestSession */,
-                                                     Utf8Str(aSource), Utf8Str(aDest), fFlags);
-    AssertPtrReturn(pTask, VERR_NO_MEMORY);
-    int rc = startTaskAsync(Utf8StrFmt(tr("Copying \"%ls\" from host to \"%ls\" on the guest"), aSource, aDest),
-                            pTask, pProgress);
-    if (RT_SUCCESS(rc))
-    {
-        /* Return progress to the caller. */
-        hr = pProgress.queryInterfaceTo(aProgress);
-    }
-    else
-        hr = setError(VBOX_E_IPRT_ERROR,
-                      tr("Starting task for copying file \"%ls\" from host to \"%ls\" on the guest failed: %Rrc"), rc);
-   return hr;
+    try
+    {
+        ComObjPtr<Progress> pProgress;
+        SessionTaskCopyTo *pTask = new SessionTaskCopyTo(this /* GuestSession */,
+                                                         Utf8Str(aSource), Utf8Str(aDest), fFlags);
+        AssertPtrReturn(pTask, VERR_NO_MEMORY);
+        int rc = startTaskAsync(Utf8StrFmt(tr("Copying \"%ls\" from host to \"%ls\" on the guest"), aSource, aDest),
+                                pTask, pProgress);
+        if (RT_SUCCESS(rc))
+        {
+            /* Return progress to the caller. */
+            hr = pProgress.queryInterfaceTo(aProgress);
+        }
+        else
+            hr = setError(VBOX_E_IPRT_ERROR,
+                          tr("Starting task for copying file \"%ls\" from host to \"%ls\" on the guest failed: %Rrc"), rc);
+    }
+    catch(std::bad_alloc &)
+    {
+        hr = E_OUTOFMEMORY;
+    }
+
+    return hr;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }

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

@@ -290 +290 @@
         for (;;)
         {
-            int guestRc;
             rc = pProcess->waitFor(ProcessWaitForFlag_StdIn,
                                    30 * 1000 /* Timeout */, waitRes, &guestRc);
@@ -550 +549 @@
     else if (objData.mType != FsObjType_File) /* Only single files are supported at the moment. */
     {
-        rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                 Utf8StrFmt(GuestSession::tr("Object \"%s\" on the guest is not a file"), mSource.c_str()));
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                            Utf8StrFmt(GuestSession::tr("Object \"%s\" on the guest is not a file"), mSource.c_str()));
+        rc = VERR_GENERAL_FAILURE; /* Fudge. */
     }
 
@@ -577 +577 @@
 
             /* Startup process. */
-            ComObjPtr<GuestProcess> pProcess; int guestRc;
+            ComObjPtr<GuestProcess> pProcess;
             rc = pSession->processCreateExInteral(procInfo, pProcess);
             if (RT_SUCCESS(rc))
@@ -605 +605 @@
                 uint64_t cbWrittenTotal = 0;
                 uint64_t cbToRead = objData.mObjectSize;
-
-                int guestRc;
 
                 for (;;)