Changeset 100666 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

Jul 20, 2023 1:43:35 PM (17 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Reduced replying to status messages from the host, as those are not needed in (most) cases. The rest is documented. bugref:9437

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (6 diffs)

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

@@ -2122 +2122 @@
     LogFlowFuncEnter();
 
-    int rc;
+    int rc = VINF_SUCCESS;
 
     PSHCLTRANSFER pTransfer = ShClTransferCtxGetTransferById(pTransferCtx, idTransfer);
@@ -2133 +2133 @@
         if (RT_SUCCESS(rc))
         {
-            LogRel(("Shared Clipboard: Transfer %RU32 successfully uninitialized\n", idTransfer));
+            LogRel(("Shared Clipboard: Transfer %RU16 successfully uninitialized\n", idTransfer));
         }
         else
-            LogRel(("Shared Clipboard: Unable to uninitialized transfer %RU32, rc=%Rrc\n", idTransfer, rc));
-    }
-    else
-        rc = VERR_SHCLPB_TRANSFER_ID_NOT_FOUND;
-
-    /* Send a reply in any case. */
-    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. */
-    if (rc2 == VERR_SHCLPB_TRANSFER_ID_NOT_FOUND)
-        rc2 = VINF_SUCCESS;
-
-    if (RT_SUCCESS(rc))
-        rc = rc2;
+            LogRel(("Shared Clipboard: Unable to uninitialized transfer %RU16, rc=%Rrc\n", idTransfer, rc));
+    }
 
     LogFlowFuncLeaveRC(rc);
@@ -2213 +2199 @@
                                                   RT_SUCCESS(rc)
                                                 ? SHCLTRANSFERSTATUS_STARTED : SHCLTRANSFERSTATUS_ERROR, rc);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-/**
- * Stops a transfer on the guest side.
- *
- * @returns VBox status code, or VERR_NOT_FOUND if transfer has not been found.
- * @param   pCmdCtx             Command context to use.
- * @param   pTransferCtx        Transfer context to stop transfer for.
- * @param   uTransferID         ID of transfer to stop.
- */
-static int vbglR3ClipboardTransferStop(PVBGLR3SHCLCMDCTX pCmdCtx, PSHCLTRANSFERCTX pTransferCtx,
-                                       SHCLTRANSFERID uTransferID)
-{
-    LogFlowFuncEnter();
-
-    int rc;
-
-    PSHCLTRANSFER pTransfer = ShClTransferCtxGetTransferById(pTransferCtx, uTransferID);
-    if (pTransfer)
-    {
-        rc = ShClTransferCtxUnregisterById(pTransferCtx, uTransferID);
-        if (RT_SUCCESS(rc))
-        {
-            LogRel(("Shared Clipboard: Transfer %RU32 successfully stopped\n", uTransferID));
-        }
-        else
-            LogRel(("Shared Clipboard: Unable to stop transfer %RU32, rc=%Rrc\n", uTransferID, rc));
-    }
-    else
-        rc = VERR_SHCLPB_TRANSFER_ID_NOT_FOUND;
-
-    /* Send a reply in any case. */
-    int rc2 = VbglR3ClipboardTransferSendStatus(pCmdCtx, pTransfer,
-                                                  RT_SUCCESS(rc)
-                                                ? SHCLTRANSFERSTATUS_COMPLETED : SHCLTRANSFERSTATUS_ERROR, rc);
     if (RT_SUCCESS(rc))
         rc = rc2;
@@ -2376 +2322 @@
                         }
 
-                        case SHCLTRANSFERSTATUS_UNINITIALIZED:
-                        {
-                            rc = vbglR3ClipboardTransferDestroy(pCmdCtx, pTransferCtx, idTransfer);
-                            break;
-                        }
-
                         case SHCLTRANSFERSTATUS_STARTED:
                         {
@@ -2388 +2328 @@
                         }
 
+                        case SHCLTRANSFERSTATUS_UNINITIALIZED:
+                            RT_FALL_THROUGH();
                         case SHCLTRANSFERSTATUS_COMPLETED:
                             RT_FALL_THROUGH();
@@ -2396 +2338 @@
                         case SHCLTRANSFERSTATUS_ERROR:
                         {
-                            rc = vbglR3ClipboardTransferStop(pCmdCtx, pTransferCtx, idTransfer);
+                            rc = vbglR3ClipboardTransferDestroy(pCmdCtx, pTransferCtx, idTransfer);
                             break;
                         }