[ros-diffs] [pschweitzer] 49711: [NTOSKRNL] - Add missing PAGED_CODE() where needed - Removed a wrong ASSERT in FsRtlIsNameInExpressionPrivate() and replace it by the right one - Mark FsRtlIsDbcsInExpression()...

pschweitzer at svn.reactos.org pschweitzer at svn.reactos.org
Mon Nov 22 21:38:23 UTC 2010


Author: pschweitzer
Date: Mon Nov 22 21:38:23 2010
New Revision: 49711

URL: http://svn.reactos.org/svn/reactos?rev=49711&view=rev
Log:
[NTOSKRNL]
- Add missing PAGED_CODE() where needed
- Removed a wrong ASSERT in FsRtlIsNameInExpressionPrivate() and replace it by the right one
- Mark FsRtlIsDbcsInExpression() as halfplemented

Modified:
    trunk/reactos/ntoskrnl/fsrtl/dbcsname.c
    trunk/reactos/ntoskrnl/fsrtl/name.c

Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?rev=49711&r1=49710&r2=49711&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Mon Nov 22 21:38:23 2010
@@ -48,6 +48,7 @@
 {
     ULONG FirstPosition, i;
     ULONG SkipFirstSlash = 0;
+    PAGED_CODE();
 
     /* Zero the strings before continuing */
     RtlZeroMemory(FirstPart, sizeof(ANSI_STRING));
@@ -116,6 +117,7 @@
 FsRtlDoesDbcsContainWildCards(IN PANSI_STRING Name)
 {
     ULONG i;
+    PAGED_CODE();
 
     /* Check every character */
     for (i = 0; i < Name->Length; i++)
@@ -138,7 +140,7 @@
 
 /*++
  * @name FsRtlIsDbcsInExpression
- * @implemented
+ * @halfplemented
  *
  * Check if the Name string is in the Expression string.
  *
@@ -150,7 +152,7 @@
  *
  * @return TRUE if Name is found in Expression, FALSE otherwise
  *
- * @remarks None
+ * @remarks Implementation should be fixed to handle wildcards
  *
  *--*/
 BOOLEAN
@@ -159,7 +161,10 @@
                         IN PANSI_STRING Name)
 {
     ULONG ExpressionPosition, NamePosition, MatchingChars = 0;
-
+    PAGED_CODE();
+
+    ASSERT(Name->Length);
+    ASSERT(Expression->Length);
     ASSERT(!FsRtlDoesDbcsContainWildCards(Name));
 
     /* One can't be null, both can be */
@@ -242,6 +247,7 @@
     ANSI_STRING FirstPart, RemainingPart, Name;
     BOOLEAN LastDot;
     ULONG i;
+    PAGED_CODE();
 
     /* Just quit if the string is empty */
     if (!DbcsName.Length)
@@ -378,6 +384,7 @@
 {
     ANSI_STRING FirstPart, RemainingPart, Name;
     ULONG i;
+    PAGED_CODE();
 
     /* Just quit if the string is empty */
     if (!DbcsName.Length)

Modified: trunk/reactos/ntoskrnl/fsrtl/name.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=49711&r1=49710&r2=49711&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Mon Nov 22 21:38:23 2010
@@ -23,8 +23,9 @@
                                IN PWCHAR UpcaseTable OPTIONAL)
 {
     ULONG i = 0, j, k = 0;
-
-    ASSERT(!FsRtlDoesNameContainWildCards(Name));
+    PAGED_CODE();
+
+    ASSERT(!IgnoreCase || UpcaseTable);
 
     while (i < Name->Length / sizeof(WCHAR) && k < Expression->Length / sizeof(WCHAR))
     {
@@ -119,6 +120,7 @@
     BOOLEAN StringsAreEqual, MemoryAllocated = FALSE;
     ULONG i;
     NTSTATUS Status;
+    PAGED_CODE();
 
     /* Well, first check their size */
     if (Name1->Length != Name2->Length) return FALSE;
@@ -210,6 +212,7 @@
 {
     ULONG FirstPosition, i;
     ULONG SkipFirstSlash = 0;
+    PAGED_CODE();
 
     /* Zero the strings before continuing */
     RtlZeroMemory(FirstPart, sizeof(UNICODE_STRING));
@@ -272,6 +275,7 @@
 FsRtlDoesNameContainWildCards(IN PUNICODE_STRING Name)
 {
     PWCHAR Ptr;
+    PAGED_CODE();
 
     /* Loop through every character */
     if (Name->Length)




More information about the Ros-diffs mailing list