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

Timestamp:

Mar 21, 2011 2:48:23 PM (14 years ago)

Author:

vboxsync

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

70655

Message:

Main/GuestCopy: Fixed copying of multiple of _64K files.

File:

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

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

@@ -327 +327 @@
                             /* Did we reach the end of the content we want to transfer (last chunk)? */
                             if (   (cbRead < _64K)
+                                /* Did we reach the last block which is exactly _64K? */
+                                || (cbToRead - cbRead == 0)
                                 /* ... or does the user want to cancel? */
                                 || (   SUCCEEDED(aTask->progress->COMGETTER(Canceled(&fCanceled)))
@@ -636 +638 @@
 
                         /* Wait for process to exit ... */
-                        SafeArray<BYTE> aInputData(_1M);
+                        SafeArray<BYTE> aInputData(_64K);
                         while (   SUCCEEDED(progressCat->COMGETTER(Completed(&fCompleted)))
                                && !fCompleted)
@@ -643 +645 @@
                             /* cbLength contains remaining bytes of our installer file
                              * opened above to read. */
-                            size_t cbToRead = RT_MIN(cbLength, _1M);
+                            size_t cbToRead = RT_MIN(cbLength, _64K);
                             if (cbToRead)
                             {
@@ -656 +658 @@
                                     /* Did we reach the end of the content we want to transfer (last chunk)? */
                                     ULONG uFlags = ProcessInputFlag_None;
-                                    if (   (cbRead < _1M)
+                                    if (   (cbRead < _64K)
+                                        /* Did we reach the last block which is exactly _64K? */
+                                        || (cbToRead - cbRead == 0)
                                         /* ... or does the user want to cancel? */
                                         || (   SUCCEEDED(aTask->progress->COMGETTER(Canceled(&fCanceled)))
@@ -1958 +1962 @@
 
                     if (!fCanceled)
-                    {   
+                    {
                         BOOL fCompleted;
                         if (   SUCCEEDED(it->second.pProgress->COMGETTER(Completed)(&fCompleted))
                             && fCompleted)
                         {
-                            AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);                        
+                            AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
                             PCALLBACKDATAEXECINSTATUS pStatusData = (PCALLBACKDATAEXECINSTATUS)it->second.pvData;
@@ -1979 +1983 @@
                                                   tr("Client error %u while processing input data"), pStatusData->u32Status);
                                     break;
-                            }                                                           
+                            }
                         }
                         else