Changeset 50593 in vbox

Timestamp:

Feb 26, 2014 8:44:58 AM (11 years ago)

Author:

vboxsync

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

92464

Message:

DnD: Bugfixes for Linux hosts.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (3 diffs)
• Additions/x11/VBoxClient/draganddrop.cpp (modified) (21 diffs)
• Frontends/VirtualBox/src/runtime/UIDnDDrag.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/runtime/UIDnDDrag.h (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/runtime/UIDnDMIMEData.h (modified) (3 diffs)
• GuestHost/DragAndDrop/DnDURIList.cpp (modified) (1 diff)
• HostServices/DragAndDrop/service.cpp (modified) (1 diff)
• Main/src-client/GuestDnDImpl.cpp (modified) (5 diffs)

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

@@ -947 +947 @@
     int rc;
 
-    uint32_t cbMaxChunk = _64K; /* Transfer max. 64K chunks per message. */
+    uint32_t cbMaxChunk = _64K; /** @todo Transfer max. 64K chunks per message. Configurable? */
     uint32_t cbSent     = 0;
 
@@ -968 +968 @@
         Assert(cbSent == cbData);
 
-    LogFlowFunc(("Returning rc=%Rrc, cbData=%RU32, cbAddtionalData=%RU32\n",
-                 rc, cbData, cbAdditionalData));
+    LogFlowFunc(("Returning rc=%Rrc, cbData=%RU32, cbAddtionalData=%RU32, cbSent=%RU32\n",
+                 rc, cbData, cbAdditionalData, cbSent));
     return rc;
 }
@@ -1144 +1144 @@
     {
         int rc2 = VbglR3DnDGHSendError(u32ClientId, rc);
-        if (RT_SUCCESS(rc2))
-            rc2 = rc;
+        AssertRC(rc2);
     }
 

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -1034 +1034 @@
 }
 
-
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-/*
- * Guest -> Host
- */
-
 int DragInstance::ghIsDnDPending(void)
 {
@@ -1084 +1079 @@
                 else
                 {
-                    xrc = XGetWindowProperty(m_pDisplay, wndOwner, xAtom(XA_XdndTypeList), 0, VBOX_MAX_XPROPERTIES, False, XA_ATOM, &type, &f, &n, &a, &ret);
+                    xrc = XGetWindowProperty(m_pDisplay, wndOwner, 
+                                             xAtom(XA_XdndTypeList), 
+                                             0, VBOX_MAX_XPROPERTIES, 
+                                             False, XA_ATOM, &type, &f, &n, &a, &ret);
                     if (   xrc == Success
                         && n > 0
@@ -1098 +1096 @@
                     }
                 }
+
                 /* Fetch the possible list of actions, if this property is set. */
-                xrc = XGetWindowProperty(m_pDisplay, wndOwner, xAtom(XA_XdndActionList), 0, VBOX_MAX_XPROPERTIES, False, XA_ATOM, &type, &f, &n, &a, &ret);
+                xrc = XGetWindowProperty(m_pDisplay, wndOwner, 
+                                         xAtom(XA_XdndActionList), 
+                                         0, VBOX_MAX_XPROPERTIES, 
+                                         False, XA_ATOM, &type, &f, &n, &a, &ret);
                 if (   xrc == Success
                     && n > 0
@@ -1110 +1112 @@
                         m_actions.append(data[i]);
                     }
+
                     XFree(ret);
                 }
@@ -1115 +1118 @@
                 m_state = Dragging;
                 m_mode  = GH;
+
                 /* Acknowledge the event by sending a Status msg back to the
                  * window. */
@@ -1152 +1156 @@
             }
         }
+
         hideProxyWin();
 
-        rc = VbglR3DnDGHAcknowledgePending(DND_COPY_ACTION, toHGCMActions(m_actions),
+        rc = VbglR3DnDGHAcknowledgePending(m_uClientID, DND_COPY_ACTION, toHGCMActions(m_actions),
                                            gX11->xAtomListToString(m_formats).c_str());
     }
@@ -1162 +1167 @@
 }
 
-int DragInstance::ghDropped(const RTCString &strFormat, uint32_t action)
-{
-    LogFlowThisFunc(("format='%s' action=%d\n", strFormat.c_str(), action));
+int DragInstance::ghDropped(const RTCString &strFormat, uint32_t uAction)
+{
+    LogFlowThisFunc(("strFormat=%s, uAction=%RU32\n", 
+                     strFormat.c_str(), uAction));
+
     int rc = VINF_SUCCESS;
 
@@ -1171 +1178 @@
     showProxyWin(rx, ry);
     XFlush(m_pDisplay);
+
     /* We send a fake release event to the current window, cause
      * this should have the grab. */
     sendButtonEvent(m_wndCur, rx, ry, 1, false);
+
     /* The fake button release event, should lead to an XdndDrop event from the
      * source. Because of the showing of the proxy window, sometimes other Xdnd
@@ -1181 +1190 @@
     XClientMessageEvent *clme = 0;
     RT_ZERO(e);
-    int tries = 3;
-    do
+
+    int cRetries = 3;
+    for (int i = 0; i < cRetries; i++) 
     {
         if (m_pParent->waitForXMsg(e, ClientMessage))
@@ -1192 +1202 @@
             }
         }
-    } while (tries--);
+    }
+
     if (clme)
     {
@@ -1202 +1213 @@
             Window srcWin = m_wndCur;//clme->data.l[0];
             Atom aFormat  = gX11->stringToxAtom(strFormat.c_str());
-            XConvertSelection(m_pDisplay, xAtom(XA_XdndSelection), aFormat, xAtom(XA_XdndSelection), m_wndProxy, clme->data.l[2]);
+
+            XConvertSelection(m_pDisplay, xAtom(XA_XdndSelection), 
+                              aFormat, xAtom(XA_XdndSelection), 
+                              m_wndProxy, clme->data.l[2]);
+
             /* Wait for the selection notify event. */
             RT_ZERO(e);
@@ -1215 +1230 @@
                 {
                     LogFlowThisFunc(("Selection notfiy (from: %x)\n", m_wndCur));
+
                     Atom type;
                     int format;
@@ -1242 +1258 @@
                                 memcpy(ucData1, ucData, cbData);
                                 ucData1[cbData++] = '\0';
+
                                 /* Got the data and its fully transfered. */
-                                rc = VbglR3DnDGHSendData(ucData1, cbData);
+                                rc = VbglR3DnDGHSendData(m_uClientID, strFormat.c_str(), 
+                                                         ucData1, cbData);
                                 RTMemFree(ucData1);
                             }
@@ -1250 +1268 @@
                         }
                         else
+                        {
                             /* Just send the data to the host. */
-                            rc = VbglR3DnDGHSendData(ucData, cbData);
+                            rc = VbglR3DnDGHSendData(m_uClientID, strFormat.c_str(),
+                                                     ucData, cbData);
+                        }
 
                         LogFlowThisFunc(("send responce\n"));
@@ -1264 +1285 @@
                         m.data.l[0]    = m_wndProxy;
                         m.data.l[1]    = RT_SUCCESS(rc) ?                   1 : 0;    /* Confirm or deny success */
-                        m.data.l[2]    = RT_SUCCESS(rc) ? toX11Action(action) : None; /* Action used on success */
+                        m.data.l[2]    = RT_SUCCESS(rc) ? toX11Action(uAction) : None; /* Action used on success */
 
                         int xrc = XSendEvent(m_pDisplay, srcWin, True, NoEventMask, reinterpret_cast<XEvent*>(&m));
@@ -1274 +1295 @@
                         if (type == xAtom(XA_INCR))
                         {
-                            /* Todo: */
+                            /** @todo Support incremental transfers. */
                             AssertMsgFailed(("Incrementally transfers are not supported, yet\n"));
                             rc = VERR_NOT_IMPLEMENTED;
@@ -1283 +1304 @@
                             rc = VERR_INVALID_PARAMETER;
                         }
+
                         /* Cancel this. */
                         XClientMessageEvent m;
@@ -1294 +1316 @@
                         m.data.l[1]    = 0;
                         m.data.l[2]    = None;
+
                         int xrc = XSendEvent(m_pDisplay, srcWin, False, NoEventMask, reinterpret_cast<XEvent*>(&m));
                         if (RT_UNLIKELY(xrc == 0))
@@ -1299 +1322 @@
                         m_wndCur = 0;
                     }
