Changeset 80866 in vbox for trunk

Timestamp:

Sep 17, 2019 3:40:00 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Yet more renaming.

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (7 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h (modified) (2 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (11 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (1 diff)

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

@@ -94 +94 @@
 *********************************************************************************************************************************/
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-static DECLCALLBACK(void) vboxClipboardTransferTransferCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc);
-static DECLCALLBACK(void) vboxClipboardTransferTransferErrorCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc);
+static DECLCALLBACK(void) vboxClipboardTransferCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc);
+static DECLCALLBACK(void) vboxClipboardTransferErrorCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc);
 #endif
 
@@ -160 +160 @@
 #endif
 
-static void vboxClipboardTransferTransferCallbackCleanup(PSHCLTRANSFERCALLBACKDATA pData)
+static void vboxClipboardTransferCallbackCleanup(PSHCLTRANSFERCALLBACKDATA pData)
 {
     PSHCLTRANSFERCTX pCtx = (PSHCLTRANSFERCTX)pData->pvUser;
@@ -183 +183 @@
 }
 
-static DECLCALLBACK(void) vboxClipboardTransferTransferCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc)
+static DECLCALLBACK(void) vboxClipboardTransferCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc)
 {
     RT_NOREF(rc);
@@ -191 +191 @@
     LogRel2(("Shared Clipboard: Transfer to destination complete\n"));
 
-    vboxClipboardTransferTransferCallbackCleanup(pData);
-}
-
-static DECLCALLBACK(void) vboxClipboardTransferTransferErrorCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc)
+    vboxClipboardTransferCallbackCleanup(pData);
+}
+
+static DECLCALLBACK(void) vboxClipboardTransferErrorCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc)
 {
     RT_NOREF(rc);
@@ -202 +202 @@
     LogRel(("Shared Clipboard: Transfer to destination failed with %Rrc\n", rc));
 
-    vboxClipboardTransferTransferCallbackCleanup(pData);
-}
-
-static int vboxClipboardTransferTransferOpen(PSHCLPROVIDERCTX pCtx)
+    vboxClipboardTransferCallbackCleanup(pData);
+}
+
+static int vboxClipboardTransferOpen(PSHCLPROVIDERCTX pCtx)
 {
     RT_NOREF(pCtx);
@@ -213 +213 @@
 }
 
-static int vboxClipboardTransferTransferClose(PSHCLPROVIDERCTX pCtx)
+static int vboxClipboardTransferClose(PSHCLPROVIDERCTX pCtx)
 {
     RT_NOREF(pCtx);
@@ -969 +969 @@
 
                TransferCallbacks.pvUser              = &pCtx->URI;
-               TransferCallbacks.pfnTransferComplete = vboxClipboardTransferTransferCompleteCallback;
-               TransferCallbacks.pfnTransferError    = vboxClipboardTransferTransferErrorCallback;
+               TransferCallbacks.pfnTransferComplete = vboxClipboardTransferCompleteCallback;
+               TransferCallbacks.pfnTransferError    = vboxClipboardTransferErrorCallback;
 
                SharedClipboardTransferSetCallbacks(pTransfer, &TransferCallbacks);

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

@@ -197 +197 @@
 
 # ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-int sharedClipboardSvcTransferTransferStart(PSHCLCLIENT pClient,
-                                     SHCLTRANSFERDIR enmDir, SHCLSOURCE enmSource,
-                                     PSHCLTRANSFER *ppTransfer);
+int sharedClipboardSvcTransferStart(PSHCLCLIENT pClient,
+                                    SHCLTRANSFERDIR enmDir, SHCLSOURCE enmSource,
+                                    PSHCLTRANSFER *ppTransfer);
+int sharedClipboardSvcTransferStop(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer);
 bool sharedClipboardSvcTransferMsgIsAllowed(uint32_t uMode, uint32_t uMsg);
 # endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
@@ -222 +223 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-int sharedClipboardSvcTransferTransferOpen(PSHCLPROVIDERCTX pCtx);
-DECLCALLBACK(int) sharedClipboardSvcTransferTransferClose(PSHCLPROVIDERCTX pCtx);
+int sharedClipboardSvcTransferOpen(PSHCLPROVIDERCTX pCtx);
+DECLCALLBACK(int) sharedClipboardSvcTransferClose(PSHCLPROVIDERCTX pCtx);
 
 int sharedClipboardSvcTransferGetRoots(PSHCLPROVIDERCTX pCtx, PSHCLROOTLIST *ppRootList);

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

@@ -58 +58 @@
 *********************************************************************************************************************************/
 
-DECLCALLBACK(int) sharedClipboardSvcTransferTransferOpen(PSHCLPROVIDERCTX pCtx)
+DECLCALLBACK(int) sharedClipboardSvcTransferOpen(PSHCLPROVIDERCTX pCtx)
 {
     RT_NOREF(pCtx);
@@ -66 +66 @@
 }
 
