Changeset 78582 in vbox for trunk/src

Timestamp:

May 18, 2019 4:24:19 PM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Build fix.

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (7 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (1 diff)

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

@@ -83 +83 @@
     CLIPX11FORMATTARGET_UTF8,
     CLIPX11FORMATTARGET_BMP,
-    CLIPX11FORMATTARGET_HTML,
+    CLIPX11FORMATTARGET_HTML
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-    CLIPX11FORMATTARGET_URI_LIST
+    , CLIPX11FORMATTARGET_URI_LIST
 #endif
 } CLIPX11FORMATTARGET;
@@ -177 +177 @@
 #ifdef TESTCASE
 /** Lookup the X11 format matching a given X11 atom text.
- * @returns the format on success, NIL_CLIPX11FORMAT on failure
+ * @returns the format on success, NIL_CLIPX11FORMATTARGET on failure
  * @param   widget a valid Xt widget
  */
@@ -192 +192 @@
  * Enumerates supported X11 clipboard formats corresponding to a given VBox format.
  *
- * @returns the next matching X11 format in the list, or NIL_CLIPX11FORMAT if
+ * @returns the next matching X11 format in the list, or NIL_CLIPX11FORMATTARGET if
  *          there are no more
  * @param lastFmtIdx  The format index returned from the last call of this function.
@@ -415 +415 @@
 {
     bool success = true;
-    CLIPX11FORMAT targets[2];
-    CLIPX11FORMAT x11Format;
+    CLIPX11FORMATTARGET targets[2];
+    CLIPX11FORMATTARGET x11Format;
     targets[0] = clipGetFmtIdxFromAtomText("text/plain");
     targets[1] = clipGetFmtIdxFromAtomText("image/bmp");
@@ -1756 +1756 @@
 struct _CLIPREADX11CBREQ
 {
-    /** @todo r=andy Why all those different CLIPX11FORMAT members? Shouldn't be one enough? */
+    /** @todo r=andy Why all those different CLIPX11FORMATTARGET members? Shouldn't be one enough? */
 
     /** The format VBox would like the data in */
@@ -2255 +2255 @@
 
 /* Take a request for the targets we are currently offering. */
-static CLIPX11FORMAT g_selTargets[10] = { 0 };
+static CLIPX11FORMATTARGET g_selTargets[10] = { 0 };
 static size_t g_cTargets = 0;
 
@@ -2270 +2270 @@
 static int g_selFormat = 0;
 
-void testRequestData(CLIPBACKEND *pCtx, CLIPX11FORMAT target, void *closure)
+void testRequestData(CLIPBACKEND *pCtx, CLIPX11FORMATTARGET target, void *closure)
 {
     RT_NOREF(pCtx);

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

@@ -507 +507 @@
 }
 
-void ClipAnnounceFormatToX11(CLIPBACKEND *pBackend, VBOXCLIPBOARDFORMATS vboxFormats)
+int ClipAnnounceFormatToX11(CLIPBACKEND *pBackend, VBOXCLIPBOARDFORMATS vboxFormats)
 {
     pBackend->formats = vboxFormats;
+    return VINF_SUCCESS;
 }