Changeset 81172 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp

Timestamp:

Oct 9, 2019 8:56:50 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Win: Use a dedicated running flag for IDataObject implementation; makes it more independent from the underlying transfer object.

File:

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

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

@@ -40 +40 @@
 /** @todo Also handle Unicode entries.
  *        !!! WARNING: Buggy, doesn't work yet (some memory corruption / garbage in the file name descriptions) !!! */
-//#define VBOX_CLIPBOARD_WITH_UNICODE_SUPPORT 0
+//#define VBOX_CLIPBOARD_WITH_UNICODE_SUPPORT 1
 
 SharedClipboardWinDataObject::SharedClipboardWinDataObject(PSHCLTRANSFER pTransfer,
@@ -50 +50 @@
     , m_pStream(NULL)
     , m_uObjIdx(0)
+    , m_fRunning(false)
     , m_EventListComplete(NIL_RTSEMEVENT)
     , m_EventTransferComplete(NIL_RTSEMEVENT)
@@ -132 +133 @@
 SharedClipboardWinDataObject::~SharedClipboardWinDataObject(void)
 {
+    LogFlowFuncEnter();
+
     RTSemEventDestroy(m_EventListComplete);
     m_EventListComplete = NIL_RTSEMEVENT;
@@ -572 +575 @@
 
         const uint32_t enmTransferStatus = SharedClipboardTransferGetStatus(m_pTransfer);
-
-        LogFlowFunc(("FormatIndex_FileDescriptor%s, transfer status is %s\n",
-                     fUnicode ? "W" : "A", VBoxShClTransferStatusToStr(enmTransferStatus)));
+        RT_NOREF(enmTransferStatus);
+
+        LogFlowFunc(("FormatIndex_FileDescriptor%s, enmTransferStatus=%s, m_fRunning=%RTbool\n",
+                     fUnicode ? "W" : "A", VBoxShClTransferStatusToStr(enmTransferStatus), m_fRunning));
 
         int rc;
 
         /* The caller can call GetData() several times, so make sure we don't do the same transfer multiple times. */
-        if (enmTransferStatus == SHCLTRANSFERSTATUS_INITIALIZED)
+        if (!m_fRunning)
         {
             /* Start the transfer asynchronously in a separate thread. */
@@ -585 +589 @@
             if (RT_SUCCESS(rc))
             {
+                m_fRunning = true;
+
                 /* 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"));