-DECLCALLBACK(int) sharedClipboardSvcTransferTransferClose(PSHCLPROVIDERCTX pCtx)
+DECLCALLBACK(int) sharedClipboardSvcTransferClose(PSHCLPROVIDERCTX pCtx)
 {
     RT_NOREF(pCtx);
@@ -1162 +1162 @@
  * @param   paParms             Array function parameters supplied.
  */
-static int sharedClipboardSvcTransferTransferHandleReply(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer,
-                                                         uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+static int sharedClipboardSvcTransferHandleReply(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer,
+                                                 uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
     RT_NOREF(pClient);
@@ -1366 +1366 @@
                         creationCtx.enmSource = pClient->State.enmSource;
 
-                        creationCtx.Interface.pfnTransferOpen  = sharedClipboardSvcTransferTransferOpen;
-                        creationCtx.Interface.pfnTransferClose = sharedClipboardSvcTransferTransferClose;
+                        creationCtx.Interface.pfnTransferOpen  = sharedClipboardSvcTransferOpen;
+                        creationCtx.Interface.pfnTransferClose = sharedClipboardSvcTransferClose;
                         creationCtx.Interface.pfnListOpen      = sharedClipboardSvcTransferListOpen;
                         creationCtx.Interface.pfnListClose     = sharedClipboardSvcTransferListClose;
@@ -1431 +1431 @@
         case VBOX_SHCL_GUEST_FN_REPLY:
         {
-            rc = sharedClipboardSvcTransferTransferHandleReply(pClient, pTransfer, cParms, paParms);
+            rc = sharedClipboardSvcTransferHandleReply(pClient, pTransfer, cParms, paParms);
 
             /* This message does not need any completion, as it can happen at any time from the guest side. */
@@ -2099 +2099 @@
  * @param   puEvent             Where to store the created wait event. Optional.
  */
-int sharedClipboardSvcTransferTransferSendStatus(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer, SHCLTRANSFERSTATUS uStatus,
-                                                 int rcTransfer, PSHCLEVENTID puEvent)
+int sharedClipboardSvcTransferSendStatus(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer, SHCLTRANSFERSTATUS uStatus,
+                                         int rcTransfer, PSHCLEVENTID puEvent)
 {
     AssertPtrReturn(pClient,   VERR_INVALID_POINTER);
@@ -2153 +2153 @@
  * @param   ppTransfer          Where to return the created transfer on success. Optional.
  */
-int sharedClipboardSvcTransferTransferStart(PSHCLCLIENT pClient,
-                                            SHCLTRANSFERDIR enmDir, SHCLSOURCE enmSource,
-                                            PSHCLTRANSFER *ppTransfer)
+int sharedClipboardSvcTransferStart(PSHCLCLIENT pClient,
+                                    SHCLTRANSFERDIR enmDir, SHCLSOURCE enmSource,
+                                    PSHCLTRANSFER *ppTransfer)
 {
     AssertPtrReturn(pClient, VERR_INVALID_POINTER);
@@ -2182 +2182 @@
                 if (RT_SUCCESS(rc))
                 {
-                    creationCtx.Interface.pfnTransferOpen    = sharedClipboardSvcTransferTransferOpen;
-                    creationCtx.Interface.pfnTransferClose   = sharedClipboardSvcTransferTransferClose;
+                    creationCtx.Interface.pfnTransferOpen    = sharedClipboardSvcTransferOpen;
+                    creationCtx.Interface.pfnTransferClose   = sharedClipboardSvcTransferClose;
                     creationCtx.Interface.pfnListOpen        = sharedClipboardSvcTransferListOpen;
                     creationCtx.Interface.pfnListClose       = sharedClipboardSvcTransferListClose;
@@ -2235 +2235 @@
                         {
                             SHCLEVENTID uEvent;
-                            rc = sharedClipboardSvcTransferTransferSendStatus(pClient, pTransfer,
-                                                                              SHCLTRANSFERSTATUS_READY, VINF_SUCCESS,
-                                                                              &uEvent);
+                            rc = sharedClipboardSvcTransferSendStatus(pClient, pTransfer,
+                                                                      SHCLTRANSFERSTATUS_READY, VINF_SUCCESS,
+                                                                      &uEvent);
                             if (RT_SUCCESS(rc))
                             {
@@ -2304 +2304 @@
  * @param   pTransfer           Transfer to stop.
  */
-int sharedClipboardSvcTransferTransferStop(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
+int sharedClipboardSvcTransferStop(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
 {
     int rc = SharedClipboardTransferClose(pTransfer);
@@ -2310 +2310 @@
     {
         SHCLEVENTID uEvent;
-        rc = sharedClipboardSvcTransferTransferSendStatus(pClient, pTransfer,
-                                                          SHCLTRANSFERSTATUS_STOPPED, VINF_SUCCESS,
-                                                          &uEvent);
+        rc = sharedClipboardSvcTransferSendStatus(pClient, pTransfer,
+                                                  SHCLTRANSFERSTATUS_STOPPED, VINF_SUCCESS,
+                                                  &uEvent);
         if (RT_SUCCESS(rc))
         {

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

@@ -340 +340 @@
             {
                 PSHCLTRANSFER pTransfer;
-                int rc = sharedClipboardSvcTransferTransferStart(pCtx->pClient,
-                                                                 SHCLTRANSFERDIR_READ, SHCLSOURCE_REMOTE,
-                                                                 &pTransfer);
+                int rc = sharedClipboardSvcTransferStart(pCtx->pClient,
+                                                         SHCLTRANSFERDIR_READ, SHCLSOURCE_REMOTE,
+                                                         &pTransfer);
                 if (RT_SUCCESS(rc))
                 {

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

@@ -1378 +1378 @@
                     if (uFormat == VBOX_SHCL_FMT_URI_LIST)
                     {
-                        rc = sharedClipboardSvcTransferTransferStart(pClient, SHCLTRANSFERDIR_WRITE, SHCLSOURCE_LOCAL,
-                                                                     NULL /* pTransfer */);
+                        rc = sharedClipboardSvcTransferStart(pClient, SHCLTRANSFERDIR_WRITE, SHCLSOURCE_LOCAL,
+                                                             NULL /* pTransfer */);
                         if (RT_FAILURE(rc))
                             LogRel(("Shared Clipboard: Initializing host write transfer failed with %Rrc\n", rc));