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

Timestamp:

Aug 10, 2012 3:19:09 PM (12 years ago)

Author:

vboxsync

Message:

Guest Control 2.0: Bugfixes.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestCtrlImpl.cpp (modified) (1 diff)
• GuestSessionImpl.cpp (modified) (5 diffs)

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

@@ -2858 +2858 @@
         mData.mGuestSessions[uNewSessionID] = pGuestSession;
 
-        LogFlowFunc(("Added new session with session ID=%RU32 (now %ld sessios total)\n",
+        LogFlowFunc(("Added new session with session ID=%RU32 (now %ld sessions total)\n",
                      uNewSessionID, mData.mGuestSessions.size()));
     }

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

@@ -257 +257 @@
                                    30 * 1000 /* Timeout */, waitRes);
             if (   RT_FAILURE(rc)
-                || waitRes.mResult == ProcessWaitResult_Terminate
-                || waitRes.mResult == ProcessWaitResult_Error
-                || waitRes.mResult == ProcessWaitResult_Timeout)
+                || waitRes.mResult != ProcessWaitForFlag_StdIn)
             {
                 break;
@@ -319 +317 @@
                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                     Utf8StrFmt(GuestSession::tr("Writing to file \"%s\" (offset %RU64) failed: %Rrc"),
-                                               mSource.c_str(), cbWrittenTotal, rc));
+                                               mDest.c_str(), cbWrittenTotal, rc));
                 break;
             }
-#ifdef DEBUG
+
             LogFlowThisFunc(("cbWritten=%RU32, cbToRead=%RU64, cbWrittenTotal=%RU64, cbFileSize=%RU64\n",
                              cbWritten, cbToRead - cbWritten, cbWrittenTotal + cbWritten, mSourceSize));
-#endif
+
             /* Only subtract bytes reported written by the guest. */
             Assert(cbToRead >= cbWritten);
@@ -488 +486 @@
     {
         rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                 Utf8StrFmt(GuestSession::tr("Guest file \"%s\" is not a file"), mSource.c_str()));
+                                 Utf8StrFmt(GuestSession::tr("Object \"%s\" on the guest is not a file"), mSource.c_str()));
     }
 
@@ -521 +519 @@
             {
                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(GuestSession::tr("Unable to start guest process: %Rrc"), rc));
+                                    Utf8StrFmt(GuestSession::tr("Unable to start guest process for copying data from guest to host: %Rrc"), rc));
             }
             else
@@ -537 +535 @@
                                            30 * 1000 /* Timeout */, waitRes);
                     if (   RT_FAILURE(rc)
-                        || waitRes.mResult != ProcessWaitResult_StdOut)
+                        && (   waitRes.mResult != ProcessWaitResult_StdOut
+                            || waitRes.mResult != ProcessWaitResult_Any)
+                       )
                     {
                         break;