diff options
author | Danny Smith <dannysmith@users.sourceforge.net> | 2006-03-18 07:02:54 +0300 |
---|---|---|
committer | Danny Smith <dannysmith@users.sourceforge.net> | 2006-03-18 07:02:54 +0300 |
commit | 61337a0f4594e1301011b775a6f9672fc58b4ec0 (patch) | |
tree | ab1537453f474cf9311212392925c51244e4f015 /winsup/w32api/include | |
parent | 9d5cff74aef9f5d359a19aa6e9f8fa910e71781b (diff) |
2006-03-18 Julien Lecomte <julienlecomte@users.sourceforge.net>
* include/wincon.h (ENABLE_*): Add more defines.
2006-03-18 Jan Nijtmans <nijtmans@users.sourceforge.net>
* include/winnt.h (INHERITED_ACE): Define.
(VALID_INHERIT_FLAGS): Correct definition.
2006-03-18 Peter �strand <astrand@cendio.se>
* lib/wtsapi32.def: New file.
Diffstat (limited to 'winsup/w32api/include')
-rw-r--r-- | winsup/w32api/include/wincon.h | 8 | ||||
-rw-r--r-- | winsup/w32api/include/winnt.h | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/winsup/w32api/include/wincon.h b/winsup/w32api/include/wincon.h index a43fe17f9..da6b18b17 100644 --- a/winsup/w32api/include/wincon.h +++ b/winsup/w32api/include/wincon.h @@ -19,7 +19,7 @@ extern "C" { #if (_WIN32_WINNT >= 0x0501) #define CONSOLE_FULLSCREEN_MODE 1 #define CONSOLE_WINDOWED_MODE 2 -#endif +#endif #define CTRL_C_EVENT 0 #define CTRL_BREAK_EVENT 1 #define CTRL_CLOSE_EVENT 2 @@ -30,6 +30,10 @@ extern "C" { #define ENABLE_PROCESSED_INPUT 1 #define ENABLE_WINDOW_INPUT 8 #define ENABLE_MOUSE_INPUT 16 +#define ENABLE_INSERT_MODE 32 +#define ENABLE_QUICK_EDIT_MODE 64 +#define ENABLE_EXTENDED_FLAGS 128 +#define ENABLE_AUTO_POSITION 256 #define ENABLE_PROCESSED_OUTPUT 1 #define ENABLE_WRAP_AT_EOL_OUTPUT 2 #define KEY_EVENT 1 @@ -98,7 +102,7 @@ typedef struct _KEY_EVENT_RECORD { CHAR AsciiChar; } uChar; DWORD dwControlKeyState; -} +} #ifdef __GNUC__ /* gcc's alignment is not what win32 expects */ PACKED diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index d7d8f6cc4..828312fbc 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -211,7 +211,13 @@ typedef DWORD FLONG; #define CONTAINER_INHERIT_ACE 2 #define NO_PROPAGATE_INHERIT_ACE 4 #define INHERIT_ONLY_ACE 8 -#define VALID_INHERIT_FLAGS 16 +#define INHERITED_ACE 16 +#define VALID_INHERIT_FLAGS \ + | OBJECT_INHERIT_ACE \ + | CONTAINER_INHERIT_ACE \ + | NO_PROPAGATE_INHERIT_ACE \ + | INHERIT_ONLY_ACE \ + | INHERITED_ACE #define SUCCESSFUL_ACCESS_ACE_FLAG 64 #define FAILED_ACCESS_ACE_FLAG 128 #define DELETE 0x00010000L |