Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 64985: [NTVDM]: So..... do not overflow the Cycles count, i.e. better estimate the number of instructions per second :)
by hbelusca＠svn.reactos.org 25 Oct '14

25 Oct '14

Author: hbelusca Date: Sat Oct 25 15:36:11 2014 New Revision: 64985 URL: http://svn.reactos.org/svn/reactos?rev=64985&view=rev Log: [NTVDM]: So..... do not overflow the Cycles count, i.e. better estimate the number of instructions per second :) Modified: trunk/reactos/subsystems/ntvdm/clock.c Modified: trunk/reactos/subsystems/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/clock.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/clock.c [iso-8859-1] Sat Oct 25 15:36:11 2014 @@ -56,7 +56,7 @@ #ifdef IPS_DISPLAY DWORD LastCyclePrintout; - DWORD Cycles = 0; + ULONGLONG Cycles = 0; #endif /* PUBLIC FUNCTIONS ***********************************************************/ @@ -142,7 +142,7 @@ { CpuStep(); #ifdef IPS_DISPLAY - Cycles++; + ++Cycles; #endif }

1 0

[akhaldi] 64984: [ADVAPI32] * Update AllocateAndInitializeSid(). CORE-8540
by akhaldi＠svn.reactos.org 25 Oct '14

25 Oct '14

Author: akhaldi Date: Sat Oct 25 15:28:29 2014 New Revision: 64984 URL: http://svn.reactos.org/svn/reactos?rev=64984&view=rev Log: [ADVAPI32] * Update AllocateAndInitializeSid(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c 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 15:28:29 2014 @@ -580,42 +580,36 @@ return DuplicateTokenEx( baseToken, MAXIMUM_ALLOWED, NULL, level, type, newToken ); } -/* - * @implemented +/****************************************************************************** + * AllocateAndInitializeSid [ADVAPI32.@] + * + * PARAMS + * pIdentifierAuthority [] + * nSubAuthorityCount [] + * nSubAuthority0 [] + * nSubAuthority1 [] + * nSubAuthority2 [] + * nSubAuthority3 [] + * nSubAuthority4 [] + * nSubAuthority5 [] + * nSubAuthority6 [] + * nSubAuthority7 [] + * pSid [] */ BOOL WINAPI -AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, - BYTE nSubAuthorityCount, - DWORD dwSubAuthority0, - DWORD dwSubAuthority1, - DWORD dwSubAuthority2, - DWORD dwSubAuthority3, - DWORD dwSubAuthority4, - DWORD dwSubAuthority5, - DWORD dwSubAuthority6, - DWORD dwSubAuthority7, - PSID *pSid) -{ - NTSTATUS Status; - - Status = RtlAllocateAndInitializeSid(pIdentifierAuthority, - nSubAuthorityCount, - dwSubAuthority0, - dwSubAuthority1, - dwSubAuthority2, - dwSubAuthority3, - dwSubAuthority4, - dwSubAuthority5, - dwSubAuthority6, - dwSubAuthority7, - pSid); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; +AllocateAndInitializeSid( PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, + BYTE nSubAuthorityCount, + DWORD nSubAuthority0, DWORD nSubAuthority1, + DWORD nSubAuthority2, DWORD nSubAuthority3, + DWORD nSubAuthority4, DWORD nSubAuthority5, + DWORD nSubAuthority6, DWORD nSubAuthority7, + PSID *pSid ) +{ + return set_ntstatus( RtlAllocateAndInitializeSid( + pIdentifierAuthority, nSubAuthorityCount, + nSubAuthority0, nSubAuthority1, nSubAuthority2, nSubAuthority3, + nSubAuthority4, nSubAuthority5, nSubAuthority6, nSubAuthority7, + pSid )); } /*

1 0

[ekohl] 64983: [NET] Display local group properties and members.
by ekohl＠svn.reactos.org 25 Oct '14

25 Oct '14

Author: ekohl Date: Sat Oct 25 14:28:38 2014 New Revision: 64983 URL: http://svn.reactos.org/svn/reactos?rev=64983&view=rev Log: [NET] Display local group properties and members. Modified: trunk/reactos/base/applications/network/net/cmdLocalGroup.c Modified: trunk/reactos/base/applications/network/net/cmdLocalGroup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdLocalGroup.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdLocalGroup.c [iso-8859-1] Sat Oct 25 14:28:38 2014 @@ -69,6 +69,93 @@ NetApiBufferFree(pBuffer); return NERR_Success; +} + + +static +NET_API_STATUS +DisplayLocalGroup(LPWSTR lpGroupName) +{ + PLOCALGROUP_INFO_1 pGroupInfo = NULL; + PLOCALGROUP_MEMBERS_INFO_3 pMembers = NULL; + PSERVER_INFO_100 pServer = NULL; + LPWSTR *pNames = NULL; + DWORD dwRead = 0; + DWORD dwTotal = 0; + DWORD_PTR ResumeHandle = 0; + DWORD i; + DWORD len; + NET_API_STATUS Status; + + Status = NetLocalGroupGetInfo(NULL, + lpGroupName, + 1, + (LPBYTE*)&pGroupInfo); + if (Status != NERR_Success) + return Status; + + Status = NetLocalGroupGetMembers(NULL, + lpGroupName, + 3, + (LPBYTE*)&pMembers, + MAX_PREFERRED_LENGTH, + &dwRead, + &dwTotal, + &ResumeHandle); + if (Status != NERR_Success) + goto done; + + Status = NetServerGetInfo(NULL, + 100, + (LPBYTE*)&pServer); + if (Status != NERR_Success) + goto done; + + pNames = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwRead * sizeof(LPWSTR)); + if (pNames == NULL) + { + Status = ERROR_OUTOFMEMORY; + goto done; + } + + len = wcslen(pServer->sv100_name); + for (i = 0; i < dwRead; i++) + { + if (!wcsncmp(pMembers[i].lgrmi3_domainandname, pServer->sv100_name, len)) + pNames[i] = &pMembers[i].lgrmi3_domainandname[len + 1]; + else + pNames[i] = pMembers[i].lgrmi3_domainandname; + } + + printf("Alias name %S\n", pGroupInfo->lgrpi1_name); + printf("Comment %S\n", pGroupInfo->lgrpi1_comment); + printf("\n"); + printf("Members\n"); + printf("\n"); + printf("------------------------------------------\n"); + + for (i = 0; i < dwRead; i++) + { + if (pNames[i]) + printf("%S\n", pNames[i]); + } + +done: + if (pNames != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pNames); + + if (pServer != NULL) + NetApiBufferFree(pServer); + + if (pMembers != NULL) + NetApiBufferFree(pMembers); + + if (pGroupInfo != NULL) + NetApiBufferFree(pGroupInfo); + + return Status; } @@ -99,6 +186,12 @@ printf("Status: %lu\n", Status); return 0; } + else if (argc == 3) + { + Status = DisplayLocalGroup(argv[2]); + printf("Status: %lu\n", Status); + return 0; + } i = 2; if (argv[i][0] != L'/')

1 0

[akhaldi] 64982: [ADVAPI32] * Update CreateRestrictedToken(). * More advapi32:security tests run now. CORE-8540
by akhaldi＠svn.reactos.org 25 Oct '14

25 Oct '14

Author: akhaldi Date: Sat Oct 25 14:15:00 2014 New Revision: 64982 URL: http://svn.reactos.org/svn/reactos?rev=64982&view=rev Log: [ADVAPI32] * Update CreateRestrictedToken(). * More advapi32:security tests run now. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c 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 14:15:00 2014 @@ -528,19 +528,56 @@ return TRUE; } -BOOL WINAPI -CreateRestrictedToken(HANDLE TokenHandle, - DWORD Flags, - DWORD DisableSidCount, - PSID_AND_ATTRIBUTES pSidAndAttributes, - DWORD DeletePrivilegeCount, - PLUID_AND_ATTRIBUTES pLUIDAndAttributes, - DWORD RestrictedSidCount, - PSID_AND_ATTRIBUTES pSIDAndAttributes, - PHANDLE NewTokenHandle) -{ - UNIMPLEMENTED; - return FALSE; +/************************************************************************* + * CreateRestrictedToken [ADVAPI32.@] + * + * Create a new more restricted token from an existing token. + * + * PARAMS + * baseToken [I] Token to base the new restricted token on + * flags [I] Options + * nDisableSids [I] Length of disableSids array + * disableSids [I] Array of SIDs to disable in the new token + * nDeletePrivs [I] Length of deletePrivs array + * deletePrivs [I] Array of privileges to delete in the new token + * nRestrictSids [I] Length of restrictSids array + * restrictSids [I] Array of SIDs to restrict in the new token + * newToken [O] Address where the new token is stored + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI CreateRestrictedToken( + HANDLE baseToken, + DWORD flags, + DWORD nDisableSids, + PSID_AND_ATTRIBUTES disableSids, + DWORD nDeletePrivs, + PLUID_AND_ATTRIBUTES deletePrivs, + DWORD nRestrictSids, + PSID_AND_ATTRIBUTES restrictSids, + PHANDLE newToken) +{ + TOKEN_TYPE type; + SECURITY_IMPERSONATION_LEVEL level = TokenImpersonationLevel; + DWORD size; + + FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n", + baseToken, flags, nDisableSids, disableSids, + nDeletePrivs, deletePrivs, + nRestrictSids, restrictSids, + newToken); + + size = sizeof(type); + if (!GetTokenInformation( baseToken, TokenType, &type, size, &size )) return FALSE; + if (type == TokenImpersonation) + { + size = sizeof(level); + if (!GetTokenInformation( baseToken, TokenImpersonationLevel, &level, size, &size )) + return FALSE; + } + return DuplicateTokenEx( baseToken, MAXIMUM_ALLOWED, NULL, level, type, newToken ); } /*

1 0

[akhaldi] 64981: [ADVAPI32] * Update ADVAPI_IsLocalComputer(). CORE-8540
by akhaldi＠svn.reactos.org 25 Oct '14

25 Oct '14

Author: akhaldi Date: Sat Oct 25 14:02:23 2014 New Revision: 64981 URL: http://svn.reactos.org/svn/reactos?rev=64981&view=rev Log: [ADVAPI32] * Update ADVAPI_IsLocalComputer(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c 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 14:02:23 2014 @@ -325,12 +325,12 @@ if (!ServerName || !ServerName[0]) return TRUE; - buf = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); + buf = heap_alloc(dwSize * sizeof(WCHAR)); Result = GetComputerNameW(buf, &dwSize); if (Result && (ServerName[0] == '\\') && (ServerName[1] == '\\')) ServerName += 2; Result = Result && !lstrcmpW(ServerName, buf); - HeapFree(GetProcessHeap(), 0, buf); + heap_free(buf); return Result; }

1 0

[akhaldi] 64980: [ADVAPI32] * Fix set_ntstatus() to use NT_SUCCESS when performing the checks. CORE-8540
by akhaldi＠svn.reactos.org 25 Oct '14

25 Oct '14

Author: akhaldi Date: Sat Oct 25 13:56:28 2014 New Revision: 64980 URL: http://svn.reactos.org/svn/reactos?rev=64980&view=rev Log: [ADVAPI32] * Fix set_ntstatus() to use NT_SUCCESS when performing the checks. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c 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 13:56:28 2014 @@ -264,8 +264,8 @@ /* used for functions that are a simple wrapper around the corresponding ntdll API */ static __inline BOOL set_ntstatus( NTSTATUS status ) { - if (status) SetLastError( RtlNtStatusToDosError( status )); - return !status; + if (!NT_SUCCESS(status)) SetLastError( RtlNtStatusToDosError( status )); + return NT_SUCCESS(status); } static const RECORD SidTable[] =

1 0

[akhaldi] 64979: [ADVAPI32] * Move some functions from trustee.c to security.c. CORE-8540
by akhaldi＠svn.reactos.org 25 Oct '14

25 Oct '14

