Changeset 80623 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

Sep 6, 2019 10:05:11 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Removed old protocol handling cruft on the host side and added message translation support for serving older Guest Additions. Updated docs / protocol changelog.

Location:

trunk/src/VBox/GuestHost/SharedClipboard

Files:

• clipboard-common.cpp (modified) (7 diffs)
• clipboard-x11.cpp (modified) (8 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp

@@ -183 +183 @@
         RTMemFree(pEvIt);
     }
+
+    pSource->uID          = 0;
+    pSource->uEventIDNext = 0;
 }
 
@@ -216 +219 @@
 
     return NULL;
+}
+
+/**
+ * Returns the last (newest) event ID which has been registered for an event source.
+ *
+ * @returns Last registered event ID, or 0 if not found.
+ * @param   pSource             Event source to get last registered event from.
+ */
+VBOXCLIPBOARDEVENTID SharedClipboardEventGetLast(PSHAREDCLIPBOARDEVENTSOURCE pSource)
+{
+    AssertPtrReturn(pSource, 0);
+    PSHAREDCLIPBOARDEVENT pEvent = RTListGetLast(&pSource->lstEvents, SHAREDCLIPBOARDEVENT, Node);
+    if (pEvent)
+        return pEvent->uID;
+
+    return 0;
 }
 
@@ -281 +300 @@
         LogFlowFunc(("Event %RU16\n", pEvent->uID));
 
+        RTListNodeRemove(&pEvent->Node);
+
         SharedClipboardEventDestroy(pEvent);
+
         RTMemFree(pEvent);
-
-        RTListNodeRemove(&pEvent->Node);
+        pEvent = NULL;
 
         rc = VINF_SUCCESS;
@@ -290 +311 @@
     else
         rc = VERR_NOT_FOUND;
-
-    AssertRC(rc);
 
     LogFlowFuncLeaveRC(rc);
@@ -362 +381 @@
     else
         rc = VERR_NOT_FOUND;
-
-#ifdef DEBUG_andy
-    AssertRC(rc);
-#endif
 
     LogFlowFuncLeaveRC(rc);
@@ -787 +802 @@
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT);
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE);
+        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT);
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_TRANSFER_START);
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_ROOT_LIST_HDR_READ);
@@ -820 +835 @@
     {
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_GET_HOST_MSG_OLD);
-        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_FORMATS_WRITE);
+        RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_FORMATS_REPORT);
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_DATA_READ);
         RT_CASE_RET_STR(VBOX_SHARED_CLIPBOARD_GUEST_FN_DATA_WRITE);

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

@@ -1893 +1893 @@
     else
         rc = VERR_NOT_IMPLEMENTED;
-    ClipCompleteDataRequestFromX11(pReq->mCtx->pFrontend, rc, pReq->mReq,
-                                   pvDest, cbDest);
+    ClipRequestFromX11CompleteCallback(pReq->mCtx->pFrontend, rc, pReq->mReq,
+                                       pvDest, cbDest);
     RTMemFree(pvDest);
     RTMemFree(pReq);
@@ -2010 +2010 @@
         /* The clipboard callback was never scheduled, so we must signal
          * that the request processing is finished and clean up ourselves. */
-        ClipCompleteDataRequestFromX11(pReq->mCtx->pFrontend, rc, pReq->mReq,
-                                       NULL, 0);
+        ClipRequestFromX11CompleteCallback(pReq->mCtx->pFrontend, rc, pReq->mReq,
+                                           NULL, 0);
         RTMemFree(pReq);
     }
@@ -2037 +2037 @@
     if (!pCtx->fHaveX11)
         return VERR_NO_DATA;
+
     int rc = VINF_SUCCESS;
-    CLIPREADX11CBREQ *pX11Req;
-    pX11Req = (CLIPREADX11CBREQ *)RTMemAllocZ(sizeof(*pX11Req));
-    if (!pX11Req)
-        rc = VERR_NO_MEMORY;
-    else
+
+    CLIPREADX11CBREQ *pX11Req = (CLIPREADX11CBREQ *)RTMemAllocZ(sizeof(CLIPREADX11CBREQ));
+    if (pX11Req)
     {
         pX11Req->mFormat = u32Format;
         pX11Req->mCtx = pCtx;
         pX11Req->mReq = pReq;
+
         /* We use this to schedule a worker function on the event thread. */
-        clipQueueToEventThread(pCtx, vboxClipboardReadX11Worker,
-                               (XtPointer) pX11Req);
-    }
+        clipQueueToEventThread(pCtx, vboxClipboardReadX11Worker, (XtPointer) pX11Req);
+    }
+    else
+        rc = VERR_NO_MEMORY;
+
     return rc;
 }
@@ -2387 +2389 @@
 static char g_completedBuf[MAX_BUF_SIZE];
 
-void ClipCompleteDataRequestFromX11(VBOXCLIPBOARDCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
+void ClipRequestFromX11CompleteCallback(VBOXCLIPBOARDCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
 {
     RT_NOREF1(pCtx);
@@ -2646 +2648 @@
     uint32_t cbActual;
     CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)&pReq, *pReqRet = NULL;
-    rc = ClipStartX11(pCtx);
+    rc = ClipStartX11(pCtx, false /* fGrab */);
     AssertRCReturn(rc, 1);
 
@@ -2843 +2845 @@
 
     pCtx = ClipConstructX11(NULL, true);
-    rc = ClipStartX11(pCtx);
+    rc = ClipStartX11(pCtx, false /* fGrab */);
     AssertRCReturn(rc, 1);
 
@@ -2894 +2896 @@
 }
 
-void ClipCompleteDataRequestFromX11(VBOXCLIPBOARDCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
+void ClipRequestFromX11CompleteCallback(VBOXCLIPBOARDCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
 {
     RT_NOREF5(pCtx, rc, pReq, pv, cb);
@@ -2924 +2926 @@
     CLIPBACKEND *pCtx = ClipConstructX11(NULL, false);
     AssertReturn(pCtx, 1);
-    rc = ClipStartX11(pCtx);
+    rc = ClipStartX11(pCtx, false /* fGrab */);
     AssertRCReturn(rc, 1);
     /* Give the clipboard time to synchronise. */