[ros-diffs] [akhaldi] 45962: [NTIFS] - Group related definitions - Add ACCESS_OBJECT_GUID, ACCESS_PROPERTY_SET_GUID, ACCESS_PROPERTY_GUID, ACCESS_MAX_LEVEL, ACCESS_DS_SOURCE_A, ACCESS_DS_SOURCE_W, ACCESS_DS_OBJECT_TYPE_NAME_A, ACCESS_DS_OBJECT_TYPE_NAME_W, ACCESS_REASON_TYPE_MASK, ACCESS_REASON_DATA_MASK, _ACCESS_REASON_TYPE, ACCESS_REASON, _ACCESS_REASONS, SE_SECURITY_DESCRIPTOR_FLAG_NO_OWNER_ACE, SE_SECURITY_DESCRIPTOR_FLAG_NO_LABEL_ACE and SE_SECURITY_DESCRIPTOR_VALID_FLAGS - Remove _AUDIT_EVENT_TYPE_HAC

Author: akhaldi
Date: Sat Mar  6 20:26:30 2010
New Revision: 45962

URL: http://svn.reactos.org/svn/reactos?rev=45962&view=rev
Log:
[NTIFS]
- Group related definitions
- Add ACCESS_OBJECT_GUID, ACCESS_PROPERTY_SET_GUID, ACCESS_PROPERTY_GUID, ACCESS_MAX_LEVEL, ACCESS_DS_SOURCE_A, ACCESS_DS_SOURCE_W, ACCESS_DS_OBJECT_TYPE_NAME_A, ACCESS_DS_OBJECT_TYPE_NAME_W, ACCESS_REASON_TYPE_MASK, ACCESS_REASON_DATA_MASK, _ACCESS_REASON_TYPE, ACCESS_REASON, _ACCESS_REASONS, SE_SECURITY_DESCRIPTOR_FLAG_NO_OWNER_ACE, SE_SECURITY_DESCRIPTOR_FLAG_NO_LABEL_ACE and SE_SECURITY_DESCRIPTOR_VALID_FLAGS
- Remove _AUDIT_EVENT_TYPE_HACK == 0 condition around _AUDIT_EVENT_TYPE

Modified:
    branches/header-work/include/ddk/ntifs.h

Modified: branches/header-work/include/ddk/ntifs.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h?...
==============================================================================
--- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Sat Mar  6 20:26:30 2010
@@ -417,6 +417,34 @@
   ULONG Dacl;
 } SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE;

+typedef struct _SECURITY_DESCRIPTOR {
+  UCHAR Revision;
+  UCHAR Sbz1;
+  SECURITY_DESCRIPTOR_CONTROL Control;
+  PSID Owner;
+  PSID Group;
+  PACL Sacl;
+  PACL Dacl;
+} SECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR;
+
+typedef struct _OBJECT_TYPE_LIST {
+  USHORT Level;
+  USHORT Sbz;
+  GUID *ObjectType;
+} OBJECT_TYPE_LIST, *POBJECT_TYPE_LIST;
+
+#define ACCESS_OBJECT_GUID       0
+#define ACCESS_PROPERTY_SET_GUID 1
+#define ACCESS_PROPERTY_GUID     2
+#define ACCESS_MAX_LEVEL         4
+
+typedef enum _AUDIT_EVENT_TYPE {
+  AuditEventObjectAccess,
+  AuditEventDirectoryServiceAccess
+} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE;
+
+#define AUDIT_ALLOW_NO_PRIVILEGE 0x1
+
 #pragma pack(push,4)

#ifndef VER_PRODUCTBUILD
@@ -753,21 +781,6 @@

#define VACB_MAPPING_GRANULARITY        (0x40000)
 #define VACB_OFFSET_SHIFT               (18)
-
-#ifndef _WINNT_H
-#define _AUDIT_EVENT_TYPE_HACK 0
-#endif
-#if (_AUDIT_EVENT_TYPE_HACK == 1)
-
-#else
-typedef enum _AUDIT_EVENT_TYPE
-{
-    AuditEventObjectAccess,
-    AuditEventDirectoryServiceAccess
-} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE;
-#endif
-
-#define AUDIT_ALLOW_NO_PRIVILEGE 0x1

#define FSCTL_REQUEST_OPLOCK_LEVEL_1    CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  0, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define FSCTL_REQUEST_OPLOCK_LEVEL_2    CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  1, METHOD_BUFFERED, FILE_ANY_ACCESS)
@@ -1042,22 +1055,6 @@
    SID_AND_ATTRIBUTES User;
 } TOKEN_USER, *PTOKEN_USER;

-typedef struct _SECURITY_DESCRIPTOR {
-	UCHAR Revision;
-	UCHAR Sbz1;
-	SECURITY_DESCRIPTOR_CONTROL Control;
-	PSID Owner;
-	PSID Group;
-	PACL Sacl;
-	PACL Dacl;
-} SECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR;
-
-typedef struct _OBJECT_TYPE_LIST {
-    USHORT Level;
-    USHORT Sbz;
-    GUID *ObjectType;
-    } OBJECT_TYPE_LIST, *POBJECT_TYPE_LIST;
-
 typedef enum _TOKEN_INFORMATION_CLASS {
    TokenUser=1,TokenGroups,TokenPrivileges,TokenOwner,
    TokenPrimaryGroup,TokenDefaultDacl,TokenSource,TokenType,