Author: akhaldi Date: Sat Oct 25 12:45:57 2014 New Revision: 64979 URL: http://svn.reactos.org/svn/reactos?rev=64979&view=rev Log: [ADVAPI32] * Move some functions from trustee.c to security.c. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/sec/trustee.c trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/sec/trustee.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/tru… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/trustee.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/trustee.c [iso-8859-1] Sat Oct 25 12:45:57 2014 @@ -31,51 +31,6 @@ pTrustee->pMultipleTrustee = pImpersonateTrustee; pTrustee->MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; } - - -/****************************************************************************** - * BuildExplicitAccessWithNameA [ADVAPI32.@] - */ -VOID WINAPI -BuildExplicitAccessWithNameA(PEXPLICIT_ACCESSA pExplicitAccess, - LPSTR pTrusteeName, - DWORD AccessPermissions, - ACCESS_MODE AccessMode, - DWORD Inheritance) -{ - pExplicitAccess->grfAccessPermissions = AccessPermissions; - pExplicitAccess->grfAccessMode = AccessMode; - pExplicitAccess->grfInheritance = Inheritance; - - pExplicitAccess->Trustee.pMultipleTrustee = NULL; - pExplicitAccess->Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; - pExplicitAccess->Trustee.TrusteeForm = TRUSTEE_IS_NAME; - pExplicitAccess->Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; - pExplicitAccess->Trustee.ptstrName = pTrusteeName; -} - - -/****************************************************************************** - * BuildExplicitAccessWithNameW [ADVAPI32.@] - */ -VOID WINAPI -BuildExplicitAccessWithNameW(PEXPLICIT_ACCESSW pExplicitAccess, - LPWSTR pTrusteeName, - DWORD AccessPermissions, - ACCESS_MODE AccessMode, - DWORD Inheritance) -{ - pExplicitAccess->grfAccessPermissions = AccessPermissions; - pExplicitAccess->grfAccessMode = AccessMode; - pExplicitAccess->grfInheritance = Inheritance; - - pExplicitAccess->Trustee.pMultipleTrustee = NULL; - pExplicitAccess->Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; - pExplicitAccess->Trustee.TrusteeForm = TRUSTEE_IS_NAME; - pExplicitAccess->Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; - pExplicitAccess->Trustee.ptstrName = pTrusteeName; -} - /****************************************************************************** * BuildImpersonateExplicitAccessWithNameA [ADVAPI32.@] @@ -122,255 +77,6 @@ pExplicitAccess->Trustee.ptstrName = pTrusteeName; } - -/****************************************************************************** - * BuildTrusteeWithSidA [ADVAPI32.@] - */ -VOID WINAPI -BuildTrusteeWithSidA(PTRUSTEE_A pTrustee, - PSID pSid) -{ - TRACE("%p %p\n", pTrustee, pSid); - - pTrustee->pMultipleTrustee = NULL; - pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; - pTrustee->TrusteeForm = TRUSTEE_IS_SID; - pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = (LPSTR) pSid; -} - - -/****************************************************************************** - * BuildTrusteeWithSidW [ADVAPI32.@] - */ -VOID WINAPI -BuildTrusteeWithSidW(PTRUSTEE_W pTrustee, - PSID pSid) -{ - TRACE("%p %p\n", pTrustee, pSid); - - pTrustee->pMultipleTrustee = NULL; - pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; - pTrustee->TrusteeForm = TRUSTEE_IS_SID; - pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = (LPWSTR) pSid; -} - - -/****************************************************************************** - * BuildTrusteeWithNameA [ADVAPI32.@] - */ -VOID WINAPI -BuildTrusteeWithNameA(PTRUSTEE_A pTrustee, - LPSTR name) -{ - TRACE("%p %s\n", pTrustee, name); - - pTrustee->pMultipleTrustee = NULL; - pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; - pTrustee->TrusteeForm = TRUSTEE_IS_NAME; - pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = name; -} - - -/****************************************************************************** - * BuildTrusteeWithNameW [ADVAPI32.@] - */ -VOID WINAPI -BuildTrusteeWithNameW(PTRUSTEE_W pTrustee, - LPWSTR name) -{ - TRACE("%p %s\n", pTrustee, name); - - pTrustee->pMultipleTrustee = NULL; - pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; - pTrustee->TrusteeForm = TRUSTEE_IS_NAME; - pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = name; -} - - -/****************************************************************************** - * BuildTrusteeWithObjectsAndNameA [ADVAPI32.@] - */ -VOID WINAPI -BuildTrusteeWithObjectsAndNameA(PTRUSTEEA pTrustee, - POBJECTS_AND_NAME_A pObjName, - SE_OBJECT_TYPE ObjectType, - LPSTR ObjectTypeName, - LPSTR InheritedObjectTypeName, - LPSTR Name) -{ - DWORD ObjectsPresent = 0; - - TRACE("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, - ObjectType, ObjectTypeName, InheritedObjectTypeName, Name); - - /* Fill the OBJECTS_AND_NAME structure */ - pObjName->ObjectType = ObjectType; - if (ObjectTypeName != NULL) - { - ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; - } - - pObjName->InheritedObjectTypeName = InheritedObjectTypeName; - if (InheritedObjectTypeName != NULL) - { - ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; - } - - pObjName->ObjectsPresent = ObjectsPresent; - pObjName->ptstrName = Name; - - /* Fill the TRUSTEE structure */ - pTrustee->pMultipleTrustee = NULL; - pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; - pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_NAME; - pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = (LPSTR)pObjName; -} - - -/****************************************************************************** - * BuildTrusteeWithObjectsAndNameW [ADVAPI32.@] - */ -VOID WINAPI -BuildTrusteeWithObjectsAndNameW(PTRUSTEEW pTrustee, - POBJECTS_AND_NAME_W pObjName, - SE_OBJECT_TYPE ObjectType, - LPWSTR ObjectTypeName, - LPWSTR InheritedObjectTypeName, - LPWSTR Name) -{ - DWORD ObjectsPresent = 0; - - TRACE("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, - ObjectType, ObjectTypeName, InheritedObjectTypeName, Name); - - /* Fill the OBJECTS_AND_NAME structure */ - pObjName->ObjectType = ObjectType; - if (ObjectTypeName != NULL) - { - ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; - } - - pObjName->InheritedObjectTypeName = InheritedObjectTypeName; - if (InheritedObjectTypeName != NULL) - { - ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; - } - - pObjName->ObjectsPresent = ObjectsPresent; - pObjName->ptstrName = Name; - - /* Fill the TRUSTEE structure */ - pTrustee->pMultipleTrustee = NULL; - pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; - pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_NAME; - pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = (LPWSTR)pObjName; -} - - -/****************************************************************************** - * BuildTrusteeWithObjectsAndSidA [ADVAPI32.@] - */ -VOID WINAPI -BuildTrusteeWithObjectsAndSidA(PTRUSTEEA pTrustee, - POBJECTS_AND_SID pObjSid, - GUID *pObjectGuid, - GUID *pInheritedObjectGuid, - PSID pSid) -{ - DWORD ObjectsPresent = 0; - - TRACE("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); - - /* Fill the OBJECTS_AND_SID structure */ - if (pObjectGuid != NULL) - { - pObjSid->ObjectTypeGuid = *pObjectGuid; - ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; - } - else - { - ZeroMemory(&pObjSid->ObjectTypeGuid, - sizeof(GUID)); - } - - if (pInheritedObjectGuid != NULL) - { - pObjSid->InheritedObjectTypeGuid = *pInheritedObjectGuid; - ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; - } - else - { - ZeroMemory(&pObjSid->InheritedObjectTypeGuid, - sizeof(GUID)); - } - - pObjSid->ObjectsPresent = ObjectsPresent; - pObjSid->pSid = pSid; - - /* Fill the TRUSTEE structure */ - pTrustee->pMultipleTrustee = NULL; - pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; - pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_SID; - pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = (LPSTR) pObjSid; -} - - -/****************************************************************************** - * BuildTrusteeWithObjectsAndSidW [ADVAPI32.@] - */ -VOID WINAPI -BuildTrusteeWithObjectsAndSidW(PTRUSTEEW pTrustee, - POBJECTS_AND_SID pObjSid, - GUID *pObjectGuid, - GUID *pInheritedObjectGuid, - PSID pSid) -{ - DWORD ObjectsPresent = 0; - - TRACE("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); - - /* Fill the OBJECTS_AND_SID structure */ - if (pObjectGuid != NULL) - { - pObjSid->ObjectTypeGuid = *pObjectGuid; - ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; - } - else - { - ZeroMemory(&pObjSid->ObjectTypeGuid, - sizeof(GUID)); - } - - if (pInheritedObjectGuid != NULL) - { - pObjSid->InheritedObjectTypeGuid = *pInheritedObjectGuid; - ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; - } - else - { - ZeroMemory(&pObjSid->InheritedObjectTypeGuid, - sizeof(GUID)); - } - - pObjSid->ObjectsPresent = ObjectsPresent; - pObjSid->pSid = pSid; - - /* Fill the TRUSTEE structure */ - pTrustee->pMultipleTrustee = NULL; - pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; - pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_SID; - pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = (LPWSTR) pObjSid; -} - - /****************************************************************************** * GetMultipleTrusteeA [ADVAPI32.@] */ @@ -410,64 +116,4 @@ return pTrustee->MultipleTrusteeOperation; } - -/****************************************************************************** - * GetTrusteeFormW [ADVAPI32.@] - */ -TRUSTEE_FORM WINAPI -GetTrusteeFormA(PTRUSTEE_A pTrustee) -{ - return pTrustee->TrusteeForm; -} - - -/****************************************************************************** - * GetTrusteeFormW [ADVAPI32.@] - */ -TRUSTEE_FORM WINAPI -GetTrusteeFormW(PTRUSTEE_W pTrustee) -{ - return pTrustee->TrusteeForm; -} - - -/****************************************************************************** - * GetTrusteeNameA [ADVAPI32.@] - */ -LPSTR WINAPI -GetTrusteeNameA(PTRUSTEE_A pTrustee) -{ - return pTrustee->ptstrName; -} - - -/****************************************************************************** - * GetTrusteeNameW [ADVAPI32.@] - */ -LPWSTR WINAPI -GetTrusteeNameW(PTRUSTEE_W pTrustee) -{ - return pTrustee->ptstrName; -} - - -/****************************************************************************** - * GetTrusteeTypeA [ADVAPI32.@] - */ -TRUSTEE_TYPE WINAPI -GetTrusteeTypeA(PTRUSTEE_A pTrustee) -{ - return pTrustee->TrusteeType; -} - - -/****************************************************************************** - * GetTrusteeTypeW [ADVAPI32.@] - */ -TRUSTEE_TYPE WINAPI -GetTrusteeTypeW(PTRUSTEE_W pTrustee) -{ - return pTrustee->TrusteeType; -} - /* 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] Sat Oct 25 12:45:57 2014 @@ -1813,6 +1813,339 @@ return ERROR_BAD_PROVIDER; } +/****************************************************************************** + * BuildExplicitAccessWithNameA [ADVAPI32.@] + */ +VOID WINAPI +BuildExplicitAccessWithNameA(PEXPLICIT_ACCESSA pExplicitAccess, + LPSTR pTrusteeName, + DWORD AccessPermissions, + ACCESS_MODE AccessMode, + DWORD Inheritance) +{ + pExplicitAccess->grfAccessPermissions = AccessPermissions; + pExplicitAccess->grfAccessMode = AccessMode; + pExplicitAccess->grfInheritance = Inheritance; + + pExplicitAccess->Trustee.pMultipleTrustee = NULL; + pExplicitAccess->Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + pExplicitAccess->Trustee.TrusteeForm = TRUSTEE_IS_NAME; + pExplicitAccess->Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + pExplicitAccess->Trustee.ptstrName = pTrusteeName; +} + + +/****************************************************************************** + * BuildExplicitAccessWithNameW [ADVAPI32.@] + */ +VOID WINAPI +BuildExplicitAccessWithNameW(PEXPLICIT_ACCESSW pExplicitAccess, + LPWSTR pTrusteeName, + DWORD AccessPermissions, + ACCESS_MODE AccessMode, + DWORD Inheritance) +{ + pExplicitAccess->grfAccessPermissions = AccessPermissions; + pExplicitAccess->grfAccessMode = AccessMode; + pExplicitAccess->grfInheritance = Inheritance; + + pExplicitAccess->Trustee.pMultipleTrustee = NULL; + pExplicitAccess->Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + pExplicitAccess->Trustee.TrusteeForm = TRUSTEE_IS_NAME; + pExplicitAccess->Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + pExplicitAccess->Trustee.ptstrName = pTrusteeName; +} + +/****************************************************************************** + * BuildTrusteeWithObjectsAndNameA [ADVAPI32.@] + */ +VOID WINAPI BuildTrusteeWithObjectsAndNameA( PTRUSTEEA pTrustee, POBJECTS_AND_NAME_A pObjName, + SE_OBJECT_TYPE ObjectType, LPSTR ObjectTypeName, + LPSTR InheritedObjectTypeName, LPSTR Name ) +{ + DWORD ObjectsPresent = 0; + + TRACE("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, + ObjectType, ObjectTypeName, InheritedObjectTypeName, debugstr_a(Name)); + + /* Fill the OBJECTS_AND_NAME structure */ + pObjName->ObjectType = ObjectType; + if (ObjectTypeName != NULL) + { + ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; + } + + pObjName->InheritedObjectTypeName = InheritedObjectTypeName; + if (InheritedObjectTypeName != NULL) + { + ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + } + + pObjName->ObjectsPresent = ObjectsPresent; + pObjName->ptstrName = Name; + + /* Fill the TRUSTEE structure */ + pTrustee->pMultipleTrustee = NULL; + pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_NAME; + pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; + pTrustee->ptstrName = (LPSTR)pObjName; +} + +/****************************************************************************** + * BuildTrusteeWithObjectsAndNameW [ADVAPI32.@] + */ +VOID WINAPI BuildTrusteeWithObjectsAndNameW( PTRUSTEEW pTrustee, POBJECTS_AND_NAME_W pObjName, + SE_OBJECT_TYPE ObjectType, LPWSTR ObjectTypeName, + LPWSTR InheritedObjectTypeName, LPWSTR Name ) +{ + DWORD ObjectsPresent = 0; + + TRACE("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, + ObjectType, ObjectTypeName, InheritedObjectTypeName, debugstr_w(Name)); + + /* Fill the OBJECTS_AND_NAME structure */ + pObjName->ObjectType = ObjectType; + if (ObjectTypeName != NULL) + { + ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; + } + + pObjName->InheritedObjectTypeName = InheritedObjectTypeName; + if (InheritedObjectTypeName != NULL) + { + ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + } + + pObjName->ObjectsPresent = ObjectsPresent; + pObjName->ptstrName = Name; + + /* Fill the TRUSTEE structure */ + pTrustee->pMultipleTrustee = NULL; + pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_NAME; + pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; + pTrustee->ptstrName = (LPWSTR)pObjName; +} + +/****************************************************************************** + * BuildTrusteeWithObjectsAndSidA [ADVAPI32.@] + */ +VOID WINAPI +BuildTrusteeWithObjectsAndSidA(PTRUSTEEA pTrustee, + POBJECTS_AND_SID pObjSid, + GUID *pObjectGuid, + GUID *pInheritedObjectGuid, + PSID pSid) +{ + DWORD ObjectsPresent = 0; + + TRACE("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); + + /* Fill the OBJECTS_AND_SID structure */ + if (pObjectGuid != NULL) + { + pObjSid->ObjectTypeGuid = *pObjectGuid; + ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; + } + else + { + ZeroMemory(&pObjSid->ObjectTypeGuid, + sizeof(GUID)); + } + + if (pInheritedObjectGuid != NULL) + { + pObjSid->InheritedObjectTypeGuid = *pInheritedObjectGuid; + ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + } + else + { + ZeroMemory(&pObjSid->InheritedObjectTypeGuid, + sizeof(GUID)); + } + + pObjSid->ObjectsPresent = ObjectsPresent; + pObjSid->pSid = pSid; + + /* Fill the TRUSTEE structure */ + pTrustee->pMultipleTrustee = NULL; + pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_SID; + pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; + pTrustee->ptstrName = (LPSTR) pObjSid; +} + + +/****************************************************************************** + * BuildTrusteeWithObjectsAndSidW [ADVAPI32.@] + */ +VOID WINAPI +BuildTrusteeWithObjectsAndSidW(PTRUSTEEW pTrustee, + POBJECTS_AND_SID pObjSid, + GUID *pObjectGuid, + GUID *pInheritedObjectGuid, + PSID pSid) +{ + DWORD ObjectsPresent = 0; + + TRACE("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); + + /* Fill the OBJECTS_AND_SID structure */ + if (pObjectGuid != NULL) + { + pObjSid->ObjectTypeGuid = *pObjectGuid; + ObjectsPresent |= ACE_OBJECT_TYPE_PRESENT; + } + else + { + ZeroMemory(&pObjSid->ObjectTypeGuid, + sizeof(GUID)); + } + + if (pInheritedObjectGuid != NULL) + { + pObjSid->InheritedObjectTypeGuid = *pInheritedObjectGuid; + ObjectsPresent |= ACE_INHERITED_OBJECT_TYPE_PRESENT; + } + else + { + ZeroMemory(&pObjSid->InheritedObjectTypeGuid, + sizeof(GUID)); + } + + pObjSid->ObjectsPresent = ObjectsPresent; + pObjSid->pSid = pSid; + + /* Fill the TRUSTEE structure */ + pTrustee->pMultipleTrustee = NULL; + pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + pTrustee->TrusteeForm = TRUSTEE_IS_OBJECTS_AND_SID; + pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; + pTrustee->ptstrName = (LPWSTR) pObjSid; +} + +/****************************************************************************** + * BuildTrusteeWithSidA [ADVAPI32.@] + */ +VOID WINAPI +BuildTrusteeWithSidA(PTRUSTEE_A pTrustee, + PSID pSid) +{ + TRACE("%p %p\n", pTrustee, pSid); + + pTrustee->pMultipleTrustee = NULL; + pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + pTrustee->TrusteeForm = TRUSTEE_IS_SID; + pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; + pTrustee->ptstrName = (LPSTR) pSid; +} + + +/****************************************************************************** + * BuildTrusteeWithSidW [ADVAPI32.@] + */ +VOID WINAPI +BuildTrusteeWithSidW(PTRUSTEE_W pTrustee, + PSID pSid) +{ + TRACE("%p %p\n", pTrustee, pSid); + + pTrustee->pMultipleTrustee = NULL; + pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + pTrustee->TrusteeForm = TRUSTEE_IS_SID; + pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; + pTrustee->ptstrName = (LPWSTR) pSid; +} + +/****************************************************************************** + * BuildTrusteeWithNameA [ADVAPI32.@] + */ +VOID WINAPI +BuildTrusteeWithNameA(PTRUSTEE_A pTrustee, + LPSTR name) +{ + TRACE("%p %s\n", pTrustee, name); + + pTrustee->pMultipleTrustee = NULL; + pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + pTrustee->TrusteeForm = TRUSTEE_IS_NAME; + pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; + pTrustee->ptstrName = name; +} + +/****************************************************************************** + * BuildTrusteeWithNameW [ADVAPI32.@] + */ +VOID WINAPI +BuildTrusteeWithNameW(PTRUSTEE_W pTrustee, + LPWSTR name) +{ + TRACE("%p %s\n", pTrustee, name); + + pTrustee->pMultipleTrustee = NULL; + pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + pTrustee->TrusteeForm = TRUSTEE_IS_NAME; + pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; + pTrustee->ptstrName = name; +} + +/****************************************************************************** + * GetTrusteeFormW [ADVAPI32.@] + */ +TRUSTEE_FORM WINAPI +GetTrusteeFormA(PTRUSTEE_A pTrustee) +{ + return pTrustee->TrusteeForm; +} + + +/****************************************************************************** + * GetTrusteeFormW [ADVAPI32.@] + */ +TRUSTEE_FORM WINAPI +GetTrusteeFormW(PTRUSTEE_W pTrustee) +{ + return pTrustee->TrusteeForm; +} + +/****************************************************************************** + * GetTrusteeNameA [ADVAPI32.@] + */ +LPSTR WINAPI +GetTrusteeNameA(PTRUSTEE_A pTrustee) +{ + return pTrustee->ptstrName; +} + + +/****************************************************************************** + * GetTrusteeNameW [ADVAPI32.@] + */ +LPWSTR WINAPI +GetTrusteeNameW(PTRUSTEE_W pTrustee) +{ + return pTrustee->ptstrName; +} + +/****************************************************************************** + * GetTrusteeTypeA [ADVAPI32.@] + */ +TRUSTEE_TYPE WINAPI +GetTrusteeTypeA(PTRUSTEE_A pTrustee) +{ + return pTrustee->TrusteeType; +} + +/****************************************************************************** + * GetTrusteeTypeW [ADVAPI32.@] + */ +TRUSTEE_TYPE WINAPI +GetTrusteeTypeW(PTRUSTEE_W pTrustee) +{ + return pTrustee->TrusteeType; +} + /* * @implemented */