+
                     /* Cleanup */
                     if (ucData)
@@ -1315 +1339 @@
         rc = VERR_TIMEOUT;
 
-    /* Inform the host on error */
+    /* Inform the host on error. */
     if (RT_FAILURE(rc))
-        VbglR3DnDGHSendError(rc);
+        VbglR3DnDGHSendError(m_uClientID, rc);
 
     /* At this point, we have either successfully transfered any data or not.
@@ -1326 +1350 @@
     return rc;
 }
-
 #endif /* VBOX_WITH_DRAG_AND_DROP_GH */
 

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

@@ -56 +56 @@
 #endif
 {
-    LogFlowFunc(("m_defAction=0x%x, m_actions=0x%x\n", m_defAction, m_actions));
+    LogFlowFunc(("m_defAction=0x%x\n", m_defAction));
     LogFlowFunc(("Number of formats: %d\n", m_lstFormats.size()));
 #ifdef DEBUG
@@ -69 +69 @@
 
     int rc = VINF_SUCCESS;
-    try
+#ifdef RT_OS_WINDOWS
+    UIDnDDropSource *pDropSource = new UIDnDDropSource(this /* pParent */);
+    UIDnDDataObject *pDataObject = new UIDnDDataObject(m_lstFormats, this /* pParent */);
+
+    DWORD dwOKEffects = DROPEFFECT_NONE;
+    if (m_actions)
     {
-#ifdef RT_OS_WINDOWS
-        UIDnDDropSource *pDropSource = new UIDnDDropSource(this /* pParent */);
-        UIDnDDataObject *pDataObject = new UIDnDDataObject(m_lstFormats, this /* pParent */);
+        if (m_actions & Qt::CopyAction)
+            dwOKEffects |= DROPEFFECT_COPY;
+        if (m_actions & Qt::MoveAction)
+            dwOKEffects |= DROPEFFECT_MOVE;
+        if (m_actions & Qt::LinkAction)
+            dwOKEffects |= DROPEFFECT_LINK;
+    }
 
-        DWORD dwOKEffects = DROPEFFECT_NONE;
-        if (m_actions)
-        {
-            if (m_actions & Qt::CopyAction)
-                dwOKEffects |= DROPEFFECT_COPY;
-            if (m_actions & Qt::MoveAction)
-                dwOKEffects |= DROPEFFECT_MOVE;
-            if (m_actions & Qt::LinkAction)
-                dwOKEffects |= DROPEFFECT_LINK;
-        }
+    DWORD dwEffect;
+    HRESULT hr = ::DoDragDrop(pDataObject, pDropSource,
+                              dwOKEffects, &dwEffect);
+    LogFlowThisFunc(("DoDragDrop ended with hr=%Rhrc, dwEffect=%RI32\n",
+                     hr, dwEffect));
 
-        DWORD dwEffect;
-        HRESULT hr = ::DoDragDrop(pDataObject, pDropSource,
-                                  dwOKEffects, &dwEffect);
-        LogFlowThisFunc(("DoDragDrop ended with hr=%Rhrc, dwEffect=%RI32\n",
-                         hr, dwEffect));
+    if (pDropSource)
+        pDropSource->Release();
+    if (pDataObject)
+        pDataObject->Release();
+#else
+    QDrag *pDrag = new QDrag(m_pParent);
 
-        if (pDropSource)
-            pDropSource->Release();
-        if (pDataObject)
-            pDataObject->Release();
-#else
-        QDrag *pDrag = new QDrag(m_pParent);
+    /* pMData is transfered to the QDrag object, so no need for deletion. */
+    pMData = new UIDnDMimeData(m_session, m_lstFormats,
+                               m_defAction, m_actions, m_pParent);
 
-        /* pMData is transfered to the QDrag object, so no need for deletion. */
-        pMData = new UIDnDMimeData(m_session, m_lstFormats,
-                                   m_defAction, m_actions, m_pParent);
+    /* Inform the MIME data object of any changes in the current action. */
+    connect(pDrag, SIGNAL(actionChanged(Qt::DropAction)),
+            pMData, SLOT(sltDropActionChanged(Qt::DropAction)));
 
-        /* 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);
+    /* 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(m_actions, m_defAction);
+    LogFlowFunc(("dropAction=%ld\n", UIDnDHandler::toVBoxDnDAction(dropAction)));
 
-        /* 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(m_actions, m_defAction);
-        LogFlowFunc(("dropAction=%ld\n", UIDnDHandler::toVBoxDnDAction(dropAction)));
-
-         /* 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. */
+     /* 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 /* !RT_OS_WINDOWS */
-    }
-    catch (std::bad_alloc)
-    {
-        rc = VERR_NO_MEMORY;
-    }
 
     LogFlowFuncLeaveRC(rc);
@@ -135 +123 @@
 }
 
-int UIDnDDrag::RetrieveData(const QString &strMimeType,
-                            QVariant::Type vaType, QVariant &vaData)
-{
-    LogFlowFunc(("Retrieving data as type=%s (variant type=%ld)\n",
-                 strMimeType.toAscii().constData(), vaType));
-
-    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(strMimeType,
-                                             UIDnDHandler::toVBoxDnDAction(m_defAction));
-    if (guest.isOk())
-    {
-        msgCenter().showModalProgressDialog(progress,
-                                            tr("Retrieving data ..."), ":/progress_dnd_gh_90px.png",
-                                            m_pParent);
-        if (!progress.GetCanceled())
-        {
-            rc =   (   progress.isOk()
-                    && progress.GetResultCode() == 0)
-                 ? VINF_SUCCESS : VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
-
-            if (RT_SUCCESS(rc))
-            {
-                /* After the data successfully arrived from the guest, we query it from Main. */
-                QVector<uint8_t> vecData = guest.DragGHGetData();
-                if (!vecData.isEmpty())
-                {
-                    switch (vaType)
-                    {
-                        case QVariant::String:
-                        {
-                            vaData = QVariant(QString(reinterpret_cast<const char*>(vecData.constData())));
-                            break;
-                        }
-
-                        case QVariant::ByteArray:
-                        {
-                            QByteArray ba(reinterpret_cast<const char*>(vecData.constData()), vecData.size());
-                            vaData = QVariant(ba);
-                            break;
-                        }
-
-                        case QVariant::StringList:
-                        {
-                            QString strData = QString(reinterpret_cast<const char*>(vecData.constData()));
-                            QStringList lstString = strData.split("\r\n", QString::SkipEmptyParts);
-
-                            vaData = QVariant(lstString);
-                            break;
-                        }
-
-                        default:
-                            rc = VERR_NOT_SUPPORTED;
-                            break;
-                    }
-                }
-                else
-                    rc = VERR_NO_DATA;
-            }
-            else
-                msgCenter().cannotDropData(progress, m_pParent);
-        }
-        else
-            rc = VERR_CANCELLED;
-    }
-    else
-    {
-        msgCenter().cannotDropData(guest, m_pParent);
-        rc = VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-#ifndef RT_OS_WINDOWS
-void UIDnDDrag::sltDataAvailable(const QString &mimeType)
-{
-    LogFlowFunc(("pMData=0x%p, mimeType=%s\n",
-                 pMData, mimeType.toAscii().constData()));
-
-    if (pMData)
-        pMData->setData(mimeType);
-}
-#endif
-
 #include "UIDnDDrag.moc"
 

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

@@ -56 +56 @@
                      QVariant::Type vaType, QVariant &vaData);
 
-public slots:
-
-#ifndef RT_OS_WINDOWS
-    void sltDataAvailable(const QString &mimetype);
-#endif
-
 private:
 

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

@@ -234 +234 @@
     if (!lstFmtNative.isEmpty())
     {
-        try
-        {
-            UIDnDDrag *pDrag = new UIDnDDrag(session, lstFmtNative,
-                                             toQtDnDAction(defaultAction),
-                                             toQtDnDActions(vecActions), pParent);
-            rc = pDrag->DoDragDrop();
-
-            delete pDrag;
-        }
-        catch (std::bad_alloc)
-        {
-            rc = VERR_NO_MEMORY;
-        }
+        UIDnDDrag *pDrag = new UIDnDDrag(session, lstFmtNative,
+                                         toQtDnDAction(defaultAction),
+                                         toQtDnDActions(vecActions), pParent);
+        rc = pDrag->DoDragDrop();
+
+        delete pDrag;
     }
     else

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

@@ -40 +40 @@
 UIDnDMimeData::UIDnDMimeData(CSession &session, QStringList formats,
                              Qt::DropAction defAction, Qt::DropActions actions,
-                             UIDnDDrag *pParent)
+                             QWidget *pParent)
     : m_pParent(pParent)
     , m_session(session)
