2002-06-24 Casper S. Hornstrup <chorns@users.sourceforge.net>

	* include/winnt.h (PCCHAR, FCHAR, FSHORT, FLONG,
	PLUID_AND_ATTRIBUTES,PSECURITY_IMPERSONATION_LEVEL,
	PSID_AND_ATTRIBUTES, PTOKEN_TYPE, PTOKEN_STATISTICS):
	Add typedefs.
	(CCHAR): Correct typedef.
	(PROCESS_SET_SESSIONID, SECURITY_*,SECTION_MAP_EXECUTE):
	Add defines.


	* README.w32api: Correct spelling error.

3 files changed, 36 insertions, 7 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index a47fe4225..fd741aa6a 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,17 @@
+2002-06-24  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* include/winnt.h (PCCHAR, FCHAR, FSHORT, FLONG,
+	PLUID_AND_ATTRIBUTES,PSECURITY_IMPERSONATION_LEVEL,
+	PSID_AND_ATTRIBUTES, PTOKEN_TYPE, PTOKEN_STATISTICS):
+	Add typedefs.
+	(CCHAR): Correct typedef.
+	(PROCESS_SET_SESSIONID, SECURITY_*,SECTION_MAP_EXECUTE):
+	Add defines.
+
+2002-06-24  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* README.w32api: Correct spelling error.
+
 2002-06-19  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
 	* include/winuser.h (FLASHW_*,INPUT_MOUSE,INPUT_KEYBOARD,
diff --git a/winsup/w32api/README.w32api b/winsup/w32api/README.w32api
index 02ca26263..6cf2a6a3c 100644
--- a/winsup/w32api/README.w32api
+++ b/winsup/w32api/README.w32api
@@ -18,7 +18,7 @@
   You may not restrict others freedoms as set forth in the above paragraph.
   You may distribute this library as part of another package or as a
   modified package if and only if you do *not* restrict others freedoms as
-  set forth in the above paragraph as it concerns this pakcage.  You do have
+  set forth in the above paragraph as it concerns this package.  You do have
   the right to restrict uses of any package using this package.
 
   This package is distributed in the hope that it will be useful, but
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 9d628baad..85a8c3a27 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -49,7 +49,7 @@ extern "C" {
 typedef char CHAR;
 typedef short SHORT;
 typedef long LONG;
-typedef CHAR CCHAR;
+typedef char CCHAR, *PCCHAR;
 typedef unsigned char UCHAR,*PUCHAR;
 typedef unsigned short USHORT,*PUSHORT;
 typedef unsigned long ULONG,*PULONG;
@@ -147,6 +147,9 @@ typedef LONGLONG USN;
 #define UNICODE_NULL L'\0'
 typedef BYTE BOOLEAN,*PBOOLEAN;
 #endif
+typedef BYTE FCHAR;
+typedef WORD FSHORT;
+typedef DWORD FLONG;
 
 #define NTAPI __stdcall
 #include <basetsd.h>
@@ -256,6 +259,7 @@ typedef BYTE BOOLEAN,*PBOOLEAN;
 #define DUPLICATE_SAME_ACCESS	2
 #define PROCESS_TERMINATE	1
 #define PROCESS_CREATE_THREAD	2
+#define PROCESS_SET_SESSIONID	4
 #define PROCESS_VM_OPERATION	8
 #define PROCESS_VM_READ	16
 #define PROCESS_VM_WRITE	32
@@ -311,6 +315,16 @@ typedef BYTE BOOLEAN,*PBOOLEAN;
 #define SECURITY_LOCAL_SYSTEM_RID	18
 #define SECURITY_BUILTIN_DOMAIN_RID   32
 #define SECURITY_PRINCIPAL_SELF_RID   10
+#define SECURITY_CREATOR_OWNER_SERVER_RID 0x2
+#define SECURITY_CREATOR_GROUP_SERVER_RID 0x3
+#define SECURITY_LOGON_IDS_RID_COUNT 0x3
+#define SECURITY_ANONYMOUS_LOGON_RID 0x7
+#define SECURITY_PROXY_RID 0x8
+#define SECURITY_ENTERPRISE_CONTROLLERS_RID 0x9
+#define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID
+#define SECURITY_AUTHENTICATED_USER_RID 0xB
+#define SECURITY_RESTRICTED_CODE_RID 0xC
+#define SECURITY_NT_NON_UNIQUE_RID 0x15
 #define SID_REVISION 1
 #define DOMAIN_USER_RID_ADMIN 0x1F4L
 #define DOMAIN_USER_RID_GUEST 0x1F5L
@@ -659,6 +673,7 @@ typedef BYTE BOOLEAN,*PBOOLEAN;
 #define SECTION_MAP_READ 4
 #define SECTION_MAP_WRITE 2
 #define SECTION_QUERY 1
+#define SECTION_MAP_EXECUTE 8
 #define SECTION_ALL_ACCESS 0xf001f
 #define MESSAGE_RESOURCE_UNICODE 1
 #define RTL_CRITSECT_TYPE 0
@@ -1785,7 +1800,7 @@ typedef LARGE_INTEGER LUID,*PLUID;
 typedef struct _LUID_AND_ATTRIBUTES {
 	LUID   Luid;
 	DWORD  Attributes;
-} LUID_AND_ATTRIBUTES;
+} LUID_AND_ATTRIBUTES, *PLUID_AND_ATTRIBUTES;
 #pragma pack(pop)
 typedef LUID_AND_ATTRIBUTES LUID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY];
 typedef LUID_AND_ATTRIBUTES_ARRAY *PLUID_AND_ATTRIBUTES_ARRAY;
