Changeset 82480 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

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

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (5 diffs)
• Additions/x11/VBoxClient/clipboard.cpp (modified) (2 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-darwin.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (2 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);

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -59 +59 @@
  * Global clipboard context information.
  */
-struct _SHCLCONTEXT
+struct SHCLCONTEXT
 {
     /** Client command context */
@@ -166 +166 @@
  * it can be completed correctly.
  */
-struct _CLIPREADCBREQ
+struct CLIPREADCBREQ
 {
     /** The data format that was requested. */

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-darwin.cpp

@@ -35 +35 @@
 *********************************************************************************************************************************/
 /** Global clipboard context information */
-struct _SHCLCONTEXT
+struct SHCLCONTEXT
 {
     /** We have a separate thread to poll for new clipboard content */

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp

@@ -55 +55 @@
 static int vboxClipboardSvcWinSyncInternal(PSHCLCONTEXT pCtx);
 
-struct _SHCLCONTEXT
+struct SHCLCONTEXT
 {
     /** Handle for window message handling thread. */

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp

@@ -39 +39 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
-
 /**
  * Global context information used by the host glue for the X11 clipboard backend.
  */
-struct _SHCLCONTEXT
+struct SHCLCONTEXT
 {
     /** This mutex is grabbed during any critical operations on the clipboard
@@ -164 +163 @@
 
 /** Structure describing a request for clipoard data from the guest. */
-struct _CLIPREADCBREQ
+struct CLIPREADCBREQ
 {
     /** User-supplied data pointer, based on the request type. */