Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correctly set internal state in NpfsDisconnectPipe and fix some return values in NpfsRead.

Browse source 
svn path=/trunk/; revision=17156
This commit is contained in:
Filip Navara 2005-08-07 10:56:57 +00:00
parent 135eaf6958
commit aef1fdc048
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/drivers/fs/np/fsctrl.c
View file

@ -187,6 +187,7 @@ NpfsDisconnectPipe(PNPFS_FCB Fcb)
Server = (Fcb->PipeEnd == FILE_PIPE_SERVER_END); Server = (Fcb->PipeEnd == FILE_PIPE_SERVER_END);
OtherSide = Fcb->OtherSide; OtherSide = Fcb->OtherSide;
Fcb->OtherSide = NULL; Fcb->OtherSide = NULL;
Fcb->PipeState = FILE_PIPE_DISCONNECTED_STATE;
/* Lock the server first */ /* Lock the server first */
if (Server) if (Server)
{ {

22
reactos/drivers/fs/np/rw.c
View file

@ -27,7 +27,7 @@ VOID HexDump(PUCHAR Buffer, ULONG Length)
DbgPrint("---------------\n"); DbgPrint("---------------\n");
for (i = 0; i < ROUND_UP(Length, 16); i+= 16) for (i = 0; i < Length; i+= 16)
{ {
memset(Line, ' ', 64); memset(Line, ' ', 64);
Line[64] = 0; Line[64] = 0;
@ -398,23 +398,19 @@ NpfsRead(IN PDEVICE_OBJECT DeviceObject,
{ {
if (Fcb->ReadDataAvailable == 0) if (Fcb->ReadDataAvailable == 0)
{ {
if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE)
{
ASSERT(Fcb->OtherSide != NULL);
KeSetEvent(&Fcb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE);
}
if (Information > 0 &&
(Fcb->Pipe->ReadMode != FILE_PIPE_BYTE_STREAM_MODE ||
Fcb->PipeState != FILE_PIPE_CONNECTED_STATE))
{
break;
}
if (Fcb->PipeState != FILE_PIPE_CONNECTED_STATE) if (Fcb->PipeState != FILE_PIPE_CONNECTED_STATE)
{ {
DPRINT("PipeState: %x\n", Fcb->PipeState); DPRINT("PipeState: %x\n", Fcb->PipeState);
Status = STATUS_PIPE_BROKEN; if (Fcb->PipeState == FILE_PIPE_LISTENING_STATE)
Status = STATUS_PIPE_LISTENING;
else
Status = STATUS_PIPE_DISCONNECTED;
break; break;
} }
ASSERT(Fcb->OtherSide != NULL);
KeSetEvent(&Fcb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE);
ExReleaseFastMutex(&Fcb->DataListLock); ExReleaseFastMutex(&Fcb->DataListLock);
if (IoIsOperationSynchronous(Irp)) if (IoIsOperationSynchronous(Irp))
{ {