[ros-diffs] [weiden] 17990: some Nt vs. Zw fixes

some Nt vs. Zw fixes
Modified: trunk/reactos/include/ndk/zwfuncs.h
Modified: trunk/reactos/lib/rtl/security.c
  _____  

Modified: trunk/reactos/include/ndk/zwfuncs.h
--- trunk/reactos/include/ndk/zwfuncs.h	2005-09-22 21:09:06 UTC (rev
17989)
+++ trunk/reactos/include/ndk/zwfuncs.h	2005-09-22 23:23:00 UTC (rev
17990)
@@ -1090,8 +1090,20 @@

     OUT PHANDLE NewTokenHandle
 );
 
+NTSYSCALLAPI
 NTSTATUS
 NTAPI
+ZwDuplicateToken(
+    IN HANDLE ExistingTokenHandle,
+    IN ACCESS_MASK DesiredAccess,
+    IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,
+    IN BOOLEAN EffectiveOnly,
+    IN TOKEN_TYPE TokenType,
+    OUT PHANDLE NewTokenHandle
+);
+
+NTSTATUS
+NTAPI
 NtEnumerateBootEntries(
     IN ULONG Unknown1,
     IN ULONG Unknown2
  _____  

Modified: trunk/reactos/lib/rtl/security.c
--- trunk/reactos/lib/rtl/security.c	2005-09-22 21:09:06 UTC (rev
17989)
+++ trunk/reactos/lib/rtl/security.c	2005-09-22 23:23:00 UTC (rev
17990)
@@ -29,7 +29,7 @@

 
    PAGED_CODE_RTL();
 
-   Status = NtOpenProcessToken(NtCurrentProcess(),
+   Status = ZwOpenProcessToken(NtCurrentProcess(),
                                TOKEN_DUPLICATE,
                                &ProcessToken);
    if (!NT_SUCCESS(Status))
@@ -53,7 +53,7 @@
 
    ObjAttr.SecurityQualityOfService = &Sqos;
 
-   Status = NtDuplicateToken(ProcessToken,
+   Status = ZwDuplicateToken(ProcessToken,
                              TOKEN_IMPERSONATE,
                              &ObjAttr,
                              Sqos.EffectiveOnly, /* why both here _and_
in Sqos? */
@@ -66,7 +66,7 @@
       return(Status);
    }
 
-   Status = NtSetInformationThread(NtCurrentThread(),
+   Status = ZwSetInformationThread(NtCurrentThread(),
                                    ThreadImpersonationToken,
                                    &ImpersonationToken,
                                    sizeof(HANDLE));
@@ -75,8 +75,8 @@
      DPRINT1("NtSetInformationThread() failed (Status %lx)\n", Status);
    }
 
-   NtClose(ImpersonationToken);
-   NtClose(ProcessToken);
+   ZwClose(ImpersonationToken);
+   ZwClose(ProcessToken);
 
    return(Status);
 }
@@ -103,14 +103,14 @@
 
    if (CurrentThread)
    {
-      Status = NtOpenThreadToken (NtCurrentThread (),
+      Status = ZwOpenThreadToken (NtCurrentThread (),
                                   TOKEN_ADJUST_PRIVILEGES |
TOKEN_QUERY,
                                   FALSE,
                                   &TokenHandle);
    }
    else
    {
-      Status = NtOpenProcessToken (NtCurrentProcess (),
+      Status = ZwOpenProcessToken (NtCurrentProcess (),
                                    TOKEN_ADJUST_PRIVILEGES |
TOKEN_QUERY,
                                    &TokenHandle);
    }
@@ -128,13 +128,13 @@
    NewState.Privileges[0].Luid.HighPart = 0;
    NewState.Privileges[0].Attributes = (Enable) ? SE_PRIVILEGE_ENABLED
: 0;
 
-   Status = NtAdjustPrivilegesToken (TokenHandle,
+   Status = ZwAdjustPrivilegesToken (TokenHandle,
                                      FALSE,
                                      &NewState,
                                      sizeof(TOKEN_PRIVILEGES),
                                      &OldState,
                                      &ReturnLength);
-   NtClose (TokenHandle);
+   ZwClose (TokenHandle);
    if (Status == STATUS_NOT_ALL_ASSIGNED)
    {
       DPRINT1 ("Failed to assign all privileges\n");