Changeset 50460 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Feb 14, 2014 9:46:58 AM (11 years ago)

Author:

vboxsync

Message:

DnD: Update.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxDnD.cpp (modified) (1 diff)
• VBoxDnDDataObject.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -51 +51 @@
         VBoxDnDDropSource.cpp \
         VBoxDnDDropTarget.cpp
+ VBoxTray_LIBS     += \
+        $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
 endif
 ifdef VBOX_WITH_GUEST_PROPS

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

@@ -1402 +1402 @@
 
         rc = VbglR3DnDProcessNextMessage(uClientID, &pEvent->Event);
-        LogFlowFunc(("VbglR3DnDProcessNextMessage returned rc=%Rrc\n", rc));
+        LogFlowFunc(("VbglR3DnDProcessNextMessage returned uType=%RU32, rc=%Rrc\n",
+                     pEvent->Event.uType, rc));
 
         if (ASMAtomicReadBool(&pCtx->fShutdown))

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDataObject.cpp

@@ -27 +27 @@
 #include "VBoxDnD.h"
 
+#ifdef DEBUG
+ /* Enable the following line to get much more debug output about
+  * (un)known clipboard formats. */
+ //#define VBOX_DND_DEBUG_FORMATS
+#endif
+
 /** @todo Implement IDataObjectAsyncCapability interface? */
 
@@ -188 +194 @@
     AssertPtrReturn(pMedium, DV_E_FORMATETC);
 
-    LogFlowFunc(("pFormatEtc=%p, pMedium=%p\n", pFormatEtc, pMedium));
-
     ULONG lIndex;
     if (!LookupFormatEtc(pFormatEtc, &lIndex)) /* Format supported? */
@@ -195 +199 @@
     if (lIndex >= mcFormats) /* Paranoia. */
         return DV_E_FORMATETC;
+
+    LogFlowFunc(("pFormatEtc=%p, pMedium=%p\n", pFormatEtc, pMedium));
 
     FORMATETC *pThisFormat = &mpFormatEtc[lIndex];
@@ -474 +480 @@
 const char* VBoxDnDDataObject::ClipboardFormatToString(CLIPFORMAT fmt)
 {
+#ifdef VBOX_DND_DEBUG_FORMATS
     char szFormat[128];
     if (GetClipboardFormatName(fmt, szFormat, sizeof(szFormat)))
         LogFlowFunc(("wFormat=%RI16, szName=%s\n", fmt, szFormat));
+#endif
 
     switch (fmt)
@@ -572 +580 @@
     }
 
+#ifdef VBOX_DND_DEBUG_FORMATS
     LogFlowFunc(("Format NOT found: tyMed=%RI32, cfFormat=%RI16, sFormats=%s, dwAspect=%RI32\n",
                  pFormatEtc->tymed, pFormatEtc->cfFormat, VBoxDnDDataObject::ClipboardFormatToString(pFormatEtc->cfFormat),
                  pFormatEtc->dwAspect));
-
+#endif
     return false;
 }