Changeset 86949 in vbox for trunk/src/VBox/Additions

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

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxClipboard.cpp (modified) (2 diffs)
• common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (5 diffs)

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

@@ -147 +147 @@
     const SHCLTRANSFERDIR enmDir = ShClTransferGetDir(pTransfer);
 
-    LogFlowFunc(("pCtx=%p, idTransfer=%RU16, enmDir=%RU32\n", pCtx, ShClTransferGetID(pTransfer), enmDir));
+    LogFlowFunc(("pCtx=%p, idTransfer=%RU32, enmDir=%RU32\n", pCtx, ShClTransferGetID(pTransfer), enmDir));
 
     int rc;
@@ -188 +188 @@
         LogRel(("Shared Clipboard: Starting transfer failed, rc=%Rrc\n", rc));
 
-    LogFlowFunc(("LEAVE: idTransfer=%RU16, rc=%Rrc\n", ShClTransferGetID(pTransfer), rc));
+    LogFlowFunc(("LEAVE: idTransfer=%RU32, rc=%Rrc\n", ShClTransferGetID(pTransfer), rc));
     return rc;
 }

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

@@ -1848 +1848 @@
             *ppTransfer = pTransfer;
 
-        LogRel2(("Shared Clipboard: Transfer ID=%RU16 (%s %s) successfully started\n",
+        LogRel2(("Shared Clipboard: Transfer ID=%RU32 (%s %s) successfully started\n",
                  uTransferID,
                  enmDir    == SHCLTRANSFERDIR_FROM_REMOTE ? "reading from" : "writing to",
@@ -1854 +1854 @@
     }
     else
-        LogRel(("Shared Clipboard: Unable to start transfer ID=%RU16, rc=%Rrc\n", uTransferID, rc));
+        LogRel(("Shared Clipboard: Unable to start transfer ID=%RU32, rc=%Rrc\n", uTransferID, rc));
 
     /* Send a reply in any case. */
@@ -1895 +1895 @@
         if (RT_SUCCESS(rc))
         {
-            LogRel2(("Shared Clipboard: Transfer ID=%RU16 successfully stopped\n", uTransferID));
+            LogRel2(("Shared Clipboard: Transfer ID=%RU32 successfully stopped\n", uTransferID));
         }
         else
-            LogRel(("Shared Clipboard: Unable to stop transfer ID=%RU16, rc=%Rrc\n", uTransferID, rc));
+            LogRel(("Shared Clipboard: Unable to stop transfer ID=%RU32, rc=%Rrc\n", uTransferID, rc));
 
         /* Send a reply in any case. */
@@ -1939 +1939 @@
                     const SHCLTRANSFERID uTransferID = VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->idContext);
 
-                    LogFlowFunc(("[Transfer %RU16] enmDir=%RU32, status=%s\n",
+                    LogFlowFunc(("[Transfer %RU32] enmDir=%RU32, status=%s\n",
                                  uTransferID, enmDir, ShClTransferStatusToStr(transferReport.uStatus)));
 
@@ -1995 +1995 @@
                         pEvent->enmType = VBGLR3CLIPBOARDEVENTTYPE_TRANSFER_STATUS;
 
-                        LogRel2(("Shared Clipboard: Received status %s (rc=%Rrc) for transfer ID=%RU16\n",
+                        LogRel2(("Shared Clipboard: Received status %s (rc=%Rrc) for transfer ID=%RU32\n",
                                  ShClTransferStatusToStr(pEvent->u.TransferStatus.Report.uStatus), pEvent->u.TransferStatus.Report.rc,
                                  pEvent->u.TransferStatus.uID));