Changeset 97737 in vbox for trunk/src/VBox/Additions

Timestamp:

Dec 5, 2022 8:02:36 AM (2 years ago)

Author:

vboxsync

Message:

DnD/VBoxClient: Added DragAndDropService::reset() for resetting drag'n drop service-specific data.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -680 +680 @@
     int  init(void);
     int  worker(bool volatile *pfShutdown);
+    void reset(void);
     void stop(void);
     int  term(void);
@@ -3456 +3457 @@
 }
 
+/**
+ * Resets the DnD service' data.
+ */
+void DragAndDropService::reset(void)
+{
+    LogFlowFuncEnter();
+
+    if (m_pCurDnD)
+        m_pCurDnD->reset();
+
+    /*
+     * Clear the event queue.
+     */
+    int rc2 = RTCritSectEnter(&m_eventQueueCS);
+    if (RT_SUCCESS(rc2))
+    {
+        for (size_t i = 0; i < m_eventQueue.size(); i++)
+        {
+            switch (m_eventQueue[i].enmType)
+            {
+                case DNDEVENT::DnDEventType_HGCM:
+                {
+                    VbglR3DnDEventFree(m_eventQueue[i].hgcm);
+                    break;
+                }
+
+                default:
+                    break;
+            }
+
+        }
+
+        m_eventQueue.clear();
+
+        rc2 = RTCritSectLeave(&m_eventQueueCS);
+        AssertRC(rc2);
+    }
+
+    LogFlowFuncLeave();
+}
+
 /** @copydoc VBCLSERVICE::pfnStop */
 void DragAndDropService::stop(void)
@@ -3521 +3563 @@
         VBClLogVerbose(2, "HGCM thread terminated\n");
     }
+
+    reset();
 
     if (m_pCurDnD)