Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-22 18:45:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NPFS]

Browse source 
- Fix wait parameters so we can break out of a wait if a user APC is delivered and the file object is opened with FILE_SYNCHRONOUS_IO_ALERT
- Fixes hanging ntdll:pipe winetest (only 1 failure out of 53 tests now)

svn path=/trunk/; revision=54319
This commit is contained in:
Cameron Gutman 2011-11-06 18:47:51 +00:00
parent 1bdbaed2a7
commit ee06a00c1a
4 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/drivers/filesystems/npfs/create.c
View file

@ -191,6 +191,8 @@ NpfsOpenFileSystem(PNPFS_FCB Fcb,
return; return;
} }
Ccb->FileObject = FileObject;
FileObject->FsContext = Fcb; FileObject->FsContext = Fcb;
FileObject->FsContext2 = Ccb; FileObject->FsContext2 = Ccb;
@ -217,6 +219,8 @@ NpfsOpenRootDirectory(PNPFS_FCB Fcb,
return; return;
} }
Ccb->FileObject = FileObject;
FileObject->FsContext = Fcb; FileObject->FsContext = Fcb;
FileObject->FsContext2 = Ccb; FileObject->FsContext2 = Ccb;
@ -336,6 +340,7 @@ NpfsCreate(PDEVICE_OBJECT DeviceObject,
return STATUS_NO_MEMORY; return STATUS_NO_MEMORY;
} }
ClientCcb->FileObject = FileObject;
ClientCcb->Thread = (struct ETHREAD *)Irp->Tail.Overlay.Thread; ClientCcb->Thread = (struct ETHREAD *)Irp->Tail.Overlay.Thread;
ClientCcb->PipeEnd = FILE_PIPE_CLIENT_END; ClientCcb->PipeEnd = FILE_PIPE_CLIENT_END;
#ifndef USING_PROPER_NPFS_WAIT_SEMANTICS #ifndef USING_PROPER_NPFS_WAIT_SEMANTICS
@ -718,6 +723,7 @@ NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject,
Fcb->CurrentInstances++; Fcb->CurrentInstances++;
Ccb->Fcb = Fcb; Ccb->Fcb = Fcb;
Ccb->FileObject = FileObject;
Ccb->PipeEnd = FILE_PIPE_SERVER_END; Ccb->PipeEnd = FILE_PIPE_SERVER_END;
Ccb->PipeState = FILE_PIPE_LISTENING_STATE; Ccb->PipeState = FILE_PIPE_LISTENING_STATE;

10
reactos/drivers/filesystems/npfs/fsctrl.c
View file

@ -186,7 +186,7 @@ NpfsConnectPipe(PIRP Irp,
KeWaitForSingleObject(&Ccb->ConnectEvent, KeWaitForSingleObject(&Ccb->ConnectEvent,
UserRequest, UserRequest,
Irp->RequestorMode, Irp->RequestorMode,
FALSE, (Flags & FO_ALERTABLE_IO),
NULL); NULL);
} }
@ -405,8 +405,8 @@ NpfsWaitPipe(PIRP Irp,
Status = KeWaitForSingleObject(&Ccb->ConnectEvent, Status = KeWaitForSingleObject(&Ccb->ConnectEvent,
UserRequest, UserRequest,
KernelMode, Irp->RequestorMode,
TRUE, (Ccb->FileObject->Flags & FO_ALERTABLE_IO),
TimeOut); TimeOut);
DPRINT("KeWaitForSingleObject() returned (Status %lx)\n", Status); DPRINT("KeWaitForSingleObject() returned (Status %lx)\n", Status);
@ -523,8 +523,8 @@ NpfsWaitPipe2(PIRP Irp,
/* Wait for one */ /* Wait for one */
Status = KeWaitForSingleObject(&Ccb->ConnectEvent, Status = KeWaitForSingleObject(&Ccb->ConnectEvent,
UserRequest, UserRequest,
KernelMode, Irp->RequestorMode,
FALSE, (Ccb->FileObject->Flags & FO_ALERTABLE_IO),
&TimeOut); &TimeOut);
DPRINT("KeWaitForSingleObject() returned (Status %lx)\n", Status); DPRINT("KeWaitForSingleObject() returned (Status %lx)\n", Status);

2
reactos/drivers/filesystems/npfs/npfs.h
View file

@ -84,6 +84,8 @@ typedef struct _NPFS_CCB
CCB_TYPE Type; CCB_TYPE Type;
PNPFS_FCB Fcb; PNPFS_FCB Fcb;
PFILE_OBJECT FileObject;
struct _NPFS_CCB* OtherSide; struct _NPFS_CCB* OtherSide;
struct ETHREAD *Thread; struct ETHREAD *Thread;
KEVENT ConnectEvent; KEVENT ConnectEvent;

14
reactos/drivers/filesystems/npfs/rw.c
View file

@ -374,11 +374,11 @@ NpfsRead(IN PDEVICE_OBJECT DeviceObject,
Context->WaitEvent = &Event; Context->WaitEvent = &Event;
ExReleaseFastMutex(&Ccb->DataListLock); ExReleaseFastMutex(&Ccb->DataListLock);
Status = KeWaitForSingleObject(&Event, Status = KeWaitForSingleObject(&Event,
Executive, UserRequest,
Irp->RequestorMode, Irp->RequestorMode,
FALSE, (FileObject->Flags & FO_ALERTABLE_IO),
NULL); NULL);
if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED))
{ {
Status = STATUS_CANCELLED; Status = STATUS_CANCELLED;
goto done; goto done;
@ -468,11 +468,11 @@ NpfsRead(IN PDEVICE_OBJECT DeviceObject,
Status = KeWaitForSingleObject(&Ccb->ReadEvent, Status = KeWaitForSingleObject(&Ccb->ReadEvent,
UserRequest, UserRequest,
Irp->RequestorMode, Irp->RequestorMode,
FALSE, (FileObject->Flags & FO_ALERTABLE_IO),
NULL); NULL);
DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status);
if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED))
{ {
Status = STATUS_CANCELLED; Status = STATUS_CANCELLED;
break; break;
@ -841,11 +841,11 @@ NpfsWrite(PDEVICE_OBJECT DeviceObject,
Status = KeWaitForSingleObject(&Ccb->WriteEvent, Status = KeWaitForSingleObject(&Ccb->WriteEvent,
UserRequest, UserRequest,
Irp->RequestorMode, Irp->RequestorMode,
FALSE, (FileObject->Flags & FO_ALERTABLE_IO),
NULL); NULL);
DPRINT("Write Finished waiting (%S)! Status: %x\n", Fcb->PipeName.Buffer, Status); DPRINT("Write Finished waiting (%S)! Status: %x\n", Fcb->PipeName.Buffer, Status);
if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED))
{ {
Status = STATUS_CANCELLED; Status = STATUS_CANCELLED;
goto done; goto done;