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

Timestamp:

Jan 30, 2012 12:41:49 PM (13 years ago)

Author:

vboxsync

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

75975

Message:

GuestCtrl/Main: Fixed another typo (return value), fixed handling of 0-byte files from host.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestCtrlImplDir.cpp (modified) (2 diffs)
• GuestCtrlImplTasks.cpp (modified) (3 diffs)

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

@@ -250 +250 @@
                 break;
 
-            case VERR_FILE_NOT_FOUND:
+            case VERR_PATH_NOT_FOUND:
                 *aExists = FALSE;
                 break;
@@ -497 +497 @@
                 const char *pszFsType = stdOut[0].GetString("ftype");
                 if (!pszFsType) /* Attribute missing? */
-                     rc = VERR_NOT_FOUND;
+                     rc = VERR_PATH_NOT_FOUND;
                 if (   RT_SUCCESS(rc)
                     && strcmp(pszFsType, "d")) /* Directory? */
                 {
-                     rc = VERR_FILE_NOT_FOUND;
+                     rc = VERR_PATH_NOT_FOUND;
                      /* This is not critical for Main, so don't set hr --
                       * we will take care of rc then. */

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

@@ -263 +263 @@
                         BOOL fCompleted = FALSE;
                         BOOL fCanceled = FALSE;
-
-                        size_t cbToRead = cbSize;
                         uint64_t cbTransferedTotal = 0;
-
-                        size_t cbRead;
 
                         SafeArray<BYTE> aInputData(_64K);
@@ -273 +269 @@
                                && !fCompleted)
                         {
-                            /** @todo Not very efficient, but works for now. */
-                            vrc = RTFileSeek(fileSource, cbTransferedTotal,
-                                             RTFILE_SEEK_BEGIN, NULL /* poffActual */);
-                            if (RT_SUCCESS(vrc))
-                            {
-                                vrc = RTFileRead(fileSource, (uint8_t*)aInputData.raw(),
-                                                 RT_MIN(cbToRead, _64K), &cbRead);
-                                /*
-                                 * Some other error occured? There might be a chance that RTFileRead
-                                 * could not resolve/map the native error code to an IPRT code, so just
-                                 * print a generic error.
-                                 */
-                                if (RT_FAILURE(vrc))
+                            size_t cbToRead = cbSize;
+                            size_t cbRead = 0;
+                            if (cbSize) /* If we have nothing to read, take a shortcut. */
+                            {
+                                /** @todo Not very efficient, but works for now. */
+                                vrc = RTFileSeek(fileSource, cbTransferedTotal,
+                                                 RTFILE_SEEK_BEGIN, NULL /* poffActual */);
+                                if (RT_SUCCESS(vrc))
+                                {
+                                    vrc = RTFileRead(fileSource, (uint8_t*)aInputData.raw(),
+                                                     RT_MIN(cbToRead, _64K), &cbRead);
+                                    /*
+                                     * Some other error occured? There might be a chance that RTFileRead
+                                     * could not resolve/map the native error code to an IPRT code, so just
+                                     * print a generic error.
+                                     */
+                                    if (RT_FAILURE(vrc))
+                                    {
+                                        rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->pProgress,
+                                                                             Guest::tr("Could not read from file \"%s\" (%Rrc)"),
+                                                                             aTask->strSource.c_str(), vrc);
+                                        break;
+                                    }
+                                }
+                                else
                                 {
                                     rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->pProgress,
-                                                                         Guest::tr("Could not read from file \"%s\" (%Rrc)"),
-                                                                         aTask->strSource.c_str(), vrc);
+                                                                         Guest::tr("Seeking file \"%s\" failed; offset = %RU64 (%Rrc)"),
+                                                                         aTask->strSource.c_str(), cbTransferedTotal, vrc);
                                     break;
                                 }
-                            }
-                            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.
@@ -317 +318 @@
                             }
 
-                            ULONG uBytesWritten;
+                            ULONG uBytesWritten = 0;
                             rc = pGuest->SetProcessInput(uPID, uFlags,
                                                          0 /* Infinite timeout */,