From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 13 Sep 2004 12:14:55 +0000 (+0000)
Subject: - Implement AddAccessAllowedAceEx, AddAccessDeniedAceEx and AddAuditAccessAceEx.
X-Git-Tag: backups/alex_2gb+hdrtests@12432~329
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=44e52019101a8fd8e6f04f287a9140636471fe1f

- Implement AddAccessAllowedAceEx, AddAccessDeniedAceEx and AddAuditAccessAceEx.
- Add GetCurrentHwProfileW stub.

svn path=/trunk/; revision=10840
---

diff --git a/reactos/lib/advapi32/advapi32.def b/reactos/lib/advapi32/advapi32.def
index 80f3776c1be..af9b0dec4b7 100644
--- a/reactos/lib/advapi32/advapi32.def
+++ b/reactos/lib/advapi32/advapi32.def
@@ -1,4 +1,4 @@
-; $Id: advapi32.def,v 1.21 2004/08/23 21:16:25 gvg Exp $
+; $Id: advapi32.def,v 1.22 2004/09/13 12:14:55 ekohl Exp $
 ;
 ; advapi32.def
 ;
@@ -12,12 +12,12 @@ AccessCheck@32
 AccessCheckAndAuditAlarmA@44
 AccessCheckAndAuditAlarmW@44
 AddAccessAllowedAce@16
-;AddAccessAllowedAceEx@20
+AddAccessAllowedAceEx@20
 AddAccessDeniedAce@16
-;AddAccessDeniedAceEx@20
+AddAccessDeniedAceEx@20
 AddAce@20
 AddAuditAccessAce@24
-;AddAuditAccessAceEx@28
+AddAuditAccessAceEx@28
 AdjustTokenGroups@24
 AdjustTokenPrivileges@24
 AllocateAndInitializeSid@44
@@ -127,7 +127,7 @@ GetAclInformation@16
 ;GetAuditedPermissionsFromSDA
 ;GetAuditedPermissionsFromSDW
 GetCurrentHwProfileA@4
-;GetCurrentHwProfileW@4
+GetCurrentHwProfileW@4
 ;GetEffectiveAccessRightsA
 ;GetEffectiveAccessRightsW
 ;GetEffectiveRightsFromAclA@12
@@ -179,7 +179,7 @@ GetUserNameW@8
 ;I_ScSetServiceBitsA@20
 ;I_ScSetServiceBitsW@20
 ImpersonateLoggedOnUser@4
-;ImpersonateNamedPipeClient@4
+ImpersonateNamedPipeClient@4
 ImpersonateSelf@4
 InitializeAcl@12
 InitializeSecurityDescriptor@8
diff --git a/reactos/lib/advapi32/advapi32.edf b/reactos/lib/advapi32/advapi32.edf
index f08749665ec..5bd405c215b 100644
--- a/reactos/lib/advapi32/advapi32.edf
+++ b/reactos/lib/advapi32/advapi32.edf
@@ -1,4 +1,4 @@
-; $Id: advapi32.edf,v 1.41 2004/08/23 21:16:25 gvg Exp $
+; $Id: advapi32.edf,v 1.42 2004/09/13 12:14:55 ekohl Exp $
 ;
 ; advapi32.edf
 ;
@@ -12,9 +12,12 @@ AccessCheck=AccessCheck@32
 AccessCheckAndAuditAlarmA=AccessCheckAndAuditAlarmA@44
 AccessCheckAndAuditAlarmW=AccessCheckAndAuditAlarmW@44
 AddAccessAllowedAce=AddAccessAllowedAce@16
+AddAccessAllowedAceEx=AddAccessAllowedAceEx@20
 AddAccessDeniedAce=AddAccessDeniedAce@16
+AddAccessDeniedAceEx=AddAccessDeniedAceEx@20
 AddAce=AddAce@20
 AddAuditAccessAce=AddAuditAccessAce@24
+AddAuditAccessAceEx=AddAuditAccessAceEx@28
 AdjustTokenGroups=AdjustTokenGroups@24
 AdjustTokenPrivileges=AdjustTokenPrivileges@24
 AllocateAndInitializeSid=AllocateAndInitializeSid@44
@@ -123,7 +126,7 @@ GetAclInformation=GetAclInformation@16
 ;GetAuditedPermissionsFromSDA
 ;GetAuditedPermissionsFromSDW
 GetCurrentHwProfileA=GetCurrentHwProfileA@4
-;GetCurrentHwProfileW=GetCurrentHwProfileW@4
+GetCurrentHwProfileW=GetCurrentHwProfileW@4
 ;GetEffectiveAccessRightsA
 ;GetEffectiveAccessRightsW
 ;GetEffectiveRightsFromAclA=GetEffectiveRightsFromAclA@12
