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

Timestamp:

Nov 30, 2022 4:41:24 PM (2 years ago)

Author:

vboxsync

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

154778

Message:

DnD/Main: Added some more (verbose) release logging for the drop target implementation and be a bit more informative wrt error reporting to the API client.

File:

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

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

@@ -336 +336 @@
         Msg.appendUInt32(cbFormats);
 
+        LogRel2(("DnD: Host enters the VM window at %RU32,%RU32 (screen %u, default action is '%s')\n",
+                 aX, aY, aScreenId, DnDActionToStr(dndActionDefault)));
+
         vrc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
         if (RT_SUCCESS(vrc))
@@ -413 +416 @@
         Msg.appendUInt32(cbFormats);
 
+        LogRel2(("DnD: Host moves to %RU32,%RU32 in VM window (screen %u, default action is '%s')\n",
+                 aX, aY, aScreenId, DnDActionToStr(dndActionDefault)));
+
         vrc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
         if (RT_SUCCESS(vrc))
@@ -447 +453 @@
 
     HRESULT hrc = S_OK;
+
+    LogRel2(("DnD: Host left the VM window (screen %u)\n", uScreenId));
 
     GuestDnDMsg Msg;
@@ -536 +544 @@
         Msg.appendUInt32(cbFormats);
 
+        LogRel2(("DnD: Host drops at %RU32,%RU32 in VM window (screen %u, default action is '%s')\n",
+                 aX, aY, aScreenId, DnDActionToStr(dndActionDefault)));
+
         int vrc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
         if (RT_SUCCESS(vrc))
@@ -543 +554 @@
             {
                 resAct = GuestDnD::toMainAction(pState->getActionDefault());
-
-                GuestDnDMIMEList lstFormats = pState->formats();
-                if (lstFormats.size() == 1) /* Exactly one format to use specified? */
+                if (resAct != DnDAction_Ignore) /* Does the guest accept a drop at the current position? */
                 {
-                    resFmt = lstFormats.at(0);
+                    GuestDnDMIMEList lstFormats = pState->formats();
+                    if (lstFormats.size() == 1) /* Exactly one format to use specified? */
+                    {
+                        resFmt = lstFormats.at(0);
+                    }
+                    else
+                    {
+                        /** @todo r=bird: This isn't an IPRT error, is it?   */
+                        if (lstFormats.size() == 0)
+                            hr = setError(VBOX_E_IPRT_ERROR, tr("Guest accepted drop, but did not specify the format"));
+                        else
+                            hr = setError(VBOX_E_IPRT_ERROR, tr("Guest accepted drop, but returned more than one drop format (%zu formats)"),
+                                          lstFormats.size());
+                    }
+
+                    LogRel2(("DnD: Guest accepted drop in format '%s' (action %#x, %zu format(s))\n",
+                             resFmt.c_str(), resAct, lstFormats.size()));
                 }
-                else
-                    /** @todo r=bird: This isn't an IPRT error, is it?   */
-                    hr = setError(VBOX_E_IPRT_ERROR, tr("Guest returned invalid drop formats (%zu formats)", "",
-                                                        lstFormats.size()), lstFormats.size());
             }
             else
@@ -562 +583 @@
     else
         hr = setError(hr, tr("Retrieving drop coordinates failed"));
-
-    LogFlowFunc(("resFmt=%s, resAct=%RU32, vrc=%Rhrc\n", resFmt.c_str(), resAct, hr));
 
     if (SUCCEEDED(hr))
@@ -635 +654 @@
         mData.mSendCtx.Meta.strFmt = aFormat;
         mData.mSendCtx.Meta.add(aData);
+
+        LogRel2(("DnD: Host sends data in format '%s'\n", aFormat.c_str()));
 
         pTask = new GuestDnDSendDataTask(this, &mData.mSendCtx);