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

[ADVAPI32]

Browse source 
* Apply Wine commit e57edfea by Paul Vriens: Skip leading spaces when parsing.
* Update the related functions with Wine 1.7.27.
CORE-8540

svn path=/trunk/; revision=65007
This commit is contained in:
Amine Khaldi 2014-10-26 10:59:11 +00:00
parent 7a1f0bac68
commit 6d8f72bf65
1 changed files with 69 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
reactos/dll/win32/advapi32/wine/security.c
View file

@ -2335,6 +2335,9 @@ static BYTE ParseAceStringType(LPCWSTR* StringAcl)
LPCWSTR szAcl = *StringAcl; LPCWSTR szAcl = *StringAcl;
const ACEFLAG *lpaf = AceType; const ACEFLAG *lpaf = AceType;
while (*szAcl == ' ')
szAcl++;
while (lpaf->wstr && while (lpaf->wstr &&
(len = strlenW(lpaf->wstr)) && (len = strlenW(lpaf->wstr)) &&
strncmpW(lpaf->wstr, szAcl, len)) strncmpW(lpaf->wstr, szAcl, len))
@ -2343,7 +2346,7 @@ static BYTE ParseAceStringType(LPCWSTR* StringAcl)
if (!lpaf->wstr) if (!lpaf->wstr)
return 0; return 0;
*StringAcl += len; *StringAcl = szAcl + len;
return lpaf->value; return lpaf->value;
} }
@ -2369,6 +2372,9 @@ static BYTE ParseAceStringFlags(LPCWSTR* StringAcl)
BYTE flags = 0; BYTE flags = 0;
LPCWSTR szAcl = *StringAcl; LPCWSTR szAcl = *StringAcl;
while (*szAcl == ' ')
szAcl++;
while (*szAcl != ';') while (*szAcl != ';')
{ {
const ACEFLAG *lpaf = AceFlags; const ACEFLAG *lpaf = AceFlags;
@ -2399,6 +2405,9 @@ static DWORD ParseAceStringRights(LPCWSTR* StringAcl)
DWORD rights = 0; DWORD rights = 0;
LPCWSTR szAcl = *StringAcl; LPCWSTR szAcl = *StringAcl;
while (*szAcl == ' ')
szAcl++;
if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) if ((*szAcl == '0') && (*(szAcl + 1) == 'x'))
{ {
LPCWSTR p = szAcl; LPCWSTR p = szAcl;
@ -2445,11 +2454,8 @@ static DWORD ParseAceStringRights(LPCWSTR* StringAcl)
* *
* dacl_flags(string_ace1)(string_ace2)... (string_acen) * dacl_flags(string_ace1)(string_ace2)... (string_acen)
*/ */
static BOOL static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags,
ParseStringAclToAcl(LPCWSTR StringAcl, PACL pAcl, LPDWORD cBytes)
LPDWORD lpdwFlags,
PACL pAcl,
LPDWORD cBytes)
{ {
DWORD val; DWORD val;
DWORD sidlen; DWORD sidlen;
@ -2457,6 +2463,7 @@ ParseStringAclToAcl(LPCWSTR StringAcl,
DWORD acesize = 0; DWORD acesize = 0;
DWORD acecount = 0; DWORD acecount = 0;
PACCESS_ALLOWED_ACE pAce = NULL; /* pointer to current ACE */ PACCESS_ALLOWED_ACE pAce = NULL; /* pointer to current ACE */
DWORD error = ERROR_INVALID_ACL;
TRACE("%s\n", debugstr_w(StringAcl)); TRACE("%s\n", debugstr_w(StringAcl));
@ -2479,7 +2486,10 @@ ParseStringAclToAcl(LPCWSTR StringAcl,
if (pAce) if (pAce)
pAce->Header.AceType = (BYTE) val; pAce->Header.AceType = (BYTE) val;
if (*StringAcl != ';') if (*StringAcl != ';')
{
error = RPC_S_INVALID_STRING_UUID;
goto lerr; goto lerr;
}
StringAcl++; StringAcl++;
/* Parse ACE flags */ /* Parse ACE flags */
@ -2499,6 +2509,8 @@ ParseStringAclToAcl(LPCWSTR StringAcl,
StringAcl++; StringAcl++;
/* Parse ACE object guid */ /* Parse ACE object guid */
while (*StringAcl == ' ')
StringAcl++;
if (*StringAcl != ';') if (*StringAcl != ';')
{ {
FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n");
@ -2507,6 +2519,8 @@ ParseStringAclToAcl(LPCWSTR StringAcl,
StringAcl++; StringAcl++;
/* Parse ACE inherit object guid */ /* Parse ACE inherit object guid */
while (*StringAcl == ' ')
StringAcl++;
if (*StringAcl != ';') if (*StringAcl != ';')
{ {
FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n");
@ -2554,7 +2568,7 @@ ParseStringAclToAcl(LPCWSTR StringAcl,
return TRUE; return TRUE;
lerr: lerr:
SetLastError(ERROR_INVALID_ACL); SetLastError(error);
WARN("Invalid ACE string format\n"); WARN("Invalid ACE string format\n");
return FALSE; return FALSE;
} }
@ -2563,8 +2577,8 @@ lerr:
/****************************************************************************** /******************************************************************************
* ParseStringSecurityDescriptorToSecurityDescriptor * ParseStringSecurityDescriptorToSecurityDescriptor
*/ */
static BOOL static BOOL ParseStringSecurityDescriptorToSecurityDescriptor(
ParseStringSecurityDescriptorToSecurityDescriptor(LPCWSTR StringSecurityDescriptor, LPCWSTR StringSecurityDescriptor,
SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor,
LPDWORD cBytes) LPDWORD cBytes)
{ {
@ -2580,6 +2594,9 @@ ParseStringSecurityDescriptorToSecurityDescriptor(LPCWSTR StringSecurityDescript
if (SecurityDescriptor) if (SecurityDescriptor)
lpNext = (LPBYTE)(SecurityDescriptor + 1); lpNext = (LPBYTE)(SecurityDescriptor + 1);
while (*StringSecurityDescriptor == ' ')
StringSecurityDescriptor++;
while (*StringSecurityDescriptor) while (*StringSecurityDescriptor)
{ {
toktype = *StringSecurityDescriptor; toktype = *StringSecurityDescriptor;