Changeset 78897 in vbox for trunk/src/VBox/Additions/common

Timestamp:

May 31, 2019 3:23:14 PM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Update.

Location:

trunk/src/VBox/Additions/common/VBoxGuest/lib

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxGuestR3LibClipboard.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk

@@ -147 +147 @@
 endif
 ifdef VBOX_WITH_SHARED_CLIPBOARD
+ VBoxGuestR3Lib_DEFS      += VBOX_WITH_SHARED_CLIPBOARD_GUEST
  VBoxGuestR3Lib_SOURCES   += \
         VBoxGuestR3LibClipboard.cpp
+ ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+ VBoxGuestR3Lib_SOURCES   += \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardMetaData.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardMIME.cpp
+ endif
 endif
 ifdef VBOX_WITH_SHARED_FOLDERS

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

@@ -264 +264 @@
  * @param   idClient            The client id returned by VbglR3ClipboardConnect().
  * @param   pDataHdr            Where to store the data header data.
- * @param   ppvData             Returns the received meta data. Needs to be free'd by the caller.
- * @param   pcbData             Where to store the size (in bytes) of the received meta data.
+ * @param   pMetaData           Returns the received meta data. Needs to be free'd by the caller.
  */
 static int vbglR3ClipboardReadMetaDataLoop(HGCMCLIENTID idClient, PVBOXCLIPBOARDDATAHDR pDataHdr,
-                                           void **ppvData, uint64_t *pcbData)
-{
-    AssertPtrReturn(pDataHdr, VERR_INVALID_POINTER);
-    AssertPtrReturn(ppvData,  VERR_INVALID_POINTER);
-    AssertPtrReturn(pcbData,  VERR_INVALID_POINTER);
+                                           PSHAREDCLIPBOARDMETADATA pMetaData)
+{
+    AssertPtrReturn(pDataHdr,  VERR_INVALID_POINTER);
+    AssertPtrReturn(pMetaData, VERR_INVALID_POINTER);
 
     int rc;
@@ -318 +316 @@
                 LogFlowFunc(("Received %RU64 bytes of data\n", cbDataTmp));
 
-                *ppvData = pvDataTmp;
-                *pcbData = cbDataTmp;
+                pMetaData->pvMeta = pvDataTmp;
+                pMetaData->cbMeta = cbDataTmp;
+                pMetaData->cbUsed = cbDataTmp;
             }
             else
@@ -326 +325 @@
     }
     else
-    {
-        *ppvData = NULL;
-        *pcbData = 0;
-    }
+        SharedClipboardMetaDataDestroy(pMetaData);
 
     LogFlowFuncLeaveRC(rc);
