Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:32:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOSKRNL]

Browse source 
Fixed FsRtlIsNameInExpression() according to r50018 tests

svn path=/trunk/; revision=50019
This commit is contained in:
Pierre Schweitzer 2010-12-12 22:17:45 +00:00
parent 94b828f1a4
commit ffd29f0aa3
1 changed files with 39 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

80
reactos/ntoskrnl/fsrtl/name.c
View file

@ -29,55 +29,53 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression,
while (i < Name->Length / sizeof(WCHAR) && k < Expression->Length / sizeof(WCHAR)) while (i < Name->Length / sizeof(WCHAR) && k < Expression->Length / sizeof(WCHAR))
{ {
if ((Expression->Buffer[k] == (IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i])) || if ((Expression->Buffer[k] == (IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i])) ||
(Expression->Buffer[k] == L'?') || (Expression->Buffer[k] == DOS_QM) || (Expression->Buffer[k] == L'?') || (Expression->Buffer[k] == DOS_QM) ||
(Expression->Buffer[k] == DOS_DOT && (Name->Buffer[i] == L'.' || Name->Buffer[i] == L'0'))) (Expression->Buffer[k] == DOS_DOT && Name->Buffer[i] == L'.'))
{
i++;
k++;
}
else if (Expression->Buffer[k] == L'*')
{
if (k < (Expression->Length / sizeof(WCHAR) - 1))
{ {
if (Expression->Buffer[k+1] != L'*' && Expression->Buffer[k+1] != L'?' && i++;
Expression->Buffer[k+1] != DOS_DOT && Expression->Buffer[k+1] != DOS_QM && k++;
Expression->Buffer[k+1] != DOS_STAR) }
{ else if (Expression->Buffer[k] == L'*')
while ((IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i]) != Expression->Buffer[k+1] && {
i < Name->Length / sizeof(WCHAR)) i++; if (k < (Expression->Length / sizeof(WCHAR) - 1))
}
else
{
if (!(Expression->Buffer[k+1] != DOS_DOT && (Name->Buffer[i] == L'.' || Name->Buffer[i] == L'0')))
{ {
i++; if (Expression->Buffer[k+1] != L'*' && Expression->Buffer[k+1] != L'?' &&
Expression->Buffer[k+1] != DOS_DOT && Expression->Buffer[k+1] != DOS_QM &&
Expression->Buffer[k+1] != DOS_STAR)
{
while ((IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i]) != Expression->Buffer[k+1] &&
i < Name->Length / sizeof(WCHAR)) i++;
}
} }
} else
{
i = Name->Length / sizeof(WCHAR);
}
k++;
}
else if (Expression->Buffer[k] == DOS_STAR)
{
j = i;
while (j < Name->Length / sizeof(WCHAR))
{
if (Name->Buffer[j] == L'.')
{
i = j;
}
j++;
}
k++;
} }
else else
{ {
i = Name->Length / sizeof(WCHAR); i = Name->Length / sizeof(WCHAR);
} }
}
if (k + 1 == Expression->Length / sizeof(WCHAR) && i == Name->Length / sizeof(WCHAR) &&
Expression->Buffer[k] == DOS_DOT)
{
k++; k++;
}
else if (Expression->Buffer[k] == DOS_STAR)
{
j = i;
while (j < Name->Length / sizeof(WCHAR))
{
if (Name->Buffer[j] == L'.')
{
i = j;
}
j++;
}
k++;
}
else
{
i = Name->Length / sizeof(WCHAR);
}
} }
return (k == Expression->Length / sizeof(WCHAR) && i == Name->Length / sizeof(WCHAR)); return (k == Expression->Length / sizeof(WCHAR) && i == Name->Length / sizeof(WCHAR));