[ros-diffs] [tfaber] 75102: [NPFS] - Misc changes to improve code clarity

Author: tfaber
Date: Sun Jun 18 18:08:52 2017
New Revision: 75102

URL: http://svn.reactos.org/svn/reactos?rev=75102&view=rev
Log:
[NPFS]
- Misc changes to improve code clarity

Modified:
    trunk/reactos/drivers/filesystems/npfs/create.c
    trunk/reactos/drivers/filesystems/npfs/fsctrl.c
    trunk/reactos/drivers/filesystems/npfs/strucsup.c
    trunk/reactos/drivers/filesystems/npfs/volinfo.c

Modified: trunk/reactos/drivers/filesystems/npfs/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs/create.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs/create.c	[iso-8859-1] Sun Jun 18 18:08:52 2017
@@ -676,7 +676,7 @@
 
     if (!(Parameters->TimeoutSpecified) ||
         !(Parameters->MaximumInstances) ||
-        (Parameters->DefaultTimeout.HighPart >= 0))
+        (Parameters->DefaultTimeout.QuadPart >= 0))
     {
         Status = STATUS_INVALID_PARAMETER;
         goto Quickie;
@@ -706,7 +706,8 @@
         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;

Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs/fsctrl.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c	[iso-8859-1] Sun Jun 18 18:08:52 2017
@@ -547,7 +547,7 @@
     }
 
     Status = NpWriteDataQueue(WriteQueue,
-                              1,
+                              FILE_PIPE_MESSAGE_MODE,
                               InBuffer,
                               InLength,
                               Ccb->Fcb->NamedPipeType,

Modified: trunk/reactos/drivers/filesystems/npfs/strucsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs/strucsup.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs/strucsup.c	[iso-8859-1] Sun Jun 18 18:08:52
2017
@@ -15,7 +15,7 @@
 
 /* GLOBALS ********************************************************************/
 
-PWCHAR NpRootDCBName = L"\\";
+WCHAR NpRootDCBName[] = L"\\";
 PNP_VCB NpVcb;
 
 /* FUNCTIONS ******************************************************************/
@@ -188,8 +188,8 @@
     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;

Modified: trunk/reactos/drivers/filesystems/npfs/volinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs/volinfo.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs/volinfo.c	[iso-8859-1] Sun Jun 18 18:08:52
2017
@@ -27,8 +27,7 @@
 
     *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;