Changeset 95821 in vbox

Timestamp:

Jul 25, 2022 4:00:26 PM (2 years ago)

Author:

vboxsync

Message:

DnD: Added GuestHost/DnDUtils module for various utility functions, (release2) log the acknowledged / pending actions by the guest, to make it easier in the future to diagnose DnD errors. bugref:10267

Location:

trunk

Files:

• include/VBox/GuestHost/DragAndDrop.h (modified) (2 diffs)
• src/VBox/GuestHost/DragAndDrop/DnDUtils.cpp (added)
• src/VBox/GuestHost/DragAndDrop/Makefile.kmk (modified) (2 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/src-client/GuestDnDPrivate.cpp (modified) (2 diffs)

trunk/include/VBox/GuestHost/DragAndDrop.h

@@ -34 +34 @@
 #include <iprt/fs.h>
 #include <iprt/list.h>
+
+#include <VBox/GuestHost/DragAndDropDefs.h>
 
 /** DnDURIDroppedFiles flags. */
@@ -89 +91 @@
 int DnDDroppedFilesReset(PDNDDROPPEDFILES pDF, bool fDelete);
 int DnDDroppedFilesRollback(PDNDDROPPEDFILES pDF);
+
+const char *DnDActionToStr(VBOXDNDACTION uAction);
 
 bool DnDMIMEHasFileURLs(const char *pcszFormat, size_t cchFormatMax);

trunk/src/VBox/GuestHost/DragAndDrop/Makefile.kmk

@@ -28 +28 @@
         DnDPath.cpp \
         DnDTransferObject.cpp \
-        DnDTransferList.cpp
+        DnDTransferList.cpp \
+        DnDUtils.cpp
 
 #
@@ -61 +62 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
-

trunk/src/VBox/Main/Makefile.kmk

@@ -1162 +1162 @@
         src-client/GuestDnDPrivate.cpp \
         src-client/GuestDnDSourceImpl.cpp \
-        src-client/GuestDnDTargetImpl.cpp
+        src-client/GuestDnDTargetImpl.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/DragAndDrop/DnDUtils.cpp
 endif
 ifdef VBOX_WITH_XPCOM

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

@@ -571 +571 @@
             AssertReturn(sizeof(DragAndDropSvc::VBOXDNDCBHGACKOPDATA) == cbParms, VERR_INVALID_PARAMETER);
             AssertReturn(DragAndDropSvc::CB_MAGIC_DND_HG_ACK_OP == pCBData->hdr.uMagic, VERR_INVALID_PARAMETER);
+
+            LogRel2(("DnD: Guest responded with action '%s' for host->guest drag event\n", DnDActionToStr(pCBData->uAction)));
 
             setActionDefault(pCBData->uAction);
@@ -628 +630 @@
             AssertReturn(DragAndDropSvc::CB_MAGIC_DND_GH_ACK_PENDING == pCBData->hdr.uMagic, VERR_INVALID_PARAMETER);
 
+            LogRel2(("DnD: Host responded with default action '%s' (%RU32 bytes format data) to guest->host drag event\n",
+                     DnDActionToStr(pCBData->uDefAction), pCBData->cbFormat));
+
             if (   pCBData->cbFormat  == 0
                 || pCBData->cbFormat  > _64K /** @todo Make the maximum size configurable? */