Changeset 83624 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Apr 8, 2020 4:29:25 PM (5 years ago)

Author:

vboxsync

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

137054

Message:

SharedClipboard: Eliminated SHCLFORMATDATA and did some minor darwin cleanups. bugref:9620

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

@@ -253 +253 @@
  *
  * @returns VBox status code.
- * @param   pCtx                Shared Clipboard command context to use for the connection.
- * @param   pFormats            Where to store the received formats from the host.
- */
-static int vbglR3ClipboardFormatsReportRecv(PVBGLR3SHCLCMDCTX pCtx, PSHCLFORMATDATA pFormats)
-{
-    AssertPtrReturn(pCtx,     VERR_INVALID_POINTER);
-    AssertPtrReturn(pFormats, VERR_INVALID_POINTER);
-
-    pFormats->fFlags = 0;
-    pFormats->Formats = 0;
+ * @param   pCtx        Shared Clipboard command context to use for the
+ *                      connection.
+ * @param   pfFormats   Where to store the received formats from the host.
+ */
+static int vbglR3ClipboardFormatsReportRecv(PVBGLR3SHCLCMDCTX pCtx, PSHCLFORMATS pfFormats)
+{
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+    AssertPtrReturn(pfFormats, VERR_INVALID_POINTER);
+
+    *pfFormats = 0;
 
     struct
@@ -278 +278 @@
     if (RT_SUCCESS(rc))
     {
-        rc = Msg.f32Formats.GetUInt32(&pFormats->Formats);
+        rc = Msg.f32Formats.GetUInt32(pfFormats);
         AssertRC(rc);
     }
@@ -2332 +2332 @@
             case VBOX_SHCL_HOST_MSG_FORMATS_REPORT:
                 pEvent->enmType = VBGLR3CLIPBOARDEVENTTYPE_REPORT_FORMATS;
-                pEvent->u.ReportedFormats.Formats = cParms;
+                pEvent->u.fReportedFormats = cParms;
                 break;
 
@@ -2372 +2372 @@
             case VBOX_SHCL_HOST_MSG_FORMATS_REPORT:
             {
-                rc = vbglR3ClipboardFormatsReportRecv(pCtx, &pEvent->u.ReportedFormats);
+                rc = vbglR3ClipboardFormatsReportRecv(pCtx, &pEvent->u.fReportedFormats);
                 if (RT_SUCCESS(rc))
                     pEvent->enmType = VBGLR3CLIPBOARDEVENTTYPE_REPORT_FORMATS;
@@ -2432 +2432 @@
             case VBOX_SHCL_HOST_MSG_FORMATS_REPORT:
                 pEvent->enmType = VBGLR3CLIPBOARDEVENTTYPE_REPORT_FORMATS;
-                pEvent->u.ReportedFormats.Formats = cParms;
+                pEvent->u.fReportedFormats = cParms;
                 break;