[ADVAPI32]

* Move PrivilegeCheck() to security.c.
CORE-8540

svn path=/trunk/; revision=64959

diff --git a/reactos/dll/win32/advapi32/CMakeLists.txt b/reactos/dll/win32/advapi32/CMakeLists.txt
index 3f54573..e54d48c 100644 (file)
--- a/reactos/dll/win32/advapi32/CMakeLists.txt
+++ b/reactos/dll/win32/advapi32/CMakeLists.txt
@@ -37,7 +37,6 @@ list(APPEND SOURCE
     service/rpc.c
     service/scm.c
     service/sctrl.c
-    token/privilege.c
     token/token.c
     wine/cred.c
     wine/crypt.c

diff --git a/reactos/dll/win32/advapi32/token/privilege.c b/reactos/dll/win32/advapi32/token/privilege.c
deleted file mode 100644 (file)
index 2b0762a..0000000
--- a/reactos/dll/win32/advapi32/token/privilege.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS system libraries
- * FILE:            lib/advapi32/token/privilege.c
- * PURPOSE:         advapi32.dll token's privilege handling
- * PROGRAMMER:      E.Aliberti
- * UPDATE HISTORY:
- *     20010317 ea     stubs
- */
-
-#include <advapi32.h>
-
-
-/**********************************************************************
- *     PrivilegeCheck                                  EXPORTED
- *
- * @implemented
- */
-BOOL WINAPI
-PrivilegeCheck(HANDLE ClientToken,
-               PPRIVILEGE_SET RequiredPrivileges,
-               LPBOOL pfResult)
-{
-    BOOLEAN Result;
-    NTSTATUS Status;
-
-    Status = NtPrivilegeCheck(ClientToken,
-                              RequiredPrivileges,
-                              &Result);
-    if (!NT_SUCCESS(Status))
-    {
-        SetLastError(RtlNtStatusToDosError(Status));
-        return FALSE;
-    }
-
-    *pfResult = (BOOL)Result;
-
-    return TRUE;
-}
-
-/* EOF */

diff --git a/reactos/dll/win32/advapi32/wine/security.c b/reactos/dll/win32/advapi32/wine/security.c
index 15a543f..130f6e5 100644 (file)
--- a/reactos/dll/win32/advapi32/wine/security.c
+++ b/reactos/dll/win32/advapi32/wine/security.c
@@ -7,8 +7,7 @@
  * Copyright 2006 Hervé Poussineau
  *
  * PROJECT:         ReactOS system libraries
- * FILE:            dll/win32/advapi32/sec/sid.c
- * PURPOSE:         Security ID functions
+ * FILE:            dll/win32/advapi32/wine/security.c
  */
 
 #include <advapi32.h>
@@ -594,6 +593,33 @@ GetLengthSid(PSID pSid)
     return (DWORD)RtlLengthSid(pSid);
 }
 
+/**********************************************************************
+ *     PrivilegeCheck                                  EXPORTED
+ *
+ * @implemented
+ */
+BOOL WINAPI
+PrivilegeCheck(HANDLE ClientToken,
+               PPRIVILEGE_SET RequiredPrivileges,
+               LPBOOL pfResult)
+{
+    BOOLEAN Result;
+    NTSTATUS Status;
+
+    Status = NtPrivilegeCheck(ClientToken,
+                              RequiredPrivileges,
+                              &Result);
+    if (!NT_SUCCESS(Status))
+    {
+        SetLastError(RtlNtStatusToDosError(Status));
+        return FALSE;
+    }
+
+    *pfResult = (BOOL)Result;
+
+    return TRUE;
+}
+
 /******************************************************************************
  * ParseAclStringFlags
  */