[ros-diffs] [hpoussin] 19531: Patch by Elrond:

Patch by Elrond:
- Let NpfsListeningCancelRoutine show the pipe name it is trying to act
on.
- Add more ASSERT()s to NpfsRead, which seems to act quite strange
sometimes
Modified: trunk/reactos/drivers/fs/np/fsctrl.c
Modified: trunk/reactos/drivers/fs/np/rw.c
  _____  

Modified: trunk/reactos/drivers/fs/np/fsctrl.c
--- trunk/reactos/drivers/fs/np/fsctrl.c	2005-11-24 14:36:47 UTC
(rev 19530)
+++ trunk/reactos/drivers/fs/np/fsctrl.c	2005-11-24 16:23:07 UTC
(rev 19531)
@@ -22,10 +22,11 @@

 {
   PNPFS_WAITER_ENTRY Waiter;
 
-  DPRINT1("NpfsListeningCancelRoutine() called\n");
-
   Waiter = (PNPFS_WAITER_ENTRY)&Irp->Tail.Overlay.DriverContext;
 
+  DPRINT1("NpfsListeningCancelRoutine() called for <%wZ>\n",
+         &Waiter->Fcb->Pipe->PipeName);
+
   IoReleaseCancelSpinLock(Irp->CancelIrql);
 
 
  _____  

Modified: trunk/reactos/drivers/fs/np/rw.c
--- trunk/reactos/drivers/fs/np/rw.c	2005-11-24 14:36:47 UTC (rev
19530)
+++ trunk/reactos/drivers/fs/np/rw.c	2005-11-24 16:23:07 UTC (rev
19531)
@@ -442,6 +442,7 @@

 	      break;
 	   }
         }
+        ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL);
         if (Fcb->Pipe->ReadMode == FILE_PIPE_BYTE_STREAM_MODE)
         {
 	   DPRINT("Byte stream mode\n");