Changeset 100665 in vbox for trunk

Timestamp:

Jul 20, 2023 1:20:29 PM (19 months ago)

Author:

vboxsync

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

158505

Message:

Shared Clipboard: More Windows data object refcount bugfixes. Added VBOX_SHARED_CLIPBOARD_DEBUG_OBJECT_COUNTS for helping tracking down those issues. bugref:9437

Location:

trunk/src/VBox/GuestHost/SharedClipboard

Files:

• ClipboardDataObjectImpl-win.cpp (modified) (4 diffs)
• ClipboardEnumFormatEtcImpl-win.cpp (modified) (3 diffs)
• ClipboardStreamImpl-win.cpp (modified) (4 diffs)
• clipboard-win.cpp (modified) (1 diff)

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

@@ -49 +49 @@
 #include <iprt/errcore.h>
 #include <VBox/log.h>
+
+/** Enable this to track the current counts of the data / stream / enum object we create + supply to the Windows clipboard.
+ *  Helps finding refcount issues or tracking down memory leaks. */
+#ifdef VBOX_SHARED_CLIPBOARD_DEBUG_OBJECT_COUNTS
+ int g_cDbgDataObj;
+ int g_cDbgStreamObj;
+ int g_cDbgEnumFmtObj;
+#endif
 
 /** @todo Also handle Unicode entries.
@@ -66 +74 @@
     , m_EventStatusChanged(NIL_RTSEMEVENT)
 {
+#ifdef VBOX_SHARED_CLIPBOARD_DEBUG_OBJECT_COUNTS
+    g_cDbgDataObj++;
+    LogFlowFunc(("g_cDataObj=%d, g_cStreamObj=%d, g_cEnumFmtObj=%d\n", g_cDbgDataObj, g_cDbgStreamObj, g_cDbgEnumFmtObj));
+#endif
 }
 
@@ -71 +83 @@
 {
     Destroy();
+
+#ifdef VBOX_SHARED_CLIPBOARD_DEBUG_OBJECT_COUNTS
+    g_cDbgDataObj--;
+    LogFlowFunc(("g_cDataObj=%d, g_cStreamObj=%d, g_cEnumFmtObj=%d\n", g_cDbgDataObj, g_cDbgStreamObj, g_cDbgEnumFmtObj));
+#endif
 
     LogFlowFunc(("mRefCount=%RI32\n", m_lRefCount));
@@ -250 +267 @@
 
     if (m_pStream)
-    {
-        m_pStream->Release();
         m_pStream = NULL;
-    }
 
     if (m_pFormatEtc)

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

@@ -40 +40 @@
 
 
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
+
+
+
+/*********************************************************************************************************************************
+*   Static variables                                                                                                             *
+*********************************************************************************************************************************/
+#ifdef VBOX_SHARED_CLIPBOARD_DEBUG_OBJECT_COUNTS
+ extern int g_cDbgDataObj;
+ extern int g_cDbgStreamObj;
+ extern int g_cDbgEnumFmtObj;
+#endif
+
 
 SharedClipboardWinEnumFormatEtc::SharedClipboardWinEnumFormatEtc(void)
@@ -45 +60 @@
       m_nIndex(0)
 {
+#ifdef VBOX_SHARED_CLIPBOARD_DEBUG_OBJECT_COUNTS
+    g_cDbgEnumFmtObj++;
+    LogFlowFunc(("g_cDataObj=%d, g_cStreamObj=%d, g_cEnumFmtObj=%d\n", g_cDbgDataObj, g_cDbgStreamObj, g_cDbgEnumFmtObj));
+#endif
 }
 
@@ -52 +71 @@
 
     LogFlowFunc(("m_lRefCount=%RI32\n", m_lRefCount));
+
+#ifdef VBOX_SHARED_CLIPBOARD_DEBUG_OBJECT_COUNTS
+    g_cDbgEnumFmtObj--;
+    LogFlowFunc(("g_cDataObj=%d, g_cStreamObj=%d, g_cEnumFmtObj=%d\n", g_cDbgDataObj, g_cDbgStreamObj, g_cDbgEnumFmtObj));
+#endif
 }
 

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

@@ -52 +52 @@
 *   Static variables                                                                                                             *
 *********************************************************************************************************************************/
-
+#ifdef VBOX_SHARED_CLIPBOARD_DEBUG_OBJECT_COUNTS
+ extern int g_cDbgDataObj;
+ extern int g_cDbgStreamObj;
+ extern int g_cDbgEnumFmtObj;
+#endif
 
 
@@ -69 +73 @@
 
     LogFunc(("m_strPath=%s\n", m_strPath.c_str()));
+
+#ifdef VBOX_SHARED_CLIPBOARD_DEBUG_OBJECT_COUNTS
+    g_cDbgStreamObj++;
+    LogFlowFunc(("g_cDataObj=%d, g_cStreamObj=%d, g_cEnumFmtObj=%d\n", g_cDbgDataObj, g_cDbgStreamObj, g_cDbgEnumFmtObj));
+#endif
 }
 
@@ -74 +83 @@
 {
     LogFlowThisFuncEnter();
+
+#ifdef VBOX_SHARED_CLIPBOARD_DEBUG_OBJECT_COUNTS
+    g_cDbgStreamObj--;
+    LogFlowFunc(("g_cDataObj=%d, g_cStreamObj=%d, g_cEnumFmtObj=%d\n", g_cDbgDataObj, g_cDbgStreamObj, g_cDbgEnumFmtObj));
+#endif
 }
 
@@ -376 +390 @@
     if (pStream)
     {
-        pStream->AddRef();
-
         *ppStream = pStream;
         return S_OK;

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

@@ -1065 +1065 @@
     if (RT_SUCCESS(rc))
     {
-        if (pWinCtx->pDataObjInFlight == NULL)
-        {
-            SharedClipboardWinDataObject *pObj = new SharedClipboardWinDataObject();
-            if (pObj)
+        LogFlowFunc(("pWinCtx->pDataObjInFlight=%p\n", pWinCtx->pDataObjInFlight));
+
+        /* Create a new data object here, assign it as the the current data object in-flight and
+         * announce it to Windows below.
+         *
+         * The data object will be deleted automatically once its refcount reaches 0.
+         */
+        SharedClipboardWinDataObject *pObj = new SharedClipboardWinDataObject();
+        if (pObj)
+        {
+            rc = pObj->Init(pCtx, pCallbacks);
+            if (RT_SUCCESS(rc))
             {
-                rc = pObj->Init(pCtx, pCallbacks);
                 if (RT_SUCCESS(rc))
-                {
-                    if (RT_SUCCESS(rc))
-                        pWinCtx->pDataObjInFlight = pObj;
-                }
+                    pWinCtx->pDataObjInFlight = pObj;
             }
-            else
-                rc = VERR_NO_MEMORY;
-        }
+        }
+        else
+            rc = VERR_NO_MEMORY;
 
         if (RT_SUCCESS(rc))