Changeset 82513 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Dec 9, 2019 1:21:55 PM (5 years ago)

Author:

vboxsync

Message:

SharedClipboardSvc,Vbgl: Reviewed and adjusted the handling of the VBOX_SHCL_GUEST_FN_REPORT_FORMATS message, paddling back the parameter changes from the 6.1 dev cycle and fixing a couple of bugs introduced. Also documented the message and renamed it to a more sensible name. Dropped the new Vbgl method, renaming the old one. bugref:9437

File:

• trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp (modified) (1 diff)

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

@@ -175 +175 @@
  * Tell the host that new clipboard formats are available.
  *
- * @param pCtx                  Our context information.
- * @param Formats               The formats to report.
- */
-DECLCALLBACK(void) ShClX11ReportFormatsCallback(PSHCLCONTEXT pCtx, SHCLFORMATS Formats)
+ * @param   pCtx            Our context information.
+ * @param   fFormats        The formats to report.
+ */
+DECLCALLBACK(void) ShClX11ReportFormatsCallback(PSHCLCONTEXT pCtx, SHCLFORMATS fFormats)
 {
     RT_NOREF(pCtx);
 
-    LogFlowFunc(("Formats=0x%x\n", Formats));
-
-    SHCLFORMATDATA formatData;
-    RT_ZERO(formatData);
-
-    formatData.Formats = Formats;
-
-    int rc2 = VbglR3ClipboardFormatsReportEx(&pCtx->CmdCtx, &formatData);
+    LogFlowFunc(("Formats=0x%x\n", fFormats));
+
+    int rc2 = VbglR3ClipboardReportFormats(pCtx->CmdCtx.uClientID, fFormats);
     RT_NOREF(rc2);
     LogFlowFuncLeaveRC(rc2);