Changeset 85371 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Jul 17, 2020 10:02:58 AM (4 years ago)

Author:

vboxsync

Message:

DnD: Revamped code to simplify / untangle of internal data handling:

• C-ifying and renaming classes DnDURIList / DnDURIObject -> DnDTransferList / DnDTransferObject
• Added testcases for DnDTransferList / DnDTransferObject + DnDPath API
• Reduced memory footprint
• Greatly simplified / stripped down internal data flow of Main side
• More (optional) release logging for further diagnosis

Work in progress.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (modified) (4 diffs)

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

@@ -549 +549 @@
     int hgMove(uint32_t uPosX, uint32_t uPosY, VBOXDNDACTION dndActionDefault);
     int hgDrop(uint32_t uPosX, uint32_t uPosY, VBOXDNDACTION dndActionDefault);
-    int hgDataReceive(PVBGLR3GUESTDNDMETADATA pMetaData);
+    int hgDataReceive(PVBGLR3GUESTDNDMETADATA pMeta);
 
     /* X11 helpers. */
@@ -1900 +1900 @@
  *
  * @returns IPRT status code.
- * @param   pMetaData               Pointer to meta data from host.
- */
-int DragInstance::hgDataReceive(PVBGLR3GUESTDNDMETADATA pMetaData)
+ * @param   pMeta               Pointer to meta data from host.
+ */
+int DragInstance::hgDataReceive(PVBGLR3GUESTDNDMETADATA pMeta)
 {
     LogFlowThisFunc(("enmMode=%RU32, enmState=%RU32\n", m_enmMode, m_enmState));
-    LogFlowThisFunc(("enmMetaDataType=%RU32\n", pMetaData->enmType));
+    LogFlowThisFunc(("enmMetaType=%RU32\n", pMeta->enmType));
 
     if (   m_enmMode  != HG
@@ -1913 +1913 @@
     }
 
-    if (   pMetaData->pvMeta == NULL
-        || pMetaData->cbMeta == 0)
-    {
-        return VERR_INVALID_PARAMETER;
-    }
-
-    int rc = VINF_SUCCESS;
-
-    const void    *pvData = pMetaData->pvMeta;
-    const uint32_t cbData = pMetaData->cbMeta;
+    void  *pvData = NULL;
+    size_t cbData = 0;
+
+    int rc;
+
+    switch (pMeta->enmType)
+    {
+        case VBGLR3GUESTDNDMETADATATYPE_RAW:
+        {
+            AssertBreakStmt(pMeta->u.Raw.pvMeta != NULL, rc = VERR_INVALID_POINTER);
+            pvData = pMeta->u.Raw.pvMeta;
+            AssertBreakStmt(pMeta->u.Raw.cbMeta, rc = VERR_INVALID_PARAMETER);
+            cbData = pMeta->u.Raw.cbMeta;
+
+            rc = VINF_SUCCESS;
+            break;
+        }
+
+        case VBGLR3GUESTDNDMETADATATYPE_URI_LIST:
+        {
+            VBClLogInfo(("URI transfer root directory is '%s'\n", DnDTransferListGetRootPathAbs(&pMeta->u.URI.Transfer)));
+
+            /* Note: The transfer list already has its root set to a temporary directory, so no need to set/add a new
+             *       path base here. */
+            rc = DnDTransferListGetRootsEx(&pMeta->u.URI.Transfer, DNDTRANSFERLISTFMT_NATIVE, NULL /* pszPathBase */,
+                                           DND_PATH_SEPARATOR, (char **)&pvData, &cbData);
+            break;
+        }
+
+        default:
+            AssertFailedStmt(rc = VERR_NOT_IMPLEMENTED);
+            break;
+    }
+
+    if (RT_FAILURE(rc))
+        return rc;
 
     /*
@@ -1928 +1954 @@
      * be on the guest, so proceed working on communicating with the target window.
      */
-    VBClLogInfo("Received %RU32 bytes of URI list meta data from host\n", cbData);
+    VBClLogInfo("Received %RU32 bytes of meta data from host\n", cbData);
 
     /* Destroy any old data. */