[NPFS]

- Misc changes to improve code clarity

svn path=/trunk/; revision=75102

diff --git a/reactos/drivers/filesystems/npfs/create.c b/reactos/drivers/filesystems/npfs/create.c
index 04fdfe8..96e60e3 100644 (file)
--- a/reactos/drivers/filesystems/npfs/create.c
+++ b/reactos/drivers/filesystems/npfs/create.c
@@ -676,7 +676,7 @@ NpCreateNewNamedPipe(IN PNP_DCB Dcb,
 
     if (!(Parameters->TimeoutSpecified) ||
         !(Parameters->MaximumInstances) ||
-        (Parameters->DefaultTimeout.HighPart >= 0))
+        (Parameters->DefaultTimeout.QuadPart >= 0))
     {
         Status = STATUS_INVALID_PARAMETER;
         goto Quickie;
@@ -706,7 +706,8 @@ NpCreateNewNamedPipe(IN PNP_DCB Dcb,
         goto Quickie;
     }
 
-    if (!Parameters->NamedPipeType && Parameters->ReadMode == 1)
+    if (Parameters->NamedPipeType == FILE_PIPE_BYTE_STREAM_TYPE &&
+        Parameters->ReadMode == FILE_PIPE_MESSAGE_MODE)
     {
         Status = STATUS_INVALID_PARAMETER;
         goto Quickie;

diff --git a/reactos/drivers/filesystems/npfs/fsctrl.c b/reactos/drivers/filesystems/npfs/fsctrl.c
index 5e1803b..d9ff6c8 100644 (file)
--- a/reactos/drivers/filesystems/npfs/fsctrl.c
+++ b/reactos/drivers/filesystems/npfs/fsctrl.c
@@ -547,7 +547,7 @@ NpTransceive(IN PDEVICE_OBJECT DeviceObject,
     }
 
     Status = NpWriteDataQueue(WriteQueue,
-                              1,
+                              FILE_PIPE_MESSAGE_MODE,
                               InBuffer,
                               InLength,
                               Ccb->Fcb->NamedPipeType,

diff --git a/reactos/drivers/filesystems/npfs/strucsup.c b/reactos/drivers/filesystems/npfs/strucsup.c
index 29a8c85..e178b01 100644 (file)
--- a/reactos/drivers/filesystems/npfs/strucsup.c
+++ b/reactos/drivers/filesystems/npfs/strucsup.c
@@ -15,7 +15,7 @@
 
 /* GLOBALS ********************************************************************/
 
-PWCHAR NpRootDCBName = L"\\";
+WCHAR NpRootDCBName[] = L"\\";
 PNP_VCB NpVcb;
 
 /* FUNCTIONS ******************************************************************/
@@ -188,8 +188,8 @@ NpCreateRootDcb(VOID)
     InitializeListHead(&Dcb->FcbList);
 
     Dcb->FullName.Buffer = NpRootDCBName;
-    Dcb->FullName.Length = 2;
-    Dcb->FullName.MaximumLength = 4;
+    Dcb->FullName.Length = sizeof(NpRootDCBName) - sizeof(UNICODE_NULL);
+    Dcb->FullName.MaximumLength = sizeof(NpRootDCBName);
 
     Dcb->ShortName.Length = Dcb->FullName.Length;
     Dcb->ShortName.MaximumLength = Dcb->FullName.MaximumLength;

diff --git a/reactos/drivers/filesystems/npfs/volinfo.c b/reactos/drivers/filesystems/npfs/volinfo.c
index 5a6f0a0..4e3cf9f 100644 (file)
--- a/reactos/drivers/filesystems/npfs/volinfo.c
+++ b/reactos/drivers/filesystems/npfs/volinfo.c
@@ -27,8 +27,7 @@ NpQueryFsVolumeInfo(IN PVOID Buffer,
 
     *Length -= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel);
 
-    InfoBuffer->VolumeCreationTime.LowPart = 0;
-    InfoBuffer->VolumeCreationTime.HighPart = 0;
+    InfoBuffer->VolumeCreationTime.QuadPart = 0;
     InfoBuffer->VolumeSerialNumber = 0;
     InfoBuffer->SupportsObjects = 0;