From 91a5c6ea10fcb25634a39b237e9857e2ae1b2612 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sat, 20 Apr 2013 16:49:53 +0000 Subject: [PATCH] [NTOSKRNL] Also allow null matching at the end of the expression with * wc in FsRtlIs*InExpression() This should fix a few tests svn path=/trunk/; revision=58791 --- reactos/ntoskrnl/fsrtl/dbcsname.c | 2 +- reactos/ntoskrnl/fsrtl/name.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/ntoskrnl/fsrtl/dbcsname.c b/reactos/ntoskrnl/fsrtl/dbcsname.c index 817a952cbe7..883a76e70da 100644 --- a/reactos/ntoskrnl/fsrtl/dbcsname.c +++ b/reactos/ntoskrnl/fsrtl/dbcsname.c @@ -248,7 +248,7 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, } } if (ExpressionPosition + 1 == Expression->Length && NamePosition == Name->Length && - Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT) + (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT || Expression->Buffer[ExpressionPosition] == '*')) { ExpressionPosition++; } diff --git a/reactos/ntoskrnl/fsrtl/name.c b/reactos/ntoskrnl/fsrtl/name.c index 6fb8c7a2a7b..be1eb348082 100644 --- a/reactos/ntoskrnl/fsrtl/name.c +++ b/reactos/ntoskrnl/fsrtl/name.c @@ -185,7 +185,7 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression, } } if (ExpressionPosition + 1 == Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR) && - Expression->Buffer[ExpressionPosition] == DOS_DOT) + (Expression->Buffer[ExpressionPosition] == DOS_DOT || Expression->Buffer[ExpressionPosition] == L'*')) { ExpressionPosition++; }