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.

4 files changed, 62 insertions, 3 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 935a0dee5..aef13d1d6 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,16 @@
+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.
+
 2006-03-15  Christopher Faylor  <cgf@timesys.com>
 
 	* include/winbase.h (STATUS_DLL_INIT_FAILED): New define.
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
diff --git a/winsup/w32api/lib/wtsapi32.def b/winsup/w32api/lib/wtsapi32.def
new file mode 100755
index 000000000..4595efeda
--- /dev/null
+++ b/winsup/w32api/lib/wtsapi32.def
@@ -0,0 +1,36 @@
+LIBRARY wtsapi32.dll
+EXPORTS
+WTSCloseServer@4
+WTSDisconnectSession@12
+WTSEnumerateProcessesA@20
+WTSEnumerateProcessesW@20
+WTSEnumerateServersA@20
+WTSEnumerateServersW@20
+WTSEnumerateSessionsA@20
+WTSEnumerateSessionsW@20
+WTSFreeMemory@4
+WTSGetActiveConsoleSessionId@0
+WTSLogoffSession@12
+WTSOpenServerA@4
+WTSOpenServerW@4
+WTSQuerySessionInformationA@20
+WTSQuerySessionInformationW@20
+WTSQueryUserConfigA@20
+WTSQueryUserConfigW@20
+WTSQueryUserToken@8
+WTSRegisterSessionNotification@8
+WTSSendMessageA@40
+WTSSendMessageW@40
+WTSSetUserConfigA@20
+WTSSetUserConfigW@20
+WTSShutdownSystem@8
+WTSTerminateProcess@12
+WTSUnRegisterSessionNotification@4
+WTSVirtualChannelClose@4
+WTSVirtualChannelOpen@12
+WTSVirtualChannelPurgeInput@4
+WTSVirtualChannelPurgeOutput@4
+WTSVirtualChannelQuery@16
+WTSVirtualChannelRead@20
+WTSVirtualChannelWrite@16	
+WTSWaitSystemEvent@12