@@ -175,7 +178,7 @@ GetUserNameW=GetUserNameW@8
 ;I_ScSetServiceBitsA=I_ScSetServiceBitsA@20
 ;I_ScSetServiceBitsW=I_ScSetServiceBitsW@20
 ImpersonateLoggedOnUser=ImpersonateLoggedOnUser@4
-;ImpersonateNamedPipeClient=ImpersonateNamedPipeClient@4
+ImpersonateNamedPipeClient=ImpersonateNamedPipeClient@4
 ImpersonateSelf=ImpersonateSelf@4
 InitializeAcl=InitializeAcl@12
 InitializeSecurityDescriptor=InitializeSecurityDescriptor@8
diff --git a/reactos/lib/advapi32/misc/hwprofiles.c b/reactos/lib/advapi32/misc/hwprofiles.c
index adc5357f43b..76f0ff54a22 100644
--- a/reactos/lib/advapi32/misc/hwprofiles.c
+++ b/reactos/lib/advapi32/misc/hwprofiles.c
@@ -1,8 +1,8 @@
-/* $Id: hwprofiles.c,v 1.3 2004/08/15 17:03:14 chorns Exp $
+/* $Id: hwprofiles.c,v 1.4 2004/09/13 12:13:35 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
- * FILE:            lib/advapi32/misc/sysfun.c
+ * FILE:            lib/advapi32/misc/hwprofiles.c
  * PURPOSE:         advapi32.dll Hardware Functions
  * PROGRAMMER:      Steven Edwards
  * UPDATE HISTORY:
@@ -27,6 +27,14 @@
 BOOL STDCALL
 GetCurrentHwProfileA(LPHW_PROFILE_INFOA pInfo)
 {
-	DPRINT("GetCurrentHwProfileA stub\n");
-	return 1;
+  DPRINT("GetCurrentHwProfileA stub\n");
+  return TRUE;
+}
+
+
+BOOL STDCALL
+GetCurrentHwProfileW(LPHW_PROFILE_INFOW pInfo)
+{
+  DPRINT("GetCurrentHwProfileW stub\n");
+  return TRUE;
 }
diff --git a/reactos/lib/advapi32/sec/ac.c b/reactos/lib/advapi32/sec/ac.c
index 78e6259da9c..181a1c29bf3 100644
--- a/reactos/lib/advapi32/sec/ac.c
+++ b/reactos/lib/advapi32/sec/ac.c
@@ -1,4 +1,4 @@
-/* $Id: ac.c,v 1.10 2004/08/15 17:03:15 chorns Exp $
+/* $Id: ac.c,v 1.11 2004/09/13 12:14:11 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -136,6 +136,33 @@ AddAccessAllowedAce (
 }
 
 
+/*
+ * @implemented
+ */
+BOOL STDCALL
+AddAccessAllowedAceEx(PACL pAcl,
+		      DWORD dwAceRevision,
+		      DWORD AceFlags,
+		      DWORD AccessMask,
+		      PSID pSid)
+{
+  NTSTATUS Status;
+
+  Status = RtlAddAccessAllowedAceEx(pAcl,
+                                    dwAceRevision,
+                                    AceFlags,
+                                    AccessMask,
+                                    pSid);
+  if (!NT_SUCCESS(Status))
+  {
+    SetLastError(RtlNtStatusToDosError(Status));
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+
 /*
  * @implemented
  */
@@ -164,6 +191,33 @@ AddAccessDeniedAce (
 }
 
 
+/*
+ * @implemented
+ */
+BOOL STDCALL
+AddAccessDeniedAceEx(PACL pAcl,
+		     DWORD dwAceRevision,
+		     DWORD AceFlags,
+		     DWORD AccessMask,
+		     PSID pSid)
+{
+  NTSTATUS Status;
+
+  Status = RtlAddAccessDeniedAceEx(pAcl,
+                                   dwAceRevision,
+                                   AceFlags,
+                                   AccessMask,
+                                   pSid);
+  if (!NT_SUCCESS(Status))
+  {
+    SetLastError(RtlNtStatusToDosError(Status));
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+
 /*
  * @implemented
  */
@@ -226,6 +280,37 @@ AddAuditAccessAce (
 }
 
 
+/*
+ * @implemented
+ */
+BOOL STDCALL
+AddAuditAccessAceEx(PACL pAcl,
+		    DWORD dwAceRevision,
+		    DWORD AceFlags,
+		    DWORD dwAccessMask,
+		    PSID pSid,
+		    BOOL bAuditSuccess,
+		    BOOL bAuditFailure)
+{
+  NTSTATUS Status;
+
+  Status = RtlAddAuditAccessAceEx(pAcl,
+                                  dwAceRevision,
+                                  AceFlags,
+                                  dwAccessMask,
+                                  pSid,
+                                  bAuditSuccess,
+                                  bAuditFailure);
+  if (!NT_SUCCESS(Status))
+  {
+    SetLastError(RtlNtStatusToDosError(Status));
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+
 /*
  * @implemented
  */