Changeset 1305 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 7, 2007 4:44:05 PM (18 years ago)

Author:

vboxsync

Message:

Guest side of shared clipboard can receive less data than the buffer size.

File:

• trunk/src/VBox/Additions/WINNT/VBoxService/VBoxClipboard.cpp (modified) (2 diffs)

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

@@ -260 +260 @@
                     *pcbActual = u32Size;
                 }
-                else
-                {
-                    if (u32Size != cb)
-                    {
-                        rc = VERR_INVALID_PARAMETER;
-                    }
-                }
             }
         }
@@ -426 +419 @@
             else
             {
-                /* Query the size of available data. */
+                const uint32_t cbPrealloc = 4096;
                 uint32_t cb = 0;
-
-                int vboxrc = vboxClipboardReadData (pCtx, u32Format, NULL, 0, &cb);
-
-                dprintf(("vboxClipboardReadData vboxrc = %d, cb = %d\n", vboxrc, cb));
-
-                if (VBOX_SUCCESS (vboxrc) && cb > 0)
+                
+                /* Preallocate a buffer, most of small text transfers will fit into it. */
+                HANDLE hMem = GlobalAlloc (GMEM_DDESHARE | GMEM_MOVEABLE, cbPrealloc);
+                dprintf(("hMem %p\n", hMem));
+
+                if (hMem)
                 {
-                    HANDLE hMem = GlobalAlloc (GMEM_DDESHARE | GMEM_MOVEABLE, cb);
-
-                    dprintf(("hMem %p\n", hMem));
-
+                    void *pMem = GlobalLock (hMem);
+                    dprintf(("pMem %p, GlobalSize %d\n", pMem, GlobalSize (hMem)));
+
+                    if (pMem)
+                    {
+                        /* Read the host data to the preallocated buffer. */
+                        int vboxrc = vboxClipboardReadData (pCtx, u32Format, pMem, cbPrealloc, &cb);
+                        dprintf(("vboxClipboardReadData vboxrc %d\n",  vboxrc));
+
+                        if (VBOX_SUCCESS (rc))
+                        {
+                            if (cb > cbPrealloc)
+                            {
+                                GlobalUnlock (hMem);
+                                
+                                /* The preallocated buffer is too small, adjust the size. */
+                                hMem = GlobalReAlloc (hMem, cb, 0);
+                                dprintf(("hMem %p\n", hMem));
+                                
+                                if (hMem)
+                                {
+                                    pMem = GlobalLock (hMem);
+                                    dprintf(("pMem %p, GlobalSize %d\n", pMem, GlobalSize (hMem)));
+
+                                    if (pMem)
+                                    {
+                                        /* Read the host data to the preallocated buffer. */
+                                        uint32_t cbNew = 0;
+                                        vboxrc = vboxClipboardReadData (pCtx, u32Format, pMem, cb, &cbNew);
+                                        dprintf(("vboxClipboardReadData vboxrc %d, cb = %d, cbNew = %d\n", vboxrc, cb, cbNew));
+
+                                        if (VBOX_SUCCESS (vboxrc) && cbNew <= cb)
+                                        {
+                                            cb = cbNew;
+                                        }
+                                        else
+                                        {
+                                            GlobalUnlock (pMem);
+                                            GlobalFree (hMem);
+                                            hMem = NULL;
+                                        }
+                                    }
+                                    else
+                                    {
+                                        GlobalFree (hMem);
+                                        hMem = NULL;
+                                    }
+                                }
+                            }
+                            
+                            if (hMem)
+                            {
+                                /* pMem is the address of the data. cb is the size of returned data. */
+                                /* Verify the size of returned text. */
+                                if (u32Format == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+                                {
+                                    cb = (lstrlenW((LPWSTR)pMem) + 1) * 2;
+                                }
+                                
+                                GlobalUnlock (hMem);
+                                
+                                hMem = GlobalReAlloc (hMem, cb, 0);
+                                dprintf(("hMem %p\n", hMem));
+                                
+                                if (hMem)
+                                {
+                                    /* 'hMem' contains the host clipboard data.
+                                     * size is 'cb' and format is 'format'.
+                                     */
+                                    HANDLE hClip = SetClipboardData (format, hMem);
+                                    dprintf(("WM_RENDERFORMAT hClip %p\n", hClip));
+
+                                    if (hClip)
+                                    {
+                                        /* The hMem ownership has gone to the system. Finish the processing. */
+                                        break;
+                                    }
+                                
+                                    /* Cleanup follows. */
+                                }
+                            }
+                        }
+                        
+                        if (hMem)
+                        {
+                            GlobalUnlock (hMem);
+                        }
+                    }
+                    
                     if (hMem)
                     {
-                        void *pMem = GlobalLock (hMem);
-
-                        dprintf(("pMem %p, GlobalSize %d\n", pMem, GlobalSize (hMem)));
-
-                        if (pMem)
-                        {
-                            /* Read the host data. */
-                            vboxrc = vboxClipboardReadData (pCtx, u32Format, pMem, cb, NULL);
-                            
-                            dprintf(("vboxClipboardReadData vboxrc %d\n",  vboxrc));
-
-                            if (VBOX_SUCCESS (vboxrc))
-                            {
-//                                /* Remember the which data was transferred. */
-//                                vboxClipboardIsSameAsLastSent (pCtx, u32Format, pMem, cb);
-
-                                /* The memory must be unlocked before inserting to the Clipboard. */
-                                GlobalUnlock (hMem);
-
-                                /* 'hMem' contains the host clipboard data.
-                                 * size is 'cb' and format is 'format'.
-                                 */
-                                HANDLE hClip = SetClipboardData (format, hMem);
-
-                                dprintf(("WM_RENDERFORMAT hClip %p\n", hClip));
-
-                                if (hClip)
-                                {
-                                    /* The hMem ownership has gone to the system. Finish the processsing. */
-                                    break;
-                                }
-                                
-                                /* Cleanup follows. */
-                            }
-                            else
-                            {
-                                GlobalUnlock (hMem);
-                            }
-                        }
-
                         GlobalFree (hMem);
                     }