1 0

[akhaldi] 64978: [ADVAPI32] * Move some functions from sec/misc.c to security.c. CORE-8540
by akhaldi＠svn.reactos.org 25 Oct '14

25 Oct '14

Author: akhaldi Date: Sat Oct 25 12:30:01 2014 New Revision: 64978 URL: http://svn.reactos.org/svn/reactos?rev=64978&view=rev Log: [ADVAPI32] * Move some functions from sec/misc.c to security.c. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sat Oct 25 12:30:01 2014 @@ -130,337 +130,6 @@ */ BOOL WINAPI -AreAllAccessesGranted(DWORD GrantedAccess, - DWORD DesiredAccess) -{ - return (BOOL)RtlAreAllAccessesGranted(GrantedAccess, - DesiredAccess); -} - - -/* - * @implemented - */ -BOOL -WINAPI -AreAnyAccessesGranted(DWORD GrantedAccess, - DWORD DesiredAccess) -{ - return (BOOL)RtlAreAnyAccessesGranted(GrantedAccess, - DesiredAccess); -} - - -/************************************************************ - * ADVAPI_IsLocalComputer - * - * Checks whether the server name indicates local machine. - */ -BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) -{ - DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; - BOOL Result; - LPWSTR buf; - - if (!ServerName || !ServerName[0]) - return TRUE; - - buf = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); - Result = GetComputerNameW(buf, &dwSize); - if (Result && (ServerName[0] == '\\') && (ServerName[1] == '\\')) - ServerName += 2; - Result = Result && !lstrcmpW(ServerName, buf); - HeapFree(GetProcessHeap(), 0, buf); - - return Result; -} - - -/****************************************************************************** - * GetFileSecurityA [ADVAPI32.@] - * - * Obtains Specified information about the security of a file or directory. - * - * PARAMS - * lpFileName [I] Name of the file to get info for - * RequestedInformation [I] SE_ flags from "winnt.h" - * pSecurityDescriptor [O] Destination for security information - * nLength [I] Length of pSecurityDescriptor - * lpnLengthNeeded [O] Destination for length of returned security information - * - * RETURNS - * Success: TRUE. pSecurityDescriptor contains the requested information. - * Failure: FALSE. lpnLengthNeeded contains the required space to return the info. - * - * NOTES - * The information returned is constrained by the callers access rights and - * privileges. - * - * @implemented - */ -BOOL -WINAPI -GetFileSecurityA(LPCSTR lpFileName, - SECURITY_INFORMATION RequestedInformation, - PSECURITY_DESCRIPTOR pSecurityDescriptor, - DWORD nLength, - LPDWORD lpnLengthNeeded) -{ - UNICODE_STRING FileName; - BOOL bResult; - - if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - bResult = GetFileSecurityW(FileName.Buffer, - RequestedInformation, - pSecurityDescriptor, - nLength, - lpnLengthNeeded); - - RtlFreeUnicodeString(&FileName); - - return bResult; -} - - -/* - * @implemented - */ -BOOL -WINAPI -GetFileSecurityW(LPCWSTR lpFileName, - SECURITY_INFORMATION RequestedInformation, - PSECURITY_DESCRIPTOR pSecurityDescriptor, - DWORD nLength, - LPDWORD lpnLengthNeeded) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK StatusBlock; - UNICODE_STRING FileName; - ULONG AccessMask = 0; - HANDLE FileHandle; - NTSTATUS Status; - - TRACE("GetFileSecurityW() called\n"); - - QuerySecurityAccessMask(RequestedInformation, &AccessMask); - - if (!RtlDosPathNameToNtPathName_U(lpFileName, - &FileName, - NULL, - NULL)) - { - ERR("Invalid path\n"); - SetLastError(ERROR_INVALID_NAME); - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &FileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenFile(&FileHandle, - AccessMask, - &ObjectAttributes, - &StatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - 0); - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - FileName.Buffer); - - if (!NT_SUCCESS(Status)) - { - ERR("NtOpenFile() failed (Status %lx)\n", Status); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - Status = NtQuerySecurityObject(FileHandle, - RequestedInformation, - pSecurityDescriptor, - nLength, - lpnLengthNeeded); - NtClose(FileHandle); - if (!NT_SUCCESS(Status)) - { - ERR("NtQuerySecurityObject() failed (Status %lx)\n", Status); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -GetKernelObjectSecurity(HANDLE Handle, - SECURITY_INFORMATION RequestedInformation, - PSECURITY_DESCRIPTOR pSecurityDescriptor, - DWORD nLength, - LPDWORD lpnLengthNeeded) -{ - NTSTATUS Status; - - Status = NtQuerySecurityObject(Handle, - RequestedInformation, - pSecurityDescriptor, - nLength, - lpnLengthNeeded); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/****************************************************************************** - * SetFileSecurityA [ADVAPI32.@] - * Sets the security of a file or directory - * - * @implemented - */ -BOOL -WINAPI -SetFileSecurityA(LPCSTR lpFileName, - SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR pSecurityDescriptor) -{ - UNICODE_STRING FileName; - BOOL bResult; - - if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - bResult = SetFileSecurityW(FileName.Buffer, - SecurityInformation, - pSecurityDescriptor); - - RtlFreeUnicodeString(&FileName); - - return bResult; -} - - -/****************************************************************************** - * SetFileSecurityW [ADVAPI32.@] - * Sets the security of a file or directory - * - * @implemented - */ -BOOL -WINAPI -SetFileSecurityW(LPCWSTR lpFileName, - SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR pSecurityDescriptor) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK StatusBlock; - UNICODE_STRING FileName; - ULONG AccessMask = 0; - HANDLE FileHandle; - NTSTATUS Status; - - TRACE("SetFileSecurityW() called\n"); - - SetSecurityAccessMask(SecurityInformation, &AccessMask); - - if (!RtlDosPathNameToNtPathName_U(lpFileName, - &FileName, - NULL, - NULL)) - { - ERR("Invalid path\n"); - SetLastError(ERROR_INVALID_NAME); - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &FileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenFile(&FileHandle, - AccessMask, - &ObjectAttributes, - &StatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - 0); - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - FileName.Buffer); - - if (!NT_SUCCESS(Status)) - { - ERR("NtOpenFile() failed (Status %lx)\n", Status); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - Status = NtSetSecurityObject(FileHandle, - SecurityInformation, - pSecurityDescriptor); - NtClose(FileHandle); - - if (!NT_SUCCESS(Status)) - { - ERR("NtSetSecurityObject() failed (Status %lx)\n", Status); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -SetKernelObjectSecurity(HANDLE Handle, - SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - NTSTATUS Status; - - Status = NtSetSecurityObject(Handle, - SecurityInformation, - SecurityDescriptor); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI ImpersonateAnonymousToken(IN HANDLE ThreadHandle) { NTSTATUS Status; @@ -474,7 +143,6 @@ return TRUE; } - /* * @implemented @@ -561,51 +229,6 @@ return TRUE; } - -/* - * @implemented - */ -BOOL -WINAPI -ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) -{ - NTSTATUS Status; - - Status = RtlImpersonateSelf(ImpersonationLevel); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -RevertToSelf(VOID) -{ - NTSTATUS Status; - HANDLE Token = NULL; - - Status = NtSetInformationThread(NtCurrentThread(), - ThreadImpersonationToken, - &Token, - sizeof(HANDLE)); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - /****************************************************************************** * GetUserNameA [ADVAPI32.@] * @@ -655,7 +278,6 @@ return Ret; } - /****************************************************************************** * GetUserNameW [ADVAPI32.@] @@ -993,63 +615,6 @@ return ret; } - - -/****************************************************************************** - * LookupAccountNameA [ADVAPI32.@] - * - * @implemented - */ -BOOL -WINAPI -LookupAccountNameA(LPCSTR SystemName, - LPCSTR AccountName, - PSID Sid, - LPDWORD SidLength, - LPSTR ReferencedDomainName, - LPDWORD hReferencedDomainNameLength, - PSID_NAME_USE SidNameUse) -{ - BOOL ret; - UNICODE_STRING lpSystemW; - UNICODE_STRING lpAccountW; - LPWSTR lpReferencedDomainNameW = NULL; - - RtlCreateUnicodeStringFromAsciiz(&lpSystemW, SystemName); - RtlCreateUnicodeStringFromAsciiz(&lpAccountW, AccountName); - - if (ReferencedDomainName) - lpReferencedDomainNameW = HeapAlloc(GetProcessHeap(), - 0, - *hReferencedDomainNameLength * sizeof(WCHAR)); - - ret = LookupAccountNameW(lpSystemW.Buffer, - lpAccountW.Buffer, - Sid, - SidLength, - lpReferencedDomainNameW, - hReferencedDomainNameLength, - SidNameUse); - - if (ret && lpReferencedDomainNameW) - { - WideCharToMultiByte(CP_ACP, - 0, - lpReferencedDomainNameW, - *hReferencedDomainNameLength + 1, - ReferencedDomainName, - *hReferencedDomainNameLength + 1, - NULL, - NULL); - } - - RtlFreeUnicodeString(&lpSystemW); - RtlFreeUnicodeString(&lpAccountW); - HeapFree(GetProcessHeap(), 0, lpReferencedDomainNameW); - - return ret; -} - /****************************************************************************** * LookupAccountNameW [ADVAPI32.@] @@ -1256,103 +821,6 @@ return TRUE; } - - -/********************************************************************** - * LookupPrivilegeDisplayNameA EXPORTED - * - * @unimplemented - */ -BOOL -WINAPI -LookupPrivilegeDisplayNameA(LPCSTR lpSystemName, - LPCSTR lpName, - LPSTR lpDisplayName, - LPDWORD cbDisplayName, - LPDWORD lpLanguageId) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - SetLastError (ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/********************************************************************** - * LookupPrivilegeDisplayNameW EXPORTED - * - * @unimplemented - */ -BOOL -WINAPI -LookupPrivilegeDisplayNameW(LPCWSTR lpSystemName, - LPCWSTR lpName, - LPWSTR lpDisplayName, - LPDWORD cbDisplayName, - LPDWORD lpLanguageId) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - SetLastError (ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/********************************************************************** - * LookupPrivilegeNameA EXPORTED - * - * @implemented - */ -BOOL -WINAPI -LookupPrivilegeNameA(LPCSTR lpSystemName, - PLUID lpLuid, - LPSTR lpName, - LPDWORD cchName) -{ - UNICODE_STRING lpSystemNameW; - BOOL ret; - DWORD wLen = 0; - - TRACE("%s %p %p %p\n", debugstr_a(lpSystemName), lpLuid, lpName, cchName); - - RtlCreateUnicodeStringFromAsciiz(&lpSystemNameW, lpSystemName); - ret = LookupPrivilegeNameW(lpSystemNameW.Buffer, lpLuid, NULL, &wLen); - if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - LPWSTR lpNameW = HeapAlloc(GetProcessHeap(), 0, wLen * sizeof(WCHAR)); - - ret = LookupPrivilegeNameW(lpSystemNameW.Buffer, lpLuid, lpNameW, - &wLen); - if (ret) - { - /* Windows crashes if cchName is NULL, so will I */ - unsigned int len = WideCharToMultiByte(CP_ACP, 0, lpNameW, -1, lpName, - *cchName, NULL, NULL); - - if (len == 0) - { - /* WideCharToMultiByte failed */ - ret = FALSE; - } - else if (len > *cchName) - { - *cchName = len; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - ret = FALSE; - } - else - { - /* WideCharToMultiByte succeeded, output length needs to be - * length not including NULL terminator - */ - *cchName = len - 1; - } - } - HeapFree(GetProcessHeap(), 0, lpNameW); - } - RtlFreeUnicodeString(&lpSystemNameW); - return ret; -} - /********************************************************************** * LookupPrivilegeNameW EXPORTED @@ -1650,46 +1118,6 @@ return ErrorCode; } - -/********************************************************************** - * GetNamedSecurityInfoA EXPORTED - * - * @implemented - */ -DWORD -WINAPI -GetNamedSecurityInfoA(LPSTR pObjectName, - SE_OBJECT_TYPE ObjectType, - SECURITY_INFORMATION SecurityInfo, - PSID *ppsidOwner, - PSID *ppsidGroup, - PACL *ppDacl, - PACL *ppSacl, - PSECURITY_DESCRIPTOR *ppSecurityDescriptor) -{ - DWORD len; - LPWSTR wstr = NULL; - DWORD r; - - TRACE("%s %d %d %p %p %p %p %p\n", pObjectName, ObjectType, SecurityInfo, - ppsidOwner, ppsidGroup, ppDacl, ppSacl, ppSecurityDescriptor); - - if( pObjectName ) - { - len = MultiByteToWideChar( CP_ACP, 0, pObjectName, -1, NULL, 0 ); - wstr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, pObjectName, -1, wstr, len ); - } - - r = GetNamedSecurityInfoW( wstr, ObjectType, SecurityInfo, ppsidOwner, - ppsidGroup, ppDacl, ppSacl, ppSecurityDescriptor ); - - HeapFree( GetProcessHeap(), 0, wstr ); - - return r; -} - - /********************************************************************** * SetNamedSecurityInfoW EXPORTED * @@ -1736,44 +1164,6 @@ return ErrorCode; } - - -/********************************************************************** - * SetNamedSecurityInfoA EXPORTED - * - * @implemented - */ -DWORD -WINAPI -SetNamedSecurityInfoA(LPSTR pObjectName, - SE_OBJECT_TYPE ObjectType, - SECURITY_INFORMATION SecurityInfo, - PSID psidOwner, - PSID psidGroup, - PACL pDacl, - PACL pSacl) -{ - UNICODE_STRING ObjectName; - DWORD Ret; - - if (!RtlCreateUnicodeStringFromAsciiz(&ObjectName, pObjectName)) - { - return ERROR_NOT_ENOUGH_MEMORY; - } - - Ret = SetNamedSecurityInfoW(ObjectName.Buffer, - ObjectType, - SecurityInfo, - psidOwner, - psidGroup, - pDacl, - pSacl); - - RtlFreeUnicodeString(&ObjectName); - - return Ret; -} - /********************************************************************** * GetSecurityInfo EXPORTED @@ -1872,81 +1262,6 @@ return ErrorCode; } - - -/****************************************************************************** - * GetSecurityInfoExW EXPORTED - */ -DWORD -WINAPI -GetSecurityInfoExA(HANDLE hObject, - SE_OBJECT_TYPE ObjectType, - SECURITY_INFORMATION SecurityInfo, - LPCSTR lpProvider, - LPCSTR lpProperty, - PACTRL_ACCESSA *ppAccessList, - PACTRL_AUDITA *ppAuditList, - LPSTR *lppOwner, - LPSTR *lppGroup) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return ERROR_BAD_PROVIDER; -} - - -/****************************************************************************** - * GetSecurityInfoExW EXPORTED - */ -DWORD -WINAPI -GetSecurityInfoExW(HANDLE hObject, - SE_OBJECT_TYPE ObjectType, - SECURITY_INFORMATION SecurityInfo, - LPCWSTR lpProvider, - LPCWSTR lpProperty, - PACTRL_ACCESSW *ppAccessList, - PACTRL_AUDITW *ppAuditList, - LPWSTR *lppOwner, - LPWSTR *lppGroup) -{ - FIXME("%s() not implemented!\n", __FUNCTION__); - return ERROR_BAD_PROVIDER; -} - - -/********************************************************************** - * ImpersonateNamedPipeClient EXPORTED - * - * @implemented - */ -BOOL -WINAPI -ImpersonateNamedPipeClient(HANDLE hNamedPipe) -{ - IO_STATUS_BLOCK StatusBlock; - NTSTATUS Status; - - TRACE("ImpersonateNamedPipeClient() called\n"); - - Status = NtFsControlFile(hNamedPipe, - NULL, - NULL, - NULL, - &StatusBlock, - FSCTL_PIPE_IMPERSONATE, - NULL, - 0, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - /* * @implemented @@ -2281,34 +1596,4 @@ #endif } -/****************************************************************************** - * QueryWindows31FilesMigration [ADVAPI32.@] - * - * PARAMS - * x1 [] - */ -BOOL WINAPI -QueryWindows31FilesMigration( DWORD x1 ) -{ - FIXME("(%d):stub\n",x1); - return TRUE; -} - -/****************************************************************************** - * SynchronizeWindows31FilesAndWindowsNTRegistry [ADVAPI32.@] - * - * PARAMS - * x1 [] - * x2 [] - * x3 [] - * x4 [] - */ -BOOL WINAPI -SynchronizeWindows31FilesAndWindowsNTRegistry( DWORD x1, DWORD x2, DWORD x3, - DWORD x4 ) -{ - FIXME("(0x%08x,0x%08x,0x%08x,0x%08x):stub\n",x1,x2,x3,x4); - 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] Sat Oct 25 12:30:01 2014 @@ -311,6 +311,30 @@ { NULL, 0 }, }; +/************************************************************ + * ADVAPI_IsLocalComputer + * + * Checks whether the server name indicates local machine. + */ +BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) +{ + DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; + BOOL Result; + LPWSTR buf; + + if (!ServerName || !ServerName[0]) + return TRUE; + + buf = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); + Result = GetComputerNameW(buf, &dwSize); + if (Result && (ServerName[0] == '\\') && (ServerName[1] == '\\')) + ServerName += 2; + Result = Result && !lstrcmpW(ServerName, buf); + HeapFree(GetProcessHeap(), 0, buf); + + return Result; +} + /* Exported functions */ /* @@ -804,6 +828,33 @@ */ BOOL WINAPI +GetKernelObjectSecurity(HANDLE Handle, + SECURITY_INFORMATION RequestedInformation, + PSECURITY_DESCRIPTOR pSecurityDescriptor, + DWORD nLength, + LPDWORD lpnLengthNeeded) +{ + NTSTATUS Status; + + Status = NtQuerySecurityObject(Handle, + RequestedInformation, + pSecurityDescriptor, + nLength, + lpnLengthNeeded); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI InitializeAcl(PACL pAcl, DWORD nAclLength, DWORD dwAclRevision) @@ -813,6 +864,39 @@ Status = RtlCreateAcl(pAcl, nAclLength, dwAclRevision); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/********************************************************************** + * ImpersonateNamedPipeClient EXPORTED + * + * @implemented + */ +BOOL +WINAPI +ImpersonateNamedPipeClient(HANDLE hNamedPipe) +{ + IO_STATUS_BLOCK StatusBlock; + NTSTATUS Status; + + TRACE("ImpersonateNamedPipeClient() called\n"); + + Status = NtFsControlFile(hNamedPipe, + NULL, + NULL, + NULL, + &StatusBlock, + FSCTL_PIPE_IMPERSONATE, + NULL, + 0, + NULL, + 0); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -1053,6 +1137,396 @@ Status = NtAllocateLocallyUniqueId (Luid); if (!NT_SUCCESS (Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/********************************************************************** + * LookupPrivilegeDisplayNameA EXPORTED + * + * @unimplemented + */ +BOOL +WINAPI +LookupPrivilegeDisplayNameA(LPCSTR lpSystemName, + LPCSTR lpName, + LPSTR lpDisplayName, + LPDWORD cbDisplayName, + LPDWORD lpLanguageId) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + SetLastError (ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/********************************************************************** + * LookupPrivilegeDisplayNameW EXPORTED + * + * @unimplemented + */ +BOOL +WINAPI +LookupPrivilegeDisplayNameW(LPCWSTR lpSystemName, + LPCWSTR lpName, + LPWSTR lpDisplayName, + LPDWORD cbDisplayName, + LPDWORD lpLanguageId) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + SetLastError (ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** + * LookupPrivilegeNameA EXPORTED + * + * @implemented + */ +BOOL +WINAPI +LookupPrivilegeNameA(LPCSTR lpSystemName, + PLUID lpLuid, + LPSTR lpName, + LPDWORD cchName) +{ + UNICODE_STRING lpSystemNameW; + BOOL ret; + DWORD wLen = 0; + + TRACE("%s %p %p %p\n", debugstr_a(lpSystemName), lpLuid, lpName, cchName); + + RtlCreateUnicodeStringFromAsciiz(&lpSystemNameW, lpSystemName); + ret = LookupPrivilegeNameW(lpSystemNameW.Buffer, lpLuid, NULL, &wLen); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + LPWSTR lpNameW = HeapAlloc(GetProcessHeap(), 0, wLen * sizeof(WCHAR)); + + ret = LookupPrivilegeNameW(lpSystemNameW.Buffer, lpLuid, lpNameW, + &wLen); + if (ret) + { + /* Windows crashes if cchName is NULL, so will I */ + unsigned int len = WideCharToMultiByte(CP_ACP, 0, lpNameW, -1, lpName, + *cchName, NULL, NULL); + + if (len == 0) + { + /* WideCharToMultiByte failed */ + ret = FALSE; + } + else if (len > *cchName) + { + *cchName = len; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + else + { + /* WideCharToMultiByte succeeded, output length needs to be + * length not including NULL terminator + */ + *cchName = len - 1; + } + } + HeapFree(GetProcessHeap(), 0, lpNameW); + } + RtlFreeUnicodeString(&lpSystemNameW); + return ret; +} + +/****************************************************************************** + * GetFileSecurityA [ADVAPI32.@] + * + * Obtains Specified information about the security of a file or directory. + * + * PARAMS + * lpFileName [I] Name of the file to get info for + * RequestedInformation [I] SE_ flags from "winnt.h" + * pSecurityDescriptor [O] Destination for security information + * nLength [I] Length of pSecurityDescriptor + * lpnLengthNeeded [O] Destination for length of returned security information + * + * RETURNS + * Success: TRUE. pSecurityDescriptor contains the requested information. + * Failure: FALSE. lpnLengthNeeded contains the required space to return the info. + * + * NOTES + * The information returned is constrained by the callers access rights and + * privileges. + * + * @implemented + */ +BOOL +WINAPI +GetFileSecurityA(LPCSTR lpFileName, + SECURITY_INFORMATION RequestedInformation, + PSECURITY_DESCRIPTOR pSecurityDescriptor, + DWORD nLength, + LPDWORD lpnLengthNeeded) +{ + UNICODE_STRING FileName; + BOOL bResult; + + if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + bResult = GetFileSecurityW(FileName.Buffer, + RequestedInformation, + pSecurityDescriptor, + nLength, + lpnLengthNeeded); + + RtlFreeUnicodeString(&FileName); + + return bResult; +} + +/* + * @implemented + */ +BOOL +WINAPI +GetFileSecurityW(LPCWSTR lpFileName, + SECURITY_INFORMATION RequestedInformation, + PSECURITY_DESCRIPTOR pSecurityDescriptor, + DWORD nLength, + LPDWORD lpnLengthNeeded) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK StatusBlock; + UNICODE_STRING FileName; + ULONG AccessMask = 0; + HANDLE FileHandle; + NTSTATUS Status; + + TRACE("GetFileSecurityW() called\n"); + + QuerySecurityAccessMask(RequestedInformation, &AccessMask); + + if (!RtlDosPathNameToNtPathName_U(lpFileName, + &FileName, + NULL, + NULL)) + { + ERR("Invalid path\n"); + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + AccessMask, + &ObjectAttributes, + &StatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + 0); + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FileName.Buffer); + + if (!NT_SUCCESS(Status)) + { + ERR("NtOpenFile() failed (Status %lx)\n", Status); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + Status = NtQuerySecurityObject(FileHandle, + RequestedInformation, + pSecurityDescriptor, + nLength, + lpnLengthNeeded); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + ERR("NtQuerySecurityObject() failed (Status %lx)\n", Status); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/****************************************************************************** + * SetFileSecurityA [ADVAPI32.@] + * Sets the security of a file or directory + * + * @implemented + */ +BOOL +WINAPI +SetFileSecurityA(LPCSTR lpFileName, + SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR pSecurityDescriptor) +{ + UNICODE_STRING FileName; + BOOL bResult; + + if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + bResult = SetFileSecurityW(FileName.Buffer, + SecurityInformation, + pSecurityDescriptor); + + RtlFreeUnicodeString(&FileName); + + return bResult; +} + +/****************************************************************************** + * SetFileSecurityW [ADVAPI32.@] + * Sets the security of a file or directory + * + * @implemented + */ +BOOL +WINAPI +SetFileSecurityW(LPCWSTR lpFileName, + SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR pSecurityDescriptor) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK StatusBlock; + UNICODE_STRING FileName; + ULONG AccessMask = 0; + HANDLE FileHandle; + NTSTATUS Status; + + TRACE("SetFileSecurityW() called\n"); + + SetSecurityAccessMask(SecurityInformation, &AccessMask); + + if (!RtlDosPathNameToNtPathName_U(lpFileName, + &FileName, + NULL, + NULL)) + { + ERR("Invalid path\n"); + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + AccessMask, + &ObjectAttributes, + &StatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + 0); + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FileName.Buffer); + + if (!NT_SUCCESS(Status)) + { + ERR("NtOpenFile() failed (Status %lx)\n", Status); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + Status = NtSetSecurityObject(FileHandle, + SecurityInformation, + pSecurityDescriptor); + NtClose(FileHandle); + + if (!NT_SUCCESS(Status)) + { + ERR("NtSetSecurityObject() failed (Status %lx)\n", Status); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/****************************************************************************** + * QueryWindows31FilesMigration [ADVAPI32.@] + * + * PARAMS + * x1 [] + */ +BOOL WINAPI +QueryWindows31FilesMigration( DWORD x1 ) +{ + FIXME("(%d):stub\n",x1); + return TRUE; +} + +/****************************************************************************** + * SynchronizeWindows31FilesAndWindowsNTRegistry [ADVAPI32.@] + * + * PARAMS + * x1 [] + * x2 [] + * x3 [] + * x4 [] + */ +BOOL WINAPI +SynchronizeWindows31FilesAndWindowsNTRegistry( DWORD x1, DWORD x2, DWORD x3, + DWORD x4 ) +{ + FIXME("(0x%08x,0x%08x,0x%08x,0x%08x):stub\n",x1,x2,x3,x4); + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +RevertToSelf(VOID) +{ + NTSTATUS Status; + HANDLE Token = NULL; + + Status = NtSetInformationThread(NtCurrentThread(), + ThreadImpersonationToken, + &Token, + sizeof(HANDLE)); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) +{ + NTSTATUS Status; + + Status = RtlImpersonateSelf(ImpersonationLevel); + if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); return FALSE; @@ -1141,6 +1615,29 @@ */ BOOL WINAPI +SetKernelObjectSecurity(HANDLE Handle, + SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + NTSTATUS Status; + + Status = NtSetSecurityObject(Handle, + SecurityInformation, + SecurityDescriptor); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI AddAuditAccessAce(PACL pAcl, DWORD dwAceRevision, DWORD dwAccessMask, @@ -1195,6 +1692,61 @@ return TRUE; } +/****************************************************************************** + * LookupAccountNameA [ADVAPI32.@] + * + * @implemented + */ +BOOL +WINAPI +LookupAccountNameA(LPCSTR SystemName, + LPCSTR AccountName, + PSID Sid, + LPDWORD SidLength, + LPSTR ReferencedDomainName, + LPDWORD hReferencedDomainNameLength, + PSID_NAME_USE SidNameUse) +{ + BOOL ret; + UNICODE_STRING lpSystemW; + UNICODE_STRING lpAccountW; + LPWSTR lpReferencedDomainNameW = NULL; + + RtlCreateUnicodeStringFromAsciiz(&lpSystemW, SystemName); + RtlCreateUnicodeStringFromAsciiz(&lpAccountW, AccountName); + + if (ReferencedDomainName) + lpReferencedDomainNameW = HeapAlloc(GetProcessHeap(), + 0, + *hReferencedDomainNameLength * sizeof(WCHAR)); + + ret = LookupAccountNameW(lpSystemW.Buffer, + lpAccountW.Buffer, + Sid, + SidLength, + lpReferencedDomainNameW, + hReferencedDomainNameLength, + SidNameUse); + + if (ret && lpReferencedDomainNameW) + { + WideCharToMultiByte(CP_ACP, + 0, + lpReferencedDomainNameW, + *hReferencedDomainNameLength + 1, + ReferencedDomainName, + *hReferencedDomainNameLength + 1, + NULL, + NULL); + } + + RtlFreeUnicodeString(&lpSystemW); + RtlFreeUnicodeString(&lpAccountW); + HeapFree(GetProcessHeap(), 0, lpReferencedDomainNameW); + + return ret; +} + /********************************************************************** * PrivilegeCheck EXPORTED * @@ -1220,6 +1772,45 @@ *pfResult = (BOOL)Result; return TRUE; +} + +/****************************************************************************** + * GetSecurityInfoExW EXPORTED + */ +DWORD +WINAPI +GetSecurityInfoExA(HANDLE hObject, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + LPCSTR lpProvider, + LPCSTR lpProperty, + PACTRL_ACCESSA *ppAccessList, + PACTRL_AUDITA *ppAuditList, + LPSTR *lppOwner, + LPSTR *lppGroup) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return ERROR_BAD_PROVIDER; +} + + +/****************************************************************************** + * GetSecurityInfoExW EXPORTED + */ +DWORD +WINAPI +GetSecurityInfoExW(HANDLE hObject, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + LPCWSTR lpProvider, + LPCWSTR lpProperty, + PACTRL_ACCESSW *ppAccessList, + PACTRL_AUDITW *ppAuditList, + LPWSTR *lppOwner, + LPWSTR *lppGroup) +{ + FIXME("%s() not implemented!\n", __FUNCTION__); + return ERROR_BAD_PROVIDER; } /* @@ -1245,6 +1836,66 @@ } return TRUE; +} + +/********************************************************************** + * SetNamedSecurityInfoA EXPORTED + * + * @implemented + */ +DWORD +WINAPI +SetNamedSecurityInfoA(LPSTR pObjectName, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSID psidOwner, + PSID psidGroup, + PACL pDacl, + PACL pSacl) +{ + UNICODE_STRING ObjectName; + DWORD Ret; + + if (!RtlCreateUnicodeStringFromAsciiz(&ObjectName, pObjectName)) + { + return ERROR_NOT_ENOUGH_MEMORY; + } + + Ret = SetNamedSecurityInfoW(ObjectName.Buffer, + ObjectType, + SecurityInfo, + psidOwner, + psidGroup, + pDacl, + pSacl); + + RtlFreeUnicodeString(&ObjectName); + + return Ret; +} + +/* + * @implemented + */ +BOOL +WINAPI +AreAllAccessesGranted(DWORD GrantedAccess, + DWORD DesiredAccess) +{ + return (BOOL)RtlAreAllAccessesGranted(GrantedAccess, + DesiredAccess); +} + +/* + * @implemented + */ +BOOL +WINAPI +AreAnyAccessesGranted(DWORD GrantedAccess, + DWORD DesiredAccess) +{ + return (BOOL)RtlAreAnyAccessesGranted(GrantedAccess, + DesiredAccess); } /****************************************************************************** @@ -2687,6 +3338,44 @@ return bret; } +/********************************************************************** + * GetNamedSecurityInfoA EXPORTED + * + * @implemented + */ +DWORD +WINAPI +GetNamedSecurityInfoA(LPSTR pObjectName, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSID *ppsidOwner, + PSID *ppsidGroup, + PACL *ppDacl, + PACL *ppSacl, + PSECURITY_DESCRIPTOR *ppSecurityDescriptor) +{ + DWORD len; + LPWSTR wstr = NULL; + DWORD r; + + TRACE("%s %d %d %p %p %p %p %p\n", pObjectName, ObjectType, SecurityInfo, + ppsidOwner, ppsidGroup, ppDacl, ppSacl, ppSecurityDescriptor); + + if( pObjectName ) + { + len = MultiByteToWideChar( CP_ACP, 0, pObjectName, -1, NULL, 0 ); + wstr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar( CP_ACP, 0, pObjectName, -1, wstr, len ); + } + + r = GetNamedSecurityInfoW( wstr, ObjectType, SecurityInfo, ppsidOwner, + ppsidGroup, ppDacl, ppSacl, ppSecurityDescriptor ); + + HeapFree( GetProcessHeap(), 0, wstr ); + + return r; +} + /* * @unimplemented */

