Changeset 100461 in vbox for trunk/include/VBox/GuestHost

Timestamp:

Jul 10, 2023 2:23:36 PM (22 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

158212

Message:

Shared Clipboard: More fine-grained control for Windows data object uninit vs. destruction. bugref:9437

File:

• trunk/include/VBox/GuestHost/SharedClipboard-win.h (modified) (4 diffs)

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

@@ -250 +250 @@
 
     int Init(PSHCLCONTEXT pCtx, SharedClipboardWinDataObject::PCALLBACKS pCallbacks, LPFORMATETC pFormatEtc = NULL, LPSTGMEDIUM pStgMed = NULL, ULONG cFormats = 0);
+    void Uninit(void);
     void Destroy(void);
 
@@ -292 +293 @@
 
 protected:
+
+    void uninitInternal(void);
 
     static int Thread(RTTHREAD hThread, void *pvUser);
@@ -351 +354 @@
     /** Critical section to serialize access. */
     RTCRITSECT                  m_CritSect;
-    /** Whether the transfer thread is running. */
-    bool                        m_fThreadRunning;
     /** Event being triggered when reading the transfer list been completed. */
     RTSEMEVENT                  m_EventListComplete;
@@ -473 +474 @@
         : pDataObj(NULL) { }
 
-    virtual ~SharedClipboardWinTransferCtx()
-    {
-        if (pDataObj)
-            delete pDataObj;
-    }
-
-    /** Pointer to data object to use for this transfer.
+    virtual ~SharedClipboardWinTransferCtx() { }
+
+    /** Pointer to data object to use for this transfer. Not owned.
      *  Can be NULL if not being used. */
     SharedClipboardWinDataObject *pDataObj;