Changeset 78315 in vbox for trunk/src/VBox

Timestamp:

Apr 26, 2019 9:06:32 AM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Build fix.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxClipboard.cpp (modified) (2 diffs)
• common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (2 diffs)
• common/VBoxService/VBoxServiceClipboard-os2.cpp (modified) (3 diffs)
• haiku/VBoxTray/VBoxClipboard.cpp (modified) (1 diff)
• x11/VBoxClient/clipboard.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -78 +78 @@
                int vboxrc = VBoxClipboardWinGetFormats(&pCtx->Win, &uFormats);
                if (RT_SUCCESS(vboxrc))
-                   vboxrc = VbglR3ClipboardWriteFormats(pCtx->u32ClientID, uFormats);
+                   vboxrc = VbglR3ClipboardReportFormats(pCtx->u32ClientID, uFormats);
            }
         }
@@ -128 +128 @@
                int vboxrc = VBoxClipboardWinGetFormats(pWinCtx, &uFormats);
                if (RT_SUCCESS(vboxrc))
-                   vboxrc = VbglR3ClipboardWriteFormats(pCtx->u32ClientID, uFormats);
+                   vboxrc = VbglR3ClipboardReportFormats(pCtx->u32ClientID, uFormats);
            }
 

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

@@ -154 +154 @@
 
 /**
- * Writes (advertises) guest clipboard formats to the host.
+ * Reports (advertises) guest clipboard formats to the host.
  *
  * @returns VBox status code.
@@ -160 +160 @@
  * @param   fFormats        The formats to advertise.
  */
-VBGLR3DECL(int) VbglR3ClipboardWriteFormats(HGCMCLIENTID idClient, uint32_t fFormats)
+VBGLR3DECL(int) VbglR3ClipboardReportFormats(HGCMCLIENTID idClient, uint32_t fFormats)
 {
     VBoxClipboardWriteFormats Msg;
 
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, VBOX_SHARED_CLIPBOARD_FN_WRITE_FORMATS, 1);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, VBOX_SHARED_CLIPBOARD_FN_REPORT_FORMATS, 1);
     VbglHGCMParmUInt32Set(&Msg.formats, fFormats);
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp

@@ -611 +611 @@
     }
     VGSvcVerbose(4, "clipboard: reporting fFormats=%#x\n", fFormats);
-    VbglR3ClipboardWriteFormats(g_u32ClientId, fFormats);
+    VbglR3ClipboardReportFormats(g_u32ClientId, fFormats);
 }
 
@@ -658 +658 @@
                 g_fEmptyClipboard = true;
                 VGSvcVerbose(3, "Reporting empty clipboard\n");
-                VbglR3ClipboardWriteFormats(g_u32ClientId, 0);
+                VbglR3ClipboardReportFormats(g_u32ClientId, 0);
             }
         }
@@ -681 +681 @@
     g_fEmptyClipboard = true;
     VGSvcVerbose(3, "Reporting empty clipboard\n");
-    VbglR3ClipboardWriteFormats(g_u32ClientId, 0);
+    VbglR3ClipboardReportFormats(g_u32ClientId, 0);
 
     vgsvcClipboardOs2PollViewer();

trunk/src/VBox/Additions/haiku/VBoxTray/VBoxClipboard.cpp

@@ -345 +345 @@
             be_clipboard->Unlock();
 
-            VbglR3ClipboardWriteFormats(fClientId, formats);
+            VbglR3ClipboardReportFormats(fClientId, formats);
             break;
         }

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

@@ -152 +152 @@
     RT_NOREF1(pCtx);
     LogRelFlowFunc(("u32Formats=%d\n", u32Formats));
-    int rc = VbglR3ClipboardWriteFormats(g_ctx.client, u32Formats);
+    int rc = VbglR3ClipboardReportFormats(g_ctx.client, u32Formats);
     LogRelFlowFunc(("rc=%Rrc\n", rc));
 }