Changeset 94914 in vbox

Timestamp:

May 8, 2022 7:18:06 PM (3 years ago)

Author:

vboxsync

Message:

Main/src-client/GuestDnDTargetImpl.cpp: Adjust to the new rules wrt. to rc -> hrc,vrc usage, ​bugref:10223

File:

• trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp (modified) (55 diffs)

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

@@ -94 +94 @@
 
         AutoCaller autoCaller(pThis);
-        if (FAILED(autoCaller.rc()))
+        if (autoCaller.isNotOk())
             return;
 
@@ -194 +194 @@
 
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+    if (autoCaller.isNotOk()) return autoCaller.rc();
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -211 +211 @@
 
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+    if (autoCaller.isNotOk()) return autoCaller.rc();
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -228 +228 @@
 
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+    if (autoCaller.isNotOk()) return autoCaller.rc();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -243 +243 @@
 
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+    if (autoCaller.isNotOk()) return autoCaller.rc();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -273 +273 @@
 
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+    if (autoCaller.isNotOk()) return autoCaller.rc();
 
     /* Default action is ignoring. */
@@ -308 +308 @@
     Assert(m_lstFmtOffered.size());
 
-    HRESULT hr = S_OK;
+    HRESULT hrc = S_OK;
 
     /* Adjust the coordinates in a multi-monitor setup. */
-    int rc = GuestDnDInst()->adjustScreenCoordinates(aScreenId, &aX, &aY);
-    if (RT_SUCCESS(rc))
+    int vrc = GuestDnDInst()->adjustScreenCoordinates(aScreenId, &aX, &aY);
+    if (RT_SUCCESS(vrc))
     {
         GuestDnDMsg Msg;
@@ -326 +326 @@
         Msg.appendUInt32(cbFormats);
 
-        rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
-        if (RT_SUCCESS(rc))
+        vrc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+        if (RT_SUCCESS(vrc))
         {
             if (RT_SUCCESS(m_pState->waitForGuestResponse()))
@@ -334 +334 @@
     }
 
-    if (RT_FAILURE(rc))
-        hr = VBOX_E_IPRT_ERROR;
-
-    if (SUCCEEDED(hr))
+    if (RT_FAILURE(vrc))
+        hrc = VBOX_E_IPRT_ERROR;
+
+    if (SUCCEEDED(hrc))
     {
         if (aResultAction)
@@ -343 +343 @@
     }
 
-    LogFlowFunc(("hr=%Rhrc, resAction=%ld\n", hr, resAction));
-    return hr;
+    LogFlowFunc(("hrc=%Rhrc, resAction=%ld\n", hrc, resAction));
+    return hrc;
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 }
@@ -361 +361 @@
 
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+    if (autoCaller.isNotOk()) return autoCaller.rc();
 
     /* Default action is ignoring. */
@@ -386 +386 @@
     const uint32_t cbFormats = (uint32_t)strFormats.length() + 1; /* Include terminating zero. */
 
-    HRESULT hr = S_OK;
-
-    int rc = GuestDnDInst()->adjustScreenCoordinates(aScreenId, &aX, &aY);
-    if (RT_SUCCESS(rc))
+    HRESULT hrc = S_OK;
+
+    int vrc = GuestDnDInst()->adjustScreenCoordinates(aScreenId, &aX, &aY);
+    if (RT_SUCCESS(vrc))
     {
         GuestDnDMsg Msg;
@@ -403 +403 @@
         Msg.appendUInt32(cbFormats);
 
-        rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
-        if (RT_SUCCESS(rc))
+        vrc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+        if (RT_SUCCESS(vrc))
         {
             GuestDnDState *pState = GuestDnDInst()->getState();
@@ -412 +412 @@
     }
 
-    if (RT_FAILURE(rc))
-        hr = VBOX_E_IPRT_ERROR;
-
-    if (SUCCEEDED(hr))
+    if (RT_FAILURE(vrc))
+        hrc = VBOX_E_IPRT_ERROR;
+
+    if (SUCCEEDED(hrc))
     {
         if (aResultAction)
@@ -421 +421 @@
     }
 
-    LogFlowFunc(("hr=%Rhrc, *pResultAction=%ld\n", hr, resAction));
-    return hr;
+    LogFlowFunc(("hrc=%Rhrc, *pResultAction=%ld\n", hrc, resAction));
+    return hrc;
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 }
@@ -434 +434 @@
 
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    HRESULT hr = S_OK;
+    if (autoCaller.isNotOk()) return autoCaller.rc();
+
+    HRESULT hrc = S_OK;
 
     GuestDnDMsg Msg;
@@ -443 +443 @@
         Msg.appendUInt32(0); /** @todo ContextID not used yet. */
 
-    int rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
-    if (RT_SUCCESS(rc))
+    int vrc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+    if (RT_SUCCESS(vrc))
     {
         GuestDnDState *pState = GuestDnDInst()->getState();
@@ -451 +451 @@
     }
 
-    if (RT_FAILURE(rc))
-        hr = VBOX_E_IPRT_ERROR;
-
-    LogFlowFunc(("hr=%Rhrc\n", hr));
-    return hr;
+    if (RT_FAILURE(vrc))
+        hrc = VBOX_E_IPRT_ERROR;
+
+    LogFlowFunc(("hrc=%Rhrc\n", hrc));
+    return hrc;
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 }
@@ -793 +793 @@
      *
      ** @todo Support more than one format; add a format<->function handler concept. Later. */
-    int rc;
+    int vrc;
     const bool fHasURIList = std::find(m_lstFmtOffered.begin(),
                                        m_lstFmtOffered.end(), "text/uri-list") != m_lstFmtOffered.end();
     if (fHasURIList)
     {
-        rc = i_sendTransferData(pCtx, msTimeout);
+        vrc = i_sendTransferData(pCtx, msTimeout);
     }
     else
     {
-        rc = i_sendRawData(pCtx, msTimeout);
-    }
-
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("DnD: Sending data to guest failed with %Rrc\n", rc));
+        vrc = i_sendRawData(pCtx, msTimeout);
+    }
+
+    if (RT_FAILURE(vrc))
+    {
+        LogRel(("DnD: Sending data to guest failed with %Rrc\n", vrc));
         sendCancel();
     }
@@ -814 +814 @@
     i_reset();
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -831 +831 @@
     size_t   cbData = pCtx->Meta.cbData;
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     const size_t  cbFmt   = pCtx->Meta.strFmt.length() + 1; /* Include terminator. */
@@ -873 +873 @@
         }
 
-        rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
-        if (RT_FAILURE(rc))
+        vrc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+        if (RT_FAILURE(vrc))
             break;
 
@@ -882 +882 @@
     }
 
-    if (RT_SUCCESS(rc))
-    {
-        rc = updateProgress(pCtx, pCtx->pState, (uint32_t)pCtx->Meta.cbData);
-        AssertRC(rc);
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = updateProgress(pCtx, pCtx->pState, (uint32_t)pCtx->Meta.cbData);
+        AssertRC(vrc);
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -924 +924 @@
     Msg.appendUInt32(0);                                                /** @todo cbChecksum; not used yet. */
 
-    int rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    int vrc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -980 +980 @@
     AssertPtrReturn(pcszDstPath, VERR_INVALID_POINTER);
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     if (!DnDTransferObjectIsOpen(pObj))
@@ -986 +986 @@
         LogRel2(("DnD: Opening host file '%s' for transferring to guest\n", pcszSrcPath));
 
-        rc = DnDTransferObjectOpen(pObj, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, 0 /* fMode */,
-                                   DNDTRANSFEROBJECT_FLAGS_NONE);
-        if (RT_FAILURE(rc))
-            LogRel(("DnD: Opening host file '%s' failed, rc=%Rrc\n", pcszSrcPath, rc));
-    }
-
-    if (RT_FAILURE(rc))
-        return rc;
+        vrc = DnDTransferObjectOpen(pObj, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, 0 /* fMode */,
+                                    DNDTRANSFEROBJECT_FLAGS_NONE);
+        if (RT_FAILURE(vrc))
+            LogRel(("DnD: Opening host file '%s' failed, rc=%Rrc\n", pcszSrcPath, vrc));
+    }
+
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     bool fSendData = false;
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc)) /** @todo r=aeichner Could save an identation level here as there is a error check above already... */
     {
         if (m_pState->m_uProtocolVersion >= 2)
@@ -1040 +1040 @@
     }
 
-    if (   RT_SUCCESS(rc)
+    if (   RT_SUCCESS(vrc)
         && fSendData)
     {
-        rc = i_sendFileData(pCtx, pObj, pMsg);
-    }
-
-    if (RT_FAILURE(rc))
-        LogRel(("DnD: Sending host file '%s' to guest failed, rc=%Rrc\n", pcszSrcPath, rc));
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+        vrc = i_sendFileData(pCtx, pObj, pMsg);
+    }
+
+    if (RT_FAILURE(vrc))
+        LogRel(("DnD: Sending host file '%s' to guest failed, rc=%Rrc\n", pcszSrcPath, vrc));
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1099 +1099 @@
     uint32_t cbRead;
 
-    int rc = DnDTransferObjectRead(pObj, pvBuf, cbBuf, &cbRead);
-    if (RT_SUCCESS(rc))
+    int vrc = DnDTransferObjectRead(pObj, pvBuf, cbBuf, &cbRead);
+    if (RT_SUCCESS(vrc))
     {
         LogFlowFunc(("cbBufe=%zu, cbRead=%RU32\n", cbBuf, cbRead));
@@ -1123 +1123 @@
         }
 
-        int rc2 = updateProgress(pCtx, pCtx->pState, (uint32_t)cbRead);
-        AssertRC(rc2);
+        int vrc2 = updateProgress(pCtx, pCtx->pState, (uint32_t)cbRead);
+        AssertRC(vrc2);
 
         /* DnDTransferObjectRead() will return VINF_EOF if reading is complete. */
-        if (rc == VINF_EOF)
-            rc = VINF_SUCCESS;
+        if (vrc == VINF_EOF)
+            vrc = VINF_SUCCESS;
 
         if (DnDTransferObjectIsComplete(pObj)) /* Done reading? */
@@ -1134 +1134 @@
     }
     else
-        LogRel(("DnD: Reading from host file '%s' failed, rc=%Rrc\n", pcszSrcPath, rc));
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+        LogRel(("DnD: Reading from host file '%s' failed, vrc=%Rrc\n", pcszSrcPath, vrc));
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1163 +1163 @@
     LogFlowFunc(("pThis=%p, pList=%p, uMsg=%RU32\n", pThis, pList, uMsg));
 
-    int  rc      = VINF_SUCCESS;
-    int  rcGuest = VINF_SUCCESS; /* Contains error code from guest in case of VERR_GSTDND_GUEST_ERROR. */
-    bool fNotify = false;
+    int  vrc      = VINF_SUCCESS;
+    int  vrcGuest = VINF_SUCCESS; /* Contains error code from guest in case of VERR_GSTDND_GUEST_ERROR. */
+    bool fNotify  = false;
 
     switch (uMsg)
@@ -1174 +1174 @@
 
         case GUEST_DND_FN_DISCONNECT:
-            rc = VERR_CANCELLED;
+            vrc = VERR_CANCELLED;
             break;
 
@@ -1188 +1188 @@
                 GuestDnDMsg *pMsg = new GuestDnDMsg();
 
-                rc = pThis->i_sendTransferListObject(pCtx, pList, pMsg);
-                if (rc == VINF_EOF) /* Transfer complete? */
+                vrc = pThis->i_sendTransferListObject(pCtx, pList, pMsg);
+                if (vrc == VINF_EOF) /* Transfer complete? */
                 {
                     LogFlowFunc(("Last transfer item processed, bailing out\n"));
                 }
-                else if (RT_SUCCESS(rc))
+                else if (RT_SUCCESS(vrc))
                 {
-                    rc = pThis->msgQueueAdd(pMsg);
-                    if (RT_SUCCESS(rc)) /* Return message type & required parameter count to the guest. */
+                    vrc = pThis->msgQueueAdd(pMsg);
+                    if (RT_SUCCESS(vrc)) /* Return message type & required parameter count to the guest. */
                     {
                         LogFlowFunc(("GUEST_DND_FN_GET_NEXT_HOST_MSG -> %RU32 (%RU32 params)\n", pMsg->getType(), pMsg->getCount()));
@@ -1204 +1204 @@
                 }
 
-                if (   RT_FAILURE(rc)
-                    || rc == VINF_EOF) /* Transfer complete? */
+                if (   RT_FAILURE(vrc)
+                    || vrc == VINF_EOF) /* Transfer complete? */
                 {
                     delete pMsg;
@@ -1213 +1213 @@
             catch(std::bad_alloc & /*e*/)
             {
-                rc = VERR_NO_MEMORY;
+                vrc = VERR_NO_MEMORY;
             }
             break;
@@ -1232 +1232 @@
             }
 
-            rc = pCtx->pState->setProgress(100, DND_PROGRESS_ERROR, pCBData->rc,
-                                           GuestDnDTarget::i_guestErrorToString(pCBData->rc));
-            if (RT_SUCCESS(rc))
+            vrc = pCtx->pState->setProgress(100, DND_PROGRESS_ERROR, pCBData->rc,
+                                            GuestDnDTarget::i_guestErrorToString(pCBData->rc));
+            if (RT_SUCCESS(vrc))
             {
-                rc      = VERR_GSTDND_GUEST_ERROR;
-                rcGuest = pCBData->rc;
+                vrc      = VERR_GSTDND_GUEST_ERROR;
+                vrcGuest = pCBData->rc;
             }
             break;
@@ -1270 +1270 @@
                     pThis->msgQueueClear();
 
-                    rc = VERR_INVALID_PARAMETER;
+                    vrc = VERR_INVALID_PARAMETER;
                 }
 
-                if (RT_SUCCESS(rc))
+                if (RT_SUCCESS(vrc))
                 {
                     LogFlowFunc(("Returning uMsg=%RU32\n", uMsg));
-                    rc = HGCM::Message::CopyParms(pCBData->paParms, pCBData->cParms, pMsg->getParms(), pMsg->getCount(),
-                                                  false /* fDeepCopy */);
-                    if (RT_SUCCESS(rc))
+                    vrc = HGCM::Message::CopyParms(pCBData->paParms, pCBData->cParms, pMsg->getParms(), pMsg->getCount(),
+                                                   false /* fDeepCopy */);
+                    if (RT_SUCCESS(vrc))
                     {
                         pCBData->cParms = pMsg->getCount();
@@ -1284 +1284 @@
                     }
                     else
-                        LogFlowFunc(("Copying parameters failed with rc=%Rrc\n", rc));
+                        LogFlowFunc(("Copying parameters failed with vrc=%Rrc\n", vrc));
                 }
             }
             else
-                rc = VERR_NO_DATA;
-
-            LogFlowFunc(("Processing next message ended with rc=%Rrc\n", rc));
+                vrc = VERR_NO_DATA;
+
+            LogFlowFunc(("Processing next message ended with vrc=%Rrc\n", vrc));
             break;
         }
         default:
-            rc = VERR_NOT_SUPPORTED;
-            break;
-    }
-
-    int rcToGuest = VINF_SUCCESS; /* Status which will be sent back to the guest. */
+            vrc = VERR_NOT_SUPPORTED;
+            break;
+    }
+
+    int vrcToGuest = VINF_SUCCESS; /* Status which will be sent back to the guest. */
 
     /*
      * Resolve errors.
      */
-    switch (rc)
+    switch (vrc)
     {
         case VINF_SUCCESS:
@@ -1316 +1316 @@
 
             /* The guest expects VERR_NO_DATA if the transfer is complete. */
-            rcToGuest = VERR_NO_DATA;
+            vrcToGuest = VERR_NO_DATA;
             break;
         }
@@ -1322 +1322 @@
         case VERR_GSTDND_GUEST_ERROR:
         {
-            LogRel(("DnD: Guest reported error %Rrc, aborting transfer to guest\n", rcGuest));
+            LogRel(("DnD: Guest reported error %Rrc, aborting transfer to guest\n", vrcGuest));
             break;
         }
@@ -1329 +1329 @@
         {
             LogRel2(("DnD: Transfer to guest canceled\n"));
-            rcToGuest = VERR_CANCELLED; /* Also cancel on guest side. */
+            vrcToGuest = VERR_CANCELLED; /* Also cancel on guest side. */
             break;
         }
@@ -1335 +1335 @@
         default:
         {
-            LogRel(("DnD: Host error %Rrc occurred, aborting transfer to guest\n", rc));
-            rcToGuest = VERR_CANCELLED; /* Also cancel on guest side. */
-            break;
-        }
-    }
-
-    if (RT_FAILURE(rc))
+            LogRel(("DnD: Host error %Rrc occurred, aborting transfer to guest\n", vrc));
+            vrcToGuest = VERR_CANCELLED; /* Also cancel on guest side. */
+            break;
+        }
+    }
+
+    if (RT_FAILURE(vrc))
     {
         /* Unregister this callback. */
         AssertPtr(pCtx->pState);
-        int rc2 = pCtx->pState->setCallback(uMsg, NULL /* PFNGUESTDNDCALLBACK */);
-        AssertRC(rc2);
+        int vrc2 = pCtx->pState->setCallback(uMsg, NULL /* PFNGUESTDNDCALLBACK */);
+        AssertRC(vrc2);
 
         /* Let the waiter(s) know. */
@@ -1352 +1352 @@
     }
 
-    LogFlowFunc(("fNotify=%RTbool, rc=%Rrc, rcToGuest=%Rrc\n", fNotify, rc, rcToGuest));
+    LogFlowFunc(("fNotify=%RTbool, vrc=%Rrc, vrcToGuest=%Rrc\n", fNotify, vrc, vrcToGuest));
 
     if (fNotify)
     {
-        int rc2 = pCtx->EventCallback.Notify(rc); /** @todo Also pass guest error back? */
-        AssertRC(rc2);
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rcToGuest; /* Tell the guest. */
+        int vrc2 = pCtx->EventCallback.Notify(vrc); /** @todo Also pass guest error back? */
+        AssertRC(vrc2);
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrcToGuest; /* Tell the guest. */
 }
 
@@ -1376 +1376 @@
     AssertPtr(pCtx->pState);
 
