From 01d699914d19eb64222f5eb0364071f18a1d77d3 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Fri, 22 Aug 2003 11:21:28 +0000 Subject: [PATCH] 2003-08-22 Filip Navara * include/aclapi.h (BuildImpersonateExplicitAccessWithName[AW]): Add prototypes. BuildImpersonateTrustee[AW]): Add prototypes. GetMultipleTrustee[AW]): Add prototypes. GetMultipleTrusteeOperation[AW]): Add prototypes. Add missing changelog entry from last commit. --- winsup/w32api/ChangeLog | 12 ++++++++++++ winsup/w32api/include/aclapi.h | 25 +++++++++++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 368de8d45..5eac565f4 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,15 @@ +2003-08-22 Filip Navara + + * include/aclapi.h (BuildImpersonateExplicitAccessWithName[AW]): + Add prototypes. + BuildImpersonateTrustee[AW]): Add prototypes. + GetMultipleTrustee[AW]): Add prototypes. + GetMultipleTrusteeOperation[AW]): Add prototypes. + +2003-08-22 Danny Smith + + * include/winnt.h (IMAGE_SUBSYSTEM_XBOX): Add define. + 2003-08-22 Mihai Preda * include/shlobj.h (IPersistFolder::GetClassID): diff --git a/winsup/w32api/include/aclapi.h b/winsup/w32api/include/aclapi.h index c8f3c7be1..1d0224086 100644 --- a/winsup/w32api/include/aclapi.h +++ b/winsup/w32api/include/aclapi.h @@ -1,6 +1,6 @@ #ifndef _ACLAPI_H #define _ACLAPI_H -#if __GNUC__ >=3 +#if __GNUC__ >= 3 #pragma GCC system_header #endif @@ -53,13 +53,14 @@ DWORD WINAPI SetEntriesInAclW(ULONG,PEXPLICIT_ACCESS_W,PACL,PACL*); DWORD WINAPI SetNamedSecurityInfoA(LPSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,PSID,PSID,PACL,PACL); DWORD WINAPI SetNamedSecurityInfoW(LPWSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,PSID,PSID,PACL,PACL); DWORD WINAPI SetSecurityInfo(HANDLE,SE_OBJECT_TYPE,SECURITY_INFORMATION,PSID,PSID,PACL,PACL); - -/* These are deprecated by MS and not documented in Aug 2001 PSDK -BuildImpersonateExplicitAccessWithName[AW] -BuildImpersonateTrustee[AW] -GetMultipleTrustee[AW] -GetMultipleTrusteeOperation[AW] -*/ +VOID WINAPI BuildImpersonateExplicitAccessWithNameA(PEXPLICIT_ACCESS_A,LPSTR,PTRUSTEE_A,DWORD,ACCESS_MODE,DWORD); +VOID WINAPI BuildImpersonateExplicitAccessWithNameW(PEXPLICIT_ACCESS_W,LPWSTR,PTRUSTEE_W,DWORD,ACCESS_MODE,DWORD); +VOID WINAPI BuildImpersonateTrusteeA(PTRUSTEE_A,PTRUSTEE_A); +VOID WINAPI BuildImpersonateTrusteeW(PTRUSTEE_W,PTRUSTEE_W); +PTRUSTEE_A WINAPI GetMultipleTrusteeA(PTRUSTEE_A); +PTRUSTEE_W WINAPI GetMultipleTrusteeW(PTRUSTEE_W); +MULTIPLE_TRUSTEE_OPERATION WINAPI GetMultipleTrusteeOperationA(PTRUSTEE_A); +MULTIPLE_TRUSTEE_OPERATION WINAPI GetMultipleTrusteeOperationW(PTRUSTEE_W); #ifdef UNICODE #define BuildExplicitAccessWithName BuildExplicitAccessWithNameW @@ -78,6 +79,10 @@ GetMultipleTrusteeOperation[AW] #define LookupSecurityDescriptorParts LookupSecurityDescriptorPartsW #define SetEntriesInAcl SetEntriesInAclW #define SetNamedSecurityInfo SetNamedSecurityInfoW +#define BuildImpersonateExplicitAccessWithName BuildImpersonateExplicitAccessWithNameW +#define BuildImpersonateTrustee BuildImpersonateTrusteeW +#define GetMultipleTrustee GetMultipleTrusteeW +#define GetMultipleTrusteeOperation GetMultipleTrusteeOperationW #else #define BuildExplicitAccessWithName BuildExplicitAccessWithNameA #define BuildSecurityDescriptor BuildSecurityDescriptorA @@ -95,6 +100,10 @@ GetMultipleTrusteeOperation[AW] #define LookupSecurityDescriptorParts LookupSecurityDescriptorPartsA #define SetEntriesInAcl SetEntriesInAclA #define SetNamedSecurityInfo SetNamedSecurityInfoA +#define BuildImpersonateExplicitAccessWithName BuildImpersonateExplicitAccessWithNameA +#define BuildImpersonateTrustee BuildImpersonateTrusteeA +#define GetMultipleTrustee GetMultipleTrusteeA +#define GetMultipleTrusteeOperation GetMultipleTrusteeOperationA #endif /* UNICODE */ #ifdef __cplusplus