- Add some missing definitions to our NTIFS.h.

svn path=/trunk/; revision=24637

diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h
index 97a5a81..7c8ab8c 100644 (file)
--- a/reactos/include/ddk/ntifs.h
+++ b/reactos/include/ddk/ntifs.h
@@ -4513,6 +4513,70 @@ ZwAllocateVirtualMemory (
     IN ULONG        Protect
 );
 
+NTSTATUS
+NTAPI
+NtAccessCheckByTypeAndAuditAlarm(
+    IN PUNICODE_STRING SubsystemName,
+    IN HANDLE HandleId,
+    IN PUNICODE_STRING ObjectTypeName,
+    IN PUNICODE_STRING ObjectName,
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    IN PSID PrincipalSelfSid,
+    IN ACCESS_MASK DesiredAccess,
+    IN AUDIT_EVENT_TYPE AuditType,
+    IN ULONG Flags,
+    IN POBJECT_TYPE_LIST ObjectTypeList,
+    IN ULONG ObjectTypeLength,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN BOOLEAN ObjectCreation,
+    OUT PACCESS_MASK GrantedAccess,
+    OUT PNTSTATUS AccessStatus,
+    OUT PBOOLEAN GenerateOnClose
+);
+
+NTSTATUS
+NTAPI
+NtAccessCheckByTypeResultListAndAuditAlarm(
+    IN PUNICODE_STRING SubsystemName,
+    IN HANDLE HandleId,
+    IN PUNICODE_STRING ObjectTypeName,
+    IN PUNICODE_STRING ObjectName,
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    IN PSID PrincipalSelfSid,
+    IN ACCESS_MASK DesiredAccess,
+    IN AUDIT_EVENT_TYPE AuditType,
+    IN ULONG Flags,
+    IN POBJECT_TYPE_LIST ObjectTypeList,
+    IN ULONG ObjectTypeLength,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN BOOLEAN ObjectCreation,
+    OUT PACCESS_MASK GrantedAccess,
+    OUT PNTSTATUS AccessStatus,
+    OUT PBOOLEAN GenerateOnClose
+);
+
+NTSTATUS
+NTAPI
+NtAccessCheckByTypeResultListAndAuditAlarmByHandle(
+    IN PUNICODE_STRING SubsystemName,
+    IN HANDLE HandleId,
+    IN HANDLE ClientToken,
+    IN PUNICODE_STRING ObjectTypeName,
+    IN PUNICODE_STRING ObjectName,
+    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
+    IN PSID PrincipalSelfSid,
+    IN ACCESS_MASK DesiredAccess,
+    IN AUDIT_EVENT_TYPE AuditType,
+    IN ULONG Flags,
+    IN POBJECT_TYPE_LIST ObjectTypeList,
+    IN ULONG ObjectTypeLength,
+    IN PGENERIC_MAPPING GenericMapping,
+    IN BOOLEAN ObjectCreation,
+    OUT PACCESS_MASK GrantedAccess,
+    OUT PNTSTATUS AccessStatus,
+    OUT PBOOLEAN GenerateOnClose
+);
+
 NTSYSAPI
 NTSTATUS
 NTAPI
@@ -4644,6 +4708,17 @@ ZwDuplicateToken (
     OUT PHANDLE             NewTokenHandle
 );
 
+NTSTATUS
+NTAPI
+NtFilterToken(
+    IN HANDLE ExistingTokenHandle,
+    IN ULONG Flags,
+    IN PTOKEN_GROUPS SidsToDisable OPTIONAL,
+    IN PTOKEN_PRIVILEGES PrivilegesToDelete OPTIONAL,
+    IN PTOKEN_GROUPS RestrictedSids OPTIONAL,
+    OUT PHANDLE NewTokenHandle
+);
+
 NTSYSAPI
 NTSTATUS
 NTAPI

diff --git a/reactos/include/ndk/sefuncs.h b/reactos/include/ndk/sefuncs.h
index 850b600..a5b9e33 100644 (file)
--- a/reactos/include/ndk/sefuncs.h
+++ b/reactos/include/ndk/sefuncs.h
@@ -103,7 +103,7 @@ NTAPI
 NtAccessCheckByType(
     IN PSECURITY_DESCRIPTOR SecurityDescriptor,
     IN PSID PrincipalSelfSid,
-    IN PTOKEN ClientToken,
+    IN HANDLE ClientToken,
     IN ACCESS_MASK DesiredAccess,
     IN POBJECT_TYPE_LIST ObjectTypeList,
     IN ULONG ObjectTypeLength,
@@ -119,7 +119,7 @@ NTAPI
 NtAccessCheckByTypeResultList(
     IN PSECURITY_DESCRIPTOR SecurityDescriptor,
     IN PSID PrincipalSelfSid,
-    IN PTOKEN ClientToken,
+    IN HANDLE ClientToken,
     IN ACCESS_MASK DesiredAccess,
     IN POBJECT_TYPE_LIST ObjectTypeList,
     IN ULONG ObjectTypeLength,

diff --git a/reactos/ntoskrnl/se/semgr.c b/reactos/ntoskrnl/se/semgr.c
index 4b795e9..d4e863c 100644 (file)
--- a/reactos/ntoskrnl/se/semgr.c
+++ b/reactos/ntoskrnl/se/semgr.c
@@ -1150,7 +1150,7 @@ NTSTATUS
 NTAPI
 NtAccessCheckByType(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
                     IN PSID PrincipalSelfSid,
-                    IN PTOKEN ClientToken,
+                    IN HANDLE ClientToken,
                     IN ACCESS_MASK DesiredAccess,
                     IN POBJECT_TYPE_LIST ObjectTypeList,
                     IN ULONG ObjectTypeLength,
@@ -1164,7 +1164,6 @@ NtAccessCheckByType(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
     return STATUS_NOT_IMPLEMENTED;
 }
 
-
 NTSTATUS
 NTAPI
 NtAccessCheckByTypeAndAuditAlarm(IN PUNICODE_STRING SubsystemName,
@@ -1192,7 +1191,7 @@ NTSTATUS
 NTAPI
 NtAccessCheckByTypeResultList(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
                               IN PSID PrincipalSelfSid,
-                              IN PTOKEN ClientToken,
+                              IN HANDLE ClientToken,
                               IN ACCESS_MASK DesiredAccess,
                               IN POBJECT_TYPE_LIST ObjectTypeList,
                               IN ULONG ObjectTypeLength,
@@ -1233,7 +1232,7 @@ NTSTATUS
 NTAPI
 NtAccessCheckByTypeResultListAndAuditAlarmByHandle(IN PUNICODE_STRING SubsystemName,
                                                    IN HANDLE HandleId,
-                                                   IN PTOKEN ClientToken,
+                                                   IN HANDLE ClientToken,
                                                    IN PUNICODE_STRING ObjectTypeName,
                                                    IN PUNICODE_STRING ObjectName,
                                                    IN PSECURITY_DESCRIPTOR SecurityDescriptor,