Changeset 49891 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

Timestamp:

Dec 12, 2013 8:09:20 PM (11 years ago)

Author:

vboxsync

Message:

Merged private draganddrop branch into trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (63 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -41 +41 @@
 #include "VBox/HostServices/DragAndDropSvc.h"
 
-#define VERBOSE 1
-
-#if defined(VERBOSE) && defined(DEBUG_poetzsch)
-# include <iprt/stream.h>
-# define DO(s) RTPrintf s
-#else
-# define DO(s) do {} while(0)
-//# define DO(s) Log s
-#endif
-
 /* Here all the communication with the host over HGCM is handled platform
  * neutral. Also the receiving of URIs content (directory trees and files) is
@@ -61 +51 @@
  */
 
-/* Not really used at the moment (only one client is possible): */
-uint32_t g_clientId = 0;
-
 /******************************************************************************
  *    Private internal functions                                              *
@@ -70 +57 @@
 static int vbglR3DnDCreateDropDir(char* pszDropDir, size_t cbSize)
 {
-    /* Validate input */
     AssertPtrReturn(pszDropDir, VERR_INVALID_POINTER);
     AssertReturn(cbSize,        VERR_INVALID_PARAMETER);
 
-    /* Get the users document directory (usually $HOME/Documents). */
-    int rc = RTPathUserDocuments(pszDropDir, cbSize);
+    /** @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))
@@ -89 +83 @@
             return rc;
     }
+
     /* The actually drop directory consist of the current time stamp and a
      * unique number when necessary. */
@@ -95 +90 @@
     if (!RTTimeSpecToString(RTTimeNow(&time), pszTime, sizeof(pszTime)))
         return VERR_BUFFER_OVERFLOW;
+#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' };
+    RTStrPurgeComplementSet(pszTime, aCpSet, '_' /* Replacement */);
+#endif
+
     rc = RTPathAppend(pszDropDir, cbSize, pszTime);
     if (RT_FAILURE(rc))
@@ -105 +110 @@
 static int vbglR3DnDQueryNextHostMessageType(uint32_t uClientId, uint32_t *puMsg, uint32_t *pcParms, bool fWait)
 {
-    /* Validate input */
     AssertPtrReturn(puMsg,   VERR_INVALID_POINTER);
     AssertPtrReturn(pcParms, VERR_INVALID_POINTER);
 
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDNEXTMSGMSG Msg;
     RT_ZERO(Msg);
@@ -116 +119 @@
     Msg.hdr.u32Function = DragAndDropSvc::GUEST_DND_GET_NEXT_HOST_MSG;
     Msg.hdr.cParms      = 3;
-    /* Initialize parameter */
+
     Msg.msg.SetUInt32(0);
     Msg.num_parms.SetUInt32(0);
     Msg.block.SetUInt32(fWait);
-    /* Do request */
+
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
@@ -132 +135 @@
         }
     }
+
     return rc;
 }
@@ -146 +150 @@
                                            uint32_t *pcbFormatsRecv)
 {
-    /* Validate input */
     AssertPtrReturn(puScreenId,     VERR_INVALID_POINTER);
     AssertPtrReturn(puX,            VERR_INVALID_POINTER);
@@ -156 +159 @@
     AssertPtrReturn(pcbFormatsRecv, VERR_INVALID_POINTER);
 
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDHGACTIONMSG Msg;
     RT_ZERO(Msg);
@@ -162 +164 @@
     Msg.hdr.u32Function = uMsg;
     Msg.hdr.cParms      = 7;
-    /* Initialize parameter */
+
     Msg.uScreenId.SetUInt32(0);
     Msg.uX.SetUInt32(0);
@@ -170 +172 @@
     Msg.pvFormats.SetPtr(pszFormats, cbFormats);
     Msg.cFormats.SetUInt32(0);
-    /* Do request */
+
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
@@ -188 +190 @@
         }
     }
+
     return rc;
 }
