commit cdbdab74bdad215eb4fb18670208647c989c63f7
author Juergen Schmied <juergen.schmied@metronet.de> Fri Feb 12 13:44:38 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Feb 12 13:44:38 1999 +0000
tree 8e84adfc89b3e072db74e59d28e5a630b6f12849
parent c95df10ed65efe0709169d3595bcd921fc3b1c0e

Made nt-related types compatible, throw out wine-specific types.

include/winnt.h

diff --git a/include/winnt.h b/include/winnt.h
index 8edbdd1..601c85a 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -317,14 +317,14 @@
 
 typedef struct {
     BYTE Value[6];
-} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY;
+} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY;
 
 typedef struct _SID {
     BYTE Revision;
     BYTE SubAuthorityCount;
     SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
     DWORD SubAuthority[1];
-} SID,*PSID,*LPSID;
+} SID,*PSID;
 
 
 #pragma pack(4)
@@ -400,15 +400,15 @@
 {
     DWORD    LowPart;
     LONG     HighPart;
-} LARGE_INTEGER,*LPLARGE_INTEGER;
+} LARGE_INTEGER,*PLARGE_INTEGER;
 
 typedef struct _ULARGE_INTEGER
 {
     DWORD    LowPart;
     DWORD    HighPart;
-} ULARGE_INTEGER,*LPULARGE_INTEGER;
+} ULARGE_INTEGER,*PULARGE_INTEGER;
 
-typedef LARGE_INTEGER LUID,*LPLUID; /* locally unique ids */
+typedef LARGE_INTEGER LUID,*PLUID; /* locally unique ids */
 
 typedef struct _LUID_AND_ATTRIBUTES {
   LUID   Luid; 
@@ -422,7 +422,7 @@
 typedef struct _TOKEN_PRIVILEGES {
   DWORD PrivilegeCount; 
   LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY]; 
-} TOKEN_PRIVILEGES; 
+} TOKEN_PRIVILEGES, *PTOKEN_PRIVILEGES; 
 
 /*
  * TOKEN_OWNER
@@ -440,9 +440,8 @@
   PSID PrimaryGroup; 
 } TOKEN_PRIMARY_GROUP; 
 
-
 /*
- * ACL (and PACL LPACL?).
+ * ACL 
  */
 
 typedef struct _ACL {
@@ -451,14 +450,14 @@
     WORD AclSize;
     WORD AceCount;
     WORD Sbz2;
-} ACL, *LPACL;
+} ACL, *PACL;
 
 /*
  * TOKEN_DEFAULT_DACL
  */
 
 typedef struct _TOKEN_DEFAULT_DACL { 
-  LPACL DefaultDacl; 
+  PACL DefaultDacl; 
 } TOKEN_DEFAULT_DACL; 
 
 /*
@@ -508,10 +507,6 @@
   LUID  ModifiedId; 
 } TOKEN_STATISTICS; 
 
-
-/* I moved the Language IDs to winnls.h (David Lee Lambert) */
-
-
 /* Access rights */
 
 #define DELETE                     0x00010000