Changeset 86948 in vbox

Timestamp:

Nov 20, 2020 6:35:24 PM (4 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Resurrected Windows code. bugref:9437

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (3 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (5 diffs)
• src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp (modified) (1 diff)

trunk/include/VBox/VBoxGuestLib.h

@@ -577 +577 @@
  * @{ */
 
+# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+/**
+ * Structure for maintaining a VbglR3 Shared Clipboard transfer context.
+ */
+typedef struct VBGLR3SHCLTRANSFERCMDCTX
+{
+    /** Default chunk size (in bytes).
+     * This is set by VbglR3ClipboardConnectEx(). */
+    uint32_t                    cbChunkSize;
+    /** Max chunk size (in bytes).
+     * This is set by VbglR3ClipboardConnectEx(). */
+    uint32_t                    cbMaxChunkSize;
+    /** Callback table to use for all transfers. */
+    SHCLTRANSFERCALLBACKS       Callbacks;
+} VBGLR3SHCLTRANSFERCTX;
+/** Pointer to a Shared Clipboard transfer context. */
+typedef VBGLR3SHCLTRANSFERCMDCTX *PVBGLR3SHCLTRANSFERCMDCTX;
+# endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
+
 /**
  * The context required for either retrieving or sending a HGCM shared clipboard
@@ -600 +619 @@
      * This is set by VbglR3ClipboardConnectEx().  */
     uint64_t                    fGuestFeatures;
-#  ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    /** Default chunk size (in bytes).
-     * This is set by VbglR3ClipboardConnectEx(). */
-    uint32_t                    cbChunkSize;
-    /** Max chunk size (in bytes).
-     * This is set by VbglR3ClipboardConnectEx(). */
-    uint32_t                    cbMaxChunkSize;
-#  endif
-
     /** The context ID - input or/and output depending on the operation. */
     uint64_t                    idContext;
@@ -614 +624 @@
      * This is set by ??. */
     uint32_t                    cParmsRecived;
-
-#  ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    /** Callback table to use for all transfers. */
-    SHCLTRANSFERCALLBACKS       Callbacks;
-#  endif
+# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+    VBGLR3SHCLTRANSFERCMDCTX    Transfers;
+# endif
 } VBGLR3SHCLCMDCTX;
 /** Pointer to a shared clipboard context for Vbgl. */

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -161 +161 @@
         /* The IDataObject *must* be created on the same thread as our (proxy) window, so post a message to it
          * to do the stuff for us. */
-        const SHCLEVENTID idEvent = ShClEventIDGenerate(&pTransfer->Events);
-
-        rc = ShClEventRegister(&pTransfer->Events, idEvent);
-        if (RT_SUCCESS(rc))
+        const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pTransfer->Events);
+        if (idEvent != NIL_SHCLEVENTID)
         {
             /* Don't want to rely on SendMessage (synchronous) here, so just post and wait the event getting signalled. */

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

@@ -113 +113 @@
     pCtx->fGuestFeatures       |= VBOX_SHCL_GF_0_TRANSFERS_FRONTEND;
 # endif
-    pCtx->cbChunkSize           = VBOX_SHCL_DEFAULT_CHUNK_SIZE; /** @todo Make this configurable. */
-    pCtx->cbMaxChunkSize        = VBOX_SHCL_MAX_CHUNK_SIZE;     /** @todo Ditto. */
+    pCtx->Transfers.cbChunkSize    = VBOX_SHCL_DEFAULT_CHUNK_SIZE; /** @todo Make this configurable. */
+    pCtx->Transfers.cbMaxChunkSize = VBOX_SHCL_MAX_CHUNK_SIZE;     /** @todo Ditto. */
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 
@@ -148 +148 @@
                         VBGL_HGCM_HDR_INIT(&MsgChunkSize.hdr, pCtx->idClient, VBOX_SHCL_GUEST_FN_NEGOTIATE_CHUNK_SIZE,
                                            VBOX_SHCL_CPARMS_NEGOTIATE_CHUNK_SIZE);
-                        MsgChunkSize.cb32MaxChunkSize.SetUInt32(pCtx->cbMaxChunkSize);
+                        MsgChunkSize.cb32MaxChunkSize.SetUInt32(pCtx->Transfers.cbMaxChunkSize);
                         MsgChunkSize.cb32ChunkSize.SetUInt32(0); /* If set to 0, let the host choose. */
                         rc = VbglR3HGCMCall(&MsgChunkSize.hdr, sizeof(MsgChunkSize));
@@ -155 +155 @@
                     {
                         Assert(MsgChunkSize.cb32ChunkSize.type == VMMDevHGCMParmType_32bit);
-                        pCtx->cbChunkSize    = RT_MIN(MsgChunkSize.cb32ChunkSize.u.value32,    pCtx->cbChunkSize);
+                        pCtx->Transfers.cbChunkSize    = RT_MIN(MsgChunkSize.cb32ChunkSize.u.value32,    pCtx->Transfers.cbChunkSize);
                         Assert(MsgChunkSize.cb32MaxChunkSize.type == VMMDevHGCMParmType_32bit);
-                        pCtx->cbMaxChunkSize = RT_MIN(MsgChunkSize.cb32MaxChunkSize.u.value32, pCtx->cbMaxChunkSize);
+                        pCtx->Transfers.cbMaxChunkSize = RT_MIN(MsgChunkSize.cb32MaxChunkSize.u.value32, pCtx->Transfers.cbMaxChunkSize);
 
                         LogRel2(("Shared Clipboard: Using chunk size %RU32 (maximum is %RU32)\n",
-                                 pCtx->cbChunkSize, pCtx->cbMaxChunkSize));
+                                 pCtx->Transfers.cbChunkSize, pCtx->Transfers.cbMaxChunkSize));
                     }
                 }
@@ -1803 +1803 @@
     if (RT_SUCCESS(rc))
     {
-        ShClTransferSetCallbacks(pTransfer, &pCmdCtx->Callbacks);
+        ShClTransferSetCallbacks(pTransfer, &pCmdCtx->Transfers.Callbacks);
 
         rc = ShClTransferCtxTransferRegisterByIndex(pTransferCtx, pTransfer, uTransferID);
@@ -2218 +2218 @@
                     AssertPtrBreakStmt(pTransfer, rc = VERR_NOT_FOUND);
 
-                    AssertBreakStmt(pCmdCtx->cbChunkSize, rc = VERR_INVALID_PARAMETER);
-
-                    const uint32_t cbToRead = RT_MIN(cbBuf, pCmdCtx->cbChunkSize);
+                    AssertBreakStmt(pCmdCtx->Transfers.cbChunkSize, rc = VERR_INVALID_PARAMETER);
+
+                    const uint32_t cbToRead = RT_MIN(cbBuf, pCmdCtx->Transfers.cbChunkSize);
 
                     LogFlowFunc(("hObj=%RU64, cbBuf=%RU32, fFlags=0x%x -> cbChunkSize=%RU32, cbToRead=%RU32\n",
-                                 hObj, cbBuf, fFlags, pCmdCtx->cbChunkSize, cbToRead));
+                                 hObj, cbBuf, fFlags, pCmdCtx->Transfers.cbChunkSize, cbToRead));
 
                     void *pvBuf = RTMemAlloc(cbToRead);

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

@@ -51 +51 @@
     , m_lRefCount(1) /* Our IDataObjct *always* holds the last reference to this object; needed for the callbacks. */
     , m_pTransfer(pTransfer)
+    , m_hObj(SHCLOBJHANDLE_INVALID)
     , m_strPath(strPath)
-    , m_hObj(SHCLOBJHANDLE_INVALID)
     , m_objInfo(*pObjInfo)
     , m_cbProcessed(0)