Changeset 78581 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

May 18, 2019 3:48:41 PM (6 years ago)

Author:

vboxsync

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

130636

Message:

Shared Clipboard/URI: Update.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxClipboard.h (modified) (1 diff)
• VBoxSharedClipboardSvc-x11.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxClipboard.h

@@ -49 +49 @@
     struct {
         VBOXHGCMCALLHANDLE callHandle;
-        VBOXHGCMSVCPARM *paParms;
+        VBOXHGCMSVCPARM   *paParms;
     } async;
 
     struct {
         VBOXHGCMCALLHANDLE callHandle;
-        VBOXHGCMSVCPARM *paParms;
+        VBOXHGCMSVCPARM   *paParms;
     } asyncRead;
 

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

@@ -507 +507 @@
 }
 
-void ClipAnnounceFormatToX11(CLIPBACKEND *pBackend, uint32_t u32Formats)
-{
-    pBackend->formats = u32Formats;
-}
-
-extern int ClipRequestDataFromX11(CLIPBACKEND *pBackend, uint32_t u32Format,
+void ClipAnnounceFormatToX11(CLIPBACKEND *pBackend, VBOXCLIPBOARDFORMATS vboxFormats)
+{
+    pBackend->formats = vboxFormats;
+}
+
+extern int ClipRequestDataFromX11(CLIPBACKEND *pBackend, VBOXCLIPBOARDFORMAT vboxFormat,
                                   CLIPREADCBREQ *pReq)
 {
-    pBackend->readData.format = u32Format;
+    pBackend->readData.format = vboxFormat;
     pBackend->readData.pReq = pReq;
     return pBackend->readData.rc;

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

@@ -513 +513 @@
                 uint32_t u32Formats;
 
-                rc = VBoxHGCMParmUInt32Get (&paParms[0], &u32Formats);
+                rc = VBoxHGCMParmUInt32Get(&paParms[0], &u32Formats);
 
                 if (RT_SUCCESS (rc))
@@ -562 +562 @@
                 uint32_t cb;
 
-                rc = VBoxHGCMParmUInt32Get (&paParms[0], &u32Format);
+                rc = VBoxHGCMParmUInt32Get(&paParms[0], &u32Format);
 
                 if (RT_SUCCESS (rc))
                 {
-                    rc = VBoxHGCMParmPtrGet (&paParms[1], &pv, &cb);
+                    rc = VBoxHGCMParmPtrGet(&paParms[1], &pv, &cb);
 
                     if (RT_SUCCESS (rc))
@@ -629 +629 @@
                         else if (RT_SUCCESS (rc))
                         {
-                            VBoxHGCMParmUInt32Set (&paParms[2], cbActual);
+                            VBoxHGCMParmUInt32Set(&paParms[2], cbActual);
                         }
                     }
@@ -657 +657 @@
                 uint32_t u32Format;
 
-                rc = VBoxHGCMParmUInt32Get (&paParms[0], &u32Format);
+                rc = VBoxHGCMParmUInt32Get(&paParms[0], &u32Format);
 
                 if (RT_SUCCESS (rc))
                 {
-                    rc = VBoxHGCMParmPtrGet (&paParms[1], &pv, &cb);
+                    rc = VBoxHGCMParmPtrGet(&paParms[1], &pv, &cb);
 
                     if (RT_SUCCESS (rc))