1 0

[akhaldi] 64977: [ADVAPI32] * Move CreateProcessWithLogonW() from logon.c to security.c. CORE-8540
by akhaldi＠svn.reactos.org 25 Oct '14

25 Oct '14

Author: akhaldi Date: Sat Oct 25 12:27:03 2014 New Revision: 64977 URL: http://svn.reactos.org/svn/reactos?rev=64977&view=rev Log: [ADVAPI32] * Move CreateProcessWithLogonW() from logon.c to security.c. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Sat Oct 25 12:27:03 2014 @@ -213,30 +213,6 @@ } return TRUE; -} - -/* - * @unimplemented - */ -BOOL WINAPI -CreateProcessWithLogonW(LPCWSTR lpUsername, - LPCWSTR lpDomain, - LPCWSTR lpPassword, - DWORD dwLogonFlags, - LPCWSTR lpApplicationName, - LPWSTR lpCommandLine, - DWORD dwCreationFlags, - LPVOID lpEnvironment, - LPCWSTR lpCurrentDirectory, - LPSTARTUPINFOW lpStartupInfo, - LPPROCESS_INFORMATION lpProcessInformation) -{ - FIXME("%s %s %s 0x%08x %s %s 0x%08x %p %s %p %p stub\n", debugstr_w(lpUsername), debugstr_w(lpDomain), - debugstr_w(lpPassword), dwLogonFlags, debugstr_w(lpApplicationName), - debugstr_w(lpCommandLine), dwCreationFlags, lpEnvironment, debugstr_w(lpCurrentDirectory), - lpStartupInfo, lpProcessInformation); - - return FALSE; } /* 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 12:27:03 2014 @@ -2428,6 +2428,30 @@ return TRUE; } +/* + * @unimplemented + */ +BOOL WINAPI +CreateProcessWithLogonW(LPCWSTR lpUsername, + LPCWSTR lpDomain, + LPCWSTR lpPassword, + DWORD dwLogonFlags, + LPCWSTR lpApplicationName, + LPWSTR lpCommandLine, + DWORD dwCreationFlags, + LPVOID lpEnvironment, + LPCWSTR lpCurrentDirectory, + LPSTARTUPINFOW lpStartupInfo, + LPPROCESS_INFORMATION lpProcessInformation) +{ + FIXME("%s %s %s 0x%08x %s %s 0x%08x %p %s %p %p stub\n", debugstr_w(lpUsername), debugstr_w(lpDomain), + debugstr_w(lpPassword), dwLogonFlags, debugstr_w(lpApplicationName), + debugstr_w(lpCommandLine), dwCreationFlags, lpEnvironment, debugstr_w(lpCurrentDirectory), + lpStartupInfo, lpProcessInformation); + + return FALSE; +} + BOOL WINAPI CreateProcessWithTokenW(IN HANDLE hToken,

