[ros-diffs] [tfaber] 56959: [NTOSKRNL:IOMGR][NPFS] - Do not pass non-boolean Alertable values to KeWaitForSingleObject - Fix some DPRINTs

Author: tfaber
Date: Tue Jul 24 15:32:06 2012
New Revision: 56959

URL: http://svn.reactos.org/svn/reactos?rev=56959&view=rev
Log:
[NTOSKRNL:IOMGR][NPFS]
- Do not pass non-boolean Alertable values to KeWaitForSingleObject
- Fix some DPRINTs

Modified:
    trunk/reactos/drivers/filesystems/npfs/fsctrl.c
    trunk/reactos/drivers/filesystems/npfs/rw.c
    trunk/reactos/ntoskrnl/io/iomgr/iofunc.c

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] Tue Jul 24 15:32:06 2012
@@ -186,7 +186,7 @@
         KeWaitForSingleObject(&Ccb->ConnectEvent,
             UserRequest,
             WaitMode,
-            (Flags & FO_ALERTABLE_IO),
+            (Flags & FO_ALERTABLE_IO) != 0,
             NULL);
     }
 
@@ -407,7 +407,7 @@
     Status = KeWaitForSingleObject(&Ccb->ConnectEvent,
                                    UserRequest,
                                    Irp->RequestorMode,
-                                   (Ccb->FileObject->Flags & FO_ALERTABLE_IO),
+                                   (Ccb->FileObject->Flags & FO_ALERTABLE_IO)
!= 0,
                                    TimeOut);
     if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status ==
STATUS_ALERTED))
         Status = STATUS_CANCELLED;
@@ -532,7 +532,7 @@
     Status = KeWaitForSingleObject(&Ccb->ConnectEvent,
         UserRequest,
         Irp->RequestorMode,
-        (Ccb->FileObject->Flags & FO_ALERTABLE_IO),
+        (Ccb->FileObject->Flags & FO_ALERTABLE_IO) != 0,
         &TimeOut);
     if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status ==
STATUS_ALERTED))
         Status = STATUS_CANCELLED;

Modified: trunk/reactos/drivers/filesystems/npfs/rw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Tue Jul 24 15:32:06 2012
@@ -459,9 +459,9 @@
                     Status = KeWaitForSingleObject(&Ccb->ReadEvent,
                         UserRequest,
                         Irp->RequestorMode,
-                        (FileObject->Flags & FO_ALERTABLE_IO),
+                        (FileObject->Flags & FO_ALERTABLE_IO) != 0,
                         NULL);
-                    DPRINT("Finished waiting (%wZ)! Status: %x\n",
&Ccb->Fcb->PipeName, Status);
+                    DPRINT("Finished waiting (%wZ)! Status: %lx\n",
&Ccb->Fcb->PipeName, Status);
 
                     ExAcquireFastMutex(&Ccb->DataListLock);
 
@@ -815,7 +815,7 @@
 
     while(1)
     {
-        if ((ReaderCcb->WriteQuotaAvailable == 0))
+        if (ReaderCcb->WriteQuotaAvailable == 0)
         {
             if (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE || !Ccb->OtherSide)
             {
@@ -826,13 +826,13 @@
             KeSetEvent(&ReaderCcb->ReadEvent, IO_NO_INCREMENT, FALSE);
             ExReleaseFastMutex(&ReaderCcb->DataListLock);
 
-            DPRINT("Write Waiting for buffer space (%S)\n",
Fcb->PipeName.Buffer);
+            DPRINT("Write Waiting for buffer space (%wZ)\n",
&Fcb->PipeName);
             Status = KeWaitForSingleObject(&Ccb->WriteEvent,
                 UserRequest,
                 Irp->RequestorMode,
-                (FileObject->Flags & FO_ALERTABLE_IO),
+                (FileObject->Flags & FO_ALERTABLE_IO) != 0,
                 NULL);
-            DPRINT("Write Finished waiting (%S)! Status: %x\n",
Fcb->PipeName.Buffer, Status);
+            DPRINT("Write Finished waiting (%wZ)! Status: %lx\n",
&Fcb->PipeName, Status);
 
             if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status
== STATUS_ALERTED))
             {

Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c…
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Tue Jul 24 15:32:06 2012
@@ -163,7 +163,7 @@
                                            Executive,
                                            PreviousMode,
                                            (FileObject->Flags &
-                                            FO_ALERTABLE_IO),
+                                            FO_ALERTABLE_IO) != 0,
                                            NULL);
             if ((Status == STATUS_ALERTED) || (Status == STATUS_USER_APC))
             {
@@ -603,7 +603,8 @@
             Status = KeWaitForSingleObject(&FileObject->Event,
                                            Executive,
                                            KernelMode,
-                                           FileObject->Flags & FO_ALERTABLE_IO,
+                                           (FileObject->Flags &
+                                            FO_ALERTABLE_IO) != 0,
                                            NULL);
             if (Status == STATUS_ALERTED)
             {
@@ -856,7 +857,8 @@
             Status = KeWaitForSingleObject(&FileObject->Event,
                                            Executive,
                                            KernelMode,
-                                           FileObject->Flags & FO_ALERTABLE_IO,
+                                           (FileObject->Flags &
+                                            FO_ALERTABLE_IO) != 0,
                                            NULL);
             if (Status == STATUS_ALERTED)
             {
@@ -1869,7 +1871,8 @@
             Status = KeWaitForSingleObject(&FileObject->Event,
                                            Executive,
                                            PreviousMode,
-                                           FileObject->Flags & FO_ALERTABLE_IO,
+                                           (FileObject->Flags &
+                                            FO_ALERTABLE_IO) != 0,
                                            NULL);
             if ((Status == STATUS_USER_APC) || (Status == STATUS_ALERTED))
             {
@@ -2529,7 +2532,8 @@
             Status = KeWaitForSingleObject(&FileObject->Event,
                                            Executive,
                                            PreviousMode,
-                                           FileObject->Flags & FO_ALERTABLE_IO,
+                                           (FileObject->Flags &
+                                            FO_ALERTABLE_IO) != 0,
                                            NULL);
             if ((Status == STATUS_USER_APC) || (Status == STATUS_ALERTED))
             {