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

Timestamp:

Apr 30, 2015 2:27:39 PM (10 years ago)

Author:

vboxsync

Message:

DnD: Rollback handling, bugfixes, cleanup.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDnDPrivate.cpp (modified) (2 diffs)
• GuestDnDSourceImpl.cpp (modified) (6 diffs)
• GuestDnDTargetImpl.cpp (modified) (1 diff)

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

@@ -317 +317 @@
                  uStatus, uPercentage, rcOp));
 
-    int vrc = VINF_SUCCESS;
+    int rc = VINF_SUCCESS;
     if (!m_progress.isNull())
     {
@@ -383 +383 @@
     }
 
-    LogFlowFuncLeaveRC(vrc);
-    return vrc;
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 

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

@@ -593 +593 @@
         if (RT_SUCCESS(rc))
         {
-            /** @todo Unescpae path before printing. */
-            LogRel2(("DnD: Transferring guest file to host: %s\n", pCtx->mURI.objURI.GetDestPath().c_str()));
-
             /* Note: Protocol v1 does not send any file sizes, so always 0. */
             if (mDataBase.mProtocolVersion >= 2)
                 rc = pCtx->mURI.objURI.SetSize(cbSize);
+
+            /** @todo Unescpae path before printing. */
+            LogRel2(("DnD: Transferring guest file to host: %s (%RU64 bytes, mode 0x%x)\n",
+                     pCtx->mURI.objURI.GetDestPath().c_str(), pCtx->mURI.objURI.GetSize(), pCtx->mURI.objURI.GetMode()));
+
+            /** @todo Set progress object title to current file being transferred? */
 
             if (!cbSize) /* 0-byte file? Close again. */
@@ -737 +740 @@
      * Reset any old data.
      */
-    pCtx->mData.vecData.clear();
-    pCtx->mData.cbToProcess = 0;
-    pCtx->mData.cbProcessed = 0;
-
-    pResp->reset();
-    pResp->resetProgress(m_pGuest);
+    pCtx->mData.Reset();
+    pCtx->mURI.Reset();
 
     /* Set the format we are going to retrieve to have it around
      * when retrieving the data later. */
+    pResp->reset();
     pResp->setFormat(pCtx->mFormat);
 
@@ -876 +876 @@
         return VERR_INVALID_POINTER;
 
-#define REGISTER_CALLBACK(x) \
+#define REGISTER_CALLBACK(x)                                    \
     rc = pResp->setCallback(x, i_receiveURIDataCallback, pCtx); \
-    if (RT_FAILURE(rc)) \
+    if (RT_FAILURE(rc))                                         \
         return rc;
 
-#define UNREGISTER_CALLBACK(x) \
-    rc = pResp->setCallback(x, NULL); \
-    AssertRC(rc);
+#define UNREGISTER_CALLBACK(x)                                  \
+    {                                                           \
+        int rc2 = pResp->setCallback(x, NULL);                  \
+        AssertRC(rc2);                                          \
+    }
 
     /*
@@ -927 +929 @@
             rc = pCtx->mCallback.Wait(msTimeout);
             LogFlowFunc(("URI callback done, rc=%Rrc\n", rc));
+            if (RT_SUCCESS(rc))
+            {
+                rc = pCtx->mCallback.Result();
+                LogFlowFunc(("Callback result is %Rrc\n", rc));
+            }
         }
 
@@ -946 +953 @@
     if (RT_FAILURE(rc))
     {
-        LogFlowFunc(("Rolling back ...\n"));
-
-        /* Rollback by removing any stuff created. */
-        for (size_t i = 0; i < pCtx->mURI.lstFiles.size(); ++i)
-            RTFileDelete(pCtx->mURI.lstFiles.at(i).c_str());
-        for (size_t i = 0; i < pCtx->mURI.lstDirs.size(); ++i)
-            RTDirRemove(pCtx->mURI.lstDirs.at(i).c_str());
-    }
-
-    /* Try removing (hopefully) empty drop directory in any case. */
-    if (pCtx->mURI.strDropDir.isNotEmpty())
-        RTDirRemove(pCtx->mURI.strDropDir.c_str());
+        int rc2 = pCtx->mURI.Rollback(); /** @todo Inform user on rollback failure? */
+        LogFlowFunc(("Rolling back ended with rc=%Rrc\n", rc2));
+    }
 
     LogFlowFuncLeaveRC(rc);
@@ -1121 +1119 @@
     }
 
-    LogFlowFunc(("cbProcessed=%RU64, cbToProcess=%RU64, fNotify=%RTbool\n",
-                 pCtx->mData.cbProcessed, pCtx->mData.cbToProcess, fNotify));
+    LogFlowFunc(("cbProcessed=%RU64, cbToProcess=%RU64, fNotify=%RTbool, rc=%Rrc\n",
+                 pCtx->mData.cbProcessed, pCtx->mData.cbToProcess, fNotify, rc));
 
     if (fNotify)

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

@@ -737 +737 @@
                 LogRel2(("DnD: Transferring host file to guest: %s (%RU64 bytes, mode 0x%x)\n",
                          strPathSrc.c_str(), aFile.GetSize(), aFile.GetMode()));
+
+                /** @todo Set progress object title to current file being transferred? */
             }
             else