Changeset 86949 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

Nov 20, 2020 6:47:46 PM (4 years ago)

Author:

vboxsync

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

141468

Message:

Shared Clipboard/Transfers: Transfer IDs are 32-bit and of type SHCLTRANSFERID. bugref:9437

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (9 diffs)

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

@@ -1242 +1242 @@
  */
 int ShClTransferInit(PSHCLTRANSFER pTransfer,
-                     uint32_t uID, SHCLTRANSFERDIR enmDir, SHCLSOURCE enmSource)
+                     SHCLTRANSFERID uID, SHCLTRANSFERDIR enmDir, SHCLSOURCE enmSource)
 {
     pTransfer->State.uID       = uID;
@@ -2149 +2149 @@
     AssertPtrReturn(pTransfer, 0);
 
-    LogFlowFunc(("[Transfer %RU16] cRoots=%RU64\n", pTransfer->State.uID, pTransfer->cRoots));
+    LogFlowFunc(("[Transfer %RU32] cRoots=%RU64\n", pTransfer->State.uID, pTransfer->cRoots));
     return (uint32_t)pTransfer->cRoots;
 }
@@ -2445 +2445 @@
     AssertPtrReturn(pTransfer, SHCLTRANSFERDIR_UNKNOWN);
 
-    LogFlowFunc(("[Transfer %RU16] enmDir=%RU32\n", pTransfer->State.uID, pTransfer->State.enmDir));
+    LogFlowFunc(("[Transfer %RU32] enmDir=%RU32\n", pTransfer->State.uID, pTransfer->State.enmDir));
     return pTransfer->State.enmDir;
 }
@@ -2459 +2459 @@
     AssertPtrReturn(pTransfer, SHCLSOURCE_INVALID);
 
-    LogFlowFunc(("[Transfer %RU16] enmSource=%RU32\n", pTransfer->State.uID, pTransfer->State.enmSource));
+    LogFlowFunc(("[Transfer %RU32] enmSource=%RU32\n", pTransfer->State.uID, pTransfer->State.enmSource));
     return pTransfer->State.enmSource;
 }
@@ -2473 +2473 @@
     AssertPtrReturn(pTransfer, SHCLTRANSFERSTATUS_NONE);
 
-    LogFlowFunc(("[Transfer %RU16] enmStatus=%RU32\n", pTransfer->State.uID, pTransfer->State.enmStatus));
+    LogFlowFunc(("[Transfer %RU32] enmStatus=%RU32\n", pTransfer->State.uID, pTransfer->State.enmStatus));
     return pTransfer->State.enmStatus;
 }
@@ -2776 +2776 @@
  * @param   pidTransfer         Where to return the transfer ID on success. Optional.
  */
-int ShClTransferCtxTransferRegister(PSHCLTRANSFERCTX pTransferCtx, PSHCLTRANSFER pTransfer, uint32_t *pidTransfer)
+int ShClTransferCtxTransferRegister(PSHCLTRANSFERCTX pTransferCtx, PSHCLTRANSFER pTransfer, SHCLTRANSFERID *pidTransfer)
 {
     AssertPtrReturn(pTransferCtx,      VERR_INVALID_POINTER);
@@ -2787 +2787 @@
      * max-1 IDs.
      */
-    uint32_t idTransfer = RTRandU32Ex(1, VBOX_SHCL_MAX_TRANSFERS - 2);
+    SHCLTRANSFERID idTransfer = RTRandU32Ex(1, VBOX_SHCL_MAX_TRANSFERS - 2);
 
     if (!ASMBitTestAndSet(&pTransferCtx->bmTransferIds[0], idTransfer))
@@ -2829 +2829 @@
  * @param   idTransfer          Transfer ID to use for registration.
  */
-int ShClTransferCtxTransferRegisterByIndex(PSHCLTRANSFERCTX pTransferCtx, PSHCLTRANSFER pTransfer, uint32_t idTransfer)
+int ShClTransferCtxTransferRegisterByIndex(PSHCLTRANSFERCTX pTransferCtx, PSHCLTRANSFER pTransfer, SHCLTRANSFERID idTransfer)
 {
     LogFlowFunc(("cTransfers=%RU16, idTransfer=%RU32\n", pTransferCtx->cTransfers, idTransfer));
@@ -2858 +2858 @@
  * @param   idTransfer          Transfer ID to unregister.
  */
-int ShClTransferCtxTransferUnregister(PSHCLTRANSFERCTX pTransferCtx, uint32_t idTransfer)
+int ShClTransferCtxTransferUnregister(PSHCLTRANSFERCTX pTransferCtx, SHCLTRANSFERID idTransfer)
 {
     int rc = VINF_SUCCESS;