Index: /trunk/include/VBox/GuestHost/SharedClipboard-transfers.h =================================================================== --- /trunk/include/VBox/GuestHost/SharedClipboard-transfers.h (revision 82479) +++ /trunk/include/VBox/GuestHost/SharedClipboard-transfers.h (revision 82480) @@ -42,4 +42,9 @@ #include + + +struct SHCLTRANSFER; +/** Pointer to a single shared clipboard transfer */ +typedef struct SHCLTRANSFER *PSHCLTRANSFER; @@ -713,7 +718,4 @@ } SHCLTRANSFERSTATE, *PSHCLTRANSFERSTATE; -struct _SHCLTRANSFER; -typedef struct _SHCLTRANSFER *PSHCLTRANSFER; - /** * Structure maintaining clipboard transfer provider context data. @@ -801,6 +803,4 @@ } SHCLPROVIDERCREATIONCTX, *PSHCLPROVIDERCREATIONCTX; -struct _SHCLTRANSFER; -typedef _SHCLTRANSFER *PSHCLTRANSFER; /** @@ -882,9 +882,9 @@ /** - * Structure for maintaining a single Shared Clipboard transfer. + * A single Shared Clipboard transfer. * ** @todo Not yet thread safe. */ -typedef struct _SHCLTRANSFER +typedef struct SHCLTRANSFER { /** The node member for using this struct in a RTList. */ Index: /trunk/include/VBox/GuestHost/SharedClipboard-x11.h =================================================================== --- /trunk/include/VBox/GuestHost/SharedClipboard-x11.h (revision 82479) +++ /trunk/include/VBox/GuestHost/SharedClipboard-x11.h (revision 82480) @@ -54,8 +54,4 @@ /** Defines an index of the X11 clipboad format table. */ typedef unsigned SHCLX11FMTIDX; - -/** Prototype for the implementation-specfic Shared Clipboard context. */ -struct _SHCLCONTEXT; -typedef SHCLCONTEXT _SHCLCONTEXT; /** Index: /trunk/include/VBox/GuestHost/SharedClipboard.h =================================================================== --- /trunk/include/VBox/GuestHost/SharedClipboard.h (revision 82479) +++ /trunk/include/VBox/GuestHost/SharedClipboard.h (revision 82480) @@ -30,12 +30,11 @@ #endif -#include +#include #include -#include - -/** - * Enumeration specifying an Shared Clipboard transfer direction. - */ -typedef enum _SHCLTRANSFERDIR + +/** + * Shared Clipboard transfer direction. + */ +typedef enum SHCLTRANSFERDIR { /** Unknown transfer directory. */ @@ -47,8 +46,8 @@ /** The usual 32-bit hack. */ SHCLTRANSFERDIR_32BIT_HACK = 0x7fffffff -} SHCLTRANSFERDIR, *PSHCLTRANSFERDIR; - -struct _SHCLTRANSFER; -typedef struct _SHCLTRANSFER SHCLTRANSFER; +} SHCLTRANSFERDIR; +/** Pointer to a shared clipboard transfer direction. */ +typedef SHCLTRANSFERDIR *PSHCLTRANSFERDIR; + /** A single Shared Clipboard format. */ @@ -62,6 +61,7 @@ typedef SHCLFORMATS *PSHCLFORMATS; -/** - * Supported data formats for Shared Clipboard. Bit mask. +/** @name VBOX_SHCL_FMT_XXX - Data formats (flags) for Shared Clipboard. + * @todo r=bird: Wrong header, belongs in the host service! + * @{ */ /** No format set. */ @@ -75,24 +75,27 @@ #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS /** Shared Clipboard format is a transfer list. */ -#define VBOX_SHCL_FMT_URI_LIST RT_BIT(3) +# define VBOX_SHCL_FMT_URI_LIST RT_BIT(3) #endif - -/** - * Structure for keeping a generic Shared Clipboard data block. - */ -typedef struct _SHCLDATABLOCK +/** @} */ + +/** + * Generic Shared Clipboard data block. + */ +typedef struct SHCLDATABLOCK { /** Clipboard format this data block represents. */ SHCLFORMAT uFormat; + /** Size (in bytes) of actual data block. */ + uint32_t cbData; /** Pointer to actual data block. */ void *pvData; - /** Size (in bytes) of actual data block. */ - uint32_t cbData; -} SHCLDATABLOCK, *PSHCLDATABLOCK; - -/** - * Structure for keeping a Shared Clipboard data read request. - */ -typedef struct _SHCLDATAREQ +} SHCLDATABLOCK; +/** Pointer to a generic shared clipboard data block. */ +typedef SHCLDATABLOCK *PSHCLDATABLOCK; + +/** + * Shared Clipboard data read request. + */ +typedef struct SHCLDATAREQ { /** In which format the data needs to be sent. */ @@ -102,10 +105,12 @@ /** Maximum data (in byte) can be sent. */ uint32_t cbSize; -} SHCLDATAREQ, *PSHCLDATAREQ; - -/** - * Structure for keeping Shared Clipboard formats specifications. - */ -typedef struct _SHCLFORMATDATA +} SHCLDATAREQ; +/** Pointer to a shared clipboard data request. */ +typedef SHCLDATAREQ *PSHCLDATAREQ; + +/** + * Shared Clipboard formats specification. + */ +typedef struct SHCLFORMATDATA { /** Available format(s) as bit map. */ @@ -113,10 +118,12 @@ /** Formats flags. Currently unused. */ uint32_t fFlags; -} SHCLFORMATDATA, *PSHCLFORMATDATA; - -/** - * Structure for an (optional) Shared Clipboard event payload. - */ -typedef struct _SHCLEVENTPAYLOAD +} SHCLFORMATDATA; +/** Pointer to a shared clipboard formats specification. */ +typedef SHCLFORMATDATA *PSHCLFORMATDATA; + +/** + * Shared Clipboard event payload (optional). + */ +typedef struct SHCLEVENTPAYLOAD { /** Payload ID; currently unused. */ @@ -126,36 +133,37 @@ /** Pointer to actual payload data. */ void *pvData; -} SHCLEVENTPAYLOAD, *PSHCLEVENTPAYLOAD; - -/** Defines an event source ID. */ +} SHCLEVENTPAYLOAD; +/** Pointer to a shared clipboard event payload. */ +typedef SHCLEVENTPAYLOAD *PSHCLEVENTPAYLOAD; + +/** A shared clipboard event source ID. */ typedef uint16_t SHCLEVENTSOURCEID; -/** Defines a pointer to a event source ID. */ +/** Pointer to a shared clipboard event source ID. */ typedef SHCLEVENTSOURCEID *PSHCLEVENTSOURCEID; -/** Defines a session ID. */ -typedef uint16_t SHCLSESSIONID; -/** Defines a pointer to a session ID. */ -typedef SHCLSESSIONID *PSHCLSESSIONID; -/** Defines a NIL session ID. */ +/** A shared clipboard session ID. */ +typedef uint16_t SHCLSESSIONID; +/** Pointer to a shared clipboard session ID. */ +typedef SHCLSESSIONID *PSHCLSESSIONID; +/** NIL shared clipboard session ID. */ #define NIL_SHCLSESSIONID UINT16_MAX -/** Defines a transfer ID. */ -typedef uint16_t SHCLTRANSFERID; -/** Defines a pointer to a transfer ID. */ +/** A shared clipboard transfer ID. */ +typedef uint16_t SHCLTRANSFERID; +/** Pointer to a shared clipboard transfer ID. */ typedef SHCLTRANSFERID *PSHCLTRANSFERID; -/** Defines a NIL transfer ID. */ +/** NIL shared clipboardtransfer ID. */ #define NIL_SHCLTRANSFERID UINT16_MAX -/** Defines an event ID. */ -typedef uint32_t SHCLEVENTID; -/** Defines a pointer to a event source ID. */ -typedef SHCLEVENTID *PSHCLEVENTID; -/** Defines a NIL event ID. */ +/** A shared clipboard event ID. */ +typedef uint32_t SHCLEVENTID; +/** Pointer to a shared clipboard event source ID. */ +typedef SHCLEVENTID *PSHCLEVENTID; +/** NIL shared clipboard event ID. */ #define NIL_SHCLEVENTID UINT32_MAX /** Maximum number of concurrent Shared Clipboard client sessions a VM can have. */ #define VBOX_SHCL_MAX_SESSIONS (UINT16_MAX - 1) -/** Maximum number of concurrent Shared Clipboard transfers a single - * client can have. */ +/** Maximum number of concurrent Shared Clipboard transfers a single client can have. */ #define VBOX_SHCL_MAX_TRANSFERS (UINT16_MAX - 1) /** Maximum number of events a single Shared Clipboard transfer can have. */ @@ -163,5 +171,5 @@ /** - * Creates a context ID out of a client ID, a transfer ID and a count (can be an event ID). + * Creates a context ID out of a client ID, a transfer ID and an event ID (count). */ #define VBOX_SHCL_CONTEXTID_MAKE(a_idSession, a_idTransfer, a_idEvent) \ @@ -182,15 +190,17 @@ * Shared Clipboard event. */ -typedef struct _SHCLEVENT +typedef struct SHCLEVENT { /** List node. */ - RTLISTNODE Node; + RTLISTNODE Node; /** The event's ID, for self-reference. */ - SHCLEVENTID uID; + SHCLEVENTID uID; /** Event semaphore for signalling the event. */ - RTSEMEVENT hEventSem; - /** Payload to this event. Optional and can be NULL. */ - PSHCLEVENTPAYLOAD pPayload; -} SHCLEVENT, *PSHCLEVENT; + RTSEMEVENT hEventSem; + /** Payload to this event, optional (NULL). */ + PSHCLEVENTPAYLOAD pPayload; +} SHCLEVENT; +/** Pointer to a shared clipboard event. */ +typedef SHCLEVENT *PSHCLEVENT; /** @@ -208,5 +218,7 @@ /** List of events (PSHCLEVENT). */ RTLISTANCHOR lstEvents; -} SHCLEVENTSOURCE, *PSHCLEVENTSOURCE; +} SHCLEVENTSOURCE; +/** Pointer to a shared clipboard event source. */ +typedef SHCLEVENTSOURCE *PSHCLEVENTSOURCE; /** @name Shared Clipboard data payload functions. @@ -252,13 +264,17 @@ } SHCLSOURCE; -/** Opaque data structure for the X11/VBox frontend/glue code. */ -struct _SHCLCONTEXT; -typedef struct _SHCLCONTEXT SHCLCONTEXT; -typedef struct _SHCLCONTEXT *PSHCLCONTEXT; +/** Opaque data structure for the X11/VBox frontend/glue code. + * @{ */ +struct SHCLCONTEXT; +typedef struct SHCLCONTEXT SHCLCONTEXT; +/** @} */ +/** Pointer to opaque data structure the X11/VBox frontend/glue code. */ +typedef SHCLCONTEXT *PSHCLCONTEXT; /** Opaque request structure for X11 clipboard data. - * @todo All use of single and double underscore prefixes is banned! */ -struct _CLIPREADCBREQ; -typedef struct _CLIPREADCBREQ CLIPREADCBREQ; + * @{ */ +struct CLIPREADCBREQ; +typedef struct CLIPREADCBREQ CLIPREADCBREQ; +/** @} */ #endif /* !VBOX_INCLUDED_GuestHost_SharedClipboard_h */ Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (revision 82479) +++ /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (revision 82480) @@ -51,6 +51,5 @@ * Structures and Typedefs * *********************************************************************************************************************************/ - -typedef struct _SHCLCONTEXT +struct SHCLCONTEXT { /** Pointer to the VBoxClient service environment. */ @@ -70,5 +69,5 @@ SHCLTRANSFERCTX TransferCtx; #endif -} SHCLCONTEXT, *PSHCLCONTEXT; +}; @@ -579,5 +578,8 @@ 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,5 +601,8 @@ 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,5 +628,8 @@ 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); Index: /trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp =================================================================== --- /trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp (revision 82479) +++ /trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp (revision 82480) @@ -59,5 +59,5 @@ * Global clipboard context information. */ -struct _SHCLCONTEXT +struct SHCLCONTEXT { /** Client command context */ @@ -166,5 +166,5 @@ * it can be completed correctly. */ -struct _CLIPREADCBREQ +struct CLIPREADCBREQ { /** The data format that was requested. */ Index: /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-darwin.cpp =================================================================== --- /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-darwin.cpp (revision 82479) +++ /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-darwin.cpp (revision 82480) @@ -35,5 +35,5 @@ *********************************************************************************************************************************/ /** Global clipboard context information */ -struct _SHCLCONTEXT +struct SHCLCONTEXT { /** We have a separate thread to poll for new clipboard content */ Index: /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp =================================================================== --- /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (revision 82479) +++ /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (revision 82480) @@ -55,5 +55,5 @@ static int vboxClipboardSvcWinSyncInternal(PSHCLCONTEXT pCtx); -struct _SHCLCONTEXT +struct SHCLCONTEXT { /** Handle for window message handling thread. */ Index: /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp =================================================================== --- /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (revision 82479) +++ /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (revision 82480) @@ -39,9 +39,8 @@ * 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,5 +163,5 @@ /** Structure describing a request for clipoard data from the guest. */ -struct _CLIPREADCBREQ +struct CLIPREADCBREQ { /** User-supplied data pointer, based on the request type. */