[ros-diffs] [akhaldi] 64959: [ADVAPI32] * Move PrivilegeCheck() to security.c. CORE-8540

Author: akhaldi
Date: Fri Oct 24 15:49:52 2014
New Revision: 64959

URL: http://svn.reactos.org/svn/reactos?rev=64959&view=rev
Log:
[ADVAPI32]
* Move PrivilegeCheck() to security.c.
CORE-8540

Removed:
    trunk/reactos/dll/win32/advapi32/token/privilege.c
Modified:
    trunk/reactos/dll/win32/advapi32/CMakeLists.txt
    trunk/reactos/dll/win32/advapi32/wine/security.c

Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt	[iso-8859-1] Fri Oct 24 15:49:52 2014
@@ -37,7 +37,6 @@
     service/rpc.c
     service/scm.c
     service/sctrl.c
-    token/privilege.c
     token/token.c
     wine/cred.c
     wine/crypt.c

Removed: trunk/reactos/dll/win32/advapi32/token/privilege.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/p…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/token/privilege.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/token/privilege.c	(removed)
@@ -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 */

Modified: trunk/reactos/dll/win32/advapi32/wine/security.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/wine/security.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/wine/security.c	[iso-8859-1] Fri Oct 24 15:49:52
2014
@@ -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 @@
     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
  */