Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 10:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

partial advapi32 sid sync to wine 1.1.24

Browse source 
svn path=/trunk/; revision=41568
This commit is contained in:
Christoph von Wittich 2009-06-22 22:54:03 +00:00
parent 1196d45474
commit c8ee793546
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reactos/dll/win32/advapi32/sec/sid.c
View file

@ -506,7 +506,7 @@ static BOOL DumpAce(LPVOID pace, WCHAR **pwptr, ULONG *plen)
return FALSE;
}
piace = (ACCESS_ALLOWED_ACE *)pace;
piace = pace;
DumpString(&openbr, 1, pwptr, plen);
switch (piace->Header.AceType)
{
@ -789,7 +789,6 @@ static DWORD ComputeStringSidSize(LPCWSTR StringSid)
return GetSidLengthRequired(0);
}
/******************************************************************************
* ParseStringSidToSid
*/
@ -900,7 +899,6 @@ lend:
return bret;
}
/******************************************************************************
* ParseAclStringFlags
*/
@ -930,7 +928,6 @@ static DWORD ParseAclStringFlags(LPCWSTR* StringAcl)
return flags;
}
/******************************************************************************
* ParseAceStringType
*/
@ -1182,7 +1179,7 @@ lerr:
*/
static BOOL ParseStringSecurityDescriptorToSecurityDescriptor(
LPCWSTR StringSecurityDescriptor,
SECURITY_DESCRIPTOR* SecurityDescriptor,
SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor,
LPDWORD cBytes)
{
BOOL bret = FALSE;
@ -1195,7 +1192,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor(
*cBytes = sizeof(SECURITY_DESCRIPTOR);
if (SecurityDescriptor)
lpNext = ((LPBYTE) SecurityDescriptor) + sizeof(SECURITY_DESCRIPTOR);
lpNext = (LPBYTE)(SecurityDescriptor + 1);
while (*StringSecurityDescriptor)
{
@ -1233,7 +1230,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor(
if (SecurityDescriptor)
{
SecurityDescriptor->Owner = (PSID)(lpNext - (LPBYTE)SecurityDescriptor);
SecurityDescriptor->Owner = lpNext - (LPBYTE)SecurityDescriptor;
lpNext += bytes; /* Advance to next token */
}
@ -1251,7 +1248,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor(
if (SecurityDescriptor)
{
SecurityDescriptor->Group = (PSID)(lpNext - (LPBYTE)SecurityDescriptor);
SecurityDescriptor->Group = lpNext - (LPBYTE)SecurityDescriptor;
lpNext += bytes; /* Advance to next token */
}
@ -1271,7 +1268,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor(
if (SecurityDescriptor)
{
SecurityDescriptor->Control |= SE_DACL_PRESENT | flags;
SecurityDescriptor->Dacl = (PACL)(lpNext - (LPBYTE)SecurityDescriptor);
SecurityDescriptor->Dacl = lpNext - (LPBYTE)SecurityDescriptor;
lpNext += bytes; /* Advance to next token */
}
@ -1291,7 +1288,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor(
if (SecurityDescriptor)
{
SecurityDescriptor->Control |= SE_SACL_PRESENT | flags;
SecurityDescriptor->Sacl = (PACL)(lpNext - (LPBYTE)SecurityDescriptor);
SecurityDescriptor->Sacl = lpNext - (LPBYTE)SecurityDescriptor;
lpNext += bytes; /* Advance to next token */
}
@ -1360,7 +1357,7 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW(
psd->Control |= SE_SELF_RELATIVE;
if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor,
psd, &cBytes))
(SECURITY_DESCRIPTOR_RELATIVE *)psd, &cBytes))
{
LocalFree(psd);
goto lend;