Changeset 97788 in vbox for trunk/src/VBox/Main/include

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/include/GuestDnDPrivate.h (modified) (1 diff)

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -844 +844 @@
     void reset(void);
 
+    /** @name Callback handling.
+     * @{ */
+    static DECLCALLBACK(int) i_defaultCallback(uint32_t uMsg, void *pvParms, size_t cbParms, void *pvUser);
+    int setCallback(uint32_t uMsg, PFNGUESTDNDCALLBACK pfnCallback, void *pvUser = NULL);
+    /** @} */
+
+    /** @name Progress handling.
+     * @{ */
     bool isProgressCanceled(void) const;
-    int setCallback(uint32_t uMsg, PFNGUESTDNDCALLBACK pfnCallback, void *pvUser = NULL);
     int setProgress(unsigned uPercentage, uint32_t uState, int rcOp = VINF_SUCCESS, const Utf8Str &strMsg = "");
     HRESULT resetProgress(const ComObjPtr<Guest>& pParent);
     HRESULT queryProgressTo(IProgress **ppProgress);
+    /** @} */
 
 public: