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

Timestamp:

Sep 27, 2019 10:57:21 AM (6 years ago)

Author:

vboxsync

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

133648

Message:

Shared Clipboard/X11: Emphasize which X11 backend APIs are callbacks and which aren't (fixed smoketests).

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (13 diffs)

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

@@ -1085 +1085 @@
 }
 
-/** This is a wrapper around ClipRequestDataForX11 that will cache the
+/** This is a wrapper around ClipRequestDataForX11Callback that will cache the
  * data returned.
  */
@@ -1943 +1943 @@
 }
 
-/** Worker function for ClipRequestDataFromX11 which runs on the event
+/** Worker function for ClipRequestDataFromX11Callback which runs on the event
  * thread. */
 static void vboxClipboardReadX11Worker(void *pUserData,
@@ -2029 +2029 @@
  * @note   We allocate a request structure which must be freed by the worker
  */
-int ClipRequestDataFromX11(CLIPBACKEND *pCtx, uint32_t u32Format,
-                           CLIPREADCBREQ *pReq)
+DECLCALLBACK(int) ClipRequestDataFromX11Callback(CLIPBACKEND *pCtx, uint32_t u32Format,
+                                                 CLIPREADCBREQ *pReq)
 {
     /*
@@ -2120 +2120 @@
 
 /* Return the data in the simulated VBox clipboard. */
-int ClipRequestDataForX11(SHCLCONTEXT *pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb)
+DECLCALLBACK(int) ClipRequestDataForX11Callback(SHCLCONTEXT *pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb)
 {
     RT_NOREF(pCtx, u32Format);
@@ -2241 +2241 @@
 static uint32_t g_fX11Formats = 0;
 
-void ClipReportX11Formats(SHCLCONTEXT *pCtx, uint32_t u32Formats)
+DECLCALLBACK(void) ClipReportX11FormatsCallback(SHCLCONTEXT *pCtx, uint32_t u32Formats)
 {
     RT_NOREF(pCtx);
@@ -2442 +2442 @@
         char *pc;
         CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)&pReq, *pReqRet = NULL;
-        ClipRequestDataFromX11(pCtx, VBOX_SHCL_FMT_UNICODETEXT,
-                               pReq);
+        ClipRequestDataFromX11Callback(pCtx, VBOX_SHCL_FMT_UNICODETEXT, pReq);
         int rc = VINF_SUCCESS;
         uint32_t cbActual = 0;
@@ -2500 +2499 @@
         char *pc;
         CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)&pReq, *pReqRet = NULL;
-        ClipRequestDataFromX11(pCtx, VBOX_SHCL_FMT_UNICODETEXT,
-                               pReq);
+        ClipRequestDataFromX11Callback(pCtx, VBOX_SHCL_FMT_UNICODETEXT,
+                                       pReq);
         int rc = VINF_SUCCESS;
         uint32_t cbActual = 0;
@@ -2577 +2576 @@
 {
     CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)&pReq;
-    int rc = ClipRequestDataFromX11(pCtx,
-                                    VBOX_SHCL_FMT_UNICODETEXT,
-                                    pReq);
+    int rc = ClipRequestDataFromX11Callback(pCtx,
+                                            VBOX_SHCL_FMT_UNICODETEXT,
+                                            pReq);
     RTTESTI_CHECK_MSG(rc == VERR_NO_DATA, ("context: %s\n", pcszTestCtx));
 }
@@ -2616 +2615 @@
         char *pc;
         CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)&pReq, *pReqRet = NULL;
-        ClipRequestDataFromX11(pCtx, 100, pReq);  /* Bad format. */
+        ClipRequestDataFromX11Callback(pCtx, 100, pReq);  /* Bad format. */
         int rc = VINF_SUCCESS;
         uint32_t cbActual = 0;
@@ -2725 +2724 @@
     clipSetSelectionValues("UTF8_STRING", XA_STRING, NULL,
                            0, 8);
-    ClipRequestDataFromX11(pCtx, VBOX_SHCL_FMT_UNICODETEXT,
-                           pReq);
+    ClipRequestDataFromX11Callback(pCtx, VBOX_SHCL_FMT_UNICODETEXT, pReq);
     clipGetCompletedRequest(&rc, &pc, &cbActual, &pReqRet);
     RTTEST_CHECK_MSG(hTest, rc == VERR_NO_DATA,
@@ -2744 +2742 @@
     /*** request for an invalid VBox format from X11 ***/
     RTTestSub(hTest, "a request for an invalid VBox format from X11");
-    ClipRequestDataFromX11(pCtx, 0xffff, pReq);
+    ClipRequestDataFromX11Callback(pCtx, 0xffff, pReq);
     clipGetCompletedRequest(&rc, &pc, &cbActual, &pReqRet);
     RTTEST_CHECK_MSG(hTest, rc == VERR_NOT_IMPLEMENTED,
@@ -2885 +2883 @@
 # include <iprt/test.h>
 
-int ClipRequestDataForX11(SHCLCONTEXT *pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb)
+DECLCALLBACK(int) ClipRequestDataForX11Callback(SHCLCONTEXT *pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb)
 {
     RT_NOREF(pCtx, u32Format, ppv, pcb);
@@ -2891 +2889 @@
 }
 
-void ClipReportX11Formats(SHCLCONTEXT *pCtx, uint32_t u32Formats)
+DECLCALLBACK(void) ClipReportX11FormatsCallback(SHCLCONTEXT *pCtx, uint32_t u32Formats)
 {
     RT_NOREF(pCtx, u32Formats);
 }
 
-void ClipRequestFromX11CompleteCallback(SHCLCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
+DECLCALLBACK(void) ClipRequestFromX11CompleteCallback(SHCLCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
 {
     RT_NOREF(pCtx, rc, pReq, pv, cb);