Changeset 81259 in vbox

Timestamp:

Oct 14, 2019 1:18:28 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Bugfixes.

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard-win.h (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp (modified) (6 diffs)
• src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (6 diffs)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (2 diffs)

trunk/include/VBox/GuestHost/SharedClipboard-win.h

@@ -355 +355 @@
     /** Number of bytes already processed. */
     uint64_t                       m_cbProcessed;
-    /** Whether we already notified the parent of completion or not. */
-    bool                           m_fNotifiedComplete;
+    /** Whether this object already is in completed state or not. */
+    bool                           m_fIsComplete;
 };
 

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp

@@ -649 +649 @@
     }
 
-    if (FAILED(hr))
+    if (   FAILED(hr)
+        && hr != DV_E_FORMATETC) /* Can happen if the caller queries unknown / unhandled formats. */
+    {
         LogRel(("Shared Clipboard: Error returning data from data object (%Rhrc)\n", hr));
+    }
 
     LogFlowFunc(("hr=%Rhrc\n", hr));

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp

@@ -55 +55 @@
     , m_objInfo(*pObjInfo)
     , m_cbProcessed(0)
-    , m_fNotifiedComplete(false)
+    , m_fIsComplete(false)
 {
     AssertPtr(m_pTransfer);
@@ -113 +113 @@
     if (lCount == 0)
     {
-        if (  !m_fNotifiedComplete
-            && m_pParent)
-        {
-            m_pParent->OnTransferComplete();
-        }
-
         delete this;
         return 0;
@@ -173 +167 @@
         return STG_E_INVALIDPOINTER;
 
-    if (nBytesToRead == 0)
+    if (   nBytesToRead == 0
+        || m_fIsComplete)
     {
         if (nBytesRead)
@@ -212 +207 @@
         const uint64_t cbSize   = (uint64_t)m_objInfo.cbObject;
         const uint32_t cbToRead = RT_MIN(cbSize - m_cbProcessed, nBytesToRead);
-
-        bool fComplete = false;
 
         if (RT_SUCCESS(rc))
@@ -229 +222 @@
 
             /* Transfer complete? Make sure to close the object again. */
-            fComplete = m_cbProcessed == cbSize;
-
-            if (fComplete)
+            m_fIsComplete = m_cbProcessed == cbSize;
+
+            if (m_fIsComplete)
             {
                 if (m_pTransfer->ProviderIface.pfnObjClose)
@@ -240 +233 @@
 
                 if (m_pParent)
-                {
                     m_pParent->OnTransferComplete();
-                    m_fNotifiedComplete = true;
-                }
             }
         }

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

@@ -766 +766 @@
 {
     PSHCLOBJHANDLEINFO pIt;
-    RTListForEach(&pTransfer->lstObj, pIt, SHCLOBJHANDLEINFO, Node)
+    RTListForEach(&pTransfer->lstObj, pIt, SHCLOBJHANDLEINFO, Node) /** @todo Slooow ...but works for now. */
     {
         if (pIt->hObj == hObj)
@@ -792 +792 @@
     int rc = VINF_SUCCESS;
 
+    AssertMsgReturn(pTransfer->pszPathRootAbs, ("Transfer has no root path set\n"), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(pOpenCreateParms->pszPath, ("No path in open/create params set\n"), VERR_INVALID_PARAMETER);
+
     LogFlowFunc(("pszPath=%s, fCreate=0x%x\n", pOpenCreateParms->pszPath, pOpenCreateParms->fCreate));
 
@@ -797 +800 @@
     {
         PSHCLOBJHANDLEINFO pInfo
-            = (PSHCLOBJHANDLEINFO)RTMemAlloc(sizeof(SHCLOBJHANDLEINFO));
+            = (PSHCLOBJHANDLEINFO)RTMemAllocZ(sizeof(SHCLOBJHANDLEINFO));
         if (pInfo)
         {
@@ -811 +814 @@
                 if (RT_SUCCESS(rc))
                 {
-                    char *pszPathAbs = RTStrAPrintf2("%s/%s", pTransfer->pszPathRootAbs, pOpenCreateParms->pszPath);
-                    if (pszPathAbs)
+                    pInfo->pszPathLocalAbs = RTStrAPrintf2("%s/%s", pTransfer->pszPathRootAbs, pOpenCreateParms->pszPath);
+                    if (pInfo->pszPathLocalAbs)
                     {
-                        LogFlowFunc(("%s\n", pszPathAbs));
-
-                        rc = RTFileOpen(&pInfo->u.Local.hFile, pszPathAbs, fOpen);
-                        RTStrFree(pszPathAbs);
+                        rc = RTFileOpen(&pInfo->u.Local.hFile, pInfo->pszPathLocalAbs, fOpen);
+                        if (RT_SUCCESS(rc))
+                        {
+                            LogRel2(("Shared Clipboard: Opened file '%s'\n", pInfo->pszPathLocalAbs));
+                        }
+                        else
+                            LogRel(("Shared Clipboard: Error opening file '%s', rc=%Rrc\n", pInfo->pszPathLocalAbs, rc));
                     }
                     else
@@ -910 +916 @@
 
             RTListNodeRemove(&pInfo->Node);
+
+            ShClTransferObjHandleInfoDestroy(pInfo);
 
             RTMemFree(pInfo);
@@ -2863 +2871 @@
 
 /**
- * Converts Shared Clipboard create flags (see SharedClipboard-uri.) into IPRT create flags.
+ * Converts Shared Clipboard create flags (see SharedClipboard-transfers.h) into IPRT create flags.
  *
  * @returns IPRT status code.
- * @param  fWritable            Whether the shared folder is writable
+ * @param  fWritable            Whether the object is writable.
  * @param  fShClFlags           Shared clipboard create flags.
  * @param  fMode                File attributes.

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp

@@ -2140 +2140 @@
             {
                 LogRel2(("Shared Clipboard: Reported status %s (rc=%Rrc) of transfer %RU32 to guest\n",
-                         ShClGuestMsgToStr(uStatus), rcTransfer, pTransfer->State.uID));
+                         ShClTransferStatusToStr(uStatus), rcTransfer, pTransfer->State.uID));
 
                 if (puEvent)
@@ -2269 +2269 @@
                                         else
                                             LogRel(("Shared Clipboard: Guest reported status %s (error %Rrc) while starting transfer %RU32\n",
-                                                    ShClGuestMsgToStr(pReply->u.TransferStatus.uStatus),
+                                                    ShClTransferStatusToStr(pReply->u.TransferStatus.uStatus),
                                                     pReply->rc, pTransfer->State.uID));
                                     }