[ros-diffs] [hpoussin] 23502: Add more SID defines

[hpoussin at svn.reactos.org]

Author: hpoussin
Date: Sun Aug  6 22:08:16 2006
New Revision: 23502

URL: http://svn.reactos.org/svn/reactos?rev=23502&view=rev
Log:
Add more SID defines

Modified:
    trunk/reactos/include/psdk/winbase.h
    trunk/reactos/include/psdk/winnt.h

Modified: trunk/reactos/include/psdk/winbase.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev=23502&r1=23501&r2=23502&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winbase.h (original)
+++ trunk/reactos/include/psdk/winbase.h Sun Aug  6 22:08:16 2006
@@ -1225,6 +1225,7 @@
 HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR);
 HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR);
 #if (_WIN32_WINNT >= 0x0501)
+BOOL WINAPI CreateWellKnownSid(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*);
 BOOL WINAPI DeactivateActCtx(DWORD,ULONG_PTR);
 #endif
 BOOL WINAPI DebugActiveProcess(DWORD);
@@ -1679,6 +1680,7 @@
 BOOL WINAPI IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR);
 BOOL WINAPI IsValidSid(PSID);
 #if (_WIN32_WINNT >= 0x0501)
+BOOL WINAPI IsWellKnownSid(PSID,WELL_KNOWN_SID_TYPE);
 BOOL WINAPI IsWow64Process(HANDLE,PBOOL);
 #endif
 void WINAPI LeaveCriticalSection(LPCRITICAL_SECTION);

Modified: trunk/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=23502&r1=23501&r2=23502&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winnt.h (original)
+++ trunk/reactos/include/psdk/winnt.h Sun Aug  6 22:08:16 2006
@@ -479,36 +479,55 @@
  * SID_IDENTIFIER_AUTHORITY aNullSidAuthority = {SECURITY_NULL_SID_AUTHORITY};
  */
 #define SID_MAX_SUB_AUTHORITIES     15
-#define SECURITY_NULL_SID_AUTHORITY	{0,0,0,0,0,0}
-#define SECURITY_WORLD_SID_AUTHORITY	{0,0,0,0,0,1}
-#define SECURITY_LOCAL_SID_AUTHORITY	{0,0,0,0,0,2}
-#define SECURITY_CREATOR_SID_AUTHORITY	{0,0,0,0,0,3}
-#define SECURITY_NON_UNIQUE_AUTHORITY	{0,0,0,0,0,4}
-#define SECURITY_NT_AUTHORITY	{0,0,0,0,0,5}
-#define SECURITY_NULL_RID	0
-#define SECURITY_WORLD_RID	(0x00000000L)
-#define SECURITY_LOCAL_RID	0
-#define SECURITY_CREATOR_OWNER_RID	0
-#define SECURITY_CREATOR_GROUP_RID	1
-#define SECURITY_DIALUP_RID	1
-#define SECURITY_NETWORK_RID	2
-#define SECURITY_BATCH_RID	3
-#define SECURITY_INTERACTIVE_RID	4
-#define SECURITY_LOGON_IDS_RID	5
-#define SECURITY_SERVICE_RID	6
-#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
+
+/* security entities */
+#define SECURITY_NULL_RID			(0x00000000L)
+#define SECURITY_WORLD_RID			(0x00000000L)
+#define SECURITY_LOCAL_RID			(0X00000000L)
+
+#define SECURITY_NULL_SID_AUTHORITY		{0,0,0,0,0,0}
+
+/* S-1-1 */
+#define SECURITY_WORLD_SID_AUTHORITY		{0,0,0,0,0,1}
+
+/* S-1-2 */
+#define SECURITY_LOCAL_SID_AUTHORITY		{0,0,0,0,0,2}
+
+/* S-1-3 */
+#define SECURITY_CREATOR_SID_AUTHORITY		{0,0,0,0,0,3}
+#define SECURITY_CREATOR_OWNER_RID		(0x00000000L)
+#define SECURITY_CREATOR_GROUP_RID		(0x00000001L)
+#define SECURITY_CREATOR_OWNER_SERVER_RID	(0x00000002L)
+#define SECURITY_CREATOR_GROUP_SERVER_RID	(0x00000003L)
+
+/* S-1-4 */
+#define SECURITY_NON_UNIQUE_AUTHORITY		{0,0,0,0,0,4}
+
+/* S-1-5 */
+#define SECURITY_NT_AUTHORITY			{0,0,0,0,0,5}
+#define SECURITY_DIALUP_RID                     0x00000001L
+#define SECURITY_NETWORK_RID                    0x00000002L
+#define SECURITY_BATCH_RID                      0x00000003L
+#define SECURITY_INTERACTIVE_RID                0x00000004L
+#define SECURITY_LOGON_IDS_RID                  0x00000005L
+#define SECURITY_SERVICE_RID                    0x00000006L
+#define SECURITY_ANONYMOUS_LOGON_RID            0x00000007L
+#define SECURITY_PROXY_RID                      0x00000008L
+#define SECURITY_ENTERPRISE_CONTROLLERS_RID     0x00000009L
+#define SECURITY_SERVER_LOGON_RID               SECURITY_ENTERPRISE_CONTROLLERS_RID
+#define SECURITY_PRINCIPAL_SELF_RID             0x0000000AL
+#define SECURITY_AUTHENTICATED_USER_RID         0x0000000BL
+#define SECURITY_RESTRICTED_CODE_RID            0x0000000CL
+#define SECURITY_TERMINAL_SERVER_RID            0x0000000DL
+#define SECURITY_REMOTE_LOGON_RID               0x0000000EL
+#define SECURITY_THIS_ORGANIZATION_RID          0x0000000FL
+#define SECURITY_LOCAL_SYSTEM_RID               0x00000012L
+#define SECURITY_LOCAL_SERVICE_RID              0x00000013L
+#define SECURITY_NETWORK_SERVICE_RID            0x00000014L
+#define SECURITY_NT_NON_UNIQUE                  0x00000015L
+#define SECURITY_BUILTIN_DOMAIN_RID             0x00000020L
+
 #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