Changeset 50265 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Jan 29, 2014 11:12:44 AM (11 years ago)

Author:

vboxsync

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

91898

Message:

DnD: First working implementation for Windows guest->host support; still work in progress. As for now only pure text data can be dragged over.

File:

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

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

@@ -882 +882 @@
                 break;
             }
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
             case DragAndDropSvc::HOST_DND_GH_REQ_PENDING:
             {
@@ -905 +904 @@
                 break;
             }
-#endif /* VBOX_WITH_DRAG_AND_DROP_GH */
             default:
-                AssertMsgFailedReturn(("Message %u isn't expected in this context", uMsg),
-                                      VERR_INVALID_PARAMETER);
+                rc = VERR_NOT_SUPPORTED;
                 break;
         }
@@ -944 +941 @@
     Msg.hdr.u32Function = DragAndDropSvc::GUEST_DND_HG_REQ_DATA;
     Msg.hdr.cParms      = 1;
+    /* Initialize parameter */
+    Msg.pFormat.SetPtr((void*)pcszFormat, (uint32_t)strlen(pcszFormat) + 1);
     /* Do request */
-    Msg.pFormat.SetPtr((void*)pcszFormat, (uint32_t)strlen(pcszFormat) + 1);
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
     if (RT_SUCCESS(rc))
@@ -968 +966 @@
     Msg.uDefAction.SetUInt32(uDefAction);
     Msg.uAllActions.SetUInt32(uAllActions);
-    Msg.pFormat.SetPtr((void*)pcszFormat, static_cast<uint32_t>(strlen(pcszFormat) + 1));
+    Msg.pFormat.SetPtr((void*)pcszFormat, (uint32_t)strlen(pcszFormat) + 1);
     /* Do request */
     int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
@@ -982 +980 @@
     AssertReturn(cbData,    VERR_INVALID_PARAMETER);
 
-    /* Todo: URI support. Currently only data is send over to the host. For URI
-     * support basically the same as in the H->G case (see
-     * HostServices/DragAndDrop/dndmanager.h/cpp) has to be done:
-     * 1. Parse the urilist
-     * 2. Recursively send "create dir" and "transfer file" msg to the host
-     * 3. Patch the urilist by removing all base dirnames
-     * 4. On the host all needs to received and the urilist patched afterwards
-     *    to point to the new location
+    /** @todo Add URI support. Currently only data is send over to the host. For URI
+     *        support basically the same as in the H->G case (see
+     *        HostServices/DragAndDrop/dndmanager.h/cpp) has to be done:
+     *        1. Parse the urilist
+     *        2. Recursively send "create dir" and "transfer file" msg to the host
+     *        3. Patch the urilist by removing all base dirnames
+     *        4. On the host all needs to received and the urilist patched afterwards
+     *           to point to the new location
      */
 
@@ -999 +997 @@
     Msg.hdr.cParms      = 2;
     Msg.uSize.SetUInt32(cbData);
+
     int rc          = VINF_SUCCESS;
-    uint32_t cbMax  = _1M;
-    uint32_t cbSend = 0;
-    while(cbSend < cbData)
+    uint32_t cbMax  = _1M; /** @todo Remove 1 MB limit. */
+    uint32_t cbSent = 0;
+
+    while (cbSent < cbData)
     {
         /* Initialize parameter */
-        uint32_t cbToSend = RT_MIN(cbData - cbSend, cbMax);
-        Msg.pData.SetPtr(static_cast<uint8_t*>(pvData) + cbSend, cbToSend);
+        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));
@@ -1018 +1018 @@
         else
             break;
-        cbSend += cbToSend;
+        cbSent += cbToSend;
 //        RTThreadSleep(500);
     }