Changeset 39487 in vbox for trunk/src/VBox/Main/src-client/GuestCtrlImplTasks.cpp

Timestamp:

Dec 1, 2011 10:58:19 AM (13 years ago)

Author:

vboxsync

Message:

GuestCtrl: More bugfixing.

File:

• trunk/src/VBox/Main/src-client/GuestCtrlImplTasks.cpp (modified) (5 diffs)

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

@@ -70 +70 @@
 
     LogFlowFuncEnter();
-    LogFlowFunc(("Guest %p\n", pGuest));
 
     HRESULT rc = S_OK;
@@ -295 +294 @@
                             }
                             else
+                            {
                                 rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->pProgress,
                                                                      Guest::tr("Seeking file \"%s\" failed; offset = %RU64 (%Rrc)"),
                                                                      aTask->strSource.c_str(), cbTransferedTotal, vrc);
+                                break;
+                            }
                             /* Resize buffer to reflect amount we just have read.
                              * Size 0 is allowed! */
@@ -360 +362 @@
                             ExecuteProcessStatus_T retStatus;
                             ULONG uRetExitCode;
-                            rc = pGuest->executeWaitForStatusChange(uPID, 0 /* No timeout. */,
-                                                                    &retStatus, &uRetExitCode);
+
+                            rc = executeWaitForExit(uPID, execProgress, 0 /* No timeout */,
+                                                    &retStatus, &uRetExitCode);
                             if (FAILED(rc))
                             {
@@ -372 +375 @@
                                 {
                                     rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->pProgress,
-                                                                         Guest::tr("Guest reported error %u while copying file \"%s\" to \"%s\""),
-                                                                         uRetExitCode, aTask->strSource.c_str(), aTask->strDest.c_str());
+                                                                         Guest::tr("Guest process reported error %u (status: %u) while copying file \"%s\" to \"%s\""),
+                                                                         uRetExitCode, retStatus, aTask->strSource.c_str(), aTask->strDest.c_str());
                                 }
                             }
@@ -592 +595 @@
                     RTFileClose(hFileDest);
 
-                    if (   cbTransfered
-                        && (cbTransfered != lFileSize))
-                    {
-                        /*
-                         * Only bitch about an unexpected end of a file when there already
-                         * was data read from that file. If this was the very first read we can
-                         * be (almost) sure that this file is not meant to be read by the specified user.
-                         */
-                        rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->pProgress,
-                                                             Guest::tr("Unexpected end of file \"%s\" (%u bytes total, %u bytes transferred)"),
-                                                             aTask->strSource.c_str(), lFileSize, cbTransfered);
-                    }
-
                     if (SUCCEEDED(rc))
-                        aTask->pProgress->notifyComplete(S_OK);
+                    {
+                        if (   cbTransfered
+                            && (cbTransfered != lFileSize))
+                        {
+                            /*
+                             * Only bitch about an unexpected end of a file when there already
+                             * was data read from that file. If this was the very first read we can
+                             * be (almost) sure that this file is not meant to be read by the specified user.
+                             */
+                            rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->pProgress,
+                                                                 Guest::tr("Unexpected end of file \"%s\" (%u bytes total, %u bytes transferred)"),
+                                                                 aTask->strSource.c_str(), lFileSize, cbTransfered);
+                        }
+
+                        if (SUCCEEDED(rc))
+                            aTask->pProgress->notifyComplete(S_OK);
+                    }
                 }
             }