diff --git a/reactos/lib/advapi32/advapi32.def b/reactos/lib/advapi32/advapi32.def index 7d1485818af..bb8151504f6 100644 --- a/reactos/lib/advapi32/advapi32.def +++ b/reactos/lib/advapi32/advapi32.def @@ -1,4 +1,4 @@ -; $Id: advapi32.def,v 1.26 2004/12/11 00:21:33 weiden Exp $ +; $Id: advapi32.def,v 1.27 2004/12/13 19:06:27 weiden Exp $ ; ; advapi32.def ; @@ -122,6 +122,7 @@ EnumServicesStatusW@32 EqualPrefixSid@8 EqualSid@8 FindFirstFreeAce@8 +FreeInheritedFromArray@12 FreeSid@4 GetAce@12 GetAclInformation@16 @@ -143,6 +144,8 @@ GetCurrentHwProfileW@4 ;GetExplicitEntriesFromAclW@12 GetFileSecurityA@20 GetFileSecurityW@20 +GetInheritanceSourceA@40 +GetInheritanceSourceW@40 GetKernelObjectSecurity@20 GetLengthSid@4 ;GetMultipleTrusteeA@4 @@ -376,7 +379,7 @@ SetSecurityDescriptorDacl@16 SetSecurityDescriptorGroup@12 SetSecurityDescriptorOwner@12 SetSecurityDescriptorSacl@16 -;SetSecurityInfo@28 +SetSecurityInfo@28 SetServiceBits@16 SetServiceObjectSecurity@12 SetServiceStatus@8 diff --git a/reactos/lib/advapi32/sec/ac.c b/reactos/lib/advapi32/sec/ac.c index 181a1c29bf3..7f81d983c93 100644 --- a/reactos/lib/advapi32/sec/ac.c +++ b/reactos/lib/advapi32/sec/ac.c @@ -1,4 +1,4 @@ -/* $Id: ac.c,v 1.11 2004/09/13 12:14:11 ekohl Exp $ +/* $Id: ac.c,v 1.12 2004/12/13 19:06:28 weiden Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -8,6 +8,8 @@ #include "advapi32.h" +#define NDEBUG +#include /* --- ACL --- */ @@ -375,4 +377,66 @@ GetAce ( return TRUE; } + +/* + * @unimplemented + */ +DWORD +STDCALL +GetInheritanceSourceW ( + LPWSTR pObjectName, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + BOOL Container, + GUID** pObjectClassGuids OPTIONAL, + DWORD GuidCount, + PACL pAcl, + PFN_OBJECT_MGR_FUNCTS pfnArray OPTIONAL, + PGENERIC_MAPPING pGenericMapping, + PINHERITED_FROMW pInheritArray + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +DWORD +STDCALL +GetInheritanceSourceA ( + LPSTR pObjectName, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + BOOL Container, + GUID** pObjectClassGuids OPTIONAL, + DWORD GuidCount, + PACL pAcl, + PFN_OBJECT_MGR_FUNCTS pfnArray OPTIONAL, + PGENERIC_MAPPING pGenericMapping, + PINHERITED_FROM pInheritArray + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +DWORD +STDCALL +FreeInheritedFromArray ( + PINHERITED_FROM pInheritArray, + USHORT AceCnt, + PFN_OBJECT_MGR_FUNCTS pfnArray OPTIONAL + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /* EOF */ diff --git a/reactos/lib/advapi32/sec/misc.c b/reactos/lib/advapi32/sec/misc.c index 30898bd8de9..030a6de4a5f 100644 --- a/reactos/lib/advapi32/sec/misc.c +++ b/reactos/lib/advapi32/sec/misc.c @@ -1,4 +1,4 @@ -/* $Id: misc.c,v 1.29 2004/12/13 07:09:56 royce Exp $ +/* $Id: misc.c,v 1.30 2004/12/13 19:06:28 weiden Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -541,14 +541,14 @@ GetUserNameW ( LPWSTR lpszName, LPDWORD lpSize ) if ( dwLastError != ERROR_NO_TOKEN && dwLastError != ERROR_NO_IMPERSONATION_TOKEN ) { - // don't call SetLastError(), - // as OpenThreadToken() ought to have set one + /* don't call SetLastError(), + as OpenThreadToken() ought to have set one */ return FALSE; } if ( !OpenProcessToken ( GetCurrentProcess(), TOKEN_QUERY, &hToken ) ) { - // don't call SetLastError(), - // as OpenProcessToken() ought to have set one + /* don't call SetLastError(), + as OpenProcessToken() ought to have set one */ return FALSE; } } @@ -569,8 +569,8 @@ GetUserNameW ( LPWSTR lpszName, LPDWORD lpSize ) } if ( !GetTokenInformation ( hToken, TokenUser, tu_buf, tu_len, &tu_len ) ) { - // don't call SetLastError(), - // as GetTokenInformation() ought to have set one + /* don't call SetLastError(), + as GetTokenInformation() ought to have set one */ LocalFree ( tu_buf ); CloseHandle ( hToken ); return FALSE; @@ -603,8 +603,8 @@ GetUserNameW ( LPWSTR lpszName, LPDWORD lpSize ) } if ( !LookupAccountSidW ( NULL, token_user->User.Sid, lpszName, &an_len, domain_name, &dn_len, &snu ) ) { - // don't call SetLastError(), - // as LookupAccountSid() ought to have set one + /* don't call SetLastError(), + as LookupAccountSid() ought to have set one */ LocalFree ( domain_name ); CloseHandle ( hToken ); return FALSE; @@ -1023,6 +1023,25 @@ GetSecurityInfo(HANDLE handle, } +/********************************************************************** + * SetSecurityInfo EXPORTED + * + * @unimplemented + */ +DWORD +WINAPI +SetSecurityInfo(HANDLE handle, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSID psidOwner, + PSID psidGroup, + PACL pDacl, + PACL pSacl) +{ + DPRINT1("SetSecurityInfo: stub\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /****************************************************************************** * GetSecurityInfoExW EXPORTED