[FASTFAT]

[NTFS]
Addendum to r67911

svn path=/trunk/; revision=67914

diff --git a/reactos/drivers/filesystems/fastfat/close.c b/reactos/drivers/filesystems/fastfat/close.c
index 193f356..938ed2b 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/close.c
+++ b/reactos/drivers/filesystems/fastfat/close.c
@@ -89,7 +89,7 @@ VfatClose(
 #if 0
     /* There occurs a dead look at the call to CcRosDeleteFileCache/ObDereferenceObject/VfatClose
        in CmLazyCloseThreadMain if VfatClose is execute asynchronous in a worker thread. */
 #if 0
     /* There occurs a dead look at the call to CcRosDeleteFileCache/ObDereferenceObject/VfatClose
        in CmLazyCloseThreadMain if VfatClose is execute asynchronous in a worker thread. */

-    if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, IrpContext->Flags & IRPCONTEXT_CANWAIT))
+    if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT)))

 #else
     if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, TRUE))
 #endif
 #else
     if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, TRUE))
 #endif

diff --git a/reactos/drivers/filesystems/fastfat/rw.c b/reactos/drivers/filesystems/fastfat/rw.c
index c3f8e95..c8644f4 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/rw.c
+++ b/reactos/drivers/filesystems/fastfat/rw.c
@@ -655,7 +655,7 @@ VfatRead(
         }
     }
 
         }
     }
 

-    Buffer = VfatGetUserBuffer(IrpContext->Irp, IrpContext->Irp->Flags & IRP_PAGING_IO);
+    Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO));

     if (!Buffer)
     {
         Status = STATUS_INVALID_USER_BUFFER;
     if (!Buffer)
     {
         Status = STATUS_INVALID_USER_BUFFER;


@@ -926,7 +926,7 @@ VfatWrite(
 
     OldFileSize = Fcb->RFCB.FileSize;
 
 
     OldFileSize = Fcb->RFCB.FileSize;
 

-    Buffer = VfatGetUserBuffer(IrpContext->Irp, IrpContext->Irp->Flags & IRP_PAGING_IO);
+    Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO));

     if (!Buffer)
     {
         Status = STATUS_INVALID_USER_BUFFER;
     if (!Buffer)
     {
         Status = STATUS_INVALID_USER_BUFFER;

diff --git a/reactos/drivers/filesystems/ntfs/rw.c b/reactos/drivers/filesystems/ntfs/rw.c
index 7387b85..dd01997 100644 (file)
--- a/reactos/drivers/filesystems/ntfs/rw.c
+++ b/reactos/drivers/filesystems/ntfs/rw.c
@@ -196,7 +196,7 @@ NtfsRead(PNTFS_IRP_CONTEXT IrpContext)
     DeviceExt = DeviceObject->DeviceExtension;
     ReadLength = Stack->Parameters.Read.Length;
     ReadOffset = Stack->Parameters.Read.ByteOffset;
     DeviceExt = DeviceObject->DeviceExtension;
     ReadLength = Stack->Parameters.Read.Length;
     ReadOffset = Stack->Parameters.Read.ByteOffset;

-    Buffer = NtfsGetUserBuffer(Irp, Irp->Flags & IRP_PAGING_IO);
+    Buffer = NtfsGetUserBuffer(Irp, BooleanFlagOn(Irp->Flags, IRP_PAGING_IO));

 
     Status = NtfsReadFile(DeviceExt,
                           FileObject,
 
     Status = NtfsReadFile(DeviceExt,
                           FileObject,