Changeset 97822 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 16, 2022 9:29:14 AM (2 years ago)

Author:

vboxsync

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

154902

Message:

DnD/Main: Don't set (and return) an error for GuestDnDSource::dragIsPending() when old(er) X11-based Guest Additions return with no supported host formats, but only specific X11-formats (TARGETS, MULTIPLE). Needs to be fixed for newer Guest Additions.

File:

• trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp (modified) (2 diffs)

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

@@ -317 +317 @@
                  * which are not supported by the host.
                  */
-                GuestDnDMIMEList lstFiltered  = GuestDnD::toFilteredFormatList(m_lstFmtSupported, pState->formats());
+                GuestDnDMIMEList const &lstGuest     = pState->formats();
+                GuestDnDMIMEList const  lstFiltered  = GuestDnD::toFilteredFormatList(m_lstFmtSupported, lstGuest);
                 if (lstFiltered.size())
                 {
@@ -333 +334 @@
                 }
                 else
-                    hrc = i_setErrorAndReset(tr("Negotiation of formats between guest and host failed!\n\nHost offers: %s\n\nGuest offers: %s"),
-                                             GuestDnD::toFormatString(m_lstFmtSupported , ",").c_str(),
-                                             GuestDnD::toFormatString(pState->formats() , ",").c_str());
+                {
+                    bool fSetError = true; /* Whether to set an error and reset or not. */
+
+                    /*
+                     * HACK ALERT: As we now expose an error (via i_setErrorAndReset(), see below) back to the API client, we
+                     *             have to add a kludge here. Older X11-based Guest Additions report "TARGETS, MULTIPLE" back
+                     *             to us, even if they don't offer any other *supported* formats of the host. This then in turn
+                     *             would lead to exposing an error, whereas we just should ignore those specific X11-based
+                     *             formats. For anything other we really want to be notified by setting an error though.
+                     */
+                    if (   lstGuest.size() == 2
+                        && GuestDnD::isFormatInFormatList("TARGETS",  lstGuest)
+                        && GuestDnD::isFormatInFormatList("MULTIPLE", lstGuest))
+                    {
+                        fSetError = false;
+                    }
+                    /* HACK ALERT END */
+
+                    if (fSetError)
+                        hrc = i_setErrorAndReset(tr("Negotiation of formats between guest and host failed!\n\nHost offers: %s\n\nGuest offers: %s"),
+                                                 GuestDnD::toFormatString(m_lstFmtSupported , ",").c_str(),
+                                                 GuestDnD::toFormatString(pState->formats() , ",").c_str());
+                    else /* Just silently reset. */
+                        i_reset();
+                }
             }
             /* Note: Don't report an error here when the action is "ignore" -- that only means that the current window on the guest