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

Timestamp:

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

Author:

vboxsync

Message:

DnD: Update.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (15 diffs)

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;