diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-09-30 07:51:26 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-09-30 07:51:26 +0000 |
| commit | 4d36c543ea789f3497833a5b70fd2d6ac8bf1e44 (patch) | |
| tree | d2d10942d65282ac8bb57dae465584bc8925a73a /winsup/w32api/include/winuser.h | |
| parent | 684f94e30521f3da4cf1b80e608406af6cd10053 (diff) | |
| download | cygnal-4d36c543ea789f3497833a5b70fd2d6ac8bf1e44.tar.gz cygnal-4d36c543ea789f3497833a5b70fd2d6ac8bf1e44.tar.bz2 cygnal-4d36c543ea789f3497833a5b70fd2d6ac8bf1e44.zip | |
* include/winuser.h (BSF_*, BSM_*): Sync constants defined in
both winuser.h and dbt.h.
* include/dbt.h (BSF_*, BSM_*): Likewise.
* include/winuser.h (struct tagRAWINPUT): Remove
_ANONYMOUS_UNION tag from named union.
(struct tagRAWMOUSE): Add _ANONYMOUS_STRUCT to nameless struct.
Diffstat (limited to 'winsup/w32api/include/winuser.h')
| -rw-r--r-- | winsup/w32api/include/winuser.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index ff6b32017..358401f2e 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -116,6 +116,14 @@ extern "C" { #define MF_USECHECKBITMAPS 512 #define MF_UNHILITE 0 #define MF_HILITE 128 + +/* Also defined in dbt.h */ +#define BSM_ALLCOMPONENTS 0 +#define BSM_APPLICATIONS 8 +#define BSM_ALLDESKTOPS 16 +#define BSM_INSTALLABLEDRIVERS 4 +#define BSM_NETDRIVER 2 +#define BSM_VXDS 1 #define BSF_FLUSHDISK 0x00000004 #define BSF_FORCEIFHUNG 0x00000020 #define BSF_IGNORECURRENTTASK 0x00000002 @@ -131,12 +139,7 @@ extern "C" { #define BSF_LUID 0x00000400 #define BSF_RETURNHDESK 0x00000200 #endif /* (_WIN32_WINNT >= 0x0501) */ -#define BSM_ALLCOMPONENTS 0 -#define BSM_APPLICATIONS 8 -#define BSM_ALLDESKTOPS 16 -#define BSM_INSTALLABLEDRIVERS 4 -#define BSM_NETDRIVER 2 -#define BSM_VXDS 1 + #define BROADCAST_QUERY_DENY 1112363332 #define ENUM_CURRENT_SETTINGS ((DWORD)-1) #define ENUM_REGISTRY_SETTINGS ((DWORD)-2) @@ -2967,7 +2970,7 @@ typedef struct tagRAWMOUSE { USHORT usFlags; _ANONYMOUS_UNION union { ULONG ulButtons; - struct { + _ANONYMOUS_STRUCT struct { USHORT usButtonFlags; USHORT usButtonData; }; @@ -2992,7 +2995,7 @@ typedef struct tagRAWHID { } RAWHID,*PRAWHID,*LPRAWHID; typedef struct tagRAWINPUT { RAWINPUTHEADER header; - _ANONYMOUS_UNION union { + union { RAWMOUSE mouse; RAWKEYBOARD keyboard; RAWHID hid; |