Changeset 100646 in vbox for trunk/src/VBox

Timestamp:

Jul 19, 2023 8:49:56 AM (20 months ago)

Author:

vboxsync

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

158483

Message:

Shared Clipboard: Renaming (ShClSvcHostReportFormats -> ShClSvcReportFormats), to match the other functions. bugref:9437

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-darwin.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc-internal.h (modified) (1 diff)
• VBoxSharedClipboardSvc-win.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc-x11.cpp (modified) (2 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (3 diffs)

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

@@ -96 +96 @@
         && fChanged
         && ShClSvcIsBackendActive())
-        rc = ShClSvcHostReportFormats(pCtx->pClient, fFormats);
+        rc = ShClSvcReportFormats(pCtx->pClient, fFormats);
 
     LogFlowFuncLeaveRC(rc);

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h

@@ -313 +313 @@
 int ShClSvcReadDataFromGuest(PSHCLCLIENT pClient, SHCLFORMAT uFmt, void **ppv, uint32_t *pcb);
 int ShClSvcGuestDataSignal(PSHCLCLIENT pClient, PSHCLCLIENTCMDCTX pCmdCtx, SHCLFORMAT uFormat, void *pvData, uint32_t cbData);
-int ShClSvcHostReportFormats(PSHCLCLIENT pClient, SHCLFORMATS fFormats);
+int ShClSvcReportFormats(PSHCLCLIENT pClient, SHCLFORMATS fFormats);
 PSHCLBACKEND ShClSvcGetBackend(void);
 uint32_t ShClSvcGetMode(void);

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

@@ -792 +792 @@
             && fFormats != VBOX_SHCL_FMT_NONE /** @todo r=bird: BUGBUG: revisit this. */
             && ShClSvcIsBackendActive())
-            rc = ShClSvcHostReportFormats(pCtx->pClient, fFormats);
+            rc = ShClSvcReportFormats(pCtx->pClient, fFormats);
     }
     else /* If we don't have any client data (yet), bail out. */

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

@@ -221 +221 @@
      * the guest when the clipboard starts up. */
     if (ShClSvcIsBackendActive())
-        return ShClSvcHostReportFormats(pClient, VBOX_SHCL_FMT_NONE);
+        return ShClSvcReportFormats(pClient, VBOX_SHCL_FMT_NONE);
     return VINF_SUCCESS;
 }
@@ -377 +377 @@
             if (fFormats != VBOX_SHCL_FMT_NONE) /* No formats to report? */
             {
-                rc = ShClSvcHostReportFormats(pCtx->pClient, fFormats);
+                rc = ShClSvcReportFormats(pCtx->pClient, fFormats);
             }
         }

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

@@ -1484 +1484 @@
  * @thread  Backend thread.
  */
-int ShClSvcHostReportFormats(PSHCLCLIENT pClient, SHCLFORMATS fFormats)
+int ShClSvcReportFormats(PSHCLCLIENT pClient, SHCLFORMATS fFormats)
 {
     LogFlowFuncEnter();
@@ -1775 +1775 @@
         if (g_ExtState.fDelayedAnnouncement)
         {
-            int rc2 = ShClSvcHostReportFormats(pClient, g_ExtState.fDelayedFormats);
+            int rc2 = ShClSvcReportFormats(pClient, g_ExtState.fDelayedFormats);
             AssertRC(rc2);
 
@@ -2735 +2735 @@
                 LogFlowFunc(("VBOX_CLIPBOARD_EXT_FN_FORMAT_ANNOUNCE: g_ExtState.fReadingData=%RTbool\n", g_ExtState.fReadingData));
                 if (!g_ExtState.fReadingData)
-                    rc = ShClSvcHostReportFormats(pClient, u32Format);
+                    rc = ShClSvcReportFormats(pClient, u32Format);
                 else
                 {