[ros-diffs] [akhaldi] 64989: [ADVAPI32] * Move a couple functions from sec.c to security.c. CORE-8540

Author: akhaldi
Date: Sat Oct 25 17:46:33 2014
New Revision: 64989

URL: http://svn.reactos.org/svn/reactos?rev=64989&view=rev
Log:
[ADVAPI32]
* Move a couple functions from sec.c to security.c.
CORE-8540

Modified:
    trunk/reactos/dll/win32/advapi32/sec/sec.c
    trunk/reactos/dll/win32/advapi32/wine/security.c

Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/sec.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/sec.c	[iso-8859-1] Sat Oct 25 17:46:33 2014
@@ -168,29 +168,6 @@
     return TRUE;
 }
 
-
-/*
- * @implemented
- */
-BOOL
-WINAPI
-InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR pSecurityDescriptor,
-                             DWORD dwRevision)
-{
-    NTSTATUS Status;
-
-    Status = RtlCreateSecurityDescriptor(pSecurityDescriptor,
-                                         dwRevision);
-    if (!NT_SUCCESS(Status))
-    {
-        SetLastError(RtlNtStatusToDosError(Status));
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-
 /*
  * @implemented
  */
@@ -206,47 +183,6 @@
 
     return (BOOL)Result;
 }
-
-
-/*
- * @implemented
- */
-BOOL
-WINAPI
-MakeAbsoluteSD(PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor,
-               PSECURITY_DESCRIPTOR pAbsoluteSecurityDescriptor,
-               LPDWORD lpdwAbsoluteSecurityDescriptorSize,
-               PACL pDacl,
-               LPDWORD lpdwDaclSize,
-               PACL pSacl,
-               LPDWORD lpdwSaclSize,
-               PSID pOwner,
-               LPDWORD lpdwOwnerSize,
-               PSID pPrimaryGroup,
-               LPDWORD lpdwPrimaryGroupSize)
-{
-    NTSTATUS Status;
-
-    Status = RtlSelfRelativeToAbsoluteSD(pSelfRelativeSecurityDescriptor,
-                                         pAbsoluteSecurityDescriptor,
-                                         lpdwAbsoluteSecurityDescriptorSize,
-                                         pDacl,
-                                         lpdwDaclSize,
-                                         pSacl,
-                                         lpdwSaclSize,
-                                         pOwner,
-                                         lpdwOwnerSize,
-                                         pPrimaryGroup,
-                                         lpdwPrimaryGroupSize);
-    if (!NT_SUCCESS(Status))
-    {
-        SetLastError(RtlNtStatusToDosError(Status));
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
 
 /*
  * @implemented

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] Sat Oct 25 17:46:33
2014
@@ -854,6 +854,66 @@
     return (DWORD)RtlLengthSid(pSid);
 }
 
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR pSecurityDescriptor,
+                             DWORD dwRevision)
+{
+    NTSTATUS Status;
+
+    Status = RtlCreateSecurityDescriptor(pSecurityDescriptor,
+                                         dwRevision);
+    if (!NT_SUCCESS(Status))
+    {
+        SetLastError(RtlNtStatusToDosError(Status));
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+MakeAbsoluteSD(PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor,
+               PSECURITY_DESCRIPTOR pAbsoluteSecurityDescriptor,
+               LPDWORD lpdwAbsoluteSecurityDescriptorSize,
+               PACL pDacl,
+               LPDWORD lpdwDaclSize,
+               PACL pSacl,
+               LPDWORD lpdwSaclSize,
+               PSID pOwner,
+               LPDWORD lpdwOwnerSize,
+               PSID pPrimaryGroup,
+               LPDWORD lpdwPrimaryGroupSize)
+{
+    NTSTATUS Status;
+
+    Status = RtlSelfRelativeToAbsoluteSD(pSelfRelativeSecurityDescriptor,
+                                         pAbsoluteSecurityDescriptor,
+                                         lpdwAbsoluteSecurityDescriptorSize,
+                                         pDacl,
+                                         lpdwDaclSize,
+                                         pSacl,
+                                         lpdwSaclSize,
+                                         pOwner,
+                                         lpdwOwnerSize,
+                                         pPrimaryGroup,
+                                         lpdwPrimaryGroupSize);
+    if (!NT_SUCCESS(Status))
+    {
+        SetLastError(RtlNtStatusToDosError(Status));
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
 /******************************************************************************
  * GetKernelObjectSecurity [ADVAPI32.@]
  */