@@ -164 +164 @@
     {
         AssertPtr(m_pParent);
-        rc = m_pParent->RetrieveData(strMIMEType, type, m_data);
+        rc = retrieveDataInternal(strMIMEType, type, m_data);
         if (RT_SUCCESS(rc))
         {
@@ -178 +178 @@
     LogFlowFunc(("Returning rc=%Rrc, m_enmState=%ld\n",
                  rc, m_enmState));
-    return QMimeData::retrieveData(strMIMEType, type);
+    return m_data;
+}
+
+int UIDnDMimeData::retrieveDataInternal(const QString &strMimeType,
+                                        QVariant::Type vaType, QVariant &vaData) const
+{
+    LogFlowFunc(("Retrieving data as type=%s (variant type=%ld)\n",
+                 strMimeType.toAscii().constData(), vaType));
+
+    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(strMimeType,
+                                             UIDnDHandler::toVBoxDnDAction(m_defAction));
+    if (guest.isOk())
+    {
+        msgCenter().showModalProgressDialog(progress,
+                                            tr("Retrieving data ..."), ":/progress_dnd_gh_90px.png",
+                                            m_pParent);
+        if (!progress.GetCanceled())
+        {
+            rc =   (   progress.isOk()
+                    && progress.GetResultCode() == 0)
+                 ? VINF_SUCCESS : VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
+
+            if (RT_SUCCESS(rc))
+            {
+                /* After the data successfully arrived from the guest, we query it from Main. */
+                QVector<uint8_t> vecData = guest.DragGHGetData();
+                if (!vecData.isEmpty())
+                {
+                    switch (vaType)
+                    {
+                        case QVariant::String:
+                        {
+                            vaData = QVariant(QString(reinterpret_cast<const char*>(vecData.constData())));
+                            break;
+                        }
+
+                        case QVariant::ByteArray:
+                        {
+                            QByteArray ba(reinterpret_cast<const char*>(vecData.constData()), vecData.size());
+                            vaData = QVariant(ba);
+                            break;
+                        }
+
+                        case QVariant::StringList:
+                        {
+                            QString strData = QString(reinterpret_cast<const char*>(vecData.constData()));
+                            QStringList lstString = strData.split("\r\n", QString::SkipEmptyParts);
+
+                            vaData = QVariant(lstString);
+                            break;
+                        }
+
+                        default:
+                            rc = VERR_NOT_SUPPORTED;
+                            break;
+                    }
+                }
+                else
+                    rc = VERR_NO_DATA;
+            }
+            else
+                msgCenter().cannotDropData(progress, m_pParent);
+        }
+        else
+            rc = VERR_CANCELLED;
+    }
+    else
+    {
+        msgCenter().cannotDropData(guest, m_pParent);
+        rc = VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 

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

@@ -51 +51 @@
          *  having retrieved the metadata from the guest yet. */
         Dragging = 0,
-        /** 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)
@@ -66 +63 @@
     UIDnDMimeData(CSession &session, QStringList formats,
                   Qt::DropAction defAction,
-                  Qt::DropActions actions, UIDnDDrag *pParent);
+                  Qt::DropActions actions, QWidget *pParent);
 
     int setData(const QString &mimeType);
@@ -98 +95 @@
 #endif
 
+protected:
+
+    int retrieveDataInternal(const QString &strMimeType, QVariant::Type vaType, QVariant &vaData) const;
+
 private:
 
-    UIDnDDrag        *m_pParent;
+    QWidget          *m_pParent;
     CSession          m_session;
     QStringList       m_lstFormats;

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp

@@ -348 +348 @@
     AssertPtrReturn(pszPath, VERR_INVALID_POINTER);
 
-    char *pszPathURI = RTUriCreate("file" /* pszScheme */, "/" /* pszAuthority */,
-                                   pszPath, NULL /* pszQuery */, NULL /* pszFragment */);
     int rc;
-    if (pszPathURI)
-    {
-        rc = AppendURIPath(pszPathURI, fFlags);
-        RTStrFree(pszPathURI);
+    char *pszPathNative = RTStrDup(pszPath);
+    if (pszPathNative) 
+    {
+        RTPathChangeToUnixSlashes(pszPathNative, true /* fForce */);
+
+        char *pszPathURI = RTUriCreate("file" /* pszScheme */, "/" /* pszAuthority */,
+                                       pszPathNative, NULL /* pszQuery */, NULL /* pszFragment */);
+        if (pszPathURI)
+        {
+            rc = AppendURIPath(pszPathURI, fFlags);
+            RTStrFree(pszPathURI);
+        }
+        else
+            rc = VERR_INVALID_PARAMETER;
+
+        RTStrFree(pszPathNative);
     }
     else
-        rc = VERR_INVALID_PARAMETER;
+        rc = VERR_NO_MEMORY;
 
     return rc;

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

@@ -128 +128 @@
 int DragAndDropService::clientConnect(uint32_t u32ClientID, void *pvClient)
 {
-    LogFlowFunc(("New client (%ld) connected\n", u32ClientID));
+    LogFlowFunc(("New client (%RU32) connected\n", u32ClientID));
     if (m_cClients < UINT32_MAX)
         m_cClients++;

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

@@ -372 +372 @@
                                   uint32_t uState, int rcOp /* = VINF_SUCCESS */)
 {
-    LogFlowFunc(("uPercentage=%RU32, uState=%ld, rcOp=%Rrc\n",
+    LogFlowFunc(("uPercentage=%RU32, uState=%RU32, rcOp=%Rrc\n",
                  uPercentage, uState, rcOp));
 
@@ -438 +438 @@
 #else
     AssertMsg(m_cbDataCurrent <= m_cbDataTotal,
-              ("More data transferred (%RU32) than initially announced (%RU32)\n",
-              m_cbDataCurrent, m_cbDataTotal));
+              ("More data transferred (%zu) than initially announced (%zu), cbDataAdd=%zu\n",
+              m_cbDataCurrent, m_cbDataTotal, cbDataAdd));
 #endif
     int rc = setProgress(cPercentage, uStatus);
@@ -449 +449 @@
         rc = setProgress(100, DragAndDropSvc::DND_PROGRESS_CANCELLED);
 
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -1097 +1098 @@
     AssertReturn(cbPath, VERR_INVALID_PARAMETER);
 
-    LogFlowFunc(("strDir=%s, cbPath=%zu, fMode=0x%x\n",
+    LogFlowFunc(("pszPath=%s, cbPath=%zu, fMode=0x%x\n",
                  pszPath, cbPath, fMode));
 
@@ -1125 +1126 @@
     AssertReturn(cbPath, VERR_INVALID_PARAMETER);
 
-    LogFlowFunc(("strFile=%s, cbPath=%zu, fMode=0x%x\n",
+    LogFlowFunc(("pszPath=%s, cbPath=%zu, fMode=0x%x\n",
                  pszPath, cbPath, fMode));