@@ -193 +196 @@
 static int vbglR3DnDHGProcessLeaveMessage(uint32_t uClientId)
 {
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDHGLEAVEMSG Msg;
     RT_ZERO(Msg);
@@ -199 +201 @@
     Msg.hdr.u32Function = DragAndDropSvc::HOST_DND_HG_EVT_LEAVE;
     Msg.hdr.cParms      = 0;
-    /* Do request */
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
-    if (RT_SUCCESS(rc))
-        rc = Msg.hdr.result;
+
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+    if (RT_SUCCESS(rc))
+        rc = Msg.hdr.result;
+
     return rc;
 }
@@ -208 +211 @@
 static int vbglR3DnDHGProcessCancelMessage(uint32_t uClientId)
 {
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDHGCANCELMSG Msg;
     RT_ZERO(Msg);
@@ -214 +216 @@
     Msg.hdr.u32Function = DragAndDropSvc::HOST_DND_HG_EVT_CANCEL;
     Msg.hdr.cParms      = 0;
-    /* Do request */
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
-    if (RT_SUCCESS(rc))
-        rc = Msg.hdr.result;
+
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+    if (RT_SUCCESS(rc))
+        rc = Msg.hdr.result;
+
     return rc;
 }
@@ -227 +230 @@
                                             uint32_t *pfMode)
 {
-    /* Validate input */
     AssertPtrReturn(pszDirname,     VERR_INVALID_POINTER);
     AssertReturn(cbDirname,         VERR_INVALID_PARAMETER);
@@ -233 +235 @@
     AssertPtrReturn(pfMode,         VERR_INVALID_POINTER);
 
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDHGSENDDIRMSG Msg;
     RT_ZERO(Msg);
@@ -239 +240 @@
     Msg.hdr.u32Function = DragAndDropSvc::HOST_DND_HG_SND_DIR;
     Msg.hdr.cParms      = 3;
-    /* Initialize parameter */
+
     Msg.pvName.SetPtr(pszDirname, cbDirname);
     Msg.cName.SetUInt32(0);
     Msg.fMode.SetUInt32(0);
-    /* Do request */
+
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
@@ -257 +258 @@
         }
     }
+
     return rc;
 }
@@ -269 +271 @@
                                              uint32_t *pfMode)
 {
-    /* Validate input */
     AssertPtrReturn(pszFilename,     VERR_INVALID_POINTER);
     AssertReturn(cbFilename,         VERR_INVALID_PARAMETER);
@@ -278 +279 @@
     AssertPtrReturn(pfMode,          VERR_INVALID_POINTER);
 
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDHGSENDFILEMSG Msg;
     RT_ZERO(Msg);
@@ -284 +284 @@
     Msg.hdr.u32Function = DragAndDropSvc::HOST_DND_HG_SND_FILE;
     Msg.hdr.cParms      = 5;
-    /* Initialize parameter */
+
     Msg.pvName.SetPtr(pszFilename, cbFilename);
     Msg.cName.SetUInt32(0);
@@ -290 +290 @@
     Msg.cData.SetUInt32(0);
     Msg.fMode.SetUInt32(0);
-    /* Do request */
+
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
@@ -306 +306 @@
         }
     }
+
     return rc;
 }
@@ -376 +377 @@
         uint32_t uNextMsg;
         uint32_t cNextParms;
-        rc = vbglR3DnDQueryNextHostMessageType(uClientId, &uNextMsg, &cNextParms, false);
-        DO(("%Rrc - %d\n", rc , uNextMsg));
+        rc = vbglR3DnDQueryNextHostMessageType(uClientId, &uNextMsg, &cNextParms, false /* fWait */);
         if (RT_SUCCESS(rc))
         {
@@ -392 +392 @@
                     if (RT_SUCCESS(rc))
                     {
-                        DO(("Got drop dir: %s - %o - %Rrc\n", pszPathname, fMode, rc));
                         char *pszNewDir = RTPathJoinA(pszDropDir, pszPathname);
                         rc = RTDirCreate(pszNewDir, (fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRWXU, 0);
@@ -415 +414 @@
                     {
                         char *pszNewFile = RTPathJoinA(pszDropDir, pszPathname);
-                        DO(("Got drop file: %s - %d - %o - %Rrc\n", pszPathname, cbDataRecv, fMode, rc));
                         RTFILE hFile;
+                        /** @todo r=andy Keep the file open and locked during the actual file transfer. Otherwise this will
+                         *               create all sorts of funny races because we don't know if the guest has
+                         *               modified the file in between the file data send calls. */
                         rc = RTFileOpen(&hFile, pszNewFile, RTFILE_O_WRITE | RTFILE_O_APPEND | RTFILE_O_DENY_ALL | RTFILE_O_OPEN_CREATE);
                         if (RT_SUCCESS(rc))
@@ -443 +444 @@
                     /* Break out of the loop. */
                 }
-                default: fLoop = false; break;
+                default:
+                    fLoop = false;
+                    break;
             }
-        } else
+        }
+        else
         {
             if (rc == VERR_NO_DATA)
@@ -451 +455 @@
             break;
         }
-    }while(fLoop);
+
+    } while (fLoop);
 
     RTMemFree(pvTmpData);
+
     /* Cleanup on failure or if the user has canceled. */
     if (RT_FAILURE(rc))
@@ -477 +483 @@
                                                  uint32_t *pcbDataRecv)
 {
-    /* Validate input */
     AssertPtrReturn(puScreenId,    VERR_INVALID_POINTER);
     AssertPtrReturn(pszFormat,     VERR_INVALID_POINTER);
@@ -486 +491 @@
     AssertPtrReturn(pcbDataRecv,   VERR_INVALID_POINTER);
 
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDHGSENDDATAMSG Msg;
     RT_ZERO(Msg);
@@ -492 +496 @@
     Msg.hdr.u32Function = DragAndDropSvc::HOST_DND_HG_SND_DATA;
     Msg.hdr.cParms      = 5;
-    /* Initialize parameter */
+
     Msg.uScreenId.SetUInt32(0);
     Msg.pvFormat.SetPtr(pszFormat, cbFormat);
@@ -498 +502 @@
     Msg.pvData.SetPtr(pvData, cbData);
     Msg.cData.SetUInt32(0);
-    /* Do request */
+
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
@@ -515 +519 @@
         }
     }
+
     return rc;
 }
@@ -523 +528 @@
                                                      uint32_t *pcbDataRecv)
 {
-    /* Validate input */
     AssertPtrReturn(pvData,      VERR_INVALID_POINTER);
     AssertReturn(cbData,         VERR_INVALID_PARAMETER);
     AssertPtrReturn(pcbDataRecv, VERR_INVALID_POINTER);
 
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDHGSENDMOREDATAMSG Msg;
     RT_ZERO(Msg);
-    Msg.hdr.u32ClientID = g_clientId;
+    Msg.hdr.u32ClientID = uClientId;
     Msg.hdr.u32Function = DragAndDropSvc::HOST_DND_HG_SND_MORE_DATA;
     Msg.hdr.cParms      = 2;
-    /* Initialize parameter */
+
     Msg.pvData.SetPtr(pvData, cbData);
     Msg.cData.SetUInt32(0);
-    /* Do request */
+
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
@@ -554 +557 @@
 }
 
-static int vbglR3DnDHGProcessSendDataMessages(uint32_t  uClientId,
-                                              uint32_t *puScreenId,
-                                              char     *pszFormat,
-                                              uint32_t  cbFormat,
-                                              uint32_t *pcbFormatRecv,
-                                              void    **ppvData,
-                                              uint32_t  cbData,
-                                              size_t   *pcbDataRecv)
+static int vbglR3DnDHGProcessSendDataMessageLoop(uint32_t  uClientId,
+                                                 uint32_t *puScreenId,
+                                                 char     *pszFormat,
+                                                 uint32_t  cbFormat,
+                                                 uint32_t *pcbFormatRecv,
+                                                 void    **ppvData,
+                                                 uint32_t  cbData,
+                                                 size_t   *pcbDataRecv)
 {
     uint32_t cbDataRecv = 0;
@@ -572 +575 @@
                                                    cbData,
                                                    &cbDataRecv);
