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

Timestamp:

Feb 28, 2011 2:20:13 PM (14 years ago)

Author:

vboxsync

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

70251

Message:

Main/VBoxManage: Added ExecuteProcessStatus, update on todos.

File:

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

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

@@ -379 +379 @@
                              * canceled or we simply got all stuff transferred.
                              */
-                            ULONG uRetStatus, uRetExitCode;
-                            rc = pGuest->waitForProcessStatusChange(uPID, &uRetStatus, &uRetExitCode, 10 * 1000 /* 10s timeout. */);
+                            ExecuteProcessStatus retStatus;
+                            ULONG uRetExitCode;
+                            rc = pGuest->waitForProcessStatusChange(uPID, &retStatus, &uRetExitCode, 10 * 1000 /* 10s timeout. */);
                             if (FAILED(rc))
                             {
@@ -388 +389 @@
                             {
                                 if (   uRetExitCode != 0
-                                    || uRetStatus   != PROC_STS_TEN)
+                                    || retStatus    != ExecuteProcessStatus_TerminatedNormally)
                                 {
                                     rc = TaskGuest::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
@@ -786 +787 @@
                     }
 
-                    ULONG uRetStatus, uRetExitCode, uRetFlags;
-                    rc = pGuest->GetProcessStatus(uPID, &uRetExitCode, &uRetFlags, &uRetStatus);
+                    ExecuteProcessStatus retStatus;
+                    ULONG uRetExitCode, uRetFlags;
+                    rc = pGuest->GetProcessStatus(uPID, &uRetExitCode, &uRetFlags, &retStatus);
                     if (SUCCEEDED(rc))
                     {
@@ -802 +804 @@
                             {
                                 LogRel(("Guest Additions update failed (Exit code=%u, Status=%u, Flags=%u)\n",
-                                        uRetExitCode, uRetStatus, uRetFlags));
+                                        uRetExitCode, retStatus, uRetFlags));
                                 rc = TaskGuest::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
                                                                      Guest::tr("Guest Additions update failed with exit code=%u (status=%u, flags=%u)"),
-                                                                     uRetExitCode, uRetStatus, uRetFlags);
+                                                                     uRetExitCode, retStatus, uRetFlags);
                             }
                         }
@@ -814 +816 @@
                             rc = TaskGuest::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
                                                                  Guest::tr("Guest Additions update was canceled by the guest with exit code=%u (status=%u, flags=%u)"),
-                                                                 uRetExitCode, uRetStatus, uRetFlags);
+                                                                 uRetExitCode, retStatus, uRetFlags);
                         }
                         else
@@ -1113 +1115 @@
                     /* Not found, add to map. */
                     GuestProcess newProcess;
-                    newProcess.mStatus = pCBData->u32Status;
+                    newProcess.mStatus = (ExecuteProcessStatus)pCBData->u32Status;
                     newProcess.mExitCode = pCBData->u32Flags; /* Contains exit code. */
                     newProcess.mFlags = 0;
@@ -1121 +1123 @@
                 else /* Update map. */
                 {
-                    it_proc->second.mStatus = pCBData->u32Status;
+                    it_proc->second.mStatus = (ExecuteProcessStatus)pCBData->u32Status;
                     it_proc->second.mExitCode = pCBData->u32Flags; /* Contains exit code. */
                     it_proc->second.mFlags = 0;
@@ -1425 +1427 @@
 }
 
-HRESULT Guest::waitForProcessStatusChange(ULONG uPID, ULONG *puRetStatus, ULONG *puRetExitCode, ULONG uTimeoutMS)
-{
-    AssertPtr(puRetStatus);
+HRESULT Guest::waitForProcessStatusChange(ULONG uPID, ExecuteProcessStatus *pRetStatus, ULONG *puRetExitCode, ULONG uTimeoutMS)
+{
+    AssertPtr(pRetStatus);
     AssertPtr(puRetExitCode);
 
@@ -1450 +1452 @@
             break;
         }
-        hRC = GetProcessStatus(uPID, puRetExitCode, &uRetFlagsIgnored, puRetStatus);
+        hRC = GetProcessStatus(uPID, puRetExitCode, &uRetFlagsIgnored, pRetStatus);
         if (FAILED(hRC))
             break;
         RTThreadSleep(100);
-    } while(*puRetStatus == PROC_STS_STARTED && SUCCEEDED(hRC));
+    } while(*pRetStatus == ExecuteProcessStatus_Started && SUCCEEDED(hRC));
     return hRC;
 }
@@ -1849 +1851 @@
             {
                 /* PID exists; check if process is still running. */
-                if (itProc->second.mStatus != PROC_STS_STARTED)
+                if (itProc->second.mStatus != ExecuteProcessStatus_Started)
                     rc = setError(VBOX_E_IPRT_ERROR,
                                   Guest::tr("Cannot inject input to not running process (PID %u)"), aPID);
@@ -2200 +2202 @@
 }
 
-STDMETHODIMP Guest::GetProcessStatus(ULONG aPID, ULONG *aExitCode, ULONG *aFlags, ULONG *aStatus)
+STDMETHODIMP Guest::GetProcessStatus(ULONG aPID, ULONG *aExitCode, ULONG *aFlags, ExecuteProcessStatus *aStatus)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -2440 +2442 @@
             if (fCompleted)
             {
-                ULONG uRetStatus, uRetExitCode, uRetFlags;
+                ExecuteProcessStatus retStatus;
+                ULONG uRetExitCode, uRetFlags;
                 if (SUCCEEDED(rc))
                 {
-                    rc = GetProcessStatus(uPID, &uRetExitCode, &uRetFlags, &uRetStatus);
+                    rc = GetProcessStatus(uPID, &uRetExitCode, &uRetFlags, &retStatus);
                     if (SUCCEEDED(rc) && uRetExitCode != 0)
                     {