Changeset 81229 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Oct 11, 2019 2:33:25 PM (5 years ago)

Author:

vboxsync

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

133917

Message:

Shared Clipboard/Transfers: Update.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-internal.h (modified) (1 diff)
• VBoxSharedClipboardSvc-transfers.cpp (modified) (11 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h

@@ -200 +200 @@
 int shclSvcTransferStop(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer);
 bool shclSvcTransferMsgIsAllowed(uint32_t uMode, uint32_t uMsg);
+void shclSvcClientTransfersReset(PSHCLCLIENT pClient);
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 

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

@@ -58 +58 @@
 *********************************************************************************************************************************/
 
+/**
+ * Resets all transfers of a Shared Clipboard client.
+ *
+ * @param   pClient             Client to reset transfers for.
+ */
+void shclSvcClientTransfersReset(PSHCLCLIENT pClient)
+{
+    if (!pClient)
+        return;
+
+    LogFlowFuncEnter();
+
+    const uint32_t cTransfers = ShClTransferCtxGetTotalTransfers(&pClient->TransferCtx);
+    for (uint32_t i = 0; i < cTransfers; i++)
+    {
+        PSHCLTRANSFER pTransfer = ShClTransferCtxGetTransfer(&pClient->TransferCtx, i);
+        if (pTransfer)
+            shclSvcTransferAreaDetach(&pClient->State, pTransfer);
+    }
+
+    ShClTransferCtxDestroy(&pClient->TransferCtx);
+}
+
+
+/*********************************************************************************************************************************
+*   Provider implementation                                                                                                      *
+*********************************************************************************************************************************/
+
 DECLCALLBACK(int) shclSvcTransferIfaceOpen(PSHCLPROVIDERCTX pCtx)
 {
@@ -208 +236 @@
         const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
-        pMsg->Ctx.uContextID = VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,  pCtx->pTransfer->State.uID,
+        pMsg->Ctx.uContextID = VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID, pCtx->pTransfer->State.uID,
                                                         uEvent);
 
@@ -233 +261 @@
 
                         Assert(pReply->uType == VBOX_SHCL_REPLYMSGTYPE_LIST_OPEN);
+
+                        LogFlowFunc(("hList=%RU64\n", pReply->u.ListOpen.uHandle));
 
                         *phList = pReply->u.ListOpen.uHandle;
@@ -466 +496 @@
                     Assert(pReply->uType == VBOX_SHCL_REPLYMSGTYPE_OBJ_OPEN);
 
+                    LogFlowFunc(("hObj=%RU64\n", pReply->u.ObjOpen.uHandle));
+
                     *phObj = pReply->u.ObjOpen.uHandle;
 
@@ -519 +551 @@
 
                     Assert(pReply->uType == VBOX_SHCL_REPLYMSGTYPE_OBJ_CLOSE);
+
+                    LogFlowFunc(("hObj=%RU64\n", pReply->u.ObjClose.uHandle));
 #endif
 
@@ -765 +799 @@
                     if (cParms >= 6)
                         rc = HGCMSvcGetU32(&paParms[5], &pReply->u.TransferStatus.uStatus);
+
+                    LogFlowFunc(("uTransferStatus=%RU32\n", pReply->u.TransferStatus.uStatus));
                     break;
                 }
@@ -772 +808 @@
                     if (cParms >= 6)
                         rc = HGCMSvcGetU64(&paParms[5], &pReply->u.ListOpen.uHandle);
+
+                    LogFlowFunc(("hListOpen=%RU64\n", pReply->u.ListOpen.uHandle));
+                    break;
+                }
+
+                case VBOX_SHCL_REPLYMSGTYPE_LIST_CLOSE:
+                {
+                    if (cParms >= 6)
+                        rc = HGCMSvcGetU64(&paParms[5], &pReply->u.ListClose.uHandle);
+
+                    LogFlowFunc(("hListClose=%RU64\n", pReply->u.ListClose.uHandle));
                     break;
                 }
@@ -779 +826 @@
                     if (cParms >= 6)
                         rc = HGCMSvcGetU64(&paParms[5], &pReply->u.ObjOpen.uHandle);
+
+                    LogFlowFunc(("hObjOpen=%RU64\n", pReply->u.ObjOpen.uHandle));
                     break;
                 }
