Changeset 87658 in vbox

Timestamp:

Feb 9, 2021 1:26:19 PM (4 years ago)

Author:

vboxsync

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

142700

Message:

Shared Clipboard/Transfers: Rearranged parameter lists of ShClTransferObj[Read|Write](). ​bugref:9437

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard-transfers.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (2 diffs)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (1 diff)

trunk/include/VBox/GuestHost/SharedClipboard-transfers.h

@@ -868 +868 @@
 int ShClTransferObjOpen(PSHCLTRANSFER pTransfer, PSHCLOBJOPENCREATEPARMS pOpenCreateParms, PSHCLOBJHANDLE phObj);
 int ShClTransferObjClose(PSHCLTRANSFER pTransfer, SHCLOBJHANDLE hObj);
-int ShClTransferObjRead(PSHCLTRANSFER pTransfer, SHCLOBJHANDLE hObj, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead, uint32_t fFlags);
-int ShClTransferObjWrite(PSHCLTRANSFER pTransfer, SHCLOBJHANDLE hObj, void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten, uint32_t fFlags);
+int ShClTransferObjRead(PSHCLTRANSFER pTransfer, SHCLOBJHANDLE hObj, void *pvBuf, uint32_t cbBuf, uint32_t fFlags, uint32_t *pcbRead);
+int ShClTransferObjWrite(PSHCLTRANSFER pTransfer, SHCLOBJHANDLE hObj, void *pvBuf, uint32_t cbBuf, uint32_t fFlags, uint32_t *pcbWritten);
 
 PSHCLOBJDATACHUNK ShClTransferObjDataChunkDup(PSHCLOBJDATACHUNK pDataChunk);

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

@@ -2241 +2241 @@
                     {
                         uint32_t cbRead;
-                        rc = ShClTransferObjRead(pTransfer, hObj, pvBuf, cbToRead, &cbRead, fFlags);
+                        rc = ShClTransferObjRead(pTransfer, hObj, pvBuf, cbToRead, fFlags, &cbRead);
                         if (RT_SUCCESS(rc))
                             rc = VbglR3ClipboardObjWriteSend(pCmdCtx, hObj, pvBuf, cbRead, NULL /* pcbWritten */);

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

@@ -298 +298 @@
     {
         Assert(pSrvTx->hObj != SHCLOBJHANDLE_INVALID);
-//        rc = ShClTransferObjRead(pSrvTx->pTransfer, pSrvTx->hObj, );
-rc = 0;
+
+        uint32_t cbRead;
+        rc = ShClTransferObjRead(pSrvTx->pTransfer, pSrvTx->hObj, pvBuf, cbBuf, 0 /* fFlags */, &cbRead);
         if (RT_SUCCESS(rc))
         {
-
+            *pcbRead = (uint32_t)cbRead;
         }
 

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

@@ -963 +963 @@
  * @param   pvBuf               Buffer for where to store the read data.
  * @param   cbBuf               Size (in bytes) of buffer.
- * @param   pcbRead             How much bytes were read on success. Optional.
+ * @param   fFlags              Read flags. Optional.
+ * @param   pcbRead             Where to return how much bytes were read on success. Optional.
  */
 int ShClTransferObjRead(PSHCLTRANSFER pTransfer,
-                        SHCLOBJHANDLE hObj, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead, uint32_t fFlags)
+                        SHCLOBJHANDLE hObj, void *pvBuf, uint32_t cbBuf, uint32_t fFlags, uint32_t *pcbRead)
 {
     AssertPtrReturn(pTransfer, VERR_INVALID_POINTER);
@@ -1027 +1028 @@
  * @param   pvBuf               Buffer of data to write.
  * @param   cbBuf               Size (in bytes) of buffer to write.
+ * @param   fFlags              Write flags. Optional.
  * @param   pcbWritten          How much bytes were writtenon success. Optional.
  */
 int ShClTransferObjWrite(PSHCLTRANSFER pTransfer,
-                         SHCLOBJHANDLE hObj, void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten,
-                         uint32_t fFlags)
+                         SHCLOBJHANDLE hObj, void *pvBuf, uint32_t cbBuf, uint32_t fFlags, uint32_t *pcbWritten)
 {
     AssertPtrReturn(pTransfer, VERR_INVALID_POINTER);

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

@@ -1636 +1636 @@
             {
                 uint32_t cbRead;
-                rc = ShClTransferObjRead(pTransfer, hObj, pvBuf, cbToRead, &cbRead, 0 /* fFlags */);
+                rc = ShClTransferObjRead(pTransfer, hObj, pvBuf, cbToRead, 0 /* fFlags */, &cbRead);
                 if (RT_SUCCESS(rc))
                 {