Changeset 28634 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 23, 2010 9:38:12 AM (15 years ago)

Author:

vboxsync

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

60486

Message:

Guest Control: Update (more bugfixes, enhancements for VBoxManage).

File:

• trunk/src/VBox/Main/GuestImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -503 +503 @@
 }
 
-/* Notifier function for control execution stuff. */
+/* Function for handling the execution start/termination notification. */
 int Guest::notifyCtrlExec(uint32_t              u32Function,
                           PHOSTEXECCALLBACKDATA pData)
@@ -523 +523 @@
         pCBData->u32Status = pData->u32Status;
         pCBData->u32Flags = pData->u32Flags;
-        /* @todo Copy void* buffer contents! */
+        /** @todo Copy void* buffer contents! */
 
         /* Do progress handling. */
@@ -577 +577 @@
 }
 
-/* Notifier function for control execution stuff. */
+/* Function for handling the execution output notification. */
 int Guest::notifyCtrlExecOut(uint32_t                 u32Function,
                              PHOSTEXECOUTCALLBACKDATA pData)
@@ -872 +872 @@
                             break;
 
+                        /* In any other case the process either already 
+                         * terminated or something else went wrong, so no PID ... */
+                        case PROC_STS_TEN: /* Terminated normally. */
+                        case PROC_STS_TEA: /* Terminated abnormally. */
+                        case PROC_STS_TES: /* Terminated through signal. */
+                        case PROC_STS_TOK:
+                        case PROC_STS_TOA:
+                        case PROC_STS_DWN:
+                            *aPID = 0;
+                            break;
+
                         case PROC_STS_ERROR:
                             vrc = pData->u32Flags; /* u32Flags member contains IPRT error code. */
@@ -877 +888 @@
 
                         default:
-                            vrc = VERR_INVALID_PARAMETER;
+                            vrc = VERR_INVALID_PARAMETER; /* Unknown status, should never happen! */
                             break;
                     }
@@ -911 +922 @@
                         rc = setError(VBOX_E_IPRT_ERROR,
                                       tr("The guest did not respond within time (%ums)"), aTimeoutMS);
+                    }
+                    else if (vrc == VERR_INVALID_PARAMETER)
+                    {
+                        rc = setError(VBOX_E_IPRT_ERROR,
+                                      tr("The guest reported an unknown process status (%u)"), pData->u32Status);
                     }
                     else
@@ -939 +955 @@
                 {
                     rc = setError(E_UNEXPECTED,
-                                  tr("The service call failed with error %Rrc"), vrc);
+                                  tr("The HGCM call failed with error %Rrc"), vrc);
                 }
             }