Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 08:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOSKRNL:IOMGR][NPFS]

Browse source 
- Do not pass non-boolean Alertable values to KeWaitForSingleObject
- Fix some DPRINTs

svn path=/trunk/; revision=56959
This commit is contained in:
Thomas Faber 2012-07-24 15:32:06 +00:00
parent a78714ae9e
commit 348b5eb57f
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -186,7 +186,7 @@ NpfsConnectPipe(PIRP Irp,
KeWaitForSingleObject(&Ccb->ConnectEvent, KeWaitForSingleObject(&Ccb->ConnectEvent,
UserRequest, UserRequest,
WaitMode, WaitMode,
(Flags & FO_ALERTABLE_IO), (Flags & FO_ALERTABLE_IO) != 0,
NULL); NULL);
} }
@ -407,7 +407,7 @@ NpfsWaitPipe(PIRP Irp,
Status = KeWaitForSingleObject(&Ccb->ConnectEvent, Status = KeWaitForSingleObject(&Ccb->ConnectEvent,
UserRequest, UserRequest,
Irp->RequestorMode, Irp->RequestorMode,
(Ccb->FileObject->Flags & FO_ALERTABLE_IO), (Ccb->FileObject->Flags & FO_ALERTABLE_IO) != 0,
TimeOut); TimeOut);
if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED)) if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED))
Status = STATUS_CANCELLED; Status = STATUS_CANCELLED;
@ -532,7 +532,7 @@ NpfsWaitPipe2(PIRP Irp,
Status = KeWaitForSingleObject(&Ccb->ConnectEvent, Status = KeWaitForSingleObject(&Ccb->ConnectEvent,
UserRequest, UserRequest,
Irp->RequestorMode, Irp->RequestorMode,
(Ccb->FileObject->Flags & FO_ALERTABLE_IO), (Ccb->FileObject->Flags & FO_ALERTABLE_IO) != 0,
&TimeOut); &TimeOut);
if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED)) if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED))
Status = STATUS_CANCELLED; Status = STATUS_CANCELLED;

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

@ -459,9 +459,9 @@ NpfsRead(IN PDEVICE_OBJECT DeviceObject,
Status = KeWaitForSingleObject(&Ccb->ReadEvent, Status = KeWaitForSingleObject(&Ccb->ReadEvent,
UserRequest, UserRequest,
Irp->RequestorMode, Irp->RequestorMode,
(FileObject->Flags & FO_ALERTABLE_IO), (FileObject->Flags & FO_ALERTABLE_IO) != 0,
NULL); 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); ExAcquireFastMutex(&Ccb->DataListLock);
@ -815,7 +815,7 @@ NpfsWrite(PDEVICE_OBJECT DeviceObject,
while(1) while(1)
{ {
if ((ReaderCcb->WriteQuotaAvailable == 0)) if (ReaderCcb->WriteQuotaAvailable == 0)
{ {
if (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE || !Ccb->OtherSide) if (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE || !Ccb->OtherSide)
{ {
@ -826,13 +826,13 @@ NpfsWrite(PDEVICE_OBJECT DeviceObject,
KeSetEvent(&ReaderCcb->ReadEvent, IO_NO_INCREMENT, FALSE); KeSetEvent(&ReaderCcb->ReadEvent, IO_NO_INCREMENT, FALSE);
ExReleaseFastMutex(&ReaderCcb->DataListLock); 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, Status = KeWaitForSingleObject(&Ccb->WriteEvent,
UserRequest, UserRequest,
Irp->RequestorMode, Irp->RequestorMode,
(FileObject->Flags & FO_ALERTABLE_IO), (FileObject->Flags & FO_ALERTABLE_IO) != 0,
NULL); 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)) if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC) || (Status == STATUS_ALERTED))
{ {

14
reactos/ntoskrnl/io/iomgr/iofunc.c
View file

@ -163,7 +163,7 @@ IopPerformSynchronousRequest(IN PDEVICE_OBJECT DeviceObject,
Executive, Executive,
PreviousMode, PreviousMode,
(FileObject->Flags & (FileObject->Flags &
FO_ALERTABLE_IO), FO_ALERTABLE_IO) != 0,
NULL); NULL);
if ((Status == STATUS_ALERTED) || (Status == STATUS_USER_APC)) if ((Status == STATUS_ALERTED) || (Status == STATUS_USER_APC))
{ {
@ -603,7 +603,8 @@ IopQueryDeviceInformation(IN PFILE_OBJECT FileObject,
Status = KeWaitForSingleObject(&FileObject->Event, Status = KeWaitForSingleObject(&FileObject->Event,
Executive, Executive,
KernelMode, KernelMode,
FileObject->Flags & FO_ALERTABLE_IO, (FileObject->Flags &
FO_ALERTABLE_IO) != 0,
NULL); NULL);
if (Status == STATUS_ALERTED) if (Status == STATUS_ALERTED)
{ {
@ -856,7 +857,8 @@ IoSetInformation(IN PFILE_OBJECT FileObject,
Status = KeWaitForSingleObject(&FileObject->Event, Status = KeWaitForSingleObject(&FileObject->Event,
Executive, Executive,
KernelMode, KernelMode,
FileObject->Flags & FO_ALERTABLE_IO, (FileObject->Flags &
FO_ALERTABLE_IO) != 0,
NULL); NULL);
if (Status == STATUS_ALERTED) if (Status == STATUS_ALERTED)
{ {
@ -1869,7 +1871,8 @@ NtQueryInformationFile(IN HANDLE FileHandle,
Status = KeWaitForSingleObject(&FileObject->Event, Status = KeWaitForSingleObject(&FileObject->Event,
Executive, Executive,
PreviousMode, PreviousMode,
FileObject->Flags & FO_ALERTABLE_IO, (FileObject->Flags &
FO_ALERTABLE_IO) != 0,
NULL); NULL);
if ((Status == STATUS_USER_APC) || (Status == STATUS_ALERTED)) if ((Status == STATUS_USER_APC) || (Status == STATUS_ALERTED))
{ {
@ -2529,7 +2532,8 @@ NtSetInformationFile(IN HANDLE FileHandle,
Status = KeWaitForSingleObject(&FileObject->Event, Status = KeWaitForSingleObject(&FileObject->Event,
Executive, Executive,
PreviousMode, PreviousMode,
FileObject->Flags & FO_ALERTABLE_IO, (FileObject->Flags &
FO_ALERTABLE_IO) != 0,
NULL); NULL);
if ((Status == STATUS_USER_APC) || (Status == STATUS_ALERTED)) if ((Status == STATUS_USER_APC) || (Status == STATUS_ALERTED))
{ {