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

Timestamp:

Sep 11, 2012 1:36:38 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80718

Message:

GuestCtrl: More error checking.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestProcessImpl.cpp (modified) (2 diffs)
• GuestSessionImplTasks.cpp (modified) (1 diff)

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

@@ -2043 +2043 @@
 
             case ProcessWaitResult_Error:
+                vrc = VERR_GENERAL_FAILURE; /** @todo Special guest control rc needed! */
+                break;
+
             case ProcessWaitResult_Terminate:
+                fDone = true;
+                break;
+
             case ProcessWaitResult_Timeout:
-                fDone = true;
+                vrc = VERR_TIMEOUT;
                 break;
 
@@ -2114 +2120 @@
     if (!pProcess.isNull())
     {
+        /** @todo Add pProcess.Terminate() here as soon as it's implemented. */
+
         Assert(pSession);
         int rc2 = pSession->processRemoveFromList(pProcess);

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

@@ -936 +936 @@
             case VERR_GENERAL_FAILURE: /** @todo Special guest control rc needed! */
                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    GuestProcess::guestErrorToString(vrc));
+                                    GuestProcess::guestErrorToString(guestRc));
+                break;
+
+            case VERR_INVALID_STATE: /** @todo Special guest control rc needed! */
+                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                    Utf8StrFmt(GuestSession::tr("Update file \"%s\" reported invalid running state"),
+                                               procInfo.mCommand.c_str()));
                 break;