@@ -1804,7 +1819,7 @@ typedef enum _SECURITY_IMPERSONATION_LEVEL {
 	SecurityIdentification,
 	SecurityImpersonation,
 	SecurityDelegation
-} SECURITY_IMPERSONATION_LEVEL;
+} SECURITY_IMPERSONATION_LEVEL,*PSECURITY_IMPERSONATION_LEVEL;
 typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE,*PSECURITY_CONTEXT_TRACKING_MODE;
 typedef struct _SECURITY_QUALITY_OF_SERVICE {
 	DWORD Length;
@@ -1832,7 +1847,7 @@ typedef struct _SID {
 typedef struct _SID_AND_ATTRIBUTES {
 	PSID Sid;
 	DWORD Attributes;
-} SID_AND_ATTRIBUTES;
+} SID_AND_ATTRIBUTES, *PSID_AND_ATTRIBUTES;
 typedef SID_AND_ATTRIBUTES SID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY];
 typedef SID_AND_ATTRIBUTES_ARRAY *PSID_AND_ATTRIBUTES_ARRAY;
 typedef struct _TOKEN_SOURCE {
@@ -1862,7 +1877,7 @@ typedef struct _TOKEN_PRIVILEGES {
 	DWORD PrivilegeCount;
 	LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY];
 } TOKEN_PRIVILEGES,*PTOKEN_PRIVILEGES,*LPTOKEN_PRIVILEGES;
-typedef enum tagTOKEN_TYPE { TokenPrimary=1,TokenImpersonation }TOKEN_TYPE;
+typedef enum tagTOKEN_TYPE { TokenPrimary=1,TokenImpersonation }TOKEN_TYPE, *PTOKEN_TYPE;
 typedef struct _TOKEN_STATISTICS {
 	LUID TokenId;
 	LUID AuthenticationId;
@@ -1874,7 +1889,7 @@ typedef struct _TOKEN_STATISTICS {
 	DWORD GroupCount;
 	DWORD PrivilegeCount;
 	LUID ModifiedId;
-} TOKEN_STATISTICS;
+} TOKEN_STATISTICS, *PTOKEN_STATISTICS;
 typedef struct _TOKEN_USER {
 	SID_AND_ATTRIBUTES User;
 } TOKEN_USER, *PTOKEN_USER;