Changeset 82872 in vbox for trunk/src/VBox

Timestamp:

Jan 27, 2020 12:43:24 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/HostServices: Resolved more todos (removed READ_ACTIVE + WRITE_ACTIVE flag handling, too buggy for now).

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-internal.h (modified) (1 diff)
• VBoxSharedClipboardSvc.cpp (modified) (8 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h

@@ -91 +91 @@
 /** No Shared Clipboard client flags defined. */
 #define SHCLCLIENTSTATE_FLAGS_NONE              0
-/** Client has a guest read operation active. */
+/** Client has a guest read operation active. Currently unused. */
 #define SHCLCLIENTSTATE_FLAGS_READ_ACTIVE       RT_BIT(0)
-/** Client has a guest write operation active. */
+/** Client has a guest write operation active. Currently unused. */
 #define SHCLCLIENTSTATE_FLAGS_WRITE_ACTIVE      RT_BIT(1)
 /** @} */

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

@@ -1342 +1342 @@
 #endif
         {
-            pClient->State.fFlags |= SHCLCLIENTSTATE_FLAGS_READ_ACTIVE;
             rc = VINF_SUCCESS;
         }
@@ -1431 +1430 @@
                 rc = ShClSvcImplFormatAnnounce(pClient, &CmdCtx, &FormatData);
             }
-
-            /** @todo r=bird: I'm not sure if the guest should be automatically allowed
-             *        to write the host clipboard now.  It would make more sense to disallow
-             *        host clipboard reads until the host reports formats.
-             *
-             *        The writes should only really be allowed upon request from the host,
-             *        shouldn't they? (Though, I'm not sure, maybe there are situations
-             *        where the guest side will just want to push the content over
-             *        immediately while it's still available, I don't quite recall now...
-             */
-            if (RT_SUCCESS(rc))
-                pClient->State.fFlags |= SHCLCLIENTSTATE_FLAGS_WRITE_ACTIVE;
         }
     }
@@ -1467 +1454 @@
         return VERR_ACCESS_DENIED;
 
-    /// @todo r=bird: The management of the SHCLCLIENTSTATE_FLAGS_READ_ACTIVE
-    /// makes it impossible for the guest to retrieve more than one format from
-    /// the clipboard.  I.e. it can either get the TEXT or the HTML rendering,
-    /// but not both.  So, I've disable the check. */
-    //ASSERT_GUEST_RETURN(pClient->State.fFlags & SHCLCLIENTSTATE_FLAGS_READ_ACTIVE, VERR_WRONG_ORDER);
-
     /*
      * Digest parameters.
@@ -1531 +1512 @@
         if (pClient->State.POD.uFormat == VBOX_SHCL_FMT_NONE)
             pClient->State.POD.uFormat = dataBlock.uFormat;
-        /// @todo r=bird: This actively breaks copying different types of data into the
-        /// guest (first copy a text snippet, then you cannot copy any bitmaps), so I've
-        /// disabled it.
-        //ASSERT_GUEST_MSG_RETURN(pClient->State.POD.uFormat == dataBlock.uFormat,
-        //                        ("Requested %#x, POD.uFormat=%#x\n", dataBlock.uFormat, pClient->State.POD.uFormat),
-        //                        VERR_BAD_EXE_FORMAT /*VERR_INTERNAL_ERROR*/);
     }
 
@@ -1595 +1570 @@
         if (cbActual >= dataBlock.cbData)
             rc = VINF_BUFFER_OVERFLOW;
-
-        if (rc == VINF_SUCCESS)
-        {
-            /* Only remove "read active" flag after successful read again. */
-            /** @todo r=bird: This doesn't make any effing sense.  What if the guest
-             *        wants to read another format???  */
-            pClient->State.fFlags &= ~SHCLCLIENTSTATE_FLAGS_READ_ACTIVE;
-        }
     }
 
@@ -1623 +1590 @@
     else
         return VERR_ACCESS_DENIED;
-
-    /** @todo r=bird: This whole active flag stuff is broken, so disabling for now. */
-    //if (pClient->State.fFlags & SHCLCLIENTSTATE_FLAGS_WRITE_ACTIVE)
-    //{ /* likely */ }
-    //else
-    //    return VERR_WRONG_ORDER;
 
     /*
@@ -1689 +1650 @@
         if (pClient->State.POD.uFormat == VBOX_SHCL_FMT_NONE)
             pClient->State.POD.uFormat = dataBlock.uFormat;
-        /** @todo r=bird: this must be buggy to, I've disabled it without testing
-         *        though. */
-        //ASSERT_GUEST_MSG_RETURN(pClient->State.POD.uFormat == dataBlock.uFormat,
-        //                        ("Requested %#x, POD.uFormat=%#x\n", dataBlock.uFormat, pClient->State.POD.uFormat),
-        //                        VERR_BAD_EXE_FORMAT /*VERR_INTERNAL_ERROR*/);
     }
 
@@ -1713 +1669 @@
     else
         rc = ShClSvcImplWriteData(pClient, &cmdCtx, &dataBlock);
-    if (RT_SUCCESS(rc))
-    {
-        /* Remove "write active" flag after successful read again. */
-        /** @todo r=bird: This doesn't make any effing sense.  What if the host
-         *         wants to have the guest write it another format???  */
-        pClient->State.fFlags &= ~SHCLCLIENTSTATE_FLAGS_WRITE_ACTIVE;
-    }
 
     LogFlowFuncLeaveRC(rc);