Changeset 50460 in vbox

Timestamp:

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

Author:

vboxsync

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

92295

Message:

DnD: Update.

Location:

trunk

Files:

• include/VBox/GuestHost/DragAndDrop.h (added)
• include/VBox/HostServices/DragAndDropSvc.h (modified) (2 diffs)
• src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDataObject.cpp (modified) (5 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (15 diffs)
• src/VBox/Additions/x11/VBoxClient/Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.cpp (added)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.h (added)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDrag.cpp (added)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDrag.h (added)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDropSource_win.cpp (added)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDropSource_win.h (added)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDEnumFormat_win.cpp (added)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDEnumFormat_win.h (added)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp (modified) (16 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.h (modified) (5 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp (modified) (6 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.h (modified) (4 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (2 diffs)
• src/VBox/GuestHost/DragAndDrop (added)
• src/VBox/GuestHost/DragAndDrop/DnDDir.cpp (added)
• src/VBox/GuestHost/DragAndDrop/DnDMIME.cpp (added)
• src/VBox/GuestHost/DragAndDrop/DnDPath.cpp (added)
• src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp (added)
• src/VBox/GuestHost/DragAndDrop/Makefile.kmk (added)
• src/VBox/GuestHost/Makefile.kmk (modified) (2 diffs)
• src/VBox/HostServices/DragAndDrop/Makefile.kmk (modified) (1 diff)
• src/VBox/HostServices/DragAndDrop/dndmanager.cpp (modified) (14 diffs)
• src/VBox/HostServices/DragAndDrop/dndmanager.h (modified) (12 diffs)
• src/VBox/HostServices/DragAndDrop/service.cpp (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (2 diffs)
• src/VBox/Main/src-client/GuestDnDImpl.cpp (modified) (17 diffs)
• src/VBox/Main/src-client/GuestImpl.cpp (modified) (11 diffs)

trunk/include/VBox/HostServices/DragAndDropSvc.h

@@ -97 +97 @@
     /** The host informs the guest that a DnD drop operation
      *  has been started and that the host wants the data in
-     *  a specific mime-type. */
+     *  a specific MIME type. */
     HOST_DND_GH_EVT_DROPPED,
 
@@ -134 +134 @@
      */
     GUEST_DND_GH_ACK_PENDING           = 500,
+    /**
+     * Sends data of the requsted MIME type to the host. There can
+     * be more than one message if the actual data does not fit
+     * into one.
+     */
     GUEST_DND_GH_SND_DATA,
     GUEST_DND_GH_EVT_ERROR,

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;
 }

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

@@ -39 +39 @@
 
 #include "VBGLR3Internal.h"
+#include "VBox/GuestHost/DragAndDrop.h"
 #include "VBox/HostServices/DragAndDropSvc.h"
 
@@ -47 +48 @@
  * Todo:
  * - Sending dirs/files in the G->H case
- * - Maybe the EOL converting of text mime-types (not fully sure, eventually
+ * - Maybe the EOL converting of text MIME types (not fully sure, eventually
  *   better done on the host side)
  */
-
-static int vbglR3DnDPathSanitize(char *pszPath, size_t cbPath);
 
 /******************************************************************************
  *    Private internal functions                                              *
  ******************************************************************************/
-
-static int vbglR3DnDCreateDropDir(char* pszDropDir, size_t cbSize)
-{
-    AssertPtrReturn(pszDropDir, VERR_INVALID_POINTER);
-    AssertReturn(cbSize,        VERR_INVALID_PARAMETER);
-
-    /** @todo On Windows we also could use the registry to override
-     *        this path, on Posix a dotfile and/or a guest property
-     *        can be used. */
-
-    /* Get the users temp directory. Don't use the user's root directory (or
-     * something inside it) because we don't know for how long/if the data will
-     * be kept after the guest OS used it. */
-    int rc = RTPathTemp(pszDropDir, cbSize);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    /* Append our base drop directory. */
-    rc = RTPathAppend(pszDropDir, cbSize, "VirtualBox Dropped Files");
-    if (RT_FAILURE(rc))
-        return rc;
-
-    /* Create it when necessary. */
-    if (!RTDirExists(pszDropDir))
-    {
-        rc = RTDirCreateFullPath(pszDropDir, RTFS_UNIX_IRWXU);
-        if (RT_FAILURE(rc))
-            return rc;
-    }
-
-    /* The actually drop directory consist of the current time stamp and a
-     * unique number when necessary. */
-    char pszTime[64];
-    RTTIMESPEC time;
-    if (!RTTimeSpecToString(RTTimeNow(&time), pszTime, sizeof(pszTime)))
-        return VERR_BUFFER_OVERFLOW;
-    rc = vbglR3DnDPathSanitize(pszTime, sizeof(pszTime));
-    if (RT_FAILURE(rc))
-        return rc;
-
-    rc = RTPathAppend(pszDropDir, cbSize, pszTime);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    /* Create it (only accessible by the current user) */
-    return RTDirCreateUniqueNumbered(pszDropDir, cbSize, RTFS_UNIX_IRWXU, 3, '-');
-}
 
 static int vbglR3DnDQueryNextHostMessageType(uint32_t uClientId, uint32_t *puMsg, uint32_t *pcParms, bool fWait)
@@ -319 +271 @@
     AssertPtrReturn(pcbDataRecv, VERR_INVALID_POINTER);
 
+    if (!*pcbDataRecv)
+        return VERR_INVALID_PARAMETER;
+
     /* Make a string list out of the uri data. */
-    RTCList<RTCString> uriList = RTCString(static_cast<char*>(*ppvData), *pcbDataRecv - 1).split("\r\n");
+    RTCList<RTCString> uriList =
+        RTCString(static_cast<char*>(*ppvData), *pcbDataRecv - 1).split("\r\n");
     if (uriList.isEmpty())
         return VINF_SUCCESS;
@@ -331 +287 @@
     /* Create and query the (unique) drop target directory. */
     char pszDropDir[RTPATH_MAX];
-    int rc = vbglR3DnDCreateDropDir(pszDropDir, sizeof(pszDropDir));
+    int rc = DnDDirCreateDroppedFiles(pszDropDir, sizeof(pszDropDir));
     if (RT_FAILURE(rc))
     {
@@ -349 +305 @@
         if (pszFilePath)
         {
-            rc = vbglR3DnDPathSanitize(pszFilePath, strlen(pszFilePath));
+            rc = DnDPathSanitize(pszFilePath, strlen(pszFilePath));
             if (RT_FAILURE(rc))
                 break;
 
             /** @todo Use RTPathJoin? */
-            RTCString strFullPath = RTCString().printf("%s%c%s", pszDropDir, RTPATH_SLASH, pszFilePath);
+            RTCString strFullPath
+                = RTCString().printf("%s%c%s", pszDropDir, RTPATH_SLASH, pszFilePath);
             char *pszNewUri = RTUriFileCreate(strFullPath.c_str());
             if (pszNewUri)
@@ -376 +333 @@
     }
 
-    /* Lists for holding created files & directories in the case of a
-     * rollback. */
+    /* Lists for holding created files & directories
+     * in the case of a rollback. */
     RTCList<RTCString> guestDirList;
     RTCList<RTCString> guestFileList;
-    char pszPathname[RTPATH_MAX];
+    char pszPathName[RTPATH_MAX];
     uint32_t cbPathname = 0;
     bool fLoop = RT_SUCCESS(rc); /* No error occurred yet? */
@@ -396 +353 @@
                     uint32_t fMode = 0;
                     rc = vbglR3DnDHGProcessSendDirMessage(uClientId,
-                                                          pszPathname,
-                                                          sizeof(pszPathname),
+                                                          pszPathName,
+                                                          sizeof(pszPathName),
                                                           &cbPathname,
                                                           &fMode);
                     if (RT_SUCCESS(rc))
-                        rc = vbglR3DnDPathSanitize(pszPathname, sizeof(pszPathname));
+                        rc = DnDPathSanitize(pszPathName, sizeof(pszPathName));
                     if (RT_SUCCESS(rc))
                     {
-                        char *pszNewDir = RTPathJoinA(pszDropDir, pszPathname);
+                        char *pszNewDir = RTPathJoinA(pszDropDir, pszPathName);
                         if (pszNewDir)
                         {
@@ -423 +380 @@
                     uint32_t fMode = 0;
                     rc = vbglR3DnDHGProcessSendFileMessage(uClientId,
-                                                           pszPathname,
-                                                           sizeof(pszPathname),
+                                                           pszPathName,
+                                                           sizeof(pszPathName),
                                                            &cbPathname,
                                                            pvTmpData,
@@ -431 +388 @@
                                                            &fMode);
                     if (RT_SUCCESS(rc))
-                        rc = vbglR3DnDPathSanitize(pszPathname, sizeof(pszPathname));
+                        rc = DnDPathSanitize(pszPathName, sizeof(pszPathName));
                     if (RT_SUCCESS(rc))
                     {
-                        char *pszNewFile = RTPathJoinA(pszDropDir, pszPathname);
+                        char *pszNewFile = RTPathJoinA(pszDropDir, pszPathName);
                         if (pszNewFile)
                         {
@@ -666 +623 @@
     {
         /* Check if this is an URI event. If so, let VbglR3 do all the actual
-         * data transfer + file /directory creation internally without letting
+         * data transfer + file/directory creation internally without letting
          * the caller know.
          *
@@ -747 +704 @@
     }
 
-    return rc;
-}
-
-static int vbglR3DnDPathSanitize(char *pszPath, size_t cbPath)
-{
-    int rc = VINF_SUCCESS;
-#ifdef RT_OS_WINDOWS
-    /* Filter out characters not allowed on Windows platforms, put in by
-       RTTimeSpecToString(). */
-    /** @todo Use something like RTPathSanitize() when available. Later. */
-    RTUNICP aCpSet[] =
-        { ' ', ' ', '(', ')', '-', '.', '0', '9', 'A', 'Z', 'a', 'z', '_', '_',
-          0xa0, 0xd7af, '\0' };
-    ssize_t cReplaced = RTStrPurgeComplementSet(pszPath, aCpSet, '_' /* Replacement */);
-    if (cReplaced < 0)
-        rc = VERR_INVALID_UTF8_ENCODING;
-#endif
     return rc;
 }
@@ -886 +826 @@
                 break;
             }
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
             case DragAndDropSvc::HOST_DND_GH_REQ_PENDING:
             {
@@ -908 +849 @@
                 break;
             }
+#endif
             default:
+            {
+                pEvent->uType = uMsg;
+
                 rc = VERR_NOT_SUPPORTED;
                 break;
+            }
         }
     }
@@ -979 +925 @@
 }
 
-VBGLR3DECL(int) VbglR3DnDGHSendData(uint32_t u32ClientId, void *pvData, uint32_t cbData)
+VBGLR3DECL(int) VbglR3DnDGHSendData(uint32_t u32ClientId,
+                                    void *pvData, uint32_t cbData)
 {
     AssertPtrReturn(pvData, VERR_INVALID_POINTER);
@@ -993 +940 @@
 
     int rc          = VINF_SUCCESS;
-    uint32_t cbMax  = _1M; /** @todo Remove 1 MB limit. */
+    uint32_t cbMax  = _64K; /* Transfer max. 64K chunks per message. */
     uint32_t cbSent = 0;
 
     while (cbSent < cbData)
     {
-        /* Initialize parameter */
         uint32_t cbToSend = RT_MIN(cbData - cbSent, cbMax);
         Msg.pData.SetPtr(static_cast<uint8_t*>(pvData) + cbSent, cbToSend);
-        /* Do request */
+
         rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
         if (RT_SUCCESS(rc))
-        {
             rc = Msg.hdr.result;
-            /* Did the host cancel the event? */
-            if (rc == VERR_CANCELLED)
-                break;
-        }
-        else
+
+        if (RT_FAILURE(rc))
             break;
+
         cbSent += cbToSend;
-//        RTThreadSleep(500);
-    }
+    }
+
+    if (RT_SUCCESS(rc))
+        Assert(cbSent == cbData);
 
     return rc;

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -75 +75 @@
  VBoxClient_SOURCES += \
         draganddrop.cpp
+ VBoxClient_LIBS     += \
+        $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
 endif
 

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -455 +455 @@
  ifdef VBOX_WITH_DRAG_AND_DROP_GH
   VirtualBox_QT_MOCHDRS += \
-        src/runtime/UIDnDMIMEData.h
+        src/runtime/UIDnDMIMEData.h \
+        src/runtime/UIDnDDrag.h
  endif
 endif
@@ -492 +493 @@
 
 ifdef VBOX_WITH_DRAG_AND_DROP
+ VirtualBox_QT_MOCSRCS += \
+        src/runtime/UIDnDHandler.cpp
  ifdef VBOX_WITH_DRAG_AND_DROP_GH
   VirtualBox_QT_MOCSRCS += \
+        src/runtime/UIDnDDrag.cpp \
         src/runtime/UIDnDMIMEData.cpp
  endif
@@ -781 +785 @@
  ifdef VBOX_WITH_DRAG_AND_DROP_GH
   VirtualBox_SOURCES += \
-        src/runtime/UIDnDMIMEData.cpp
-  VirtualBox_QT_MOCSRCS += \
-        src/runtime/UIDnDMIMEData.cpp
+        src/runtime/UIDnDMIMEData.cpp \
+        src/runtime/UIDnDDrag.cpp
+  VirtualBox_SOURCES.win += \
+        src/runtime/UIDnDDropSource_win.cpp \
+        src/runtime/UIDnDDataObject_win.cpp \
+        src/runtime/UIDnDEnumFormat_win.cpp
  endif
 endif

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp

@@ -34 +34 @@
 #include "UIDnDHandler.h"
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-# include "UIDnDMIMEData.h"
+# include "UIDnDDrag.h"
 #endif
 #include "UIMessageCenter.h"
@@ -46 +46 @@
 
 UIDnDHandler::UIDnDHandler(void)
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
-    : pMData(NULL)
-#endif
+    : mMode(Unknown)
 {
 }
@@ -60 +58 @@
                                          const QMimeData *pMimeData, QWidget * /* pParent = NULL */)
 {
+    if (mMode == GH) /* Wrong mode? Bail out. */
+        return Qt::IgnoreAction;
+
     LogFlowFunc(("screenId=%RU32, x=%d, y=%d, action=%ld\n",
                  screenId, x, y, toVBoxDnDAction(proposedAction)));
@@ -78 +79 @@
                                         const QMimeData *pMimeData, QWidget * /* pParent = NULL */)
 {
+    if (mMode == GH) /* Wrong mode? Bail out. */
+        return Qt::IgnoreAction;
+
 #ifdef DEBUG_andy
     LogFlowFunc(("screenId=%RU32, x=%d, y=%d, action=%ld\n",
@@ -99 +103 @@
                                         const QMimeData *pMimeData, QWidget *pParent /* = NULL */)
 {
+    if (mMode == GH) /* Wrong mode? Bail out. */
+        return Qt::IgnoreAction;
+
     LogFlowFunc(("screenId=%RU32, x=%d, y=%d, action=%ld\n",
                  screenId, x, y, toVBoxDnDAction(proposedAction)));
@@ -114 +121 @@
     if (result != KDragAndDropAction_Ignore)
     {
-        /* Get the actually data */
+        /* Get the actual MIME data in the requested format. */
         const QByteArray &d = pMimeData->data(format);
         if (   !d.isEmpty()
             && !format.isEmpty())
         {
-            /* We need the data in the vector format. */
+            /* Convert the actual MIME data to a vector (needed
+             * for the COM wrapper). */
             QVector<uint8_t> dv(d.size());
             memcpy(dv.data(), d.constData(), d.size());
@@ -126 +134 @@
             if (guest.isOk())
             {
-                msgCenter().showModalProgressDialog(progress, tr("Dropping data ..."), ":/progress_dnd_hg_90px.png", pParent);
-                if (!progress.GetCanceled() && (!progress.isOk() || progress.GetResultCode() != 0))
+                msgCenter().showModalProgressDialog(progress,
+                                                    tr("Dropping data ..."), ":/progress_dnd_hg_90px.png",
+                                                    pParent);
+                if (   !progress.GetCanceled()
+                    && (   !progress.isOk()
+                        ||  progress.GetResultCode() != 0))
                 {
                     msgCenter().cannotDropData(progress, pParent);
@@ -146 +158 @@
 void UIDnDHandler::dragHGLeave(CGuest &guest, ulong screenId, QWidget * /* pParent = NULL */)
 {
+    if (mMode == GH) /* Wrong mode? Bail out. */
+        return;
+
     LogFlowFunc(("screenId=%RU32\n", screenId));
     guest.DragHGLeave(screenId);
@@ -154 +169 @@
     int rc;
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
+    if (mMode == HG) /* Wrong mode? Bail out. */
+        return VERR_WRONG_ORDER;
+
     /*
      * How this works: Host is asking the guest if there is any DnD
@@ -169 +187 @@
     LogFlowFunc(("defaultAction=%d, numFormats=%d\n", defaultAction, vecFmtGuest.size()));
 
-    /*
-     * Do guest -> host format conversion, if needed.
-     * On X11 this already maps to the Xdnd protocol.
-     ** @todo What about the MacOS Carbon Drag Manager? Needs testing.
-     *
-     * See: https://www.iana.org/assignments/media-types/media-types.xhtml
-     */
-    LogFlowFunc(("Number of guest formats: %d\n", vecFmtGuest.size()));
     QStringList lstFmtNative;
-    for (int i = 0; i < vecFmtGuest.size(); i++)
+    if (defaultAction != KDragAndDropAction_Ignore)
     {
-        const QString &strFmtGuest = vecFmtGuest.at(i);
-        LogFlowFunc(("\tFormat %d: %s\n", i,
-                     strFmtGuest.toAscii().constData()));
+        /*
+         * Do guest -> host format conversion, if needed.
+         * On X11 this already maps to the Xdnd protocol.
+         ** @todo What about the MacOS Carbon Drag Manager? Needs testing.
+         *
+         * See: https://www.iana.org/assignments/media-types/media-types.xhtml
+         */
+        LogFlowFunc(("Number of guest formats: %d\n", vecFmtGuest.size()));
+        for (int i = 0; i < vecFmtGuest.size(); i++)
+        {
+            const QString &strFmtGuest = vecFmtGuest.at(i);
+            LogFlowFunc(("\tFormat %d: %s\n", i,
+                         strFmtGuest.toAscii().constData()));
 # ifdef RT_OS_WINDOWS
-        /* CF_TEXT */
-        if (   strFmtGuest.contains("text/plain", Qt::CaseInsensitive)
-            && !lstFmtNative.contains("text/plain"))
-        {
-            lstFmtNative << "text/plain";
-        }
-        /* CF_HDROP */
-        else if (   strFmtGuest.contains("text/uri-list", Qt::CaseInsensitive)
-                 && !lstFmtNative.contains("text/uri-list"))
-        {
-            lstFmtNative << "text/uri-list";
-        }
+            /* CF_TEXT */
+            if (   strFmtGuest.contains("text/plain", Qt::CaseInsensitive)
+                && !lstFmtNative.contains("text/plain"))
+            {
+                lstFmtNative << "text/plain";
+            }
+            /* CF_HDROP */
+            else if (   strFmtGuest.contains("text/uri-list", Qt::CaseInsensitive)
+                     && !lstFmtNative.contains("text/uri-list"))
+            {
+                lstFmtNative << "text/uri-list";
+            }
 # else
-        /* On non-Windows just do a 1:1 mapping. */
-        lstFmtNative << strFmtGuest;
+            /* On non-Windows just do a 1:1 mapping. */
+            lstFmtNative << strFmtGuest;
 #  ifdef RT_OS_MACOS
-        /** @todo Does the mapping apply here? Don't think so ... */
+            /** @todo Does the mapping apply here? Don't think so ... */
 #  endif
 # endif /* !RT_OS_WINDOWS */
+        }
+
+        LogFlowFunc(("Number of native formats: %d\n", lstFmtNative.size()));
+# ifdef DEBUG
+        for (int i = 0; i < lstFmtNative.size(); i++)
+            LogFlowFunc(("\tFormat %d: %s\n", i, lstFmtNative.at(i).toAscii().constData()));
+# endif
     }
 
-    LogFlowFunc(("Number of native formats: %d\n", lstFmtNative.size()));
-# ifdef DEBUG
-    for (int i = 0; i < lstFmtNative.size(); i++)
-        LogFlowFunc(("\tFormat %d: %s\n", i, lstFmtNative.at(i).toAscii().constData()));
-# endif
-
-    if (    defaultAction != KDragAndDropAction_Ignore
-        && !lstFmtNative.isEmpty())
+    if (!lstFmtNative.isEmpty())
     {
         try
         {
-            QDrag *pDrag = new QDrag(pParent);
-
-            /* pMData is transfered to the QDrag object, so no need for deletion. */
-            pMData = new UIDnDMimeData(session, lstFmtNative,
-                                                      toQtDnDAction(defaultAction),
-                                                      toQtDnDActions(vecActions), pParent);
-
-            /* Inform this object that MIME data from the guest is available so that
-             * it can update the MIME data object accordingly. */
-            connect(pMData, SIGNAL(sigDataAvailable(QString)),
-                    this, SLOT(sltDataAvailable(QString)), Qt::DirectConnection);
-
-            /* Inform the MIME data object of any changes in the current action. */
-            connect(pDrag, SIGNAL(actionChanged(Qt::DropAction)),
-                    pMData, SLOT(sltDropActionChanged(Qt::DropAction)));
-
-            /* Fire it up.
-             *
-             * On Windows this will start a modal operation using OLE's
-             * DoDragDrop() method, so this call will block until the DnD operation
-             * is finished. */
-            pDrag->setMimeData(pMData);
-            Qt::DropAction dropAction =
-                 pDrag->exec(toQtDnDActions(vecActions), toQtDnDAction(defaultAction));
-            LogFlowFunc(("dropAction=%ld\n", toVBoxDnDAction(dropAction)));
-# ifdef RT_OS_WINDOWS
-            /* Since the QDrag::exec() call above was blocking on Windows, decide what
-             * to do now, e.g. if there was a "drop" action.
-             *
-             * Note: The UIDnDMimeData object will not be not accessible here anymore,
-             *       since QDrag had its ownership and deleted it after the (blocking)
-             *       QDrag::exec() call. */
-# endif
-            rc = VINF_SUCCESS;
+            UIDnDDrag *pDrag = new UIDnDDrag(session, lstFmtNative,
+                                             toQtDnDAction(defaultAction),
+                                             toQtDnDActions(vecActions), pParent);
+            rc = pDrag->DoDragDrop();
+
+            delete pDrag;
         }
         catch (std::bad_alloc)
@@ -258 +250 @@
     else
         rc = VINF_SUCCESS;
-#else
+#else /* !VBOX_WITH_DRAG_AND_DROP_GH */
     NOREF(session);
     NOREF(screenId);
@@ -274 +266 @@
  */
 
+/* static */
 KDragAndDropAction UIDnDHandler::toVBoxDnDAction(Qt::DropAction action)
 {
@@ -286 +279 @@
 }
 
+/* static */
 QVector<KDragAndDropAction> UIDnDHandler::toVBoxDnDActions(Qt::DropActions actions)
 {
@@ -301 +295 @@
 }
 
+/* static */
 Qt::DropAction UIDnDHandler::toQtDnDAction(KDragAndDropAction action)
 {
@@ -315 +310 @@
 }
 
+/* static */
 Qt::DropActions UIDnDHandler::toQtDnDActions(const QVector<KDragAndDropAction> &vecActions)
 {
@@ -343 +339 @@
 }
 
-void UIDnDHandler::sltDataAvailable(const QString &mimeType)
-{
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
-    LogFlowFunc(("pMData=0x%p, mimeType=%s\n",
-                 pMData, mimeType.toAscii().constData()));
-
-    if (pMData)
-        pMData->setData(mimeType);
-#endif
-}
-
 #include "UIDnDHandler.moc"
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.h

@@ -35 +35 @@
 
 public:
+
     /* Singleton factory. */
     static UIDnDHandler* instance(void)
@@ -42 +43 @@
         return m_pInstance;
     }
+
     static void destroy(void)
     {
@@ -50 +52 @@
         }
     }
+
+    /**
+     * Current operation mode.
+     */
+    enum Mode
+    {
+        /** Unknown mode. */
+        Unknown = 0,
+        /** Host to guest. */
+        HG,
+        /** Guest to host. */
+        GH
+    };
 
     /* Host -> Guest. */
@@ -60 +75 @@
     int            dragGHPending(CSession &session, ulong screenId, QWidget *pParent = NULL);
 
-public slots:
+public:
 
-    void sltDataAvailable(const QString &mimetype);
+    static KDragAndDropAction          toVBoxDnDAction(Qt::DropAction action);
+    static QVector<KDragAndDropAction> toVBoxDnDActions(Qt::DropActions actions);
+    static Qt::DropAction              toQtDnDAction(KDragAndDropAction action);
+    static Qt::DropActions             toQtDnDActions(const QVector<KDragAndDropAction> &vecActions);
 
 private:
@@ -70 +88 @@
     virtual ~UIDnDHandler(void) {}
 
-    /* Private helpers. */
-    static KDragAndDropAction          toVBoxDnDAction(Qt::DropAction action);
-    static QVector<KDragAndDropAction> toVBoxDnDActions(Qt::DropActions actions);
-    static Qt::DropAction              toQtDnDAction(KDragAndDropAction action);
-    static Qt::DropActions             toQtDnDActions(const QVector<KDragAndDropAction> &vecActions);
-
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
-    UIDnDMimeData *pMData;
-    friend class UIDnDMimeData;
-#endif
+    /** The current operation mode. */
+    Mode mMode;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp

@@ -20 +20 @@
 /* Qt includes: */
 #include <QApplication>
+#include <QFileInfo>
 #include <QKeyEvent>
 #include <QMimeData>
@@ -34 +35 @@
 /* GUI includes: */
 #include "UIDnDMIMEData.h"
+#include "UIDnDDrag.h"
 #include "UIMessageCenter.h"
 
 UIDnDMimeData::UIDnDMimeData(CSession &session, QStringList formats,
                              Qt::DropAction defAction, Qt::DropActions actions,
-                             QWidget *pParent)
+                             UIDnDDrag *pParent)
     : m_pParent(pParent)
     , m_session(session)
@@ -96 +98 @@
 }
 
-bool UIDnDMimeData::hasFormat(const QString &mimeType) const
-{
-    bool fRc = m_lstFormats.contains(mimeType);
+bool UIDnDMimeData::hasFormat(const QString &strMIMEType) const
+{
+    bool fRc = m_lstFormats.contains(strMIMEType);
     LogFlowFunc(("%s: %RTbool (QtMimeData: %RTbool)\n",
-                 mimeType.toStdString().c_str(),
-                 fRc, QMimeData::hasFormat(mimeType)));
+                 strMIMEType.toStdString().c_str(),
+                 fRc, QMimeData::hasFormat(strMIMEType)));
     return fRc;
 }
 
-QVariant UIDnDMimeData::retrieveData(const QString &mimeType,
+QVariant UIDnDMimeData::retrieveData(const QString &strMIMEType,
                                      QVariant::Type type) const
 {
     LogFlowFunc(("m_enmState=%d, mimeType=%s, type=%d (%s)\n",
-                 m_enmState, mimeType.toStdString().c_str(),
+                 m_enmState, strMIMEType.toStdString().c_str(),
                  type, QVariant::typeToName(type)));
 
     bool fCanDrop = true;
 
-#if 0
 #ifdef RT_OS_WINDOWS
-    Qt::MouseButtons mouseBtns = Qt::NoButton;
-    bool fLeftBtnDown = RT_BOOL(GetAsyncKeyState(VK_LBUTTON) & 0x8000);
-    if (fLeftBtnDown)
-        mouseBtns |= Qt::LeftButton;
-# ifdef DEBUG_andy
-    LogFlowFunc(("mouseButtons=0x%x, GetAsyncKeyState(VK_LBUTTON)=%RTbool\n",
-                 mouseBtns, fLeftBtnDown));
-# endif
-    if (mouseBtns == Qt::NoButton)
-        m_enmState = Dropped;
-#endif
-#endif
-
-#ifdef RT_OS_WINDOWS
-    /* On Windows we only will get into this function if OLE's DoDragDrop
-     * routine (called by QtDrag) decides that a drop event just happened.
-     * So just update our internal state to reflect the same as on other
-     * platforms. */
+    /* On Windows this function will be called several times by Qt's
+     * OLE-specific internals to figure out which data formats we have
+     * to offer. So just assume we can drop data here for a start.* */
     fCanDrop = true;
 #else
-    /* Mouse button released? See eventFilter for more information. */
+    /* On non-Windows our state gets updated via an own event filter
+     * (see UIDnDMimeData::eventFilter). This filter will update the current
+     * operation state for us (based on the mouse buttons). */
     if (m_enmState != Dropped)
         fCanDrop = false;
@@ -143 +131 @@
     /* Do we support the requested MIME type? */
     if (   fCanDrop
-        && !m_lstFormats.contains(mimeType))
+        && !m_lstFormats.contains(strMIMEType))
     {
         LogFlowFunc(("Unsupported MIME type=%s\n",
-                     mimeType.toStdString().c_str()));
+                     strMIMEType.toStdString().c_str()));
         fCanDrop = false;
     }
@@ -169 +157 @@
         LogFlowFunc(("Skipping request, m_enmState=%d ...\n",
                      m_enmState));
-        return QMimeData::retrieveData(mimeType, type);
-    }
-
-    if (m_enmState == Dragging)
-    {
-        int rc = VINF_SUCCESS;
-
-        CGuest guest = m_session.GetConsole().GetGuest();
-        /* Start getting the data from the guest. First inform the guest we
-         * want the data in the specified MIME type. */
-        CProgress progress = guest.DragGHDropped(mimeType,
-                                                 UIDnDHandler::toVBoxDnDAction(m_defAction));
-        if (guest.isOk())
-        {
-            msgCenter().showModalProgressDialog(progress,
-                                                tr("Retrieving data ..."), ":/progress_dnd_gh_90px.png",
-                                                m_pParent);
-            if (!progress.GetCanceled())
-            {
-                if (   progress.isOk()
-                    && progress.GetResultCode() == 0)
-                {
-                    /** @todo What about retrieving bigger files? Loop? */
-
-                    /* After the data successfully arrived from the guest, we query it from Main. */
-                    QVector<uint8_t> data = guest.DragGHGetData();
-                    if (!data.isEmpty())
-                    {
-                        switch (type)
-                        {
-                            case QVariant::String:
-                            {
-                                m_data = QVariant(QString(reinterpret_cast<const char*>(data.data())));
-                                break;
-                            }
-
-                            case QVariant::ByteArray:
-                            {
-                                QByteArray ba(reinterpret_cast<const char*>(data.constData()), data.size());
-                                m_data = QVariant(ba);
-                                break;
-                            }
-
-                            case QVariant::List:
-                            {
-                                QString strData = QString(reinterpret_cast<const char*>(data.data()));
-                                QStringList lstString = strData.split("\r\n", QString::SkipEmptyParts);
-
-                                m_data = QVariant(lstString);
-                                break;
-                            }
-
-                            default:
-                                AssertMsgFailed(("Should never happen, d'oh!\n"));
-                                rc = VERR_NOT_SUPPORTED;
-                                break;
-                        }
-                    }
-                    /** @todo How often to retry on empty data received? */
-
-                    if (RT_SUCCESS(rc))
-                        emit sigDataAvailable(mimeType);
-
-                    m_enmState = DataRetrieved;
-                }
-                else
-                    msgCenter().cannotDropData(progress, m_pParent);
-            }
-            else
-                m_enmState = Canceled;
+        return QMimeData::retrieveData(strMIMEType, type);
+    }
+
+    int rc = VINF_SUCCESS;
+    if (m_enmState == Dropped)
+    {
+        AssertPtr(m_pParent);
+        rc = m_pParent->RetrieveData(strMIMEType, type, m_data);
+        if (RT_SUCCESS(rc))
+        {
+            /* Tell ourselves that data became available. */
+            emit sigDataAvailable(strMIMEType);
         }
         else
-            msgCenter().cannotDropData(guest, m_pParent);
-    }
-
-    //return QMimeData::retrieveData(mimeType, type);
-    return m_data;
+        {
+            m_enmState = Canceled;
+        }
+    }
+
+    LogFlowFunc(("Returning rc=%Rrc, m_enmState=%ld\n",
+                 rc, m_enmState));
+    return QMimeData::retrieveData(strMIMEType, type);
 }
 
@@ -327 +260 @@
             for (int i = 0; i < lstData.size(); i++)
             {
-                QString strURL = lstData.at(i).toString();
-                LogFlowFunc(("\tURL: %s\n",
-                             strURL.toAscii().constData()));
-                lstURL << QUrl(strURL.toAscii());
+                QFileInfo fileInfo(lstData.at(i).toString());
+#ifdef DEBUG
+                LogFlowFunc(("\tURL: %s (fExists=%RTbool, fIsDir=%RTbool, cb=%RU64)\n",
+                             fileInfo.absoluteFilePath().constData(), fileInfo.exists(),
+                             fileInfo.isDir(), fileInfo.size()));
+#endif
+                lstURL << QUrl::fromLocalFile(fileInfo.absoluteFilePath());
             }
             LogFlowFunc(("Number of URLs: %d\n",  lstURL.size()));
 
-            QMimeData::setUrls(f);
+            if (RT_SUCCESS(rc))
+                QMimeData::setUrls(lstURL);
             break;
         }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.h

@@ -32 +32 @@
 #include "UIDnDHandler.h"
 
+/* Forward declarations: */
+class UIDnDDrag;
+
 /** @todo Subclass QWindowsMime / QMacPasteboardMime
  *  to register own/more MIME types. */
@@ -45 +48 @@
     enum State
     {
+        /** Host is in dragging state, without
+         *  having retrieved the metadata from the guest yet. */
         Dragging = 0,
-        DataRetrieved,
+        /** Guest sent over the (MIME) metadata so that the
+         *  host knows which DnD targets can be used. */
+        MetaDataRetrieved,
+        /** There has been a "dropped" action which indicates
+         *  that the guest can continue sending more data (if any)
+         *  over to the host, based on the (MIME) metadata. */
         Dropped,
+        /** The operation has been canceled. */
         Canceled
     };
@@ -55 +66 @@
     UIDnDMimeData(CSession &session, QStringList formats,
                   Qt::DropAction defAction,
-                  Qt::DropActions actions, QWidget *pParent);
+                  Qt::DropActions actions, UIDnDDrag *pParent);
 
     int setData(const QString &mimeType);
@@ -89 +100 @@
 private:
 
-    /* Private members. */
-    QWidget          *m_pParent;
+    UIDnDDrag        *m_pParent;
     CSession          m_session;
     QStringList       m_lstFormats;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -1092 +1092 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
-
 void UIMachineView::dragEnterEvent(QDragEnterEvent *pEvent)
 {
@@ -1178 +1177 @@
     gDnD->dragGHPending(session(), screenId(), this);
 }
-
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 

trunk/src/VBox/GuestHost/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2008-2012 Oracle Corporation
+# Copyright (C) 2008-2014 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -32 +32 @@
 endif
 
+ifdef VBOX_WITH_DRAG_AND_DROP
+ include $(PATH_SUB_CURRENT)/DragAndDrop/Makefile.kmk
+endif
+
 include $(FILE_KBUILD_SUB_FOOTER)
 

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

@@ -43 +43 @@
         $(LIB_VMM) \
         $(LIB_RUNTIME) \
-        $(LIB_REM)
+        $(LIB_REM) \
+        $(PATH_STAGE_LIB)/VBoxDnDHostR3Lib$(VBOX_SUFF_LIB)
 
 VBoxDragAndDropSvc_LDFLAGS.darwin = \

trunk/src/VBox/HostServices/DragAndDrop/dndmanager.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -48 +48 @@
 {
 public:
-    DnDHGSendDirPrivate(const RTCString &strPath, uint32_t fMode, uint64_t cbSize, PFNDNDPRIVATEPROGRESS pfnProgressCallback, void *pvProgressUser)
-      : m_strPath(strPath)
-      , m_cbSize(cbSize)
-      , m_pfnProgressCallback(pfnProgressCallback)
-      , m_pvProgressUser(pvProgressUser)
+
+    DnDHGSendDirPrivate(const RTCString &strPath,
+                        uint32_t fMode, uint64_t cbSize,
+                        PFNDNDPRIVATEPROGRESS pfnProgressCallback, void *pvProgressUser)
+        : m_strPath(strPath)
+        , m_cbSize(cbSize)
+        , m_pfnProgressCallback(pfnProgressCallback)
+        , m_pvProgressUser(pvProgressUser)
     {
         VBOXHGCMSVCPARM paTmpParms[3];
         paTmpParms[0].setString(m_strPath.c_str());
-        paTmpParms[1].setUInt32(m_strPath.length() + 1);
+        paTmpParms[1].setUInt32((uint32_t)(m_strPath.length() + 1));
         paTmpParms[2].setUInt32(fMode);
 
@@ -74 +77 @@
 
 protected:
-    RTCString m_strPath;
+    RTCString              m_strPath;
 
     /* Progress stuff */
@@ -90 +93 @@
 {
 public:
-    DnDHGSendFilePrivate(const RTCString &strHostPath, const RTCString &strGuestPath, uint32_t fMode, uint64_t cbSize, PFNDNDPRIVATEPROGRESS pfnProgressCallback, void *pvProgressUser);
-    virtual ~DnDHGSendFilePrivate();
+
+    DnDHGSendFilePrivate(const RTCString &strHostPath,
+                         const RTCString &strGuestPath,
+                         uint32_t fMode, uint64_t cbSize,
+                         PFNDNDPRIVATEPROGRESS pfnProgressCallback, void *pvProgressUser);
+    virtual ~DnDHGSendFilePrivate(void);
 
     int currentMessage(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
@@ -117 +124 @@
 {
 public:
-    DnDHGSendDataMessagePrivate(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[], PFNDNDPRIVATEPROGRESS pfnProgressCallback, void *pvProgressUser);
+
+    DnDHGSendDataMessagePrivate(uint32_t uMsg, uint32_t cParms,
+                                VBOXHGCMSVCPARM paParms[],
+                                PFNDNDPRIVATEPROGRESS pfnProgressCallback, void *pvProgressUser);
     int currentMessage(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
 
@@ -149 +159 @@
 {
     m_paSkelParms[0].setString(m_strGuestPath.c_str());
-    m_paSkelParms[1].setUInt32(m_strGuestPath.length() + 1);
+    m_paSkelParms[1].setUInt32((uint32_t)(m_strGuestPath.length() + 1));
     m_paSkelParms[2].setPointer(NULL, 0);
     m_paSkelParms[3].setUInt32(0);
@@ -198 +208 @@
 
             /* Tell the guest the actual size. */
-            paParms[3].setUInt32(cbRead);
+            paParms[3].setUInt32((uint32_t)cbRead);
         }
     }
@@ -205 +215 @@
     {
         /* Check if we are done. */
+        Assert(m_cbFileProcessed <= m_cbFileSize);
         bool fDone = m_cbFileSize == m_cbFileProcessed;
         if (!fDone)
@@ -231 +242 @@
         {
             RTFileClose(m_hCurFile);
-            m_hCurFile = 0;
+            m_hCurFile = NIL_RTFILE;
         }
     }
@@ -325 +336 @@
                                            PFNDNDPROGRESS pfnProgressCallback,
                                            void *pvProgressUser)
-    : m_cbAll(0)
+    : m_cbTotal(0)
     , m_cbTransfered(0)
     , m_pfnProgressCallback(pfnProgressCallback)
     , m_pvProgressUser(pvProgressUser)
 {
+    if (cParms < 5) /* Paranoia. */
+        return;
+
+    const char *pszFormat = static_cast<const char*>(paParms[1].u.pointer.addr);
+    uint32_t cbFormat = paParms[1].u.pointer.size;
+
+    int rc = VINF_SUCCESS;
     RTCString strNewURIs;
 
-    /* Check the format for any uri type. */
-    if (hasFileUrls(static_cast<const char*>(paParms[1].u.pointer.addr),
-                    paParms[1].u.pointer.size))
-    {
-        LogFlowFunc(("Old data: '%s'\n", (char*)paParms[3].u.pointer.addr));
+    /* Do we need to build up a file tree? */
+    if (DnDMIMEHasFileURLs(pszFormat, cbFormat))
+    {
+        const char *pszList = static_cast<const char*>(paParms[3].u.pointer.addr);
+        AssertPtr(pszList);
+        uint32_t cbList = paParms[3].u.pointer.size;
+        Assert(cbList);
+
+        LogFlowFunc(("Old data: '%s'\n", pszList));
 
         /* The list is separated by newline (even if only one file is listed). */
-        RTCList<RTCString> lstURIOrg = RTCString(static_cast<const char*>(paParms[3].u.pointer.addr),
-                                                 paParms[3].u.pointer.size).split("\r\n");
+        RTCList<RTCString> lstURIOrg
+            = RTCString(pszList, cbList).split("\r\n");
         if (!lstURIOrg.isEmpty())
         {
-            RTCList<RTCString> lstURINew;
-            for (size_t i = 0; i < lstURIOrg.size(); ++i)
-            {
-                const RTCString &strURI = lstURIOrg.at(i);
-
-                /* Query the path component of a file URI. If this hasn't a
-                 * file scheme NULL is returned. */
-                char *pszFilePath;
-                if ((pszFilePath = RTUriFilePath(strURI.c_str(), URI_FILE_FORMAT_AUTO)))
-                {
-                    /* Add the path to our internal file list (recursive in
-                     * the case of a directory). */
-                    char *pszFilename;
-                    if ((pszFilename = RTPathFilename(pszFilePath)))
-                    {
-                        char *pszNewURI = RTUriFileCreate(pszFilename);
-                        if (pszNewURI)
-                        {
-                            lstURINew.append(pszNewURI);
-                            RTStrFree(pszNewURI);
-
-                            buildFileTree(pszFilePath, pszFilename - pszFilePath);
-                        }
-                    }
-
-                    RTStrFree(pszFilePath);
-                }
-                else /* Just append the raw data. */
-                    lstURINew.append(strURI);
-            }
-
-            /* We have to change the actual DnD data. Remove any host paths and
-             * just decode the filename into the new data. The guest tools will
-             * add the correct path again, before sending the DnD drop event to
-             * some window. */
-            strNewURIs = RTCString::join(lstURINew, "\r\n") + "\r\n";
-
-            /* Note: We don't delete the old pointer here, cause this is done
-             *       by the caller. We just use the RTString data, which has the
-             *       scope of this ctor. This is enough cause the data is copied in
-             *       the DnDHGSendDataMessagePrivate anyway. */
-            paParms[3].u.pointer.addr = (void*)strNewURIs.c_str();
-            paParms[3].u.pointer.size = strNewURIs.length() + 1;
-            paParms[4].u.uint32       = strNewURIs.length() + 1;
+            rc = m_lstURI.AppendPathsFromList(lstURIOrg, 0 /* fFlags */);
+            if (RT_SUCCESS(rc))
+            {
+                /* Add the total size of all meta data + files transferred to
+                 * the message's total count. */
+                m_cbTotal += m_lstURI.TotalBytes();
+
+                /* We have to change the actual DnD data. Remove any host paths and
+                 * just decode the filename into the new data. The guest tools will
+                 * add the correct path again, before sending the DnD drop event to
+                 * some window. */
+                strNewURIs = m_lstURI.RootToString();
+
+                /* Note: We don't delete the old pointer here, cause this is done
+                 *       by the caller. We just use the RTString data, which has the
+                 *       scope of this ctor. This is enough cause the data is copied in
+                 *       the DnDHGSendDataMessagePrivate anyway. */
+                paParms[3].u.pointer.addr = (void *)strNewURIs.c_str();
+                paParms[3].u.pointer.size = (uint32_t)(strNewURIs.length() + 1);
+                paParms[4].u.uint32       = (uint32_t)(strNewURIs.length() + 1);
+
+                LogFlowFunc(("Set new data: '%s'\n", (char*)paParms[3].u.pointer.addr));
+            }
         }
     }
 
     /* Add the size of the data to the todo list. */
-    m_cbAll += paParms[4].u.uint32;
+    m_cbTotal += paParms[4].u.uint32;
+    LogFlowFunc(("cbTotal=%zu\n", m_cbTotal));
 
     /* The first message is the meta info for the data and the data itself. */
     m_pNextPathMsg = new DnDHGSendDataMessagePrivate(uMsg, cParms, paParms,
                                                      &DnDHGSendDataMessage::progressCallback, this);
-#ifdef DEBUG
-    LogFlowFunc(("new data '%s'\n", (char*)paParms[3].u.pointer.addr));
-    LogFlowFunc(("cbAll: %zu\n", m_cbAll));
-    LogFlowFunc(("cbData: %RU32\n", paParms[4].u.uint32));
-
-    for (size_t i = 0; i < m_uriList.size(); ++i)
-        LogFlowFunc(("file: %s : %s - %o - %ld\n",
-                     m_uriList.at(i).m_strHostPath.c_str(), m_uriList.at(i).m_strGuestPath.c_str(),
-                     m_uriList.at(i).m_fMode, m_uriList.at(i).m_cbSize));
-#endif
 }
 
@@ -430 +422 @@
 }
 
-int DnDHGSendDataMessage::currentMessage(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+int DnDHGSendDataMessage::currentMessage(uint32_t uMsg,
+                                         uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
     if (!m_pNextPathMsg)
@@ -444 +437 @@
     }
 
-    /* File data to send? */
+    /* File/directory data to send? */
     if (!m_pNextPathMsg)
     {
-        if (m_uriList.isEmpty())
+        if (m_lstURI.IsEmpty())
             return rc;
+
         /* Create new messages based on our internal path list. Currently
          * this could be directories or regular files. */
-        PathEntry nextPath = m_uriList.first();
+        const DnDURIPath &nextPath = m_lstURI.First();
         try
         {
+            LogFlowFunc(("Processing srcPath=%s, dstPath=%s, fMode=0x%x, cbSize=%RU32, fIsDir=%RTbool, fIsFile=%RTbool\n",
+                         nextPath.m_strSrcPath.c_str(), nextPath.m_strDstPath.c_str(),
+                         nextPath.m_fMode, nextPath.m_cbSize,
+                         RTFS_IS_DIRECTORY(nextPath.m_fMode), RTFS_IS_FILE(nextPath.m_fMode)));
+
             if (RTFS_IS_DIRECTORY(nextPath.m_fMode))
-                m_pNextPathMsg = new DnDHGSendDirPrivate(nextPath.m_strGuestPath,
+                m_pNextPathMsg = new DnDHGSendDirPrivate(nextPath.m_strDstPath,
                                                          nextPath.m_fMode, nextPath.m_cbSize,
-                                                         &DnDHGSendDataMessage::progressCallback, this);
+                                                         &DnDHGSendDataMessage::progressCallback,
+                                                         this /* pvProgressUser */);
             else if (RTFS_IS_FILE(nextPath.m_fMode))
-                m_pNextPathMsg = new DnDHGSendFilePrivate(nextPath.m_strHostPath, nextPath.m_strGuestPath,
+                m_pNextPathMsg = new DnDHGSendFilePrivate(nextPath.m_strSrcPath, nextPath.m_strDstPath,
                                                           nextPath.m_fMode, nextPath.m_cbSize,
-                                                          &DnDHGSendDataMessage::progressCallback, this);
+                                                          &DnDHGSendDataMessage::progressCallback,
+                                                          this /* pvProgressUser */);
             else
-                AssertMsgFailedReturn(("type '%d' is not supported for path '%s'",
-                                       nextPath.m_fMode, nextPath.m_strHostPath.c_str()), VERR_NO_DATA);
-
-            m_uriList.removeFirst();
+                AssertMsgFailedReturn(("fMode=0x%x is not supported for srcPath=%s, dstPath=%s\n",
+                                       nextPath.m_fMode, nextPath.m_strSrcPath.c_str(), nextPath.m_strDstPath),
+                                       VERR_NO_DATA);
+
+            m_lstURI.RemoveFirst();
         }
         catch(std::bad_alloc &)
@@ -473 +475 @@
         }
     }
-
-    return rc;
-}
-
-bool DnDHGSendDataMessage::hasFileUrls(const char *pcszFormat, size_t cbMax) const
-{
-    LogFlowFunc(("format %s\n", pcszFormat));
-
-    /** @todo text/uri also an official variant? */
-    return (   RTStrNICmp(pcszFormat, "text/uri-list", cbMax)             == 0
-            || RTStrNICmp(pcszFormat, "x-special/gnome-icon-list", cbMax) == 0);
-}
-
-int DnDHGSendDataMessage::buildFileTree(const char *pcszPath, size_t cbBaseLen)
-{
-    RTFSOBJINFO objInfo;
-    int rc = RTPathQueryInfo(pcszPath, &objInfo, RTFSOBJATTRADD_NOTHING);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    /*
-     * These are the types we currently support. Symlinks are not directly
-     * supported. First the guest could be an OS which doesn't support it and
-     * second the symlink could point to a file which is out of the base tree.
-     * Both things are hard to support. For now we just copy the target file in
-     * this case.
-     */
-    if (!(   RTFS_IS_DIRECTORY(objInfo.Attr.fMode)
-          || RTFS_IS_FILE(objInfo.Attr.fMode)
-          || RTFS_IS_SYMLINK(objInfo.Attr.fMode)))
-        return VINF_SUCCESS;
-
-    uint64_t cbSize = 0;
-    rc = RTFileQuerySize(pcszPath, &cbSize);
-    if (rc == VERR_IS_A_DIRECTORY)
-        rc = VINF_SUCCESS;
-
-    if (RT_FAILURE(rc))
-        return rc;
-
-    m_uriList.append(PathEntry(pcszPath, &pcszPath[cbBaseLen], objInfo.Attr.fMode, cbSize));
-    m_cbAll += cbSize;
-    LogFlowFunc(("cbFile: %RU64\n", cbSize));
-
-    PRTDIR hDir;
-    /* We have to try to open even symlinks, cause they could be symlinks
-     * to directories. */
-    rc = RTDirOpen(&hDir, pcszPath);
-    /* The following error happens when this was a symlink to an file or a
-     * regular file. */
-    if (rc == VERR_PATH_NOT_FOUND)
-        return VINF_SUCCESS;
-    if (RT_FAILURE(rc))
-        return rc;
-
-    while (RT_SUCCESS(rc))
-    {
-        RTDIRENTRY DirEntry;
-        rc = RTDirRead(hDir, &DirEntry, NULL);
-        if (RT_FAILURE(rc))
-        {
-            if (rc == VERR_NO_MORE_FILES)
-                rc = VINF_SUCCESS;
-            break;
-        }
-        switch (DirEntry.enmType)
-        {
-            case RTDIRENTRYTYPE_DIRECTORY:
-            {
-                /* Skip "." and ".." entries. */
-                if (   RTStrCmp(DirEntry.szName, ".")  == 0
-                    || RTStrCmp(DirEntry.szName, "..") == 0)
-                    break;
-                if (char *pszRecDir = RTStrAPrintf2("%s%c%s", pcszPath, RTPATH_DELIMITER, DirEntry.szName))
-                {
-                    rc = buildFileTree(pszRecDir, cbBaseLen);
-                    RTStrFree(pszRecDir);
-                }
-                else
-                    rc = VERR_NO_MEMORY;
-                break;
-            }
-            case RTDIRENTRYTYPE_SYMLINK:
-            case RTDIRENTRYTYPE_FILE:
-            {
-                char *pszNewFile;
-                if ((pszNewFile = RTStrAPrintf2("%s%c%s", pcszPath, RTPATH_DELIMITER, DirEntry.szName)))
-                {
-                    /* We need the size and the mode of the file. */
-                    RTFSOBJINFO objInfo1;
-                    rc = RTPathQueryInfo(pszNewFile, &objInfo1, RTFSOBJATTRADD_NOTHING);
-                    if (RT_FAILURE(rc))
-                        return rc;
-                    rc = RTFileQuerySize(pszNewFile, &cbSize);
-                    if (RT_FAILURE(rc))
-                        break;
-
-                    m_uriList.append(PathEntry(pszNewFile, &pszNewFile[cbBaseLen],
-                                               objInfo1.Attr.fMode, cbSize));
-                    m_cbAll += cbSize;
-
-                    RTStrFree(pszNewFile);
-                }
-                else
-                    rc = VERR_NO_MEMORY;
-                break;
-            }
-
-            default:
-                break;
-        }
-    }
-
-    RTDirClose(hDir);
 
     return rc;
@@ -601 +489 @@
     pSelf->m_cbTransfered += cbDone;
 
-    /* Advance progress info */
+    /* Advance progress info. */
     int rc = VINF_SUCCESS;
     if (   pSelf->m_pfnProgressCallback
-        && pSelf->m_cbAll)
-    {
-        rc = pSelf->m_pfnProgressCallback((uint64_t)pSelf->m_cbTransfered * 100 / pSelf->m_cbAll,
+        && pSelf->m_cbTotal)
+    {
+        AssertMsg(pSelf->m_cbTransfered <= pSelf->m_cbTotal,
+                  ("More bytes transferred (%zu) than expected (%zu), cbDone=%zu\n",
+                   pSelf->m_cbTransfered, pSelf->m_cbTotal, cbDone));
+
+        unsigned uPercentage = (unsigned)((uint64_t)pSelf->m_cbTransfered * 100 / pSelf->m_cbTotal);
+        rc = pSelf->m_pfnProgressCallback(RT_CLAMP(uPercentage, 0, 100),
                                           DragAndDropSvc::DND_PROGRESS_RUNNING,
                                           VINF_SUCCESS /* rc */, pSelf->m_pvProgressUser);

trunk/src/VBox/HostServices/DragAndDrop/dndmanager.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -18 +18 @@
 #define ___VBox_HostService_DnD_dndmanager_h
 
+#include <VBox/GuestHost/DragAndDrop.h>
 #include <VBox/HostServices/Service.h>
 #include <VBox/HostServices/DragAndDropSvc.h>
@@ -34 +35 @@
 {
 public:
-    DnDMessage()
-      : m_pNextMsg(NULL)
-    {
-    }
-    virtual ~DnDMessage()
+
+    DnDMessage(void)
+        : m_pNextMsg(NULL)
+    {
+    }
+
+    virtual ~DnDMessage(void)
     {
         clearNextMsg();
     }
 
-    virtual HGCM::Message* nextHGCMMessage()
+    virtual HGCM::Message* nextHGCMMessage(void)
     {
         return m_pNextMsg;
     }
+
     virtual int currentMessageInfo(uint32_t *puMsg, uint32_t *pcParms)
     {
@@ -60 +64 @@
         return VINF_SUCCESS;
     }
-    virtual int currentMessage(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+
+    virtual int currentMessage(uint32_t uMsg, uint32_t cParms,
+                               VBOXHGCMSVCPARM paParms[])
     {
         if (!m_pNextMsg)
@@ -71 +77 @@
         return rc;
     }
-    virtual void clearNextMsg()
+
+    virtual void clearNextMsg(void)
     {
         if (m_pNextMsg)
@@ -80 +87 @@
     }
 
-    virtual bool isMessageWaiting() const { return m_pNextMsg != NULL; }
+    virtual bool isMessageWaiting(void) const { return m_pNextMsg != NULL; }
 
 protected:
+
     HGCM::Message *m_pNextMsg;
 };
@@ -106 +114 @@
 public:
 
-    DnDHGSendDataMessage(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[], PFNDNDPROGRESS pfnProgressCallback, void *pvProgressUser);
+    DnDHGSendDataMessage(uint32_t uMsg, uint32_t cParms,
+                         VBOXHGCMSVCPARM paParms[],
+                         PFNDNDPROGRESS pfnProgressCallback, void *pvProgressUser);
+
     virtual ~DnDHGSendDataMessage(void);
 
@@ -117 +128 @@
 protected:
 
-    struct PathEntry
-    {
-        PathEntry(const RTCString &strHostPath, const RTCString &strGuestPath, uint32_t fMode, uint64_t cbSize)
-            : m_strHostPath(strHostPath)
-            , m_strGuestPath(strGuestPath)
-            , m_fMode(fMode)
-            , m_cbSize(cbSize) {}
-        RTCString m_strHostPath;
-        RTCString m_strGuestPath;
-        uint32_t  m_fMode;
-        uint64_t  m_cbSize;
-    };
-
-    bool hasFileUrls(const char *pcszFormat, size_t cbMax) const;
-    int buildFileTree(const char *pcszPath, size_t cbBaseLen);
     static DECLCALLBACK(int) progressCallback(size_t cbDone, void *pvUser);
 
-    RTCList<PathEntry>  m_uriList;
     DnDMessage         *m_pNextPathMsg;
 
-    /* Total size (in bytes). */
-    size_t              m_cbAll;
-    /* Transferred size (in bytes). */
+    DnDURIList          m_lstURI;
+    /* Total message size (in bytes). */
+    size_t              m_cbTotal;
+    /* Transferred message size (in bytes). */
     size_t              m_cbTransfered;
+
     PFNDNDPROGRESS      m_pfnProgressCallback;
     void               *m_pvProgressUser;
@@ -152 +149 @@
 {
 public:
-    DnDHGCancelMessage()
-    {
-        m_pNextMsg = new HGCM::Message(DragAndDropSvc::HOST_DND_HG_EVT_CANCEL, 0, 0);
+
+    DnDHGCancelMessage(void)
+    {
+        m_pNextMsg
+            = new HGCM::Message(DragAndDropSvc::HOST_DND_HG_EVT_CANCEL,
+                                0 /* cParms */, 0 /* aParms */);
     }
 };
@@ -165 +165 @@
 {
 public:
+
     DnDManager(PFNDNDPROGRESS pfnProgressCallback, void *pvProgressUser)
-      : m_pCurMsg(0)
-      , m_fOpInProcess(false)
-      , m_pfnProgressCallback(pfnProgressCallback)
-      , m_pvProgressUser(pvProgressUser)
+        : m_pCurMsg(0)
+        , m_fOpInProcess(false)
+        , m_pfnProgressCallback(pfnProgressCallback)
+        , m_pvProgressUser(pvProgressUser)
     {}
-    virtual ~DnDManager()
+
+    virtual ~DnDManager(void)
     {
         clear();
@@ -178 +180 @@
     int addMessage(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
 
-    HGCM::Message *nextHGCMMessage();
+    HGCM::Message *nextHGCMMessage(void);
     int nextMessageInfo(uint32_t *puMsg, uint32_t *pcParms);
     int nextMessage(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
 
-    void clear();
-
-    bool hasActiveOperation() const { return m_fOpInProcess; }
+    void clear(void);
+
+    bool hasActiveOperation(void) const { return m_fOpInProcess; }
 
 private:
@@ -196 +198 @@
     void                 *m_pvProgressUser;
 };
-
 #endif /* ___VBox_HostService_DnD_dndmanager_h */
 

trunk/src/VBox/HostServices/DragAndDrop/service.cpp

@@ -470 +470 @@
         DragAndDropSvc::VBOXDNDCBHGEVTPROGRESSDATA data;
         data.hdr.u32Magic = DragAndDropSvc::CB_MAGIC_DND_HG_EVT_PROGRESS;
-        data.uPercentage  = uPercentage;
+        data.uPercentage  = RT_CLAMP(uPercentage, 0, 100);
         data.uState       = uState;
         data.rc           = rc;

trunk/src/VBox/Main/Makefile.kmk

@@ -392 +392 @@
         $(if $(VBOX_WITH_XPCOM),src-server/xpcom/server.cpp,)
 
-ifn1of ($(KBUILD_TARGET), win darwin) 
+ifn1of ($(KBUILD_TARGET), win darwin)
         VBoxSVC_SOURCES += $(PATH_ROOT)/src/VBox/Devices/Network/slirp/resolv_conf_parser.c
 endif
@@ -663 +663 @@
  VBoxC_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)
  VBoxC_LDFLAGS.darwin += -framework OpenGL
+endif
+
+ifdef VBOX_WITH_DRAG_AND_DROP
+ VBoxC_LIBS += $(PATH_STAGE_LIB)/VBoxDnDHostR3Lib$(VBOX_SUFF_LIB)
 endif
 

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

@@ -24 +24 @@
 # include "GuestDnDImpl.h"
 
+# include <iprt/dir.h>
+# include <iprt/path.h>
+# include <iprt/stream.h>
+# include <iprt/semaphore.h>
+# include <iprt/cpp/utils.h>
+
 # include <VMMDev.h>
 
 # include <VBox/com/list.h>
+# include <VBox/GuestHost/DragAndDrop.h>
 # include <VBox/HostServices/DragAndDropSvc.h>
 
@@ -34 +41 @@
 # define LOG_GROUP LOG_GROUP_GUEST_DND
 # include <VBox/log.h>
-
-# include <iprt/stream.h>
-# include <iprt/semaphore.h>
-# include <iprt/cpp/utils.h>
 
 /* How does this work:
@@ -209 +212 @@
 };
 
+/** @todo This class needs a major cleanup. Later. */
 class GuestDnDPrivate
 {
 private:
-    /* todo: currently we only support one response. Maybe this needs to be extended at some time. */
+
+    /** @todo Currently we only support one response. Maybe this needs to be extended at some time. */
     GuestDnDPrivate(GuestDnD *q, const ComObjPtr<Guest>& pGuest)
         : q_ptr(q)
@@ -225 +230 @@
     void hostCall(uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms) const;
 
-    /* Static helper */
+    /* Static helpers. */
     static RTCString           toFormatString(ComSafeArrayIn(IN_BSTR, formats));
     static void                toFormatSafeArray(const RTCString &strFormats, ComSafeArrayOut(BSTR, formats));
@@ -238 +243 @@
     ComObjPtr<Guest>                 p;
 
-    /* Private helper members */
+    /* Private helper members. */
     static const RTCList<RTCString>  m_sstrAllowedMimeTypes;
     DnDGuestResponse                *m_pDnDResponse;
@@ -396 +401 @@
     ComPtr<IDisplay> pDisplay;
     HRESULT rc = p->mParent->COMGETTER(Display)(pDisplay.asOutParam());
-    if (FAILED(rc)) throw rc;
+    if (FAILED(rc))
+        throw rc;
+
     ComPtr<IFramebuffer> pFramebuffer;
     LONG xShift, yShift;
-    rc = pDisplay->GetFramebuffer(uScreenId, pFramebuffer.asOutParam(), &xShift, &yShift);
-    if (FAILED(rc)) throw rc;
+    rc = pDisplay->GetFramebuffer(uScreenId, pFramebuffer.asOutParam(),
+                                  &xShift, &yShift);
+    if (FAILED(rc))
+        throw rc;
+
     *puX += xShift;
     *puY += yShift;
@@ -696 +706 @@
 }
 
-HRESULT GuestDnD::dragHGDrop(ULONG uScreenId, ULONG uX, ULONG uY, DragAndDropAction_T defaultAction, ComSafeArrayIn(DragAndDropAction_T, allowedActions), ComSafeArrayIn(IN_BSTR, formats), BSTR *pstrFormat, DragAndDropAction_T *pResultAction)
+HRESULT GuestDnD::dragHGDrop(ULONG uScreenId, ULONG uX, ULONG uY,
+                             DragAndDropAction_T defaultAction,
+                             ComSafeArrayIn(DragAndDropAction_T, allowedActions),
+                             ComSafeArrayIn(IN_BSTR, formats),
+                             BSTR *pstrFormat,
+                             DragAndDropAction_T *pResultAction)
 {
     DPTR(GuestDnD);
@@ -783 +798 @@
         pDnD->resetProgress(p);
 
+        /* Note: The actual data transfer of files/directoies is performed by the
+         *       DnD host service. */
         d->hostCall(DragAndDropSvc::HOST_DND_HG_SND_DATA,
                     i,
@@ -854 +871 @@
 
     Utf8Str strFormat(bstrFormat);
-    HRESULT rc = S_OK;
+    HRESULT hr = S_OK;
 
     uint32_t uAction = d->toHGCMAction(action);
@@ -861 +878 @@
         return S_OK;
 
+    const char *pcszFormat = strFormat.c_str();
+    LogFlowFunc(("strFormat=%s, uAction=0x%x\n", pcszFormat, uAction));
+    if (DnDMIMENeedsDropDir(pcszFormat, strlen(pcszFormat)))
+    {
+        char szDropDir[RTPATH_MAX];
+        int rc = DnDDirCreateDroppedFiles(szDropDir, sizeof(szDropDir));
+        if (RT_FAILURE(rc))
+            return p->setError(VBOX_E_IPRT_ERROR,
+                               p->tr("Unable to create the temporary drag'n drop directory \"%s\" (%Rrc)\n"),
+                               szDropDir, rc);
+        LogFlowFunc(("Dropped files directory on the host is: %s\n", szDropDir));
+    }
+
     try
     {
-        LogFlowFunc(("strFormat=%s, uAction=0x%x\n", strFormat.c_str(), uAction));
-
         VBOXHGCMSVCPARM paParms[3];
         int i = 0;
@@ -872 +900 @@
 
         DnDGuestResponse *pDnD = d->response();
+
         /* Reset any old data and the progress status. */
         pDnD->reset();
@@ -885 +914 @@
     catch (HRESULT rc2)
     {
-        rc = rc2;
-    }
-
-    return rc;
+        hr = rc2;
+    }
+
+    return hr;
 }
 
@@ -906 +935 @@
         if (cbData)
         {
-            /* Copy the data into an safe array of bytes. */
+            /* Copy the data into a safe array of bytes. */
             const void *pvData = pDnD->data();
             if (sfaData.resize(cbData))
@@ -1006 +1035 @@
             if (RT_SUCCESS(rc))
             {
+                /** @todo Store pCBData->cbAllSize in the guest's response struct
+                 *        if not set already. */
                 uint32_t cbTotalSize = pCBData->cbAllSize;
                 unsigned int cPercentage;
@@ -1015 +1046 @@
                 /** @todo Don't use anonymous enums. */
                 uint32_t uState = DragAndDropSvc::DND_PROGRESS_RUNNING;
-                if (   pCBData->cbAllSize == cbCurSize
+                if (   cbTotalSize == cbCurSize
                     /* Empty data? Should not happen, but anyway ... */
-                    || !pCBData->cbAllSize)
+                    || !cbTotalSize)
                 {
                     uState = DragAndDropSvc::DND_PROGRESS_COMPLETE;
@@ -1024 +1055 @@
                 rc = pResp->setProgress(cPercentage, uState);
             }
-            /* Todo: for now we instantly confirm the cancel. Check if the
-             * guest should first clean up stuff itself and than really confirm
-             * the cancel request by an extra message. */
+
+            /** @todo For now we instantly confirm the cancel. Check if the
+             *        guest should first clean up stuff itself and than really confirm
+             *        the cancel request by an extra message. */
             if (rc == VERR_CANCELLED)
                 pResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_CANCELLED);
@@ -1053 +1085 @@
     return rc;
 }
-
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 

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

@@ -838 +838 @@
 }
 
-STDMETHODIMP Guest::DragHGEnter(ULONG uScreenId, ULONG uX, ULONG uY, DragAndDropAction_T defaultAction, ComSafeArrayIn(DragAndDropAction_T, allowedActions), ComSafeArrayIn(IN_BSTR, formats), DragAndDropAction_T *pResultAction)
+STDMETHODIMP Guest::DragHGEnter(ULONG uScreenId, ULONG uX, ULONG uY,
+                                DragAndDropAction_T defaultAction,
+                                ComSafeArrayIn(DragAndDropAction_T, allowedActions),
+                                ComSafeArrayIn(IN_BSTR, formats),
+                                DragAndDropAction_T *pResultAction)
 {
     /* Input validation */
@@ -849 +853 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
-    return m_pGuestDnD->dragHGEnter(uScreenId, uX, uY, defaultAction, ComSafeArrayInArg(allowedActions), ComSafeArrayInArg(formats), pResultAction);
+    return m_pGuestDnD->dragHGEnter(uScreenId, uX, uY, defaultAction,
+                                    ComSafeArrayInArg(allowedActions),
+                                    ComSafeArrayInArg(formats),
+                                    pResultAction);
 #else /* VBOX_WITH_DRAG_AND_DROP */
     ReturnComNotImplemented();
@@ -855 +862 @@
 }
 
-STDMETHODIMP Guest::DragHGMove(ULONG uScreenId, ULONG uX, ULONG uY, DragAndDropAction_T defaultAction, ComSafeArrayIn(DragAndDropAction_T, allowedActions), ComSafeArrayIn(IN_BSTR, formats), DragAndDropAction_T *pResultAction)
+STDMETHODIMP Guest::DragHGMove(ULONG uScreenId, ULONG uX, ULONG uY,
+                               DragAndDropAction_T defaultAction,
+                               ComSafeArrayIn(DragAndDropAction_T, allowedActions),
+                               ComSafeArrayIn(IN_BSTR, formats),
+                               DragAndDropAction_T *pResultAction)
 {
     /* Input validation */
@@ -866 +877 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
-    return m_pGuestDnD->dragHGMove(uScreenId, uX, uY, defaultAction, ComSafeArrayInArg(allowedActions), ComSafeArrayInArg(formats), pResultAction);
+    return m_pGuestDnD->dragHGMove(uScreenId, uX, uY, defaultAction,
+                                   ComSafeArrayInArg(allowedActions),
+                                   ComSafeArrayInArg(formats),
+                                   pResultAction);
 #else /* VBOX_WITH_DRAG_AND_DROP */
     ReturnComNotImplemented();
@@ -884 +898 @@
 }
 
-STDMETHODIMP Guest::DragHGDrop(ULONG uScreenId, ULONG uX, ULONG uY, DragAndDropAction_T defaultAction, ComSafeArrayIn(DragAndDropAction_T, allowedActions), ComSafeArrayIn(IN_BSTR, formats), BSTR *pstrFormat, DragAndDropAction_T *pResultAction)
+STDMETHODIMP Guest::DragHGDrop(ULONG uScreenId, ULONG uX, ULONG uY,
+                               DragAndDropAction_T defaultAction,
+                               ComSafeArrayIn(DragAndDropAction_T, allowedActions),
+                               ComSafeArrayIn(IN_BSTR, formats),
+                               BSTR *pstrFormat, DragAndDropAction_T *pResultAction)
 {
     /* Input validation */
@@ -896 +914 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
-    return m_pGuestDnD->dragHGDrop(uScreenId, uX, uY, defaultAction, ComSafeArrayInArg(allowedActions), ComSafeArrayInArg(formats), pstrFormat, pResultAction);
+    return m_pGuestDnD->dragHGDrop(uScreenId, uX, uY,
+                                   defaultAction,
+                                   ComSafeArrayInArg(allowedActions),
+                                   ComSafeArrayInArg(formats),
+                                   pstrFormat, pResultAction);
 #else /* VBOX_WITH_DRAG_AND_DROP */
     ReturnComNotImplemented();
@@ -902 +924 @@
 }
 
-STDMETHODIMP Guest::DragHGPutData(ULONG uScreenId, IN_BSTR bstrFormat, ComSafeArrayIn(BYTE, data), IProgress **ppProgress)
+STDMETHODIMP Guest::DragHGPutData(ULONG uScreenId, IN_BSTR bstrFormat,
+                                  ComSafeArrayIn(BYTE, data),
+                                  IProgress **ppProgress)
 {
     /* Input validation */
@@ -913 +937 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
-    return m_pGuestDnD->dragHGPutData(uScreenId, bstrFormat, ComSafeArrayInArg(data), ppProgress);
+    return m_pGuestDnD->dragHGPutData(uScreenId, bstrFormat,
+                                      ComSafeArrayInArg(data), ppProgress);
 #else /* VBOX_WITH_DRAG_AND_DROP */
     ReturnComNotImplemented();
@@ -919 +944 @@
 }
 
-STDMETHODIMP Guest::DragGHPending(ULONG uScreenId, ComSafeArrayOut(BSTR, formats), ComSafeArrayOut(DragAndDropAction_T, allowedActions), DragAndDropAction_T *pDefaultAction)
+STDMETHODIMP Guest::DragGHPending(ULONG uScreenId,
+                                  ComSafeArrayOut(BSTR, formats),
+                                  ComSafeArrayOut(DragAndDropAction_T, allowedActions),
+                                  DragAndDropAction_T *pDefaultAction)
 {
     /* Input validation */
@@ -930 +958 @@
 
 #if defined(VBOX_WITH_DRAG_AND_DROP) && defined(VBOX_WITH_DRAG_AND_DROP_GH)
-    return m_pGuestDnD->dragGHPending(uScreenId, ComSafeArrayOutArg(formats), ComSafeArrayOutArg(allowedActions), pDefaultAction);
+    return m_pGuestDnD->dragGHPending(uScreenId,
+                                      ComSafeArrayOutArg(formats),
+                                      ComSafeArrayOutArg(allowedActions),
+                                      pDefaultAction);
 #else /* VBOX_WITH_DRAG_AND_DROP */
     ReturnComNotImplemented();
@@ -936 +967 @@
 }
 
-STDMETHODIMP Guest::DragGHDropped(IN_BSTR bstrFormat, DragAndDropAction_T action, IProgress **ppProgress)
+STDMETHODIMP Guest::DragGHDropped(IN_BSTR bstrFormat, DragAndDropAction_T action,
+                                  IProgress **ppProgress)
 {
     /* Input validation */