drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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.
This commit is contained in:
Danny Smith 2003-09-30 07:51:26 +00:00
parent 684f94e305
commit 4d36c543ea
3 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/w32api/ChangeLog
View File

@ -1,3 +1,13 @@
2003-09-30 Danny Smith <dannysmith@users.sourceforge.net>
* 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.
2003-09-30 Dimitri Papadopoulos <papadopo@users.sourceforge.net> 2003-09-30 Dimitri Papadopoulos <papadopo@users.sourceforge.net>
* include/dhcpcsvc.h: New file. * include/dhcpcsvc.h: New file.
@ -24,6 +34,7 @@
* lib/user32.def (GetRawInputDeviceInfo[AW]): Ooops... there * lib/user32.def (GetRawInputDeviceInfo[AW]): Ooops... there
are ANSI/Unicode versions of this function. are ANSI/Unicode versions of this function.
>>>>>>> 1.469
2003-09-29 Dimitri Papadopoulos <papadopo@users.sourceforge.net> 2003-09-29 Dimitri Papadopoulos <papadopo@users.sourceforge.net>
* include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_TYPEMOUSE, * include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_TYPEMOUSE,

36
winsup/w32api/include/dbt.h
View File

@ -39,18 +39,30 @@ extern "C" {
#define DBT_USERDEFINED 0xFFFF #define DBT_USERDEFINED 0xFFFF
#define DBTF_MEDIA 1 #define DBTF_MEDIA 1
#define DBTF_NET 2 #define DBTF_NET 2
#define BSM_ALLCOMPONENTS 0
#define BSM_VXDS 1 /* Also defined in winuser.h */
#define BSM_NETDRIVER 2 #define BSM_ALLCOMPONENTS 0
#define BSM_INSTALLABLEDRIVERS 4 #define BSM_APPLICATIONS 8
#define BSM_APPLICATIONS 8 #define BSM_ALLDESKTOPS 16
#define BSF_QUERY 1 #define BSM_INSTALLABLEDRIVERS 4
#define BSF_IGNORECURRENTTASK 2 #define BSM_NETDRIVER 2
#define BSF_FLUSHDISK 4 #define BSM_VXDS 1
#define BSF_NOHANG 8 #define BSF_FLUSHDISK 0x00000004
#define BSF_POSTMESSAGE 16 #define BSF_FORCEIFHUNG 0x00000020
#define BSF_FORCEIFHUNG 32 #define BSF_IGNORECURRENTTASK 0x00000002
#define BSF_NOTIMEOUTIFNOTHUNG 64 #define BSF_NOHANG 0x00000008
#define BSF_NOTIMEOUTIFNOTHUNG 0x00000040
#define BSF_POSTMESSAGE 0x00000010
#define BSF_QUERY 0x00000001
#if (_WIN32_WINNT >= 0x0500)
#define BSF_ALLOWSFW 0x00000080
#define BSF_SENDNOTIFYMESSAGE 0x00000100
#endif /* (_WIN32_WINNT >= 0x0500) */
#if (_WIN32_WINNT >= 0x0501)
#define BSF_LUID 0x00000400
#define BSF_RETURNHDESK 0x00000200
#endif /* (_WIN32_WINNT >= 0x0501) */
#define BSF_MSGSRV32ISOK_BIT 31 #define BSF_MSGSRV32ISOK_BIT 31
#define BSF_MSGSRV32ISOK 0x80000000 #define BSF_MSGSRV32ISOK 0x80000000

19
winsup/w32api/include/winuser.h
View File

@ -116,6 +116,14 @@ extern "C" {
#define MF_USECHECKBITMAPS 512 #define MF_USECHECKBITMAPS 512
#define MF_UNHILITE 0 #define MF_UNHILITE 0
#define MF_HILITE 128 #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_FLUSHDISK 0x00000004
#define BSF_FORCEIFHUNG 0x00000020 #define BSF_FORCEIFHUNG 0x00000020
#define BSF_IGNORECURRENTTASK 0x00000002 #define BSF_IGNORECURRENTTASK 0x00000002
@ -131,12 +139,7 @@ extern "C" {
#define BSF_LUID 0x00000400 #define BSF_LUID 0x00000400
#define BSF_RETURNHDESK 0x00000200 #define BSF_RETURNHDESK 0x00000200
#endif /* (_WIN32_WINNT >= 0x0501) */ #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 BROADCAST_QUERY_DENY 1112363332
#define ENUM_CURRENT_SETTINGS ((DWORD)-1) #define ENUM_CURRENT_SETTINGS ((DWORD)-1)
#define ENUM_REGISTRY_SETTINGS ((DWORD)-2) #define ENUM_REGISTRY_SETTINGS ((DWORD)-2)
@ -2967,7 +2970,7 @@ typedef struct tagRAWMOUSE {
USHORT usFlags; USHORT usFlags;
_ANONYMOUS_UNION union { _ANONYMOUS_UNION union {
ULONG ulButtons; ULONG ulButtons;
struct { _ANONYMOUS_STRUCT struct {
USHORT usButtonFlags; USHORT usButtonFlags;
USHORT usButtonData; USHORT usButtonData;
}; };
@ -2992,7 +2995,7 @@ typedef struct tagRAWHID {
} RAWHID,*PRAWHID,*LPRAWHID; } RAWHID,*PRAWHID,*LPRAWHID;
typedef struct tagRAWINPUT { typedef struct tagRAWINPUT {
RAWINPUTHEADER header; RAWINPUTHEADER header;
_ANONYMOUS_UNION union { union {
RAWMOUSE mouse; RAWMOUSE mouse;
RAWKEYBOARD keyboard; RAWKEYBOARD keyboard;
RAWHID hid; RAWHID hid;