Changeset 79702 in vbox for trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-uri.cpp

Timestamp:

Jul 11, 2019 7:34:05 PM (6 years ago)

Author:

vboxsync

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

132047

Message:

Shared Clipboard/URI: Update.

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-uri.cpp (modified) (12 diffs)

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

@@ -51 +51 @@
 int VBoxSvcClipboardURISetListOpen(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
                                    PVBOXCLIPBOARDLISTOPENPARMS pOpenParms);
+int VBoxSvcClipboardURISetListClose(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                    SHAREDCLIPBOARDLISTHANDLE hList);
 
 
@@ -186 +188 @@
                                               PVBOXCLIPBOARDLISTOPENPARMS pOpenParms, PSHAREDCLIPBOARDLISTHANDLE phList)
 {
-    RT_NOREF(phList);
-
     LogFlowFuncEnter();
 
@@ -241 +241 @@
 DECLCALLBACK(int) vboxSvcClipboardURIListClose(PSHAREDCLIPBOARDPROVIDERCTX pCtx, SHAREDCLIPBOARDLISTHANDLE hList)
 {
-    RT_NOREF(pCtx, hList);
-
-    LogFlowFuncEnter();
-
-    int rc = VINF_SUCCESS;
+    LogFlowFuncEnter();
+
+    PVBOXCLIPBOARDCLIENT pClient = (PVBOXCLIPBOARDCLIENT)pCtx->pvUser;
+    AssertPtr(pClient);
+
+    int rc;
+
+    PVBOXCLIPBOARDCLIENTMSG pMsg = vboxSvcClipboardMsgAlloc(VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_LIST_CLOSE,
+                                                            VBOX_SHARED_CLIPBOARD_CPARMS_LIST_CLOSE);
+    if (pMsg)
+    {
+        rc = VBoxSvcClipboardURISetListClose(pMsg->m_cParms, pMsg->m_paParms, hList);
+        if (RT_SUCCESS(rc))
+        {
+            rc = vboxSvcClipboardMsgAdd(pClient->pData, pMsg, true /* fAppend */);
+            if (RT_SUCCESS(rc))
+            {
+                int rc2 = SharedClipboardURITransferEventRegister(pCtx->pTransfer, SHAREDCLIPBOARDURITRANSFEREVENTTYPE_LIST_CLOSE);
+                AssertRC(rc2);
+
+                vboxSvcClipboardClientWakeup(pClient);
+            }
+        }
+    }
+    else
+        rc = VERR_NO_MEMORY;
+
+    if (RT_SUCCESS(rc))
+    {
+        PSHAREDCLIPBOARDURITRANSFERPAYLOAD pPayload;
+        rc = SharedClipboardURITransferEventWait(pCtx->pTransfer, SHAREDCLIPBOARDURITRANSFEREVENTTYPE_LIST_CLOSE,
+                                                 30 * 1000 /* Timeout in ms */, &pPayload);
+        if (RT_SUCCESS(rc))
+            SharedClipboardURITransferPayloadFree(pPayload);
+    }
 
     LogFlowFuncLeaveRC(rc);
@@ -378 +408 @@
     LogFlowFuncEnter();
 
-    return VERR_NOT_IMPLEMENTED;
-}
-
-int vboxSvcClipboardURIObjClose(PSHAREDCLIPBOARDPROVIDERCTX pCtx, SHAREDCLIPBOARDOBJHANDLE hObj)
-{
-    RT_NOREF(pCtx, hObj);
-
-    LogFlowFuncEnter();
-
     int rc = VINF_SUCCESS;
 
@@ -396 +417 @@
 }
 
+int vboxSvcClipboardURIObjClose(PSHAREDCLIPBOARDPROVIDERCTX pCtx, SHAREDCLIPBOARDOBJHANDLE hObj)
+{
+    RT_NOREF(pCtx, hObj);
+
+    LogFlowFuncEnter();
+
+    int rc = VINF_SUCCESS;
+
+    PVBOXCLIPBOARDCONTEXT pThisCtx = (PVBOXCLIPBOARDCONTEXT)pCtx->pvUser;
+    AssertPtr(pThisCtx);
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
 int vboxSvcClipboardURIObjRead(PSHAREDCLIPBOARDPROVIDERCTX pCtx, SHAREDCLIPBOARDOBJHANDLE hObj,
                                void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbRead)
 {
-    RT_NOREF(pCtx, pCtx, hObj, pvData, cbData, fFlags, pcbRead);
-
-    LogFlowFuncEnter();
-
-    return VERR_NOT_IMPLEMENTED;
+    RT_NOREF(pCtx, hObj, pvData, cbData, fFlags, pcbRead);
+
+    LogFlowFuncEnter();
+
+    int rc = VINF_SUCCESS;
+
+    *pcbRead = cbData;
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -454 +495 @@
     LogRel(("Shared Clipboard: Transfer failed with %Rrc\n", rc));
 }
+
+/*********************************************************************************************************************************
+*   HGCM getters / setters                                                                                                       *
+*********************************************************************************************************************************/
 
 /**
@@ -522 +567 @@
 }
 
+/**
+ * Gets the URI root entries 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   pRoots              Where to store the URI root entries on success.
+ */
 int VBoxSvcClipboardURIGetRoots(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
                                 PVBOXCLIPBOARDROOTS pRoots)
@@ -604 +657 @@
 }
 
+/**
+ * Sets an URI list open request to HGCM service parameters.
+ *
+ * @returns VBox status code.
+ * @param   cParms              Number of HGCM parameters supplied in \a paParms.
+ * @param   paParms             Array of HGCM parameters.
+ * @param   pOpenParms          List open parameters to set.
+ */
 int VBoxSvcClipboardURISetListOpen(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
                                    PVBOXCLIPBOARDLISTOPENPARMS pOpenParms)
@@ -618 +679 @@
         HGCMSvcSetPv (&paParms[5], pOpenParms->pszPath, pOpenParms->cbPath);
         HGCMSvcSetU64(&paParms[6], 0); /* OUT: uHandle */
+
+        rc = VINF_SUCCESS;
+    }
+    else
+        rc = VERR_INVALID_PARAMETER;
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+/**
+ * Sets an URI list close request to HGCM service parameters.
+ *
+ * @returns VBox status code.
+ * @param   cParms              Number of HGCM parameters supplied in \a paParms.
+ * @param   paParms             Array of HGCM parameters.
+ * @param   hList               Handle of list to close.
+ */
+int VBoxSvcClipboardURISetListClose(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                    SHAREDCLIPBOARDLISTHANDLE hList)
+{
+    int rc;
+
+    if (cParms == VBOX_SHARED_CLIPBOARD_CPARMS_LIST_CLOSE)
+    {
+        HGCMSvcSetU32(&paParms[0], 0 /* uContextID */);
+        HGCMSvcSetU64(&paParms[1], hList);
 
         rc = VINF_SUCCESS;
@@ -809 +897 @@
 }
 
+/**
+ * Handles a guest reply (VBOX_SHARED_CLIPBOARD_GUEST_FN_REPLY) message.
+ *
+ * @returns VBox status code.
+ * @param   pClient             Pointer to associated client.
+ * @param   pTransfer           Pointer to transfer to handle guest reply for.
+ * @param   cParms              Number of function parameters supplied.
+ * @param   paParms             Array function parameters supplied.
+ */
 int VBoxSvcClipboardURITransferHandleReply(PVBOXCLIPBOARDCLIENT pClient, PSHAREDCLIPBOARDURITRANSFER pTransfer,
                                            uint32_t cParms, VBOXHGCMSVCPARM paParms[])
@@ -836 +933 @@
                         rc = SharedClipboardURITransferEventSignal(pTransfer,
                                                                    SHAREDCLIPBOARDURITRANSFEREVENTTYPE_LIST_OPEN, pPayload);
+                        break;
+                    }
+
+                    case VBOX_SHAREDCLIPBOARD_REPLYMSGTYPE_LIST_CLOSE:
+                    {
+                        rc = SharedClipboardURITransferEventSignal(pTransfer,
+                                                                   SHAREDCLIPBOARDURITRANSFEREVENTTYPE_LIST_CLOSE, pPayload);
+                        break;
+                    }
+
+                    case VBOX_SHAREDCLIPBOARD_REPLYMSGTYPE_OBJ_OPEN:
+                    {
+                        rc = SharedClipboardURITransferEventSignal(pTransfer,
+                                                                   SHAREDCLIPBOARDURITRANSFEREVENTTYPE_OBJ_OPEN, pPayload);
+                        break;
+                    }
+
+                    case VBOX_SHAREDCLIPBOARD_REPLYMSGTYPE_OBJ_CLOSE:
+                    {
+                        rc = SharedClipboardURITransferEventSignal(pTransfer,
+                                                                   SHAREDCLIPBOARDURITRANSFEREVENTTYPE_OBJ_CLOSE, pPayload);
                         break;
                     }
@@ -999 +1117 @@
                         if (enmDir == SHAREDCLIPBOARDURITRANSFERDIR_READ)
                         {
-                            creationCtx.Interface.pfnGetRoots      = vboxSvcClipboardURIGetRoots;
-                            creationCtx.Interface.pfnListHdrRead   = vboxSvcClipboardURIListHdrRead;
-                            creationCtx.Interface.pfnListEntryRead = vboxSvcClipboardURIListEntryRead;
-                            creationCtx.Interface.pfnObjRead       = vboxSvcClipboardURIObjRead;
+                            creationCtx.Interface.pfnGetRoots        = vboxSvcClipboardURIGetRoots;
+                            creationCtx.Interface.pfnListHdrRead     = vboxSvcClipboardURIListHdrRead;
+                            creationCtx.Interface.pfnListEntryRead   = vboxSvcClipboardURIListEntryRead;
+                            creationCtx.Interface.pfnObjRead         = vboxSvcClipboardURIObjRead;
                         }
                         else