Changeset 55459 in vbox for trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

Timestamp:

Apr 27, 2015 5:17:07 PM (10 years ago)

Author:

vboxsync

Message:

DnD: Bugfixes.

File:

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

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

@@ -530 +530 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    HRESULT hr;
+    HRESULT hr = S_OK;
     int vrc;
 
@@ -682 +682 @@
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
 
-    RTCString strPath = aFile.GetDestPath();
-    if (strPath.isEmpty())
+    RTCString strPathSrc = aFile.GetSourcePath();
+    if (strPathSrc.isEmpty())
         return VERR_INVALID_PARAMETER;
 
@@ -689 +689 @@
 
     LogFlowFunc(("Sending \"%s\" (%RU32 bytes buffer) using protocol v%RU32 ...\n",
-                 aFile.GetDestPath().c_str(), m_cbBlockSize, mData.mProtocolVersion));
+                 strPathSrc.c_str(), m_cbBlockSize, mData.mProtocolVersion));
+
+    bool fOpen = aFile.IsOpen();
+    if (!fOpen)
+    {
+        LogFlowFunc(("Opening \"%s\" ...\n", strPathSrc.c_str()));
+        rc = aFile.OpenEx(strPathSrc, DnDURIObject::File, DnDURIObject::Source,
+                          RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, 0 /* fFlags */);           
+    }
 
     bool fSendFileData = false;
-    if (mData.mProtocolVersion >= 2)
-    {
-        if (!aFile.IsOpen())
-        {
-            rc = aFile.OpenEx(aFile.GetSourcePath(), DnDURIObject::File, DnDURIObject::Source,
-                              RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, 0 /* fFlags */);
-            if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc)) 
+    {
+        if (mData.mProtocolVersion >= 2)
+        {
+            if (!fOpen) 
             {
                 /*
@@ -706 +712 @@
                  */
                 pMsg->setType(DragAndDropSvc::HOST_DND_HG_SND_FILE_HDR);
-                pMsg->setNextUInt32(0);                                /* context ID */
-                pMsg->setNextString(strPath.c_str());                  /* pvName */
-                pMsg->setNextUInt32((uint32_t)(strPath.length() + 1)); /* cbName */
-                pMsg->setNextUInt32(0);                                /* uFlags */
-                pMsg->setNextUInt32(aFile.GetMode());                  /* fMode */
-                pMsg->setNextUInt64(aFile.GetSize());                  /* uSize */
+                pMsg->setNextUInt32(0);                                            /* context ID */
+                rc = pMsg->setNextString(aFile.GetDestPath().c_str());             /* pvName */
+                AssertRC(rc);
+                pMsg->setNextUInt32((uint32_t)(aFile.GetDestPath().length() + 1)); /* cbName */
+                pMsg->setNextUInt32(0);                                            /* uFlags */
+                pMsg->setNextUInt32(aFile.GetMode());                              /* fMode */
+                pMsg->setNextUInt64(aFile.GetSize());                              /* uSize */
 
                 LogFlowFunc(("Sending file header ...\n"));
             }
-        }
-        else
-        {
-            /* File header was sent, so only send the actual file data. */
+            else
+            {
+                /* File header was sent, so only send the actual file data. */
+                fSendFileData = true;
+            }
+        }
+        else /* Protocol v1. */
+        {
+            /* Always send the file data, every time. */
             fSendFileData = true;
         }
-    }
-    else /* Protocol v1. */
-    {
-        /* Always send the file data, every time. */
-        fSendFileData = true;
     }
 
@@ -766 +773 @@
     if (mData.mProtocolVersion <= 1)
     {
-        pMsg->setNextUInt32(0);                                              /* context ID */
         pMsg->setNextString(aFile.GetSourcePath().c_str());                  /* pvName */
         pMsg->setNextUInt32((uint32_t)(aFile.GetSourcePath().length() + 1)); /* cbName */
+    }
+    else
+    {
+        /* Protocol version 2 also sends the context ID. Currently unused. */
+        pMsg->setNextUInt32(0);                                              /* context ID */
     }
 
@@ -869 +880 @@
             AssertReturn(DragAndDropSvc::CB_MAGIC_DND_HG_GET_NEXT_HOST_MSG_DATA == pCBData->hdr.u32Magic, VERR_INVALID_PARAMETER);
 
+            LogFlowFunc(("pCBData->uMsg=%RU32, paParms=%p, cParms=%RU32\n", pCBData->uMsg, pCBData->paParms, pCBData->cParms));
+
             GuestDnDMsg *pMsg = pThis->nextMsg();
             if (pMsg)
@@ -884 +897 @@
                 if (RT_SUCCESS(rc))
                 {
-                    LogFlowFunc(("Sending uMsg=%RU32, cParms=%RU32 ...\n", uMsg, pCBData->cParms));
+                    LogFlowFunc(("Returning uMsg=%RU32\n", uMsg));
                     rc = HGCM::Message::copyParms(pMsg->getCount(), pMsg->getParms(), pCBData->paParms);
                     if (RT_SUCCESS(rc))
@@ -891 +904 @@
                         pThis->removeNext();
                     }
+                    else
+                        LogFlowFunc(("Copying parameters failed with rc=%Rrc\n", rc));
                 }
             }
@@ -896 +911 @@
                 rc = VERR_NO_DATA;
 
-            LogFlowFunc(("Returning msg %RU32, rc=%Rrc\n", uMsg, rc));
+            LogFlowFunc(("Processing next message ended with rc=%Rrc\n", rc));
             break;
         }
@@ -992 +1007 @@
             break;
 
+        pCtx->mURI.cbProcessed = 0;
+        pCtx->mURI.cProcessed  = 0;
+        pCtx->mURI.cbToProcess = lstURI.TotalBytes();
+
         /*
          * The first message always is the meta info for the data. The meta
@@ -1044 +1063 @@
 #undef UNREGISTER_CALLBACK
 
+    /* Destroy temporary scratch buffer. */
     if (pvBuf)
         RTMemFree(pvBuf);
@@ -1055 +1075 @@
 int GuestDnDTarget::i_sendURIDataLoop(PSENDDATACTX pCtx, GuestDnDMsg *pMsg)
 {
-    AssertPtrReturn(pCtx,  VERR_INVALID_POINTER);
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
 
     DnDURIList &lstURI = pCtx->mURI.lstURI;
@@ -1061 +1081 @@
     int rc;
 
-    uint64_t cbTotal = pCtx->mURI.lstURI.TotalBytes();
+    uint64_t cbTotal = pCtx->mURI.cbToProcess;
     uint8_t uPercent = pCtx->mURI.cbProcessed * 100 / (cbTotal ? cbTotal : 1);
-    Assert(uPercent <= 100);
 
     LogFlowFunc(("%RU64 / %RU64 -- %RU8%%\n", pCtx->mURI.cbProcessed, cbTotal, uPercent));