@@ -336 +332 @@
 
 /**
- * Main function for reading the actual meta data from the host, extended version.
- *
- * @returns IPRT status code.
- * @param   idClient            The client id returned by VbglR3ClipboardConnect().
- * @param   pEnmType            Where to store the meta data type. Optional.
- * @param   ppvData             Returns the received meta data. Needs to be free'd by the caller.  Optional.
- * @param   pcbData             Where to store the size (in bytes) of the received meta data. Optional.
- */
-static int vbglR3ClipboardReadMetaDataMainEx(HGCMCLIENTID                 idClient,
-                                             VBGLR3GUESTDNDMETADATATYPE  *pEnmType,
-                                             void                       **ppvData,
-                                             uint32_t                    *pcbData)
+ * Reads the actual meta data from the host, extended version.
+ *
+ * @returns IPRT status code.
+ * @param   idClient            The client id returned by VbglR3ClipboardConnect().
+ * @param   URIList             Where to store received meta data.
+ */
+static int vbglR3ClipboardReadMetaDataEx(HGCMCLIENTID idClient, SharedClipboardURIList &URIList)
 {
     /* The rest is optional. */
@@ -359 +350 @@
         return VERR_NO_MEMORY;
 
-    SharedClipboardURIList lstURI;
-
-    void    *pvData = NULL;
-    uint64_t cbData = 0;
-
-    int rc = vbglR3ClipboardReadMetaDataLoop(idClient, &dataHdr, &pvData, &cbData);
+    SHAREDCLIPBOARDMETADATA dataMeta;
+    SharedClipboardMetaDataInit(&dataMeta);
+
+    int rc = vbglR3ClipboardReadMetaDataLoop(idClient, &dataHdr, &dataMeta);
     if (RT_SUCCESS(rc))
     {
@@ -379 +368 @@
         if (SharedClipboardMIMEHasFileURLs((char *)dataHdr.pvMetaFmt, dataHdr.cbMetaFmt)) /* URI data. */
         {
-            AssertPtr(pvData);
-            Assert(cbData);
-
-            rc = lstURI.SetFromURIData(pvData, cbData, 0 /* fFlags */);
+            rc = URIList.SetFromURIData(dataMeta.pvMeta, dataMeta.cbMeta, 0 /* fFlags */);
+
+        #if 0
             if (RT_SUCCESS(rc))
                 rc = vbglR3ClipboardReadURIData(idClient, &dataHdr);
 
-            if (RT_SUCCESS(rc)) /** @todo Remove this block as soon as we hand in DnDURIList. */
+            if (RT_SUCCESS(rc))
             {
                 if (pvData)
@@ -406 +394 @@
                 {
                     memcpy(pvData, strData.c_str(), cbData);
-
-                    if (pEnmType)
-                        *pEnmType = VBGLR3GUESTDNDMETADATATYPE_URI_LIST;
                 }
                 else
@@ -414 +399 @@
             #endif
             }
+        #endif
         }
         else /* Raw data. */
         {
-            if (pEnmType)
-                *pEnmType = VBGLR3GUESTDNDMETADATATYPE_RAW;
+            /** @todo Implement this. */
         }
+
+        SharedClipboardMetaDataDestroy(&dataMeta);
     }
 
     if (dataHdr.pvMetaFmt)
+    {
         RTMemFree(dataHdr.pvMetaFmt);
-
-    if (RT_SUCCESS(rc))
-    {
-        if (   pvData
-            && cbData)
-        {
-            if (pcbData)
-                *pcbData = cbData;
-            if (ppvData)
-                *ppvData = pvData;
-            else
-                RTMemFree(pvData);
-        }
-    }
-    else if (   RT_FAILURE(rc)
-             && rc != VERR_CANCELLED)
-    {
-        if (pvData)
-            RTMemFree(pvData);
+        dataHdr.pvMetaFmt = NULL;
     }
 
@@ -450 +420 @@
 
 /**
- * Main function for reading the actual meta data from the host.
- *
- * @returns IPRT status code.
- * @param   idClient            The client id returned by VbglR3ClipboardConnect().
- * @param   pMeta               Where to store the actual meta data received from the host.
- */
-static int vbglR3ClipboardReadMetaDataMain(HGCMCLIENTID idClient, PVBGLR3GUESTDNDMETADATA pMeta)
-{
-    AssertPtrReturn(pMeta, VERR_INVALID_POINTER);
-
-    int rc = vbglR3ClipboardReadMetaDataMainEx(idClient,
-                                               &pMeta->enmType,
-                                               &pMeta->pvMeta,
-                                               &pMeta->cbMeta);
-    return rc;
+ * Reads the actual meta data from the host.
+ *
+ * @returns IPRT status code.
+ * @param   idClient            The client id returned by VbglR3ClipboardConnect().
+ * @param   URIList             Where to store received meta data.
+ */
+VBGLR3DECL(int) VbglR3ClipboardReadMetaData(HGCMCLIENTID idClient, SharedClipboardURIList &URIList)
+{
+    return vbglR3ClipboardReadMetaDataEx(idClient, URIList);
+}
+
+VBGLR3DECL(int) VbglR3ClipboardWriteMetaData(HGCMCLIENTID idClient, const SharedClipboardURIList &URIList)
+{
+    RT_NOREF(idClient, URIList);
+    return 0;
 }