Changeset 80885 in vbox for trunk

Timestamp:

Sep 18, 2019 11:24:54 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Update on IDataObject implementation.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp (modified) (8 diffs)

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

@@ -28 +28 @@
 #include <iprt/win/shlwapi.h>
 
+#include <iprt/asm.h>
 #include <iprt/err.h>
 #include <iprt/path.h>
@@ -364 +365 @@
                 }
 
+                if (ASMAtomicReadBool(&pTransfer->Thread.fStop))
+                {
+                    LogRel2(("Shared Clipboard: Stopping transfer calculating ...\n"));
+                    break;
+                }
+
                 if (RT_FAILURE(rc))
                     break;
@@ -373 +380 @@
             if (RT_SUCCESS(rc))
             {
-                LogRel2(("Shared Clipboard: Calculation complete, starting transfer ...\n"));
+                LogRel2(("Shared Clipboard: Transfer calculation complete (%zu root entries)\n", pThis->m_lstEntries.size()));
 
                 /*
@@ -382 +389 @@
                 AssertRC(rc2);
 
-                LogFlowFunc(("Waiting for transfer to complete ...\n"));
-
-                /* Transferring stuff can take a while, so don't use any timeout here. */
-                rc2 = RTSemEventWait(pThis->m_EventTransferComplete, RT_INDEFINITE_WAIT);
-                AssertRC(rc2);
+                if (pThis->m_lstEntries.size())
+                {
+                    LogRel2(("Shared Clipboard: Starting transfer ...\n"));
+
+                    LogFlowFunc(("Waiting for transfer to complete ...\n"));
+
+                    /* Transferring stuff can take a while, so don't use any timeout here. */
+                    rc2 = RTSemEventWait(pThis->m_EventTransferComplete, RT_INDEFINITE_WAIT);
+                    AssertRC(rc2);
+                }
+                else
+                   LogRel(("Shared Clipboard: No transfer root entries found -- should not happen, please file a bug report\n"));
             }
+            else
+                LogRel(("Shared Clipboard: Transfer failed with %Rrc\n", rc));
         }
 
@@ -419 +435 @@
     if (!cItems)
         return VERR_NOT_FOUND;
-          UINT   curIdx = 0; /* Current index of the handled file group descriptor (FGD). */
+
+    UINT         curIdx = 0; /* Current index of the handled file group descriptor (FGD). */
 
     const size_t cbFGD  = cbFileGroupDescriptor + (cbFileDescriptor * (cItems - 1));
@@ -569 +586 @@
                     /* Don't block for too long here, as this also will screw other apps running on the OS. */
                     LogFunc(("Waiting for listing to arrive ...\n"));
-                    rc = RTSemEventWait(m_EventListComplete, 10 * 1000 /* 10s timeout */);
+                    rc = RTSemEventWait(m_EventListComplete, 30 * 1000 /* 30s timeout */);
                     if (RT_SUCCESS(rc))
                     {
                         LogFunc(("Listing complete\n"));
-
-
                     }
                 }
@@ -594 +609 @@
                 hr = S_OK;
             }
+            else /* We can't tell any better to the caller, unfortunately. */
+                hr = E_UNEXPECTED;
         }
 
@@ -626 +643 @@
     }
 
-    /* Error handling; at least return some basic data. */
     if (FAILED(hr))
-    {
-        LogFunc(("Failed; copying medium ...\n"));
-
-        //pMedium->tymed          = pThisFormat->tymed;
-        //pMedium->pUnkForRelease = NULL;
-    }
-
-    if (hr == DV_E_FORMATETC)
-        LogRel(("Shared Clipboard: Error handling format\n"));
+        LogRel(("Shared Clipboard: Error returning data from data object (%Rhrc)\n", hr));
 
     LogFlowFunc(("hr=%Rhrc\n", hr));