1 0

[jimtabor] 64976: [Win32k] - Fix a copy paste error, see CORE-8667. - Set top margin to 2.
by jimtabor＠svn.reactos.org 25 Oct '14

25 Oct '14

Author: jimtabor Date: Sat Oct 25 11:45:47 2014 New Revision: 64976 URL: http://svn.reactos.org/svn/reactos?rev=64976&view=rev Log: [Win32k] - Fix a copy paste error, see CORE-8667. - Set top margin to 2. Modified: trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Sat Oct 25 11:45:47 2014 @@ -649,7 +649,7 @@ lpmi->cyMenu = Menu->cyMenu; lpmi->spwndNotify = Menu->spwndNotify; lpmi->cxTextAlign = Menu->cxTextAlign; - lpmi->iTop = Menu->iMaxTop; + lpmi->iTop = Menu->iTop; lpmi->iMaxTop = Menu->iMaxTop; lpmi->dwArrowsOn = Menu->dwArrowsOn; Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Sat Oct 25 11:45:47 2014 @@ -43,7 +43,7 @@ #define MENU_COL_SPACE 4 /* top and bottom margins for popup menus */ -#define MENU_TOP_MARGIN 3 +#define MENU_TOP_MARGIN 2 //3 #define MENU_BOTTOM_MARGIN 2 #define MENU_TYPE_MASK (MF_STRING | MF_BITMAP | MF_OWNERDRAW | MF_SEPARATOR) @@ -395,7 +395,7 @@ MenuInfo->cyMenu = pMenu->cyMenu; MenuInfo->spwndNotify = pMenu->spwndNotify; MenuInfo->cxTextAlign = pMenu->cxTextAlign; - MenuInfo->iTop = pMenu->iMaxTop; + MenuInfo->iTop = pMenu->iTop; MenuInfo->iMaxTop = pMenu->iMaxTop; MenuInfo->dwArrowsOn = pMenu->dwArrowsOn; @@ -1301,7 +1301,7 @@ orgX = maxX; //if( lpitem.fType & (MF_MENUBREAK | MF_MENUBARBREAK)) // orgX += MENU_COL_SPACE; - orgY = 2;//MENU_TOP_MARGIN; + orgY = MENU_TOP_MARGIN; maxTab = maxTabWidth = 0; /* Parse items until column break or end of menu */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs