- Update to r53061

[reactos.git] / drivers / filesystems / npfs / dirctl.c

diff --git a/drivers/filesystems/npfs/dirctl.c b/drivers/filesystems/npfs/dirctl.c
index 2fbfbd4..87053e8 100644 (file)
--- a/drivers/filesystems/npfs/dirctl.c
+++ b/drivers/filesystems/npfs/dirctl.c
@@ -21,7 +21,7 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
                    PULONG Size)
 {
     PIO_STACK_LOCATION Stack;
                    PULONG Size)
 {
     PIO_STACK_LOCATION Stack;

-    LONG BufferLength = 0;
+    ULONG BufferLength = 0;

     PUNICODE_STRING SearchPattern = NULL;
     FILE_INFORMATION_CLASS FileInformationClass;
     ULONG FileIndex = 0;
     PUNICODE_STRING SearchPattern = NULL;
     FILE_INFORMATION_CLASS FileInformationClass;
     ULONG FileIndex = 0;


@@ -31,7 +31,6 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
     PNPFS_VCB Vcb;
     PNPFS_FCB PipeFcb;
     ULONG PipeIndex;
     PNPFS_VCB Vcb;
     PNPFS_FCB PipeFcb;
     ULONG PipeIndex;

-    BOOLEAN Found = FALSE;

     NTSTATUS Status = STATUS_SUCCESS;
     PFILE_NAMES_INFORMATION NamesBuffer;
     PFILE_DIRECTORY_INFORMATION DirectoryBuffer;
     NTSTATUS Status = STATUS_SUCCESS;
     PFILE_NAMES_INFORMATION NamesBuffer;
     PFILE_DIRECTORY_INFORMATION DirectoryBuffer;


@@ -39,6 +38,9 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
     PFILE_BOTH_DIR_INFORMATION BothDirBuffer;
     ULONG InfoSize = 0;
     ULONG NameLength;
     PFILE_BOTH_DIR_INFORMATION BothDirBuffer;
     ULONG InfoSize = 0;
     ULONG NameLength;

+    ULONG CurrentOffset = 0;
+    ULONG LastOffset = 0;
+    PULONG NextEntryOffset;

 
     Stack = IoGetCurrentIrpStackLocation(Irp);
 
 
     Stack = IoGetCurrentIrpStackLocation(Irp);
 


@@ -69,7 +71,9 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
         if (SearchPattern != NULL)
         {
             Ccb->u.Directory.SearchPattern.Buffer =
         if (SearchPattern != NULL)
         {
             Ccb->u.Directory.SearchPattern.Buffer =

-                ExAllocatePool(NonPagedPool, SearchPattern->Length + sizeof(WCHAR));
+                ExAllocatePoolWithTag(NonPagedPool,
+                                      SearchPattern->Length + sizeof(WCHAR),
+                                      TAG_NPFS_NAMEBLOCK);

             if (Ccb->u.Directory.SearchPattern.Buffer == NULL)
             {
                 return STATUS_INSUFFICIENT_RESOURCES;
             if (Ccb->u.Directory.SearchPattern.Buffer == NULL)
             {
                 return STATUS_INSUFFICIENT_RESOURCES;


@@ -85,7 +89,9 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
         else
         {
             Ccb->u.Directory.SearchPattern.Buffer =
         else
         {
             Ccb->u.Directory.SearchPattern.Buffer =

-                ExAllocatePool(NonPagedPool, 2 * sizeof(WCHAR));
+                ExAllocatePoolWithTag(NonPagedPool,
+                                      2 * sizeof(WCHAR),
+                                      TAG_NPFS_NAMEBLOCK);

             if (Ccb->u.Directory.SearchPattern.Buffer == NULL)
             {
                 return STATUS_INSUFFICIENT_RESOURCES;
             if (Ccb->u.Directory.SearchPattern.Buffer == NULL)
             {
                 return STATUS_INSUFFICIENT_RESOURCES;


@@ -103,7 +109,8 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
     if (First || (Stack->Flags & SL_RESTART_SCAN))
     {
         FileIndex = 0;
     if (First || (Stack->Flags & SL_RESTART_SCAN))
     {
         FileIndex = 0;

-    } else if ((Stack->Flags & SL_INDEX_SPECIFIED) == 0)
+    }
+    else if ((Stack->Flags & SL_INDEX_SPECIFIED) == 0)

     {
         FileIndex = Ccb->u.Directory.FileIndex + 1;
     }
     {
         FileIndex = Ccb->u.Directory.FileIndex + 1;
     }


@@ -139,7 +146,6 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
     Vcb = Ccb->Fcb->Vcb;
     CurrentEntry = Vcb->PipeListHead.Flink;
     while (CurrentEntry != &Vcb->PipeListHead &&
     Vcb = Ccb->Fcb->Vcb;
     CurrentEntry = Vcb->PipeListHead.Flink;
     while (CurrentEntry != &Vcb->PipeListHead &&

-           Found == FALSE &&

            Status == STATUS_SUCCESS)
     {
         /* Get the FCB of the next pipe */
            Status == STATUS_SUCCESS)
     {
         /* Get the FCB of the next pipe */


@@ -174,13 +180,12 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
                 }
 
                 /* Initialize the information struct */
                 }
 
                 /* Initialize the information struct */

-                RtlZeroMemory(Buffer, InfoSize);
+                RtlZeroMemory(&Buffer[CurrentOffset], InfoSize);

 
                 switch (FileInformationClass)
                 {
                     case FileDirectoryInformation:
 
                 switch (FileInformationClass)
                 {
                     case FileDirectoryInformation:

-                        DirectoryBuffer = (PFILE_DIRECTORY_INFORMATION)Buffer;
-                        DirectoryBuffer->NextEntryOffset = 0;
+                        DirectoryBuffer = (PFILE_DIRECTORY_INFORMATION)&Buffer[CurrentOffset];

                         DirectoryBuffer->FileIndex = PipeIndex;
                         DirectoryBuffer->FileAttributes = FILE_ATTRIBUTE_NORMAL;
                         DirectoryBuffer->EndOfFile.QuadPart = PipeFcb->CurrentInstances;
                         DirectoryBuffer->FileIndex = PipeIndex;
                         DirectoryBuffer->FileAttributes = FILE_ATTRIBUTE_NORMAL;
                         DirectoryBuffer->EndOfFile.QuadPart = PipeFcb->CurrentInstances;


@@ -192,8 +197,7 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
                         break;
 
                     case FileFullDirectoryInformation:
                         break;
 
                     case FileFullDirectoryInformation:

-                        FullDirBuffer = (PFILE_FULL_DIR_INFORMATION)Buffer;
-                        FullDirBuffer->NextEntryOffset = 0;
+                        FullDirBuffer = (PFILE_FULL_DIR_INFORMATION)&Buffer[CurrentOffset];

                         FullDirBuffer->FileIndex = PipeIndex;
                         FullDirBuffer->FileAttributes = FILE_ATTRIBUTE_NORMAL;
                         FullDirBuffer->EndOfFile.QuadPart = PipeFcb->CurrentInstances;
                         FullDirBuffer->FileIndex = PipeIndex;
                         FullDirBuffer->FileAttributes = FILE_ATTRIBUTE_NORMAL;
                         FullDirBuffer->EndOfFile.QuadPart = PipeFcb->CurrentInstances;


@@ -205,7 +209,7 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
                         break;
 
                     case FileBothDirectoryInformation:
                         break;
 
                     case FileBothDirectoryInformation:

-                        BothDirBuffer = (PFILE_BOTH_DIR_INFORMATION)Buffer;
+                        BothDirBuffer = (PFILE_BOTH_DIR_INFORMATION)&Buffer[CurrentOffset];

                         BothDirBuffer->NextEntryOffset = 0;
                         BothDirBuffer->FileIndex = PipeIndex;
                         BothDirBuffer->FileAttributes = FILE_ATTRIBUTE_NORMAL;
                         BothDirBuffer->NextEntryOffset = 0;
                         BothDirBuffer->FileIndex = PipeIndex;
                         BothDirBuffer->FileAttributes = FILE_ATTRIBUTE_NORMAL;


@@ -218,8 +222,7 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
                         break;
 
                     case FileNamesInformation:
                         break;
 
                     case FileNamesInformation:

-                        NamesBuffer = (PFILE_NAMES_INFORMATION)Buffer;
-                        NamesBuffer->NextEntryOffset = 0;
+                        NamesBuffer = (PFILE_NAMES_INFORMATION)&Buffer[CurrentOffset];

                         NamesBuffer->FileIndex = PipeIndex;
                         NamesBuffer->FileNameLength = NameLength;
                         RtlCopyMemory(NamesBuffer->FileName,
                         NamesBuffer->FileIndex = PipeIndex;
                         NamesBuffer->FileNameLength = NameLength;
                         RtlCopyMemory(NamesBuffer->FileName,


@@ -233,15 +236,33 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
                         break;
                 }
 
                         break;
                 }
 

-                *Size = InfoSize + NameLength;
+                DPRINT("CurrentOffset: %lu\n", CurrentOffset);

 
 

+                /* Store the current pipe index in the CCB */

                 Ccb->u.Directory.FileIndex = PipeIndex;
                 Ccb->u.Directory.FileIndex = PipeIndex;

-                Found = TRUE;

 
 

-//                if (Stack->Flags & SL_RETURN_SINGLE_ENTRY)
-//                    return STATUS_SUCCESS;
+                /* Get the pointer to the previous entries NextEntryOffset */
+                NextEntryOffset = (PULONG)&Buffer[LastOffset];
+
+                /* Set the previous entries NextEntryOffset */
+                *NextEntryOffset = CurrentOffset - LastOffset;
+
+                /* Return the used buffer size */
+                *Size = CurrentOffset + InfoSize + NameLength;
+
+                /* Leave, if there is no space left in the buffer */
+                if (Status == STATUS_BUFFER_OVERFLOW)
+                    return Status;
+
+                /* Leave, if we should return only one entry */
+                if (Stack->Flags & SL_RETURN_SINGLE_ENTRY)
+                    return STATUS_SUCCESS;
+
+                /* Store the current offset for the next round */
+                LastOffset = CurrentOffset;

 
 

-                break;
+                /* Set the offset for the next entry */
+                CurrentOffset += ROUND_UP(InfoSize + NameLength, sizeof(ULONG));

             }
 
             PipeIndex++;
             }
 
             PipeIndex++;


@@ -250,7 +271,8 @@ NpfsQueryDirectory(PNPFS_CCB Ccb,
         CurrentEntry = CurrentEntry->Flink;
     }
 
         CurrentEntry = CurrentEntry->Flink;
     }
 

-    if (Found == FALSE)
+    /* Return STATUS_NO_MORE_FILES if no matching pipe name was found */
+    if (CurrentOffset == 0)

         Status = STATUS_NO_MORE_FILES;
 
     return Status;
         Status = STATUS_NO_MORE_FILES;
 
     return Status;