Changeset 81768 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Nov 11, 2019 4:36:41 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Update.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (11 diffs)

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

@@ -352 +352 @@
             {
                 const uint32_t cbPrealloc = _4K;
-                uint32_t cb = 0;
+                      uint32_t cb         = 0;
 
                 /* Preallocate a buffer, most of small text transfers will fit into it. */
                 HANDLE hMem = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, cbPrealloc);
-                LogFlowFunc(("Preallocated handle hMem = %p\n", hMem));
-
                 if (hMem)
                 {
                     void *pMem = GlobalLock(hMem);
-                    LogFlowFunc(("Locked pMem = %p, GlobalSize = %ld\n", pMem, GlobalSize(hMem)));
-
                     if (pMem)
                     {
+                        SHCLDATABLOCK dataBlock;
+                        RT_ZERO(dataBlock);
+
+                        dataBlock.cbData  = cbPrealloc;
+                        dataBlock.pvData  = pMem;
+                        dataBlock.uFormat = fFormat;
+
                         /* Read the host data to the preallocated buffer. */
-                        int rc = VbglR3ClipboardReadData(pCtx->CmdCtx.uClientID, fFormat, pMem, cbPrealloc, &cb);
-                        LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc\n",  rc));
-
+                        int rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, &dataBlock, &cb);
                         if (RT_SUCCESS(rc))
                         {
@@ -384 +385 @@
                                 GlobalUnlock(hMem);
 
+                                LogRel2(("Shared Clipboard: Buffer too small (%RU32), needs %RU32 bytes\n", cbPrealloc, cb));
+
                                 /* The preallocated buffer is too small, adjust the size. */
                                 hMem = GlobalReAlloc(hMem, cb, 0);
-                                LogFlowFunc(("Reallocated hMem = %p\n", hMem));
-
                                 if (hMem)
                                 {
                                     pMem = GlobalLock(hMem);
-                                    LogFlowFunc(("Locked pMem = %p, GlobalSize = %ld\n", pMem, GlobalSize(hMem)));
-
                                     if (pMem)
                                     {
+                                        dataBlock.cbData  = cb;
+                                        dataBlock.pvData  = pMem;
+
                                         /* Read the host data to the preallocated buffer. */
                                         uint32_t cbNew = 0;
-                                        rc = VbglR3ClipboardReadData(pCtx->CmdCtx.uClientID, fFormat, pMem, cb, &cbNew);
-                                        LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc, cb = %d, cbNew = %d\n",
-                                                     rc, cb, cbNew));
-
-                                        if (RT_SUCCESS(rc)
+                                        rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, &dataBlock, &cbNew);
+                                        if (   RT_SUCCESS(rc)
                                             && cbNew <= cb)
                                         {
@@ -408 +407 @@
                                         else
                                         {
+                                            LogRel(("Shared Clipboard: Receiving host data failed with %Rrc\n", rc));
+
                                             GlobalUnlock(hMem);
                                             GlobalFree(hMem);
@@ -415 +416 @@
                                     else
                                     {
+                                        LogRel(("Shared Clipboard: Error locking reallocated host data buffer\n"));
+
                                         GlobalFree(hMem);
                                         hMem = NULL;
                                     }
                                 }
+                                else
+                                    LogRel(("Shared Clipboard: No memory for reallocating host data buffer\n"));
                             }
 
@@ -433 +438 @@
                                     if (FAILED(hrc))
                                     {
+                                        LogRel(("Shared Clipboard: Received host data is invalid (%RU32 vs. %zu)\n",
+                                                cb, cbActual));
+
                                         /* Discard invalid data. */
                                         GlobalUnlock(hMem);
@@ -453 +461 @@
 
                                 hMem = GlobalReAlloc(hMem, cb, 0);
-                                LogFlowFunc(("Reallocated hMem = %p\n", hMem));
-
                                 if (hMem)
                                 {
@@ -460 +466 @@
                                      * size is 'cb' and format is 'format'. */
                                     HANDLE hClip = SetClipboardData(cfFormat, hMem);
-                                    LogFlowFunc(("WM_RENDERFORMAT hClip = %p\n", hClip));
-
                                     if (hClip)
                                     {
@@ -467 +471 @@
                                         break;
                                     }
+                                    else
+                                        LogRel(("Shared Clipboard: Setting host data buffer to clipboard failed with %ld\n",
+                                                GetLastError()));
 
                                     /* Cleanup follows. */
                                 }
+                                else
+                                    LogRel(("Shared Clipboard: No memory for allocating final host data buffer\n"));
                             }
                         }
+
                         if (hMem)
                             GlobalUnlock(hMem);
                     }
+                    else
+                        LogRel(("Shared Clipboard: No memory for allocating host data buffer\n"));
+
                     if (hMem)
                         GlobalFree(hMem);
@@ -629 +642 @@
                     /* Requested clipboard format is not available, send empty data. */
                     VbglR3ClipboardWriteData(pCtx->CmdCtx.uClientID, VBOX_SHCL_FMT_NONE, NULL, 0);
-#ifdef DEBUG_andy
-                    AssertFailed();
-#endif
                 }
 
@@ -983 +993 @@
         PVBGLR3CLIPBOARDEVENT pEvent = NULL;
 
-        LogFlowFunc(("Waiting for host message (fHostFeatures=%#RX64) ...\n", pCtx->CmdCtx.fHostFeatures));
+        LogFlowFunc(("Waiting for host message (fUseLegacyProtocol=%RTbool, fHostFeatures=%#RX64) ...\n",
+                     pCtx->CmdCtx.fUseLegacyProtocol, pCtx->CmdCtx.fHostFeatures));
 
         if (pCtx->CmdCtx.fUseLegacyProtocol)
@@ -1025 +1036 @@
                         rc = VERR_NOT_SUPPORTED;
                         break;
+                }
+
+                if (RT_SUCCESS(rc))
+                {
+                    /* Copy over our command context to the event. */
+                    pEvent->cmdCtx = pCtx->CmdCtx;
                 }
             }