-
-    size_t cbAllDataRecv = cbDataRecv;
+    uint32_t cbAllDataRecv = cbDataRecv;
     while (rc == VERR_BUFFER_OVERFLOW)
     {
@@ -624 +626 @@
                                              size_t    *pcbDataRecv)
 {
-    int rc = vbglR3DnDHGProcessSendDataMessages(uClientId,
-                                                puScreenId,
-                                                pszFormat,
-                                                cbFormat,
-                                                pcbFormatRecv,
-                                                ppvData,
-                                                cbData,
-                                                pcbDataRecv);
-    if (RT_SUCCESS(rc))
-    {
-        /* Check if this is a uri-event */
+    int rc = vbglR3DnDHGProcessSendDataMessageLoop(uClientId,
+                                                   puScreenId,
+                                                   pszFormat,
+                                                   cbFormat,
+                                                   pcbFormatRecv,
+                                                   ppvData,
+                                                   cbData,
+                                                   pcbDataRecv);
+    if (RT_SUCCESS(rc))
+    {
+        /* Check if this is a uri-event. If so, let VbglR3 do all the actual
+         * data transfer + file /directory creation internally without letting
+         * the caller know. */
         if (RTStrNICmp(pszFormat, "text/uri-list", *pcbFormatRecv) == 0)
             rc = vbglR3DnDHGProcessURIMessages(uClientId,
@@ -645 +649 @@
                                                pcbDataRecv);
     }
+
     return rc;
 }
@@ -651 +656 @@
                                                    uint32_t *puScreenId)
 {
-    /* Validate input */
     AssertPtrReturn(puScreenId, VERR_INVALID_POINTER);
 
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDGHREQPENDINGMSG Msg;
     RT_ZERO(Msg);
@@ -660 +663 @@
     Msg.hdr.u32Function = DragAndDropSvc::HOST_DND_GH_REQ_PENDING;
     Msg.hdr.cParms      = 1;
-    /* Initialize parameter */
+
     Msg.uScreenId.SetUInt32(0);
-    /* Do request */
+
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
@@ -673 +676 @@
         }
     }
+
     return rc;
 }
@@ -682 +686 @@
                                             uint32_t *puAction)
 {
-    /* Validate input */
     AssertPtrReturn(pszFormat,     VERR_INVALID_POINTER);
     AssertReturn(cbFormat,         VERR_INVALID_PARAMETER);
@@ -688 +691 @@
     AssertPtrReturn(puAction,      VERR_INVALID_POINTER);
 
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDGHDROPPEDMSG Msg;
     RT_ZERO(Msg);
@@ -694 +696 @@
     Msg.hdr.u32Function = DragAndDropSvc::HOST_DND_GH_EVT_DROPPED;
     Msg.hdr.cParms      = 3;
-    /* Initialize parameter */
+
     Msg.pvFormat.SetPtr(pszFormat, cbFormat);
     Msg.cFormat.SetUInt32(0);
     Msg.uAction.SetUInt32(0);
-    /* Do request */
+
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
@@ -712 +714 @@
         }
     }
+
     return rc;
 }
@@ -719 +722 @@
  ******************************************************************************/
 
