Move security information constants.

svn path=/trunk/; revision=10258

diff --git a/reactos/include/defines.h b/reactos/include/defines.h
index e9602eb..ebf0f63 100644 (file)
--- a/reactos/include/defines.h
+++ b/reactos/include/defines.h
@@ -2310,12 +2310,6 @@ extern "C" {
 #define PURGE_TXCLEAR  (4)
 #define PURGE_RXCLEAR  (8)
 
 #define PURGE_TXCLEAR  (4)
 #define PURGE_RXCLEAR  (8)
 

-/* QueryServiceObjectSecurity */
-#define OWNER_SECURITY_INFORMATION     (0x1L)
-#define GROUP_SECURITY_INFORMATION     (0x2L)
-#define DACL_SECURITY_INFORMATION      (0x4L)
-#define SACL_SECURITY_INFORMATION      (0x8L)
-

 /* ReadEventLog, ReportEvent */
 #define EVENTLOG_FORWARDS_READ (4)
 #define EVENTLOG_BACKWARDS_READ        (8)
 /* ReadEventLog, ReportEvent */
 #define EVENTLOG_FORWARDS_READ (4)
 #define EVENTLOG_BACKWARDS_READ        (8)

diff --git a/reactos/include/ntos/security.h b/reactos/include/ntos/security.h
index ea77800..cc1b6d0 100644 (file)
--- a/reactos/include/ntos/security.h
+++ b/reactos/include/ntos/security.h
@@ -122,20 +122,17 @@ typedef struct _SECURITY_DESCRIPTOR_CONTEXT
 #define DOMAIN_ALIAS_RID_REPLICATOR            (0x228L)
 
 /* ACCESS_MASK */
 #define DOMAIN_ALIAS_RID_REPLICATOR            (0x228L)
 
 /* ACCESS_MASK */

-#define MAXIMUM_ALLOWED                        (0x2000000L)
+#define MAXIMUM_ALLOWED                        (0x02000000L)

 #define GENERIC_ALL                    (0x10000000L)
 #define GENERIC_EXECUTE                        (0x20000000L)
 
 #define GENERIC_ALL                    (0x10000000L)
 #define GENERIC_EXECUTE                        (0x20000000L)
 

-#define SECURITY_STATIC_TRACKING       (0)
-#define SECURITY_DYNAMIC_TRACKING      (1)
-

 /* Standard rights */
 /* Standard rights */

-#define STANDARD_RIGHTS_REQUIRED       (0xf0000L)
-#define STANDARD_RIGHTS_WRITE          (0x20000L)
-#define STANDARD_RIGHTS_READ           (0x20000L)
-#define STANDARD_RIGHTS_EXECUTE                (0x20000L)
-#define STANDARD_RIGHTS_ALL            (0x1f0000L)
-#define SPECIFIC_RIGHTS_ALL            (0xffffL)
+#define STANDARD_RIGHTS_REQUIRED       (0x000f0000L)
+#define STANDARD_RIGHTS_WRITE          (0x00020000L)
+#define STANDARD_RIGHTS_READ           (0x00020000L)
+#define STANDARD_RIGHTS_EXECUTE                (0x00020000L)
+#define STANDARD_RIGHTS_ALL            (0x001f0000L)
+#define SPECIFIC_RIGHTS_ALL            (0x0000ffffL)

 
 /* Token rights */
 #define TOKEN_ASSIGN_PRIMARY           (0x0001L)
 
 /* Token rights */
 #define TOKEN_ASSIGN_PRIMARY           (0x0001L)


@@ -154,8 +151,16 @@ typedef struct _SECURITY_DESCRIPTOR_CONTEXT
 
 typedef BOOL SECURITY_CONTEXT_TRACKING_MODE;
 
 
 typedef BOOL SECURITY_CONTEXT_TRACKING_MODE;
 

+#define SECURITY_STATIC_TRACKING       (0)
+#define SECURITY_DYNAMIC_TRACKING      (1)
+

 typedef ULONG SECURITY_INFORMATION, *PSECURITY_INFORMATION;
 
 typedef ULONG SECURITY_INFORMATION, *PSECURITY_INFORMATION;
 

+#define OWNER_SECURITY_INFORMATION     (0x1L)
+#define GROUP_SECURITY_INFORMATION     (0x2L)
+#define DACL_SECURITY_INFORMATION      (0x4L)
+#define SACL_SECURITY_INFORMATION      (0x8L)
+

 typedef enum _TOKEN_INFORMATION_CLASS
 {
   TokenUser = 1,
 typedef enum _TOKEN_INFORMATION_CLASS
 {
   TokenUser = 1,