From c48b6ad95494c9fdf4753b08f29f947d1fc9acc8 Mon Sep 17 00:00:00 2001
From: Pierre Schweitzer <pierre@reactos.org>
Date: Sat, 12 Apr 2014 21:15:55 +0000
Subject: [PATCH] [NPFS] Fix failing tests

CORE-7451

svn path=/trunk/; revision=62724
---
 reactos/drivers/filesystems/npfs/volinfo.c | 24 ++++++++--------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/reactos/drivers/filesystems/npfs/volinfo.c b/reactos/drivers/filesystems/npfs/volinfo.c
index a8449ef9a84..ea0d67442b8 100644
--- a/reactos/drivers/filesystems/npfs/volinfo.c
+++ b/reactos/drivers/filesystems/npfs/volinfo.c
@@ -25,7 +25,7 @@ NpQueryFsVolumeInfo(IN PVOID Buffer,
     USHORT NameLength;
     TRACE("Entered\n");
 
-    *Length -= sizeof(*InfoBuffer);
+    *Length -= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel);
 
     InfoBuffer->VolumeCreationTime.LowPart = 0;
     InfoBuffer->VolumeCreationTime.HighPart = 0;
@@ -77,23 +77,15 @@ NpQueryFsDeviceInfo(IN PVOID Buffer,
                     IN OUT PULONG Length)
 {
     PFILE_FS_DEVICE_INFORMATION InfoBuffer = Buffer;
-    NTSTATUS Status;
     TRACE("Entered\n");
 
-    if (*Length >= sizeof(*InfoBuffer))
-    {
-        InfoBuffer->DeviceType = 0;
-        InfoBuffer->Characteristics = 0;
-        InfoBuffer->DeviceType = FILE_DEVICE_NAMED_PIPE;
-        *Length -= sizeof(*InfoBuffer);
-        Status = STATUS_SUCCESS;
-    }
-    else
-    {
-        Status = STATUS_BUFFER_OVERFLOW;
-    }
-    TRACE("Leaving, Status = %lx\n", Status);
-    return Status;
+    InfoBuffer->DeviceType = 0;
+    InfoBuffer->Characteristics = 0;
+    InfoBuffer->DeviceType = FILE_DEVICE_NAMED_PIPE;
+    *Length -= sizeof(*InfoBuffer);
+
+    TRACE("Leaving, Status = STATUS_SUCCESS\n");
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS