Changeset 58329 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Oct 20, 2015 10:05:12 AM (9 years ago)

Author:

vboxsync

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

103528

Message:

DnD: Updates/bugfixes:

• Added separate VBOXDNDDISCONNECTMSG message for letting Main know about client disconnects.
• Various cleanups and bugfixes.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (19 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

@@ -131 +131 @@
         Msg.u.v1.uAllActions.SetUInt32(0);
         Msg.u.v1.pvFormats.SetPtr(pszFormats, cbFormats);
-        Msg.u.v1.cFormats.SetUInt32(0);
+        Msg.u.v1.cbFormats.SetUInt32(0);
     }
     else
@@ -144 +144 @@
         Msg.u.v3.uAllActions.SetUInt32(0);
         Msg.u.v3.pvFormats.SetPtr(pszFormats, cbFormats);
-        Msg.u.v3.cFormats.SetUInt32(0);
+        Msg.u.v3.cbFormats.SetUInt32(0);
     }
 
@@ -160 +160 @@
                 rc = Msg.u.v1.uDefAction.GetUInt32(puDefAction);   AssertRC(rc);
                 rc = Msg.u.v1.uAllActions.GetUInt32(puAllActions); AssertRC(rc);
-                rc = Msg.u.v1.cFormats.GetUInt32(pcbFormatsRecv);  AssertRC(rc);
+                rc = Msg.u.v1.cbFormats.GetUInt32(pcbFormatsRecv); AssertRC(rc);
             }
             else
@@ -170 +170 @@
                 rc = Msg.u.v3.uDefAction.GetUInt32(puDefAction);   AssertRC(rc);
                 rc = Msg.u.v3.uAllActions.GetUInt32(puAllActions); AssertRC(rc);
-                rc = Msg.u.v3.cFormats.GetUInt32(pcbFormatsRecv);  AssertRC(rc);
+                rc = Msg.u.v3.cbFormats.GetUInt32(pcbFormatsRecv); AssertRC(rc);
             }
 
@@ -447 +447 @@
 }
 
-static int vbglR3DnDHGRecvURIData(PVBGLR3GUESTDNDCMDCTX pCtx, DnDDroppedFiles *pDroppedFiles)
+static int vbglR3DnDHGRecvURIData(PVBGLR3GUESTDNDCMDCTX pCtx, PVBOXDNDSNDDATAHDR pDataHdr, DnDDroppedFiles *pDroppedFiles)
 {
     AssertPtrReturn(pCtx,          VERR_INVALID_POINTER);
+    AssertPtrReturn(pDataHdr,      VERR_INVALID_POINTER);
     AssertPtrReturn(pDroppedFiles, VERR_INVALID_POINTER);
+
+    /* Only count the raw data minus the already received meta data. */
+    Assert(pDataHdr->cbTotal >= pDataHdr->cbMeta);
+    uint64_t cbToRecvBytes = pDataHdr->cbTotal - pDataHdr->cbMeta;
+    uint64_t cToRecvObjs   = pDataHdr->cObjects;
+
+    LogFlowFunc(("cbToRecvBytes=%RU64, cToRecvObjs=%RU64, (cbTotal=%RU64, cbMeta=%RU32)\n",
+                 cbToRecvBytes, cToRecvObjs, pDataHdr->cbTotal, pDataHdr->cbMeta));
+
+    /*
+     * Only do accounting for protocol v3 and up.
+     * The older protocols did not have any data accounting available, so
+     * we simply tried to receive as much data as available and bail out.
+     */
+    const bool fDoAccounting = pCtx->uProtocol >= 3;
+
+    /* Anything to do at all? */
+    if (fDoAccounting)
+    {
+        if (   !cbToRecvBytes
+            && !cToRecvObjs)
+        {
+            return VINF_SUCCESS;
+        }
+    }
 
     /*
@@ -484 +510 @@
     char szPathName[RTPATH_MAX] = { 0 };
     uint32_t cbPathName = 0;
-    uint32_t fFlags = 0;
-    uint32_t fMode = 0;
-
-    while (RT_SUCCESS(rc))
-    {
+    uint32_t fFlags     = 0;
+    uint32_t fMode      = 0;
+
+    /*
+     * Only wait for new incoming commands for protocol v3 and up.
+     * The older protocols did not have any data accounting available, so
+     * we simply tried to receive as much data as available and bail out.
+     */
+    const bool fWait = pCtx->uProtocol >= 3;
+
+    do
+    {
+        LogFlowFunc(("Wating for new message ...\n"));
+
         uint32_t uNextMsg;
         uint32_t cNextParms;
-        rc = vbglR3DnDGetNextMsgType(pCtx, &uNextMsg, &cNextParms, false /* fWait */);
+        rc = vbglR3DnDGetNextMsgType(pCtx, &uNextMsg, &cNextParms, fWait);
         if (RT_SUCCESS(rc))
         {
@@ -519 +554 @@
                         if (RT_SUCCESS(rc))
                             rc = pDroppedFiles->AddDir(pszPathAbs);
+
+                        if (   RT_SUCCESS(rc)
+                            && fDoAccounting)
+                        {
+                            Assert(cToRecvObjs);
+                            cToRecvObjs--;
+                        }
 
                         RTStrFree(pszPathAbs);
@@ -623 +665 @@
                                 /* Data transfer complete? Close the file. */
                                 fClose = objFile.IsComplete();
+                                if (   fClose
+                                    && fDoAccounting)
+                                {
+                                    Assert(cToRecvObjs);
+                                    cToRecvObjs--;
+                                }
 
                                 /* Only since protocol v2 we know the file size upfront. */
@@ -631 +679 @@
 
                             cbFileWritten += cbChunkWritten;
+
+                            if (pCtx->uProtocol >= 3)
+                            {
+                                Assert(cbToRecvBytes >= cbChunkRead);
+                                cbToRecvBytes -= cbChunkRead;
+                            }
                         }
 
@@ -660 +714 @@
             break;
 
-    } /* while */
+        if (fDoAccounting)
+        {
+            LogFlowFunc(("cbToRecvBytes=%RU64, cToRecvObjs=%RU64\n", cbToRecvBytes, cToRecvObjs));
+            if (   !cbToRecvBytes
+                && !cToRecvObjs)
+            {
+                break;
+            }
+        }
+
+    } while (RT_SUCCESS(rc));
 
     LogFlowFunc(("Loop ended with %Rrc\n", rc));
@@ -723 +787 @@
         uint32_t cbDataRecv;
 
-        if (pCtx->uProtocol < 3) /* For VBox < 5.0.8. */
+        if (pCtx->uProtocol < 3)
         {
             Msg.hdr.cParms  = 5;
@@ -901 +965 @@
     uint32_t cbDataRecv;
 
-    if (pCtx->uProtocol < 3) /* For VBox < 5.0.8. */
+    LogFlowFuncEnter();
+
+    if (pCtx->uProtocol < 3)
     {
         uint64_t cbDataTmp = pCtx->cbMaxChunkSize;
@@ -979 +1045 @@
             RTMemFree(pvDataTmp);
     }
-    else /* Protocol v3 and up. Since VBox 5.0.8. */
+    else /* Protocol v3 and up. */
     {
         rc = vbglR3DnDHGRecvDataHdr(pCtx, pDataHdr);
         if (RT_SUCCESS(rc))
         {
-            LogFlowFunc(("cbMeta=%RU32\n", pDataHdr->cbMeta));
+            LogFlowFunc(("cbTotal=%RU64, cbMeta=%RU32\n", pDataHdr->cbTotal, pDataHdr->cbMeta));
             if (pDataHdr->cbMeta)
             {
@@ -1086 +1152 @@
             rc = lstURI.RootFromURIData(pvData, cbData, 0 /* fFlags */);
             if (RT_SUCCESS(rc))
-                rc = vbglR3DnDHGRecvURIData(pCtx, &droppedFiles);
+                rc = vbglR3DnDHGRecvURIData(pCtx, &dataHdr, &droppedFiles);
 
             if (RT_SUCCESS(rc)) /** @todo Remove this block as soon as we hand in DnDURIList. */
@@ -1506 +1572 @@
     Msg.hdr.u32Function = GUEST_DND_HG_ACK_OP;
 
+    LogFlowFunc(("uProto=%RU32\n", pCtx->uProtocol));
+
     if (pCtx->uProtocol < 3)
     {
@@ -1660 +1728 @@
 
     /* For protocol v3 and up we need to send the data header first. */
-    if (pCtx->uProtocol > 2)
+    if (pCtx->uProtocol >= 3)
     {
         AssertPtrReturn(pDataHdr, VERR_INVALID_POINTER);
@@ -1675 +1743 @@
         Msg.uScreenId.SetUInt32(0);                          /** @todo Not used for guest->host (yet). */
         Msg.cbTotal.SetUInt64(pDataHdr->cbTotal);
-        Msg.cbMeta.SetUInt64(pDataHdr->cbMeta);
+        Msg.cbMeta.SetUInt32(pDataHdr->cbMeta);
         Msg.pvMetaFmt.SetPtr(pDataHdr->pvMetaFmt, pDataHdr->cbMetaFmt);
         Msg.cbMetaFmt.SetUInt32(pDataHdr->cbMetaFmt);
@@ -1700 +1768 @@
         Msg.hdr.u32Function = GUEST_DND_GH_SND_DATA;
 
-        if (pCtx->uProtocol > 2)
+        if (pCtx->uProtocol >= 3)
         {
             Msg.hdr.cParms = 5;
@@ -1721 +1789 @@
         uint32_t       cbSent     = 0;
 
-        HGCMFunctionParameter *pParm = (pCtx->uProtocol > 2)
+        HGCMFunctionParameter *pParm = (pCtx->uProtocol >= 3)
                                      ? &Msg.u.v3.pvData
                                      : &Msg.u.v1.pvData;