Changeset 81044 in vbox

Timestamp:

Sep 27, 2019 10:49:07 AM (6 years ago)

Author:

vboxsync

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

133647

Message:

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

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard.h (modified) (2 diffs)
• src/VBox/Additions/x11/VBoxClient/clipboard.cpp (modified) (3 diffs)
• src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (2 diffs)

trunk/include/VBox/GuestHost/SharedClipboard.h

@@ -225 +225 @@
 typedef struct _CLIPREADCBREQ CLIPREADCBREQ;
 
-/* APIs exported by the X11 backend */
+/* APIs exported by the X11 backend. */
 extern CLIPBACKEND *ClipConstructX11(SHCLCONTEXT *pFrontend, bool fHeadless);
 extern void ClipDestructX11(CLIPBACKEND *pBackend);
@@ -233 +233 @@
 extern int ClipRequestDataFromX11(CLIPBACKEND *pBackend, SHCLFORMATS vboxFormat, CLIPREADCBREQ *pReq);
 
-/* APIs exported by the X11/VBox frontend */
-extern int ClipRequestDataForX11(SHCLCONTEXT *pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb);
-extern void ClipReportX11Formats(SHCLCONTEXT *pCtx, uint32_t u32Formats);
-extern void ClipRequestFromX11CompleteCallback(SHCLCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb);
+/* APIs (as callbacks) exported by the X11/VBox frontend. */
+extern DECLCALLBACK(int)  ClipRequestDataForX11Callback(SHCLCONTEXT *pCtx, uint32_t u32Format, void **ppv, uint32_t *pcb);
+extern DECLCALLBACK(void) ClipReportX11FormatsCallback(SHCLCONTEXT *pCtx, uint32_t u32Formats);
+extern DECLCALLBACK(void) ClipRequestFromX11CompleteCallback(SHCLCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb);
 #endif /* !VBOX_INCLUDED_GuestHost_SharedClipboard_h */
 

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

@@ -86 +86 @@
  *                    returned
  */
-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);
@@ -148 +148 @@
  * @param u32Formats            The formats to report.
  */
-void ClipReportX11Formats(SHCLCONTEXT *pCtx, uint32_t u32Formats)
+DECLCALLBACK(void) ClipReportX11FormatsCallback(SHCLCONTEXT *pCtx, uint32_t u32Formats)
 {
     RT_NOREF(pCtx);
@@ -166 +166 @@
  * @param  cb        the size of the data in @a pv
  */
-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);

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

@@ -377 +377 @@
                     pCtx->X11TextFormat, pCtx->X11BitmapFormat, pCtx->X11HTMLFormat,
                     u32VBoxFormats ));
-    ClipReportX11Formats(pCtx->pFrontend, u32VBoxFormats);
+    ClipReportX11FormatsCallback(pCtx->pFrontend, u32VBoxFormats);
 }
 
@@ -1097 +1097 @@
     {
         if (pCtx->pvUnicodeCache == NULL)
-            rc = ClipRequestDataForX11(pCtx->pFrontend, u32Format,
-                                              &pCtx->pvUnicodeCache,
-                                              &pCtx->cbUnicodeCache);
+            rc = ClipRequestDataForX11Callback(pCtx->pFrontend, u32Format,
+                                               &pCtx->pvUnicodeCache,
+                                               &pCtx->cbUnicodeCache);
         if (RT_SUCCESS(rc))
         {
@@ -1109 +1109 @@
     }
     else
-        rc = ClipRequestDataForX11(pCtx->pFrontend, u32Format,
-                                          ppv, pcb);
+        rc = ClipRequestDataForX11Callback(pCtx->pFrontend, u32Format,
+                                           ppv, pcb);
     LogRelFlowFunc(("returning %Rrc\n", rc));
     if (RT_SUCCESS(rc))

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp

@@ -62 +62 @@
  * @param  u32Formats           The formats available.
  */
-void ClipReportX11Formats(SHCLCONTEXT *pCtx, uint32_t u32Formats)
+DECLCALLBACK(void) ClipReportX11FormatsCallback(SHCLCONTEXT *pCtx, uint32_t u32Formats)
 {
     LogFlowFunc(("pCtx=%p, u32Formats=%02X\n", pCtx, u32Formats));
@@ -351 +351 @@
  * @note   Host glue code.
  */
-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)
 {
     LogFlowFunc(("pCtx=%p, u32Format=%02X, ppv=%p\n", pCtx, u32Format, ppv));