-#define REGISTER_CALLBACK(x)                                                 \
-    do {                                                                     \
-        rc = pCtx->pState->setCallback(x, i_sendTransferDataCallback, pCtx); \
-        if (RT_FAILURE(rc))                                                  \
-            return rc;                                                       \
+#define REGISTER_CALLBACK(x)                                                  \
+    do {                                                                      \
+        vrc = pCtx->pState->setCallback(x, i_sendTransferDataCallback, pCtx); \
+        if (RT_FAILURE(vrc))                                                  \
+            return vrc;                                                       \
     } while (0)
 
 #define UNREGISTER_CALLBACK(x)                        \
     do {                                              \
-        int rc2 = pCtx->pState->setCallback(x, NULL); \
-        AssertRC(rc2);                                \
+        int vrc2 = pCtx->pState->setCallback(x, NULL); \
+        AssertRC(vrc2);                                \
     } while (0)
 
-    int rc = pCtx->Transfer.init(mData.mcbBlockSize);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    rc = pCtx->EventCallback.Reset();
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = pCtx->Transfer.init(mData.mcbBlockSize);
+    if (RT_FAILURE(vrc))
+        return vrc;
+
+    vrc = pCtx->EventCallback.Reset();
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     /*
@@ -1416 +1416 @@
          * Extract transfer list from current meta data.
          */
-        rc = DnDTransferListAppendPathsFromBuffer(&pCtx->Transfer.List, DNDTRANSFERLISTFMT_URI,
-                                                  (const char *)pCtx->Meta.pvData, pCtx->Meta.cbData, DND_PATH_SEPARATOR_STR,
-                                                  DNDTRANSFERLIST_FLAGS_RECURSIVE);
-        if (RT_FAILURE(rc))
+        vrc = DnDTransferListAppendPathsFromBuffer(&pCtx->Transfer.List, DNDTRANSFERLISTFMT_URI,
+                                                   (const char *)pCtx->Meta.pvData, pCtx->Meta.cbData, DND_PATH_SEPARATOR_STR,
+                                                   DNDTRANSFERLIST_FLAGS_RECURSIVE);
+        if (RT_FAILURE(vrc))
             break;
 
@@ -1428 +1428 @@
         /* cbExtra can be 0, if all files are of 0 bytes size. */
         pCtx->Transfer.cObjToProcess = DnDTransferListObjCount(&pCtx->Transfer.List);
-        AssertBreakStmt(pCtx->Transfer.cObjToProcess, rc = VERR_INVALID_PARAMETER);
+        AssertBreakStmt(pCtx->Transfer.cObjToProcess, vrc = VERR_INVALID_PARAMETER);
 
         /* Update the meta data to have the current root transfer entries in the right shape. */
@@ -1442 +1442 @@
             size_t cbData;
 #ifdef DEBUG
-            rc = DnDTransferListGetRootsEx(&pCtx->Transfer.List, DNDTRANSFERLISTFMT_URI, "" /* pcszPathBase */,
-                                           "\n" /* pcszSeparator */, (char **)&pvData, &cbData);
-            AssertRCReturn(rc, rc);
+            vrc = DnDTransferListGetRootsEx(&pCtx->Transfer.List, DNDTRANSFERLISTFMT_URI, "" /* pcszPathBase */,
+                                            "\n" /* pcszSeparator */, (char **)&pvData, &cbData);
+            AssertRCReturn(vrc, vrc);
             LogFlowFunc(("URI data:\n%s", (char *)pvData));
             RTMemFree(pvData);
             cbData = 0;
 #endif
-            rc = DnDTransferListGetRoots(&pCtx->Transfer.List, DNDTRANSFERLISTFMT_URI,
-                                         (char **)&pvData, &cbData);
-            AssertRCReturn(rc, rc);
+            vrc = DnDTransferListGetRoots(&pCtx->Transfer.List, DNDTRANSFERLISTFMT_URI,
+                                          (char **)&pvData, &cbData);
+            AssertRCReturn(vrc, vrc);
 
             /* pCtx->Meta now owns the allocated data. */
@@ -1475 +1475 @@
          */
         if (m_pState->m_uProtocolVersion >= 3)
-            rc = i_sendMetaDataHeader(pCtx);
+            vrc = i_sendMetaDataHeader(pCtx);
 
         /*
          * Send the (meta) data body.
          */
-        if (RT_SUCCESS(rc))
-            rc = i_sendMetaDataBody(pCtx);
-
-        if (RT_SUCCESS(rc))
-        {
-            rc = waitForEvent(&pCtx->EventCallback, pCtx->pState, msTimeout);
-            if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
+            vrc = i_sendMetaDataBody(pCtx);
+
+        if (RT_SUCCESS(vrc))
+        {
+            vrc = waitForEvent(&pCtx->EventCallback, pCtx->pState, msTimeout);
+            if (RT_SUCCESS(vrc))
                 pCtx->pState->setProgress(100, DND_PROGRESS_COMPLETE, VINF_SUCCESS);
         }
@@ -1509 +1509 @@
 #undef UNREGISTER_CALLBACK
 
-    if (RT_FAILURE(rc))
-    {
-        if (rc == VERR_CANCELLED) /* Transfer was cancelled by the host. */
+    if (RT_FAILURE(vrc))
+    {
+        if (vrc == VERR_CANCELLED) /* Transfer was cancelled by the host. */
         {
             /*
@@ -1518 +1518 @@
              * host side never must depend on anything from the guest.
              */
-            int rc2 = sendCancel();
-            AssertRC(rc2);
+            int vrc2 = sendCancel();
+            AssertRC(vrc2);
 
             LogRel2(("DnD: Sending transfer data to guest cancelled by user\n"));
 
-            rc2 = pCtx->pState->setProgress(100, DND_PROGRESS_CANCELLED, VINF_SUCCESS);
-            AssertRC(rc2);
+            vrc2 = pCtx->pState->setProgress(100, DND_PROGRESS_CANCELLED, VINF_SUCCESS);
+            AssertRC(vrc2);
 
             /* Cancelling is not an error, just set success here. */
-            rc  = VINF_SUCCESS;
-        }
-        else if (rc != VERR_GSTDND_GUEST_ERROR) /* Guest-side error are already handled in the callback. */
-        {
-            LogRel(("DnD: Sending transfer data to guest failed with rc=%Rrc\n", rc));
-            int rc2 = pCtx->pState->setProgress(100, DND_PROGRESS_ERROR, rc,
-                                                GuestDnDTarget::i_hostErrorToString(rc));
-            AssertRC(rc2);
-        }
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+            vrc  = VINF_SUCCESS;
+        }
+        else if (vrc != VERR_GSTDND_GUEST_ERROR) /* Guest-side error are already handled in the callback. */
+        {
+            LogRel(("DnD: Sending transfer data to guest failed with vrc=%Rrc\n", vrc));
+            int vrc2 = pCtx->pState->setProgress(100, DND_PROGRESS_ERROR, vrc,
+                                                 GuestDnDTarget::i_hostErrorToString(vrc));
+            AssertRC(vrc2);
+        }
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1556 +1556 @@
     AssertPtrReturn(pMsg, VERR_INVALID_POINTER);
 
-    int rc = updateProgress(pCtx, pCtx->pState);
-    AssertRCReturn(rc, rc);
+    int vrc = updateProgress(pCtx, pCtx->pState);
+    AssertRCReturn(vrc, vrc);
 
     PDNDTRANSFEROBJECT pObj = DnDTransferListObjGetFirst(pList);
@@ -1566 +1566 @@
     {
         case DNDTRANSFEROBJTYPE_DIRECTORY:
-            rc = i_sendDirectory(pCtx, pObj, pMsg);
+            vrc = i_sendDirectory(pCtx, pObj, pMsg);
             break;
 
         case DNDTRANSFEROBJTYPE_FILE:
-            rc = i_sendFile(pCtx, pObj, pMsg);
+            vrc = i_sendFile(pCtx, pObj, pMsg);
             break;
 
         default:
-            AssertFailedStmt(rc = VERR_NOT_SUPPORTED);
-            break;
-    }
-
-    if (   RT_SUCCESS(rc)
+            AssertFailedStmt(vrc = VERR_NOT_SUPPORTED);
+            break;
+    }
+
+    if (   RT_SUCCESS(vrc)
         && DnDTransferObjectIsComplete(pObj))
     {
@@ -1590 +1590 @@
     }
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1612 +1612 @@
         return VINF_SUCCESS;
 
-    int rc = i_sendMetaDataHeader(pCtx);
-    if (RT_SUCCESS(rc))
-        rc = i_sendMetaDataBody(pCtx);
-
-    int rc2;
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("DnD: Sending raw data to guest failed with rc=%Rrc\n", rc));
-        rc2 = pCtx->pState->setProgress(100 /* Percent */, DND_PROGRESS_ERROR, rc,
-                                        GuestDnDTarget::i_hostErrorToString(rc));
+    int vrc = i_sendMetaDataHeader(pCtx);
+    if (RT_SUCCESS(vrc))
+        vrc = i_sendMetaDataBody(pCtx);
+
+    int vrc2;
+    if (RT_FAILURE(vrc))
+    {
+        LogRel(("DnD: Sending raw data to guest failed with vrc=%Rrc\n", vrc));
+        vrc2 = pCtx->pState->setProgress(100 /* Percent */, DND_PROGRESS_ERROR, vrc,
+                                         GuestDnDTarget::i_hostErrorToString(vrc));
     }
     else
-        rc2 = pCtx->pState->setProgress(100 /* Percent */, DND_PROGRESS_COMPLETE, rc);
-    AssertRC(rc2);
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+        vrc2 = pCtx->pState->setProgress(100 /* Percent */, DND_PROGRESS_COMPLETE, vrc);
+    AssertRC(vrc2);
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1646 +1646 @@
     LogRel2(("DnD: Sending cancelling request to the guest ...\n"));
 
-    int rc = GuestDnDBase::sendCancel();
+    int vrc = GuestDnDBase::sendCancel();
 
     if (aVeto)
         *aVeto = FALSE; /** @todo Implement vetoing. */
 
-    HRESULT hr = RT_SUCCESS(rc) ? S_OK : VBOX_E_IPRT_ERROR;
-
-    LogFlowFunc(("hr=%Rhrc\n", hr));
-    return hr;
+    HRESULT hrc = RT_SUCCESS(vrc) ? S_OK : VBOX_E_IPRT_ERROR;
+
+    LogFlowFunc(("hrc=%Rhrc\n", hrc));
+    return hrc;
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 }