Changeset 82480 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Dec 7, 2019 12:32:57 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135332

Message:

GuestHost/SharedClipboard.h: Got rid of all the leading underscores that I could spot. Shuffled the members of SHCLDATABLOCK so we save 8 bytes on 64-bit machines. bugref:9437

File:

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

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

@@ -51 +51 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
-
-typedef struct _SHCLCONTEXT
+struct SHCLCONTEXT
 {
     /** Pointer to the VBoxClient service environment. */
@@ -70 +69 @@
     SHCLTRANSFERCTX       TransferCtx;
 #endif
-} SHCLCONTEXT, *PSHCLCONTEXT;
+};
 
 
@@ -579 +578 @@
                         if (lp != NULL)
                         {
-                            SHCLDATABLOCK dataBlock = { uFormat, lp, (uint32_t)GlobalSize(hClip) };
+                            SHCLDATABLOCK dataBlock;
+                            dataBlock.uFormat = uFormat;
+                            dataBlock.pvData  = lp;
+                            dataBlock.cbData  = (uint32_t)GlobalSize(hClip);
 
                             rc = VbglR3ClipboardWriteDataEx(&pEvent->cmdCtx, &dataBlock);
@@ -599 +601 @@
                         if (uniString != NULL)
                         {
-                            SHCLDATABLOCK dataBlock = { uFormat, uniString, ((uint32_t)lstrlenW(uniString) + 1) * 2 };
+                            SHCLDATABLOCK dataBlock;
+                            dataBlock.uFormat = uFormat;
+                            dataBlock.pvData  = uniString;
+                            dataBlock.cbData  = ((uint32_t)lstrlenW(uniString) + 1) * 2;
 
                             rc = VbglR3ClipboardWriteDataEx(&pEvent->cmdCtx, &dataBlock);
@@ -623 +628 @@
                             if (lp != NULL)
                             {
-                                SHCLDATABLOCK dataBlock = { uFormat, lp, (uint32_t)GlobalSize(hClip) };
+                                SHCLDATABLOCK dataBlock;
+                                dataBlock.uFormat = uFormat;
+                                dataBlock.pvData  = lp;
+                                dataBlock.cbData  = (uint32_t)GlobalSize(hClip);
 
                                 rc = VbglR3ClipboardWriteDataEx(&pEvent->cmdCtx, &dataBlock);