Changeset 97788 in vbox for trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

Timestamp:

Dec 12, 2022 6:36:50 PM (2 years ago)

Author:

vboxsync

Message:

DnD: Simplified / untangled reset handling:

• Don't implicitly reset the DnD state with the GuestDnDSendCtx / GuestDnDRecvCtx classes; that can cause side effects.
• Don't reset GuestDnDTargets state before sending data to the guest via GuestDnDTarget::sendData().
• Don't reset the DnD state within GuestDnDState::setProgress() anymore. This needs to be done explicitly by the caller waiting for the progress.
• Make sure to also clear the DnD state's callback map within GuestDnDState::reset().
• Implemented a default guest callback, which gets invoked when no other (registered) guest callbacks are in place (anymore).
• Return VERR_CANCELLED to VBoxTray / VBoxClient clients when there was a reset or the current operation was aborted.
• Release (2) log what has been reset.
• Implement reference counting for internal DnD messages within the host service; this should help wrt races between peeking for new client messages and actual retrieving those messages.

File:

• trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -107 +107 @@
             return;
 
-        int vrc = pThis->i_sendData(mpCtx, RT_INDEFINITE_WAIT /* msTimeout */);
-        if (RT_FAILURE(vrc)) /* In case we missed some error handling within i_sendData(). */
-        {
-            if (vrc != VERR_CANCELLED)
-                LogRel(("DnD: Sending data to guest failed with %Rrc\n", vrc));
-
-            /* Make sure to fire a cancel request to the guest side in case something went wrong. */
-            pThis->sendCancel();
-        }
+        /* ignore rc */ pThis->i_sendData(mpCtx, RT_INDEFINITE_WAIT /* msTimeout */);
     }
 
@@ -720 +712 @@
         return setError(E_FAIL, tr("Current drop operation to guest still in progress"));
 
-    /* Reset our internal state. */
-    i_reset();
-
     /* At the moment we only support one transfer at a time. */
     if (GuestDnDInst()->getTargetCount())
@@ -878 +867 @@
 void GuestDnDTarget::i_reset(void)
 {
-    LogFlowThisFunc(("\n"));
+    LogRel2(("DnD: Target reset\n"));
 
     mData.mSendCtx.reset();