Changeset 36309 in vbox

Timestamp:

Mar 17, 2011 2:43:25 PM (14 years ago)

Author:

vboxsync

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

70617

Message:

Main/GuestCtrl: Some more checking for SetProcessInput.

File:

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

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

@@ -1243 +1243 @@
                 && !fCompleted)
             {
-                    /* If we previously got completed notification, don't trigger again. */
+                /* If we previously got completed notification, don't trigger again. */
                 it->second.pProgress->notifyComplete(S_OK);
             }
@@ -1270 +1270 @@
         /* Save bytes processed. */
         pCBData->cbProcessed = pData->cbProcessed;
+        pCBData->u32Status = pData->u32Status;
+        pCBData->u32Flags = pData->u32Flags;
+        pCBData->u32PID = pData->u32PID;
 
         /* Only trigger completion once. */
@@ -1950 +1953 @@
                     if (FAILED(rc)) throw rc;
 
-                    /* Was the call completed within time? */
-                    LONG uResult;
-                    if (   SUCCEEDED(it->second.pProgress->COMGETTER(ResultCode)(&uResult))
-                        && uResult == S_OK)
-                    {
-                        PCALLBACKDATAEXECINSTATUS pStatusData = (PCALLBACKDATAEXECINSTATUS)it->second.pvData;
-                        AssertPtr(pStatusData);
-                        Assert(it->second.cbData == sizeof(CALLBACKDATAEXECINSTATUS));
-
-                        *aBytesWritten = pStatusData->cbProcessed;
-                    }
-                    else if (   SUCCEEDED(it->second.pProgress->COMGETTER(Canceled)(&fCanceled))
-                             && fCanceled)
-                    {
-                        rc = setError(VBOX_E_IPRT_ERROR,
-                                      tr("The input operation was canceled by the guest"));
+                    /* Was the operation canceled by one of the parties? */
+                    rc = it->second.pProgress->COMGETTER(Canceled)(&fCanceled);
+                    if (FAILED(rc)) throw rc;
+
+                    if (!fCanceled)
+                    {   
+                        BOOL fCompleted;
+                        if (   SUCCEEDED(it->second.pProgress->COMGETTER(Completed)(&fCompleted))
+                            && fCompleted)
+                        {
+                            AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);                        
+
+                            PCALLBACKDATAEXECINSTATUS pStatusData = (PCALLBACKDATAEXECINSTATUS)it->second.pvData;
+                            AssertPtr(pStatusData);
+                            Assert(it->second.cbData == sizeof(CALLBACKDATAEXECINSTATUS));
+
+                            switch (pStatusData->u32Status)
+                            {
+                                case INPUT_STS_WRITTEN:
+                                    *aBytesWritten = pStatusData->cbProcessed;
+                                    break;
+
+                                default:
+                                    rc = setError(VBOX_E_IPRT_ERROR,
+                                                  tr("Client error %u while processing input data"), pStatusData->u32Status);
+                                    break;
+                            }                                                           
+                        }
+                        else
+                            rc = setError(VBOX_E_IPRT_ERROR,
+                                          tr("The input operation was not acknowledged from guest within time (%ums)"), aTimeoutMS);
                     }
                     else
                         rc = setError(VBOX_E_IPRT_ERROR,
-                                      tr("The input operation was not acknowledged from guest within time (%ums)"), aTimeoutMS);
-
+                                      tr("The input operation was canceled by the guest"));
                     {
                         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);