Changeset 100657 in vbox

Timestamp:

Jul 20, 2023 6:52:56 AM (17 months ago)

Author:

vboxsync

Message:

Shared Clipboard/VbglR3: Renamed VbglR3ClipboardTransferStatusReply() -> VbglR3ClipboardTransferSendStatus(), as the function can be also called without any former call from the host. bugref:9437

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (8 diffs)

trunk/include/VBox/VBoxGuestLib.h

@@ -726 +726 @@
 VBGLR3DECL(int)     VbglR3ClipboardEventGetNextEx(uint32_t idMsg, uint32_t cParms, PVBGLR3SHCLCMDCTX pCtx, PSHCLTRANSFERCTX pTransferCtx, PVBGLR3CLIPBOARDEVENT pEvent);
 
-VBGLR3DECL(int)     VbglR3ClipboardTransferStatusReply(PVBGLR3SHCLCMDCTX pCtx, PSHCLTRANSFER pTransfer, SHCLTRANSFERSTATUS uStatus, int rcTransfer);
+VBGLR3DECL(int)     VbglR3ClipboardTransferSendStatus(PVBGLR3SHCLCMDCTX pCtx, PSHCLTRANSFER pTransfer, SHCLTRANSFERSTATUS uStatus, int rcTransfer);
 
 VBGLR3DECL(int)     VbglR3ClipboardTransferRootListRead(PVBGLR3SHCLCMDCTX pCtx, PSHCLLIST *ppRootList);

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

@@ -380 +380 @@
     }
 
-    int rc = VbglR3ClipboardTransferStatusReply(&pCtx->CmdCtx, pCbCtx->pTransfer, enmSts, rcCompletion);
+    int rc = VbglR3ClipboardTransferSendStatus(&pCtx->CmdCtx, pCbCtx->pTransfer, enmSts, rcCompletion);
     LogFlowFuncLeaveRC(rc);
 }
@@ -407 +407 @@
     }
 
-    int rc = VbglR3ClipboardTransferStatusReply(&pCtx->CmdCtx, pCbCtx->pTransfer, SHCLTRANSFERSTATUS_ERROR, rcError);
+    int rc = VbglR3ClipboardTransferSendStatus(&pCtx->CmdCtx, pCbCtx->pTransfer, SHCLTRANSFERSTATUS_ERROR, rcError);
     LogFlowFuncLeaveRC(rc);
 }

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

@@ -956 +956 @@
 
 /**
- * Replies to a transfer report from the host.
+ * Sends a transfer status to the host.
  *
  * @returns VBox status code.
@@ -964 +964 @@
  * @param   rcTransfer          Result code (rc) to reply.
  */
-VBGLR3DECL(int) VbglR3ClipboardTransferStatusReply(PVBGLR3SHCLCMDCTX pCtx, PSHCLTRANSFER pTransfer,
-                                                   SHCLTRANSFERSTATUS uStatus, int rcTransfer)
+VBGLR3DECL(int) VbglR3ClipboardTransferSendStatus(PVBGLR3SHCLCMDCTX pCtx, PSHCLTRANSFER pTransfer,
+                                                  SHCLTRANSFERSTATUS uStatus, int rcTransfer)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
@@ -2142 +2142 @@
 
     /* Send a reply in any case. */
-    int rc2 = VbglR3ClipboardTransferStatusReply(pCmdCtx, pTransfer,
-                                                   RT_SUCCESS(rc)
-                                                 ? SHCLTRANSFERSTATUS_UNINITIALIZED : SHCLTRANSFERSTATUS_ERROR, rc);
+    int rc2 = VbglR3ClipboardTransferSendStatus(pCmdCtx, pTransfer,
+                                                  RT_SUCCESS(rc)
+                                                ? SHCLTRANSFERSTATUS_UNINITIALIZED : SHCLTRANSFERSTATUS_ERROR, rc);
 
     /* The host might not have the transfer around anymore at this time, so simply ignore this error. */
@@ -2210 +2210 @@
 
     /* Send a reply in any case. */
-    int rc2 = VbglR3ClipboardTransferStatusReply(pCmdCtx, pTransfer,
-                                                   RT_SUCCESS(rc)
-                                                 ? SHCLTRANSFERSTATUS_STARTED : SHCLTRANSFERSTATUS_ERROR, rc);
+    int rc2 = VbglR3ClipboardTransferSendStatus(pCmdCtx, pTransfer,
+                                                  RT_SUCCESS(rc)
+                                                ? SHCLTRANSFERSTATUS_STARTED : SHCLTRANSFERSTATUS_ERROR, rc);
     if (RT_SUCCESS(rc))
         rc = rc2;
@@ -2250 +2250 @@
 
     /* Send a reply in any case. */
-    int rc2 = VbglR3ClipboardTransferStatusReply(pCmdCtx, pTransfer,
-                                                   RT_SUCCESS(rc)
-                                                 ? SHCLTRANSFERSTATUS_COMPLETED : SHCLTRANSFERSTATUS_ERROR, rc);
+    int rc2 = VbglR3ClipboardTransferSendStatus(pCmdCtx, pTransfer,
+                                                  RT_SUCCESS(rc)
+                                                ? SHCLTRANSFERSTATUS_COMPLETED : SHCLTRANSFERSTATUS_ERROR, rc);
     if (RT_SUCCESS(rc))
         rc = rc2;
@@ -2309 +2309 @@
                              * This will initialize the transfer on the host, so that in turn reports INITIALIZED
                              * back to us (see case down below).*/
-                            int rc2 = VbglR3ClipboardTransferStatusReply(pCmdCtx, pTransfer,
-                                                                           RT_SUCCESS(rc)
-                                                                         ? SHCLTRANSFERSTATUS_INITIALIZED : SHCLTRANSFERSTATUS_ERROR, rc);
+                            int rc2 = VbglR3ClipboardTransferSendStatus(pCmdCtx, pTransfer,
+                                                                          RT_SUCCESS(rc)
+                                                                        ? SHCLTRANSFERSTATUS_INITIALIZED : SHCLTRANSFERSTATUS_ERROR, rc);
                             if (RT_SUCCESS(rc))
                                 rc = rc2;
@@ -2346 +2346 @@
                                     if (RT_FAILURE(rc))
                                     {
-                                        int rc2 = VbglR3ClipboardTransferStatusReply(pCmdCtx, pTransfer,
-                                                                                     SHCLTRANSFERSTATUS_ERROR, rc);
+                                        int rc2 = VbglR3ClipboardTransferSendStatus(pCmdCtx, pTransfer,
+                                                                                    SHCLTRANSFERSTATUS_ERROR, rc);
                                         AssertRC(rc2);
                                     }
@@ -2364 +2364 @@
 
                                 /* Send a reply in any case. */
-                                int rc2 = VbglR3ClipboardTransferStatusReply(pCmdCtx, pTransfer,
-                                                                               RT_SUCCESS(rc)
-                                                                             ? SHCLTRANSFERSTATUS_INITIALIZED : SHCLTRANSFERSTATUS_ERROR, rc);
+                                int rc2 = VbglR3ClipboardTransferSendStatus(pCmdCtx, pTransfer,
+                                                                              RT_SUCCESS(rc)
+                                                                            ? SHCLTRANSFERSTATUS_INITIALIZED : SHCLTRANSFERSTATUS_ERROR, rc);
                                 if (RT_SUCCESS(rc))
                                     rc = rc2;