Changeset 100664 in vbox

Timestamp:

Jul 20, 2023 10:22:27 AM (17 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Windows data object locking fixes. bugref:9437

File:

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

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

@@ -186 +186 @@
     LogFlowFuncEnter();
 
-    /* Let waiters know. */
-    setStatusLocked(Uninitialized, VINF_SUCCESS);
-
-    /* Make sure to release the transfer. */
-    setTransferLocked(NULL);
+    lock();
+
+    if (m_enmStatus != Uninitialized)
+    {
+
+        /* Let the read thread know. */
+        setStatusLocked(Uninitialized, VINF_SUCCESS);
+
+        /* Make sure to unlock before stopping the read thread. */
+        unlock();
+
+        /* Stop the read thread. */
+        if (m_pTransfer)
+            ShClTransferStop(m_pTransfer);
+
+        lock();
+
+        /* Make sure to release the transfer. */
+        setTransferLocked(NULL);
+    }
+
+    unlock();
 }
 
@@ -200 +217 @@
     LogFlowFuncEnter();
 
-    lock();
-
     uninitInternal();
-
-    unlock();
 }
 
@@ -217 +230 @@
         return;
 
-    lock();
-
     uninitInternal();
-
-    unlock();
 
     int rc = RTCritSectDelete(&m_CritSect);
@@ -552 +561 @@
                 for (;;)
                 {
+                    if (ASMAtomicReadBool(&pTransfer->Thread.fStop))
+                        break;
+
                     pThis->unlock();
 
@@ -1315 +1327 @@
         LogRel(("Shared Clipboard: Data object received error %Rrc (status %#x)\n", rc, enmStatus));
 
-    if (m_EventStatusChanged != NIL_RTSEMEVENT)
-        rc2 = RTSemEventSignal(m_EventStatusChanged);
-
+    rc2 = RTSemEventSignal(m_EventStatusChanged);
+
+    LogFlowFuncLeaveRC(rc2);
     return rc2;
 }