-/**
- * Initialize Drag & Drop.
- *
- * This will enable the Drag & Drop events.
- *
- * @returns VBox status code.
- */
-VBGLR3DECL(int) VbglR3DnDInit(void)
-{
-    return VbglR3DnDConnect(&g_clientId);
-}
-
-/**
- * Terminate Drag and Drop.
- *
- * This will Drag and Drop events.
- *
- * @returns VBox status.
- */
-VBGLR3DECL(int) VbglR3DnDTerm(void)
-{
-    return VbglR3DnDDisconnect(g_clientId);
-}
-
 VBGLR3DECL(int) VbglR3DnDConnect(uint32_t *pu32ClientId)
 {
-    /* Validate input */
     AssertPtrReturn(pu32ClientId, VERR_INVALID_POINTER);
 
@@ -770 +748 @@
 VBGLR3DECL(int) VbglR3DnDDisconnect(uint32_t u32ClientId)
 {
-    /* Initialize header */
     VBoxGuestHGCMDisconnectInfo Info;
     Info.result      = VERR_WRONG_ORDER;
     Info.u32ClientID = u32ClientId;
+
     /* Do request */
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_DISCONNECT, &Info, sizeof(Info));
     if (RT_SUCCESS(rc))
         rc = Info.result;
-    return rc;
-}
-
-VBGLR3DECL(int) VbglR3DnDProcessNextMessage(CPVBGLR3DNDHGCMEVENT pEvent)
-{
-    /* Validate input */
+
+    return rc;
+}
+
+VBGLR3DECL(int) VbglR3DnDProcessNextMessage(uint32_t u32ClientId, CPVBGLR3DNDHGCMEVENT pEvent)
+{
     AssertPtrReturn(pEvent, VERR_INVALID_POINTER);
 
@@ -789 +767 @@
     uint32_t       uNumParms  = 0;
     const uint32_t ccbFormats = _64K;
-    const uint32_t ccbData    = _1M;
-    int rc = vbglR3DnDQueryNextHostMessageType(g_clientId, &uMsg, &uNumParms, true);
-    if (RT_SUCCESS(rc))
-    {
-        DO(("Got message %d\n", uMsg));
+    const uint32_t ccbData    = _64K;
+    int rc = vbglR3DnDQueryNextHostMessageType(u32ClientId, &uMsg, &uNumParms,
+                                               true /* fWait */);
+    if (RT_SUCCESS(rc))
+    {
         switch(uMsg)
         {
@@ -803 +781 @@
                 pEvent->pszFormats = static_cast<char*>(RTMemAlloc(ccbFormats));
                 if (!pEvent->pszFormats)
-                    return VERR_NO_MEMORY;
-                rc = vbglR3DnDHGProcessActionMessage(g_clientId,
-                                                     uMsg,
-                                                     &pEvent->uScreenId,
-                                                     &pEvent->u.a.uXpos,
-                                                     &pEvent->u.a.uYpos,
-                                                     &pEvent->u.a.uDefAction,
-                                                     &pEvent->u.a.uAllActions,
-                                                     pEvent->pszFormats,
-                                                     ccbFormats,
-                                                     &pEvent->cbFormats);
+                    rc = VERR_NO_MEMORY;
+
+                if (RT_SUCCESS(rc))
+                    rc = vbglR3DnDHGProcessActionMessage(u32ClientId,
+                                                         uMsg,
+                                                         &pEvent->uScreenId,
+                                                         &pEvent->u.a.uXpos,
+                                                         &pEvent->u.a.uYpos,
+                                                         &pEvent->u.a.uDefAction,
+                                                         &pEvent->u.a.uAllActions,
+                                                         pEvent->pszFormats,
+                                                         ccbFormats,
+                                                         &pEvent->cbFormats);
                 break;
             }
@@ -819 +799 @@
             {
                 pEvent->uType = uMsg;
-                rc = vbglR3DnDHGProcessLeaveMessage(g_clientId);
+                rc = vbglR3DnDHGProcessLeaveMessage(u32ClientId);
                 break;
             }
@@ -827 +807 @@
                 pEvent->pszFormats = static_cast<char*>(RTMemAlloc(ccbFormats));
                 if (!pEvent->pszFormats)
-                    return VERR_NO_MEMORY;
-                pEvent->u.b.pvData = RTMemAlloc(ccbData);
-                if (!pEvent->u.b.pvData)
+                    rc = VERR_NO_MEMORY;
+
+                if (RT_SUCCESS(rc))
                 {
-                    RTMemFree(pEvent->pszFormats);
-                    pEvent->pszFormats = NULL;
-                    return VERR_NO_MEMORY;
+                    pEvent->u.b.pvData = RTMemAlloc(ccbData);
+                    if (!pEvent->u.b.pvData)
+                    {
+                        RTMemFree(pEvent->pszFormats);
+                        pEvent->pszFormats = NULL;
+                        rc = VERR_NO_MEMORY;
+                    }
                 }
-                rc = vbglR3DnDHGProcessSendDataMessage(g_clientId,
-                                                       &pEvent->uScreenId,
-                                                       pEvent->pszFormats,
-                                                       ccbFormats,
-                                                       &pEvent->cbFormats,
-                                                       &pEvent->u.b.pvData,
-                                                       ccbData,
-                                                       &pEvent->u.b.cbData);
+
+                if (RT_SUCCESS(rc))
+                    rc = vbglR3DnDHGProcessSendDataMessage(u32ClientId,
+                                                           &pEvent->uScreenId,
+                                                           pEvent->pszFormats,
+                                                           ccbFormats,
+                                                           &pEvent->cbFormats,
+                                                           &pEvent->u.b.pvData,
+                                                           ccbData,
+                                                           &pEvent->u.b.cbData);
+                break;
+            }
+            case DragAndDropSvc::HOST_DND_HG_EVT_CANCEL:
+            {
+                pEvent->uType = uMsg;
+                rc = vbglR3DnDHGProcessCancelMessage(u32ClientId);
                 break;
             }
@@ -849 +841 @@
             {
                 pEvent->uType = uMsg;
-                rc = vbglR3DnDGHProcessRequestPendingMessage(g_clientId,
+                rc = vbglR3DnDGHProcessRequestPendingMessage(u32ClientId,
                                                              &pEvent->uScreenId);
                 break;
@@ -858 +850 @@
                 pEvent->pszFormats = static_cast<char*>(RTMemAlloc(ccbFormats));
                 if (!pEvent->pszFormats)
-                    return VERR_NO_MEMORY;
-                rc = vbglR3DnDGHProcessDroppedMessage(g_clientId,
-                                                      pEvent->pszFormats,
-                                                      ccbFormats,
-                                                      &pEvent->cbFormats,
-                                                      &pEvent->u.a.uDefAction);
+                    rc = VERR_NO_MEMORY;
+
+                if (RT_SUCCESS(rc))
+                    rc = vbglR3DnDGHProcessDroppedMessage(u32ClientId,
+                                                          pEvent->pszFormats,
+                                                          ccbFormats,
+                                                          &pEvent->cbFormats,
+                                                          &pEvent->u.a.uDefAction);
                 break;
             }
 #endif /* VBOX_WITH_DRAG_AND_DROP_GH */
-            case DragAndDropSvc::HOST_DND_HG_EVT_CANCEL:
-            {
-                pEvent->uType = uMsg;
-                rc = vbglR3DnDHGProcessCancelMessage(g_clientId);
-                if (RT_SUCCESS(rc))
-                    rc = VERR_CANCELLED;
+            default:
+                AssertMsgFailedReturn(("Message %u isn't expected in this context", uMsg),
+                                      VERR_INVALID_PARAMETER);
                 break;
-            }
-            default: AssertMsgFailedReturn(("Message %u isn't expected in this context", uMsg), VERR_INVALID_PARAMETER); break;
-        }
-    }
-    return rc;
-}
-
-VBGLR3DECL(int) VbglR3DnDHGAcknowledgeOperation(uint32_t uAction)
-{
-    DO(("ACK: %u\n", uAction));
-    /* Initialize header */
+        }
+    }
+
+    return rc;
+}
+
+VBGLR3DECL(int) VbglR3DnDHGAcknowledgeOperation(uint32_t u32ClientId, uint32_t uAction)
+{
     DragAndDropSvc::VBOXDNDHGACKOPMSG Msg;
     RT_ZERO(Msg);
     Msg.hdr.result      = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = g_clientId;
+    Msg.hdr.u32ClientID = u32ClientId;
     Msg.hdr.u32Function = DragAndDropSvc::GUEST_DND_HG_ACK_OP;
     Msg.hdr.cParms      = 1;
@@ -897 +885 @@
     if (RT_SUCCESS(rc))
         rc = Msg.hdr.result;
-    return rc;
-}
-
-VBGLR3DECL(int) VbglR3DnDHGRequestData(const char* pcszFormat)
-{
-    DO(("DATA_REQ: '%s'\n", pcszFormat));
-    /* Validate input */
+
+    return rc;
+}
+
+VBGLR3DECL(int) VbglR3DnDHGRequestData(uint32_t u32ClientId, const char* pcszFormat)
+{
     AssertPtrReturn(pcszFormat, VERR_INVALID_PARAMETER);
 
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDHGREQDATAMSG Msg;
     RT_ZERO(Msg);
     Msg.hdr.result      = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = g_clientId;
+    Msg.hdr.u32ClientID = u32ClientId;
     Msg.hdr.u32Function = DragAndDropSvc::GUEST_DND_HG_REQ_DATA;
     Msg.hdr.cParms      = 1;
@@ -918 +904 @@
     if (RT_SUCCESS(rc))
         rc = Msg.hdr.result;
-    return rc;
-}
-
-VBGLR3DECL(int) VbglR3DnDGHAcknowledgePending(uint32_t uDefAction, uint32_t uAllActions, const char* pcszFormat)
-{
-    DO(("PEND: %u: %u (%s)\n", uDefAction, uAllActions, pcszFormat));
-    /* Validate input */
+
+    return rc;
+}
+
+VBGLR3DECL(int) VbglR3DnDGHAcknowledgePending(uint32_t u32ClientId,
+                                              uint32_t uDefAction, uint32_t uAllActions,
+                                              const char* pcszFormat)
+{
     AssertPtrReturn(pcszFormat, VERR_INVALID_POINTER);
 
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDGHACKPENDINGMSG Msg;
     RT_ZERO(Msg);
     Msg.hdr.result      = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = g_clientId;
+    Msg.hdr.u32ClientID = u32ClientId;
     Msg.hdr.u32Function = DragAndDropSvc::GUEST_DND_GH_ACK_PENDING;
     Msg.hdr.cParms      = 3;
@@ -942 +928 @@
     if (RT_SUCCESS(rc))
         rc = Msg.hdr.result;
-    return rc;
-}
-
-VBGLR3DECL(int) VbglR3DnDGHSendData(void *pvData, uint32_t cbData)
-{
-    DO(("DATA: %x (%u)\n", pvData, cbData));
-    /* Validate input */
+
+    return rc;
+}
+
+VBGLR3DECL(int) VbglR3DnDGHSendData(uint32_t u32ClientId, void *pvData, uint32_t cbData)
+{
     AssertPtrReturn(pvData, VERR_INVALID_POINTER);
     AssertReturn(cbData,    VERR_INVALID_PARAMETER);
@@ -962 +947 @@
      */
 
-    /* Initialize header */
     DragAndDropSvc::VBOXDNDGHSENDDATAMSG Msg;
     RT_ZERO(Msg);
     Msg.hdr.result      = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = g_clientId;
+    Msg.hdr.u32ClientID = u32ClientId;
     Msg.hdr.u32Function = DragAndDropSvc::GUEST_DND_GH_SND_DATA;
     Msg.hdr.cParms      = 2;
@@ -992 +976 @@
 //        RTThreadSleep(500);
     }
-    return rc;
-}
-
-VBGLR3DECL(int) VbglR3DnDGHErrorEvent(int rcOp)
-{
-    DO(("GH_ERROR\n"));
-
-    /* Initialize header */
+
+    return rc;
+}
+
+VBGLR3DECL(int) VbglR3DnDGHErrorEvent(uint32_t u32ClientId, int rcOp)
+{
     DragAndDropSvc::VBOXDNDGHEVTERRORMSG Msg;
     RT_ZERO(Msg);
     Msg.hdr.result      = VERR_WRONG_ORDER;
-    Msg.hdr.u32ClientID = g_clientId;
+    Msg.hdr.u32ClientID = u32ClientId;
     Msg.hdr.u32Function = DragAndDropSvc::GUEST_DND_GH_EVT_ERROR;
     Msg.hdr.cParms      = 1;
@@ -1012 +994 @@
     if (RT_SUCCESS(rc))
         rc = Msg.hdr.result;
-    return rc;
-}
+
+    return rc;
+}