Changeset 100449 in vbox for trunk/src/VBox

Timestamp:

Jul 10, 2023 9:16:00 AM (17 months ago)

Author:

vboxsync

Message:

Shared Clipboard: (Release) log if clearing the Windows clipboard failed (better fix). ​​bugref:9437

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp (modified) (2 diffs)

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

@@ -149 +149 @@
 
     DWORD const dwLastErr = GetLastError();
-    int   const rc        = RTErrConvertFromWin32(dwLastErr);
-    if (dwLastErr != ERROR_CLIPBOARD_NOT_OPEN) /* Can happen if we didn't open the clipboard before. Just ignore this. */
-        LogRel2(("Shared Clipboard: Clearing Windows clipboard failed with %Rrc (0x%x)\n", rc, dwLastErr));
+    if (dwLastErr == ERROR_CLIPBOARD_NOT_OPEN) /* Can happen if we didn't open the clipboard before. Just ignore this. */
+        return VINF_SUCCESS;
+
+    int const rc = RTErrConvertFromWin32(dwLastErr);
+    LogRel2(("Shared Clipboard: Clearing Windows clipboard failed with %Rrc (0x%x)\n", rc, dwLastErr));
 
     return rc;
@@ -1169 +1171 @@
         AssertPtr(pWinURITransferCtx);
 
+        /* If the transfer has a data object assigned, uninitialize it here.
+         * Note: We don't free the object here, as other processes like the Windows Explorer still might refer to it. */
         if (pWinURITransferCtx->pDataObj)
-        {
-            delete pWinURITransferCtx->pDataObj;
-            pWinURITransferCtx->pDataObj = NULL;
-        }
+            pWinURITransferCtx->pDataObj->Uninit();
 
         delete pWinURITransferCtx;