Changeset 100612 in vbox

Timestamp:

Jul 17, 2023 5:45:04 PM (20 months ago)

Author:

vboxsync

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

158442

Message:

Shared Clipboard/Main: Made SHCLEXTPARMS a little more flexible (only was used by the VRDP console stuff before). bugref:9437

Location:

trunk

Files:

• include/VBox/HostServices/VBoxClipboardExt.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleVRDPServer.cpp (modified) (4 diffs)

trunk/include/VBox/HostServices/VBoxClipboardExt.h

@@ -53 +53 @@
 typedef FNVRDPCLIPBOARDEXTCALLBACK *PFNVRDPCLIPBOARDEXTCALLBACK;
 
+/**
+ * Structure for holding Shared Clipboard service extension parameters.
+ */
 typedef struct _SHCLEXTPARMS
 {
-    uint32_t                        uFormat;
     union
     {
-        void                       *pvData;
-        PFNVRDPCLIPBOARDEXTCALLBACK pfnCallback;
+        /** Reports clipboard formats. */
+        struct
+        {
+            SHCLFORMATS             uFormats;
+        } ReportFormats;
+        /** Reads / writes clipboard data. */
+        struct
+        {
+            SHCLFORMAT              uFormat;
+            void                   *pvData;
+            uint32_t                cbData;
+        } ReadWriteData;
+        /** Sets a read / write callback. */
+        struct
+        {
+            PFNVRDPCLIPBOARDEXTCALLBACK
+                                    pfnCallback;
+        } SetCallback;
     } u;
-    uint32_t   cbData;
 } SHCLEXTPARMS;
+/** Pointer to Shared Clipboard service extension parameters. */
+typedef SHCLEXTPARMS *PSHCLEXTPARMS;
 
 #endif /* !VBOX_INCLUDED_HostServices_VBoxClipboardExt_h */

trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp

@@ -3351 +3351 @@
         case VBOX_CLIPBOARD_EXT_FN_SET_CALLBACK:
         {
-            pServer->mpfnClipboardCallback = pParms->u.pfnCallback;
+            pServer->mpfnClipboardCallback = pParms->u.SetCallback.pfnCallback;
         } break;
 
@@ -3361 +3361 @@
                 mpEntryPoints->VRDEClipboard(pServer->mhServer,
                                              VRDE_CLIPBOARD_FUNCTION_FORMAT_ANNOUNCE,
-                                             pParms->uFormat,
+                                             pParms->u.ReportFormats.uFormats,
                                              NULL,
                                              0,
@@ -3378 +3378 @@
                 mpEntryPoints->VRDEClipboard(pServer->mhServer,
                                              VRDE_CLIPBOARD_FUNCTION_DATA_READ,
-                                             pParms->uFormat,
-                                             pParms->u.pvData,
-                                             pParms->cbData,
-                                             &pParms->cbData);
+                                             pParms->u.ReadWriteData.uFormat,
+                                             pParms->u.ReadWriteData.pvData,
+                                             pParms->u.ReadWriteData.cbData,
+                                             &pParms->u.ReadWriteData.cbData);
             }
         } break;
@@ -3391 +3391 @@
                 mpEntryPoints->VRDEClipboard(pServer->mhServer,
                                              VRDE_CLIPBOARD_FUNCTION_DATA_WRITE,
-                                             pParms->uFormat,
-                                             pParms->u.pvData,
-                                             pParms->cbData,
+                                             pParms->u.ReadWriteData.uFormat,
+                                             pParms->u.ReadWriteData.pvData,
+                                             pParms->u.ReadWriteData.cbData,
                                              NULL);
             }