Changeset 82462 in vbox for trunk/src/VBox

Timestamp:

Dec 6, 2019 2:22:03 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Renamed SHCLTRANSFERDIR_[READ|WRITE] -> SHCLTRANSFERDIR_[FROM|TO]_REMOTE.

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (1 diff)
• Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (3 diffs)
• GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (3 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (4 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (1 diff)
• HostServices/SharedClipboard/testcase/tstClipboardTransfers.cpp (modified) (1 diff)

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

@@ -152 +152 @@
 
     /* The guest wants to write local data to the host? */
-    if (enmDir == SHCLTRANSFERDIR_WRITE)
+    if (enmDir == SHCLTRANSFERDIR_TO_REMOTE)
     {
         rc = SharedClipboardWinGetRoots(&pCtx->Win, pTransfer);
     }
     /* The guest wants to read data from a remote source. */
-    else if (enmDir == SHCLTRANSFERDIR_READ)
+    else if (enmDir == SHCLTRANSFERDIR_FROM_REMOTE)
     {
         /* The IDataObject *must* be created on the same thread as our (proxy) window, so post a message to it

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

@@ -1815 +1815 @@
                 /* If this is a read transfer (reading data from host), set the interface to use
                  * our VbglR3 routines here. */
-                if (enmDir == SHCLTRANSFERDIR_READ)
+                if (enmDir == SHCLTRANSFERDIR_FROM_REMOTE)
                 {
                     SHCLPROVIDERCREATIONCTX creationCtx;
@@ -1852 +1852 @@
         LogRel2(("Shared Clipboard: Transfer ID=%RU16 (%s %s) successfully started\n",
                  uTransferID,
-                 enmDir    == SHCLTRANSFERDIR_READ ? "reading from" : "writing to",
-                 enmSource == SHCLSOURCE_LOCAL     ? "local"        : "remote"));
+                 enmDir    == SHCLTRANSFERDIR_FROM_REMOTE ? "reading from" : "writing to",
+                 enmSource == SHCLSOURCE_LOCAL            ? "local"        : "remote"));
     }
     else
@@ -1952 +1952 @@
 
                         /* The host announces the transfer direction from its point of view, so inverse the direction here. */
-                        if (enmDir == SHCLTRANSFERDIR_WRITE)
+                        if (enmDir == SHCLTRANSFERDIR_TO_REMOTE)
                         {
-                            enmDir = SHCLTRANSFERDIR_READ;
+                            enmDir = SHCLTRANSFERDIR_FROM_REMOTE;
                             enmSource = SHCLSOURCE_REMOTE;
                         }
-                        else if (enmDir == SHCLTRANSFERDIR_READ)
+                        else if (enmDir == SHCLTRANSFERDIR_FROM_REMOTE)
                         {
-                            enmDir = SHCLTRANSFERDIR_WRITE;
+                            enmDir = SHCLTRANSFERDIR_TO_REMOTE;
                             enmSource = SHCLSOURCE_LOCAL;
                         }

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

@@ -818 +818 @@
          * Make sure the transfer direction matches the open/create parameters.
          */
-        if (pTransfer->State.enmDir == SHCLTRANSFERDIR_READ)
+        if (pTransfer->State.enmDir == SHCLTRANSFERDIR_FROM_REMOTE)
         {
             if (pOpenCreateParms->fCreate & SHCL_OBJ_CF_ACCESS_READ) /* Read access wanted? */
@@ -827 +827 @@
             }
         }
-        else if (pTransfer->State.enmDir == SHCLTRANSFERDIR_WRITE)
+        else if (pTransfer->State.enmDir == SHCLTRANSFERDIR_TO_REMOTE)
         {
             if (pOpenCreateParms->fCreate & SHCL_OBJ_CF_ACCESS_WRITE) /* Write access wanted? */
@@ -854 +854 @@
                     /* Only if this is a read transfer (locally) we're able to actually write to files
                      * (we're reading from the source). */
-                    const bool fWritable = pTransfer->State.enmDir == SHCLTRANSFERDIR_READ;
+                    const bool fWritable = pTransfer->State.enmDir == SHCLTRANSFERDIR_FROM_REMOTE;
 
                     uint64_t fOpen;

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

@@ -1396 +1396 @@
 
             if (   ShClTransferGetSource(pTransfer) == SHCLSOURCE_LOCAL
-                && ShClTransferGetDir(pTransfer)    == SHCLTRANSFERDIR_WRITE)
+                && ShClTransferGetDir(pTransfer)    == SHCLTRANSFERDIR_TO_REMOTE)
             {
                 /* Get roots if this is a local write transfer (host -> guest). */
@@ -2047 +2047 @@
     if (!ShClTransferCtxTransfersMaximumReached(&pClient->TransferCtx))
     {
-        LogRel2(("Shared Clipboard: Starting %s transfer ...\n", enmDir == SHCLTRANSFERDIR_READ ? "read" : "write"));
+        LogRel2(("Shared Clipboard: Starting %s transfer ...\n", enmDir == SHCLTRANSFERDIR_FROM_REMOTE ? "read" : "write"));
 
         PSHCLTRANSFER pTransfer;
@@ -2059 +2059 @@
                 RT_ZERO(creationCtx);
 
-                if (enmDir == SHCLTRANSFERDIR_READ)
+                if (enmDir == SHCLTRANSFERDIR_FROM_REMOTE)
                 {
                     rc = shClSvcTransferAreaRegister(&pClient->State, pTransfer);
@@ -2079 +2079 @@
                     }
                 }
-                else if (enmDir == SHCLTRANSFERDIR_WRITE)
+                else if (enmDir == SHCLTRANSFERDIR_TO_REMOTE)
                 {
                     creationCtx.Interface.pfnListHdrWrite   = shClSvcTransferIfaceListHdrWrite;

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

@@ -364 +364 @@
                 PSHCLTRANSFER pTransfer;
                 int rc = shClSvcTransferStart(pCtx->pClient,
-                                              SHCLTRANSFERDIR_READ, SHCLSOURCE_REMOTE,
+                                              SHCLTRANSFERDIR_FROM_REMOTE, SHCLSOURCE_REMOTE,
                                               &pTransfer);
                 if (RT_SUCCESS(rc))

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

@@ -1244 +1244 @@
             if (fFormats & VBOX_SHCL_FMT_URI_LIST)
             {
-                rc = shClSvcTransferStart(pClient, SHCLTRANSFERDIR_WRITE, SHCLSOURCE_LOCAL,
+                rc = shClSvcTransferStart(pClient, SHCLTRANSFERDIR_TO_REMOTE, SHCLSOURCE_LOCAL,
                                           NULL /* pTransfer */);
                 if (RT_FAILURE(rc))

trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardTransfers.cpp

@@ -235 +235 @@
     RTTESTI_CHECK_RC_OK(rc);
 
-    rc = ShClTransferInit(pTransfer, 0 /* ID */, SHCLTRANSFERDIR_READ, SHCLSOURCE_LOCAL);
+    rc = ShClTransferInit(pTransfer, 0 /* ID */, SHCLTRANSFERDIR_FROM_REMOTE, SHCLSOURCE_LOCAL);
     RTTESTI_CHECK_RC_OK(rc);