Changeset 100413 in vbox for trunk/src/VBox

Timestamp:

Jul 6, 2023 2:10:35 PM (17 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Removed dead code. ​​​bugref:9437

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/clipboard-win.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp

@@ -1126 +1126 @@
 }
 
-#if 0
-/**
- * Creates an Shared Clipboard transfer by announcing transfer data  (via IDataObject) to Windows.
- *
- * This creates the necessary IDataObject + IStream implementations and initiates the actual transfers required for getting
- * the meta data. Whether or not the actual (file++) transfer(s) are happening is up to the user (at some point) later then.
- *
- * @returns VBox status code.
- * @param   pWinCtx             Windows context to use.
- * @param   pTransferCtxCtx     Transfer contextto use.
- * @param   pTransfer           Shared Clipboard transfer to use.
- */
-int SharedClipboardWinTransferCreate(PSHCLWINCTX pWinCtx, PSHCLTRANSFER pTransfer)
-{
-    AssertPtrReturn(pTransfer, VERR_INVALID_POINTER);
-
-    LogFlowFunc(("pWinCtx=%p\n", pWinCtx));
-
-    AssertReturn(pTransfer->pvUser == NULL, VERR_WRONG_ORDER);
-
-    /* Make sure to enter the critical section before setting the clipboard data, as otherwise WM_CLIPBOARDUPDATE
-     * might get called *before* we had the opportunity to set pWinCtx->hWndClipboardOwnerUs below. */
-    int rc = RTCritSectEnter(&pWinCtx->CritSect);
-    if (RT_SUCCESS(rc))
-    {
-        SharedClipboardWinTransferCtx *pWinURITransferCtx = new SharedClipboardWinTransferCtx();
-        if (pWinURITransferCtx)
-        {
-            pTransfer->pvUser = pWinURITransferCtx;
-            pTransfer->cbUser = sizeof(SharedClipboardWinTransferCtx);
-
-            pWinURITransferCtx->pDataObj = new SharedClipboardWinDataObject();
-            if (pWinURITransferCtx->pDataObj)
-            {
-                rc = pWinURITransferCtx->pDataObj->Init(pCtx);
-                if (RT_SUCCESS(rc))
-                {
-                    SharedClipboardWinClose();
-                    /* Note: Clipboard must be closed first before calling OleSetClipboard(). */
-
-                    /** @todo There is a potential race between SharedClipboardWinClose() and OleSetClipboard(),
-                     *        where another application could own the clipboard (open), and thus the call to
-                     *        OleSetClipboard() will fail. Needs (better) fixing. */
-                    HRESULT hr = S_OK;
-
-                    for (unsigned uTries = 0; uTries < 3; uTries++)
-                    {
-                        hr = OleSetClipboard(pWinURITransferCtx->pDataObj);
-                        if (SUCCEEDED(hr))
-                        {
-                            Assert(OleIsCurrentClipboard(pWinURITransferCtx->pDataObj) == S_OK); /* Sanity. */
-
-                            /*
-                             * Calling OleSetClipboard() changed the clipboard owner, which in turn will let us receive
-                             * a WM_CLIPBOARDUPDATE message. To not confuse ourselves with our own clipboard owner changes,
-                             * save a new window handle and deal with it in WM_CLIPBOARDUPDATE.
-                             */
-                            pWinCtx->hWndClipboardOwnerUs = GetClipboardOwner();
-
-                            LogFlowFunc(("hWndClipboardOwnerUs=%p\n", pWinCtx->hWndClipboardOwnerUs));
-                            break;
-                        }
-
-                        LogFlowFunc(("Failed with %Rhrc (try %u/3)\n", hr, uTries + 1));
-                        RTThreadSleep(500); /* Wait a bit. */
-                    }
-
-                    if (FAILED(hr))
-                    {
-                        rc = VERR_ACCESS_DENIED; /** @todo Fudge; fix this. */
-                        LogRel(("Shared Clipboard: Failed with %Rhrc when setting data object to clipboard\n", hr));
-                    }
-                }
-            }
-            else
-                rc = VERR_NO_MEMORY;
-        }
-        else
-            rc = VERR_NO_MEMORY;
-
-        int rc2 = RTCritSectLeave(&pWinCtx->CritSect);
-        AssertRC(rc2);
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-#endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
-
 /**
  * Destroys implementation-specific data for an Shared Clipboard transfer.

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

@@ -1335 +1335 @@
                 }
 
-#if 0 /* ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
-                /*
-                 * When the host wants to read URI data from the guest:
-                 *   - Initialize a transfer locally.
-                 *   - Request URI data from the guest; this tells the guest to initialize a transfer on the guest side.
-                 *   - Start the transfer locally once we receive the transfer INITIALIZED status from the guest via VBOX_SHCL_GUEST_FN_REPLY.
-                 *
-                 * When this function returns, the X11 clipboard will try reading the data, so we need to make sure that
-                 *   - the local HTTP server is up and running (will be done in ShClBackendTransferCreate() on X11)
-                 *   - the right (HTTP) URL data is filled into the clipboard
-                 * by then.
-                 */
-                if (   RT_SUCCESS(rc)
-                    && (fFormat & VBOX_SHCL_FMT_URI_LIST))
-                {
-                    PSHCLTRANSFER pTransfer;
-                    rc = ShClSvcTransferInit(pClient, SHCLTRANSFERDIR_FROM_REMOTE, SHCLSOURCE_REMOTE, &pTransfer);
-                    if (RT_SUCCESS(rc))
-                        rc = shClSvcSetSource(pClient, SHCLSOURCE_REMOTE);
-
-                    if (RT_FAILURE(rc))
-                        LogRel(("Shared Clipboard: Initializing guest -> host transfer failed with %Rrc\n", rc));
-                }
-#endif
                 /* Remove event from list if caller did not request event handle or in case
                  * of failure (in this case caller should not release event). */