Changeset 100613 in vbox for trunk/src/VBox

Timestamp:

Jul 17, 2023 5:49:10 PM (21 months ago)

Author:

vboxsync

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

158443

Message:

Shared Clipboard/Main: Made SHCLEXTPARMS a little more flexible (only was used by the VRDP console stuff before) [build fix, forgot a file]. bugref:9437

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (6 diffs)

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

@@ -1617 +1617 @@
                 SHCLEXTPARMS parms;
                 RT_ZERO(parms);
-                parms.uFormat = fFormats;
+                parms.u.ReportFormats.uFormats = fFormats;
 
                 g_ExtState.pfnExtension(g_ExtState.pvExtension, VBOX_CLIPBOARD_EXT_FN_FORMAT_ANNOUNCE, &parms, sizeof(parms));
@@ -1754 +1754 @@
         RT_ZERO(parms);
 
-        parms.uFormat  = uFormat;
-        parms.u.pvData = pvData;
-        parms.cbData   = cbData;
+        parms.u.ReadWriteData.uFormat = uFormat;
+        parms.u.ReadWriteData.pvData  = pvData;
+        parms.u.ReadWriteData.cbData  = cbData;
 
         g_ExtState.fReadingData = true;
@@ -1764 +1764 @@
 
         LogRel2(("Shared Clipboard: Read extension clipboard data (fDelayedAnnouncement=%RTbool, fDelayedFormats=%#x, max %RU32 bytes), got %RU32 bytes: rc=%Rrc\n",
-                 g_ExtState.fDelayedAnnouncement, g_ExtState.fDelayedFormats, cbData, parms.cbData, rc));
+                 g_ExtState.fDelayedAnnouncement, g_ExtState.fDelayedFormats, cbData, parms.u.ReadWriteData.cbData, rc));
 
         /* Did the extension send the clipboard formats yet?
@@ -1780 +1780 @@
 
         if (RT_SUCCESS(rc))
-            cbActual = parms.cbData;
+            cbActual = parms.u.ReadWriteData.cbData;
     }
     else
@@ -1949 +1949 @@
         SHCLEXTPARMS parms;
         RT_ZERO(parms);
-        parms.uFormat   = uFormat;
-        parms.u.pvData  = pvData;
-        parms.cbData    = cbData;
+        parms.u.ReadWriteData.uFormat = uFormat;
+        parms.u.ReadWriteData.pvData  = pvData;
+        parms.u.ReadWriteData.cbData  = cbData;
 
         g_ExtState.pfnExtension(g_ExtState.pvExtension, VBOX_CLIPBOARD_EXT_FN_DATA_WRITE, &parms, sizeof(parms));
@@ -2798 +2798 @@
         g_ExtState.pvExtension  = pvExtension;
 
-        parms.u.pfnCallback = extCallback;
+        parms.u.SetCallback.pfnCallback = extCallback;
+
         g_ExtState.pfnExtension(g_ExtState.pvExtension, VBOX_CLIPBOARD_EXT_FN_SET_CALLBACK, &parms, sizeof(parms));