Changeset 79174 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/ClipboardProvider-HostService.cpp

Timestamp:

Jun 17, 2019 10:30:49 AM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Update.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/ClipboardProvider-HostService.cpp (modified) (4 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardProvider-HostService.cpp

@@ -100 +100 @@
 }
 
+/**
+ * Returns the event's (raw) data (mutable).
+ *
+ * @returns Pointer to the event's raw data.
+ */
 void *SharedClipboardProviderHostService::Event::DataRaw()
 {
@@ -105 +110 @@
 }
 
+/**
+ * Returns the event's data size (in bytes).
+ *
+ * @returns Data size (in bytes).
+ */
 uint32_t SharedClipboardProviderHostService::Event::DataSize()
 {
@@ -125 +135 @@
     int rc;
 
-    Event *pEvent = eventGet(VBOX_SHARED_CLIPBOARD_GUEST_FN_WRITE_DATA_HDR);
-    if (pEvent)
-    {
-        rc = pEvent->Wait(m_uTimeoutMs);
-        if (RT_SUCCESS(rc))
-            memcpy(pDataHdr, pEvent->DataRaw(), pEvent->DataSize());
+    if (m_Callbacks.pfnReadDataHdr)
+    {
+        SHAREDCLIPBOARDPROVIDERCALLBACKDATA data = { this, m_Callbacks.pvUser };
+        rc = m_Callbacks.pfnReadDataHdr(&data);
     }
     else
-        rc = VERR_NOT_FOUND;
+        rc = VERR_NOT_SUPPORTED;
+
+    if (RT_SUCCESS(rc))
+    {
+        Event *pEvent = eventGet(VBOX_SHARED_CLIPBOARD_GUEST_FN_WRITE_DATA_HDR);
+        if (pEvent)
+        {
+            rc = pEvent->Wait(m_uTimeoutMs);
+            if (RT_SUCCESS(rc))
+                memcpy(pDataHdr, pEvent->DataRaw(), pEvent->DataSize());
+        }
+        else
+            rc = VERR_NOT_FOUND;
+    }
 
     LogFlowFuncLeaveRC(rc);
@@ -277 +298 @@
                 Event *pEvent = eventGet(pParms->u.HostService.uMsg);
                 if (pEvent)
-                {
                     rc = pEvent->SetData(&dataHdr, sizeof(dataHdr));
-                }
             }
             break;