Changeset 99974 in vbox

Timestamp:

May 25, 2023 11:10:14 AM (2 years ago)

Author:

vboxsync

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

157634

Message:

Shared Clipboard/HostService: Fixes for (not) reporting (and starting) transfers with older Guest Additions. bugref:9437

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/clipboard-common.cpp (modified) (2 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (4 diffs)

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

@@ -148 +148 @@
 {
     if (!pSource)
+        return VINF_SUCCESS;
+
+    if (!RTCritSectIsInitialized(&pSource->CritSect)) /* Already destroyed? Bail out. */
         return VINF_SUCCESS;
 
@@ -294 +297 @@
 
     ShClPayloadFree(pEvent->pPayload);
+    pEvent->pPayload = NULL;
 
     pEvent->idEvent = NIL_SHCLEVENTID;

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp

@@ -1445 +1445 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    /*
-     * If transfer mode is set to disabled, don't report the URI list format to the guest.
-     */
+    bool fSkipTransfers = false;
     if (!(g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_F_ENABLED))
     {
+        LogRel2(("Shared Clipboard: File transfers are disabled, skipping reporting those to the guest\n"));
+        fSkipTransfers = true;
+    }
+    else if (!(pClient->State.fGuestFeatures0 & VBOX_SHCL_GF_0_TRANSFERS))
+    {
+        LogRel2(("Shared Clipboard: File transfers not supported by installed Guest Addtions, skipping reporting those to the guest\n"));
+        fSkipTransfers = true;
+    }
+
+    if (fSkipTransfers)
         fFormats &= ~VBOX_SHCL_FMT_URI_LIST;
-        LogRel2(("Shared Clipboard: File transfers are disabled, skipping reporting those to the guest\n"));
-    }
 #endif
 
@@ -1477 +1483 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-        /* If we announce an URI list, create a transfer locally and also tell the guest to create
-         * a transfer on the guest side. */
-        if (fFormats & VBOX_SHCL_FMT_URI_LIST)
+        /* Create a transfer locally and also tell the guest to create a transfer on the guest side. */
+        if (!fSkipTransfers)
         {
             rc = shClSvcTransferStart(pClient, SHCLTRANSFERDIR_TO_REMOTE, SHCLSOURCE_LOCAL,
@@ -1491 +1496 @@
         else
 #endif
-        {
             rc = VINF_SUCCESS;
-        }
     }
     else
@@ -2210 +2213 @@
 
                 shClSvcClientLock(pClient);
+
+                /* Reset message queue. */
+                shClSvcMsgQueueReset(pClient);
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS