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

Timestamp:

Jan 27, 2020 5:52:41 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Ditched SHCLDATABLOCK.

File:

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

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

@@ -362 +362 @@
                     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 = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, &dataBlock, &cb);
+                        int rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, fFormat, pMem, cbPrealloc, &cb);
                         if (RT_SUCCESS(rc))
                         {
@@ -395 +388 @@
                                     if (pMem)
                                     {
-                                        dataBlock.cbData  = cb;
-                                        dataBlock.pvData  = pMem;
-
                                         /* Read the host data to the preallocated buffer. */
                                         uint32_t cbNew = 0;
-                                        rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, &dataBlock, &cbNew);
+                                        rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, fFormat, pMem, cb, &cbNew);
                                         if (   RT_SUCCESS(rc)
                                             && cbNew <= cb)
@@ -580 +570 @@
                         if (lp != NULL)
                         {
-                            SHCLDATABLOCK dataBlock;
-                            RT_ZERO(dataBlock);
-
-                            dataBlock.uFormat = fFormat;
-                            dataBlock.pvData  = lp;
-                            dataBlock.cbData  = (uint32_t)GlobalSize(hClip);
-
-                            rc = VbglR3ClipboardWriteDataEx(&pEvent->cmdCtx, &dataBlock);
+                            rc = VbglR3ClipboardWriteDataEx(&pEvent->cmdCtx, fFormat, lp, (uint32_t)GlobalSize(hClip));
 
                             GlobalUnlock(hClip);
@@ -605 +588 @@
                         if (uniString != NULL)
                         {
-                            SHCLDATABLOCK dataBlock;
-                            RT_ZERO(dataBlock);
-
-                            dataBlock.uFormat = fFormat;
-                            dataBlock.pvData  = uniString;
-                            dataBlock.cbData  = ((uint32_t)lstrlenW(uniString) + 1) * 2;
-
-                            rc = VbglR3ClipboardWriteDataEx(&pEvent->cmdCtx, &dataBlock);
+                            rc = VbglR3ClipboardWriteDataEx(&pEvent->cmdCtx,
+                                                            fFormat, uniString, ((uint32_t)lstrlenW(uniString) + 1) * 2);
 
                             GlobalUnlock(hClip);
@@ -631 +608 @@
                         {
                             LPVOID lp = GlobalLock(hClip);
-
                             if (lp != NULL)
                             {
-                                SHCLDATABLOCK dataBlock;
-                                RT_ZERO(dataBlock);
-
-                                dataBlock.uFormat = fFormat;
-                                dataBlock.pvData  = lp;
-                                dataBlock.cbData  = (uint32_t)GlobalSize(hClip);
-
-                                rc = VbglR3ClipboardWriteDataEx(&pEvent->cmdCtx, &dataBlock);
+                                rc = VbglR3ClipboardWriteDataEx(&pEvent->cmdCtx, fFormat, lp, (uint32_t)GlobalSize(hClip));
 
                                 GlobalUnlock(hClip);