@@ -786 +835 @@
                     if (cParms >= 6)
                         rc = HGCMSvcGetU64(&paParms[5], &pReply->u.ObjClose.uHandle);
+
+                    LogFlowFunc(("hObjClose=%RU64\n", pReply->u.ObjClose.uHandle));
                     break;
                 }
@@ -1152 +1203 @@
             }
         }
-    }
-    else
-        rc = VERR_INVALID_PARAMETER;
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-/**
- * Gets a transfer error from HGCM service parameters.
- *
- * @returns VBox status code.
- * @param   cParms              Number of HGCM parameters supplied in \a paParms.
- * @param   paParms             Array of HGCM parameters.
- * @param   pRc                 Where to store the received error code.
- */
-static int shclSvcTransferGetError(uint32_t cParms, VBOXHGCMSVCPARM paParms[], int *pRc)
-{
-    AssertPtrReturn(paParms, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pRc,     VERR_INVALID_PARAMETER);
-
-    int rc;
-
-    if (cParms == VBOX_SHCL_CPARMS_ERROR)
-    {
-        rc = HGCMSvcGetU32(&paParms[1], (uint32_t *)pRc); /** @todo int vs. uint32_t !!! */
     }
     else
@@ -1848 +1873 @@
         }
 #endif
-        case VBOX_SHCL_GUEST_FN_CANCEL:
-        {
-            LogRel2(("Shared Clipboard: Transfer canceled\n"));
-            break;
-        }
-
-        case VBOX_SHCL_GUEST_FN_ERROR:
-        {
-            int rcGuest;
-            rc = shclSvcTransferGetError(cParms,paParms, &rcGuest);
-            if (RT_SUCCESS(rc))
-                LogRel(("Shared Clipboard: Transfer error from guest: %Rrc\n", rcGuest));
-            break;
-        }
-
         default:
             LogFunc(("Not implemented\n"));

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

@@ -1060 +1060 @@
 }
 
+/**
+ * Gets an error from HGCM service parameters.
+ *
+ * @returns VBox status code.
+ * @param   cParms              Number of HGCM parameters supplied in \a paParms.
+ * @param   paParms             Array of HGCM parameters.
+ * @param   pRc                 Where to store the received error code.
+ */
+static int shclSvcGetError(uint32_t cParms, VBOXHGCMSVCPARM paParms[], int *pRc)
+{
+    AssertPtrReturn(paParms, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pRc,     VERR_INVALID_PARAMETER);
+
+    int rc;
+
+    if (cParms == VBOX_SHCL_CPARMS_ERROR)
+    {
+        rc = HGCMSvcGetU32(&paParms[1], (uint32_t *)pRc); /** @todo int vs. uint32_t !!! */
+    }
+    else
+        rc = VERR_INVALID_PARAMETER;
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
 int shclSvcSetSource(PSHCLCLIENT pClient, SHCLSOURCE enmSource)
 {
@@ -1121 +1147 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    PSHCLTRANSFER pTransfer = ShClTransferCtxGetTransfer(&pClient->TransferCtx, 0 /* Index*/);
-    if (pTransfer)
-        shclSvcTransferAreaDetach(&pClient->State, pTransfer);
-
-    ShClTransferCtxDestroy(&pClient->TransferCtx);
+    shclSvcClientTransfersReset(pClient);
 #endif
 
@@ -1487 +1509 @@
         }
 
+        case VBOX_SHCL_GUEST_FN_CANCEL:
+        {
+            LogRel2(("Shared Clipboard: Operation canceled by guest side\n"));
+
+            /** @todo Do we need to do anything here? */
+            break;
+        }
+
+        case VBOX_SHCL_GUEST_FN_ERROR:
+        {
+            int rcGuest;
+            rc = shclSvcGetError(cParms,paParms, &rcGuest);
+            if (RT_SUCCESS(rc))
+            {
+                LogRel(("Shared Clipboard: Error from guest side: %Rrc\n", rcGuest));
+
+                /* Reset client state and start over. */
+                shclSvcClientStateReset(&pClient->State);
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+                shclSvcClientTransfersReset(pClient);
+#endif
+            }
+            break;
+        }
+
         default:
         {