Changeset 100370 in vbox for trunk/src

Timestamp:

Jul 5, 2023 7:14:28 AM (18 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Removed ShClBackendTransferHGRootListRead(), not needed. ​​bugref:9437

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-internal.h (modified) (1 diff)
• VBoxSharedClipboardSvc-transfers.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc-win.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc-x11.cpp (modified) (2 diffs)
• testcase/tstClipboardServiceHost.cpp (modified) (1 diff)

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

@@ -461 +461 @@
  */
 int ShClBackendTransferHandleStatusReply(PSHCLBACKEND pBackend, PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer, SHCLSOURCE enmSource, SHCLTRANSFERSTATUS enmStatus, int rcStatus);
-/**
- * Called when the guest wants to read the transfer roots.
- *
- * @returns VBox status code.
- * @param   pBackend            Shared Clipboard backend to use.
- * @param   pClient             Shared Clipboard client context.
- * @param   pTransfer           Shared Clipboard transfer to get roots for.
- */
-int ShClBackendTransferHGRootListRead(PSHCLBACKEND pBackend, PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer);
 /** @} */
 #endif

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

@@ -1663 +1663 @@
             ASSERT_GUEST_RETURN(aParms[2].type == VBOX_HGCM_SVC_PARM_64BIT, VERR_WRONG_PARAMETER_TYPE); /* # Entries  */
 
-            if (   ShClTransferGetSource(pTransfer) == SHCLSOURCE_LOCAL
-                && ShClTransferGetDir(pTransfer)    == SHCLTRANSFERDIR_TO_REMOTE)
-            {
-                rc = ShClBackendTransferHGRootListRead(pClient->pBackend, pClient, pTransfer);
-                if (RT_FAILURE(rc))
-                    break;
-            }
-            else
-                break;
-
             SHCLLISTHDR rootListHdr;
             RT_ZERO(rootListHdr);

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

@@ -970 +970 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-int ShClBackendTransferHGRootListRead(PSHCLBACKEND pBackend, PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
-{
-    RT_NOREF(pBackend);
-
-    LogFlowFuncEnter();
-
-    const PSHCLWINCTX pWinCtx = &pClient->State.pCtx->Win;
-
-    int rc = SharedClipboardWinTransferGetRootsFromClipboard(pWinCtx, pTransfer);
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+/**
+ * Handles transfer status replies from the guest.
+ */
+int ShClBackendTransferHandleStatusReply(PSHCLBACKEND pBackend, PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer, SHCLSOURCE enmSource, SHCLTRANSFERSTATUS enmStatus, int rcStatus)
+{
+    RT_NOREF(pBackend, pClient, pTransfer, enmSource, enmStatus, rcStatus);
+
+    return VINF_SUCCESS;
 }
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
+

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

@@ -434 +434 @@
                             rc = ShClTransferRootsInitFromStringList(pTransfer,
                                                                      (char *)pResp->Read.pvData, pResp->Read.cbData + 1 /* Include zero terminator */);
-                            //if (RT_SUCCESS(rc))
-                            //    rc = ShClTransferRootListRead(pTransfer);
-
                             if (RT_SUCCESS(rc))
                                 LogRel2(("Shared Clipboard: Host reported %RU64 X11 root entries for transfer to guest\n", ShClTransferRootsCount(pTransfer)));
@@ -662 +659 @@
     return VINF_SUCCESS;
 }
-
-int ShClBackendTransferHGRootListRead(PSHCLBACKEND pBackend, PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
-{
-    RT_NOREF(pBackend);
-
-#if 1
-    RT_NOREF(pClient, pTransfer);
-    int rc = 0;
-#else
-    LogFlowFuncEnter();
-
-    PSHCLEVENT pEvent;
-    int rc = ShClEventSourceGenerateAndRegisterEvent(&pClient->EventSrc, &pEvent);
-    if (RT_SUCCESS(rc))
-    {
-        rc = ShClX11ReadDataFromX11Async(&pClient->State.pCtx->X11, VBOX_SHCL_FMT_URI_LIST, UINT32_MAX, pEvent);
-        if (RT_SUCCESS(rc))
-        {
-            /* X supplies the data asynchronously, so we need to wait for data to arrive first. */
-            PSHCLEVENTPAYLOAD pPayload;
-            rc = ShClEventWait(pEvent, SHCL_TIMEOUT_DEFAULT_MS, &pPayload);
-            if (RT_SUCCESS(rc))
-            {
-                if (pPayload)
-                {
-                    Assert(pPayload->cbData == sizeof(SHCLX11RESPONSE));
-                    AssertPtr(pPayload->pvData);
-                    PSHCLX11RESPONSE pResp = (PSHCLX11RESPONSE)pPayload->pvData;
-
-                    rc = ShClTransferRootsInitFromStringList(pTransfer,
-                                              (char *)pResp->Read.pvData, pResp->Read.cbData + 1 /* Include zero terminator */);
-                    if (RT_SUCCESS(rc))
-                        rc = ShClTransferRootListRead(pTransfer);
-
-                    if (RT_SUCCESS(rc))
-                        LogRel2(("Shared Clipboard: Host reported %RU64 X11 root entries for transfer to guest\n", ShClTransferRootsCount(pTransfer)));
-
-                    RTMemFree(pResp->Read.pvData);
-                    pResp->Read.cbData = 0;
-
-                    ShClPayloadFree(pPayload);
-                    pPayload = NULL;
-                }
-                else
-                    rc = VERR_NO_DATA; /* No payload. */
-            }
-        }
-
-        ShClEventRelease(pEvent);
-    }
-    else
-        rc = VERR_SHCLPB_MAX_EVENTS_REACHED;
-#endif
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 

trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp

@@ -331 +331 @@
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
 int ShClBackendTransferHandleStatusReply(PSHCLBACKEND, PSHCLCLIENT, PSHCLTRANSFER, SHCLSOURCE, SHCLTRANSFERSTATUS, int) { return VINF_SUCCESS; }
-int ShClBackendTransferHGRootListRead(PSHCLBACKEND, PSHCLCLIENT, PSHCLTRANSFER) { return VINF_SUCCESS; }
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */