- Avoid magic values, remove a few casts and don't name an IO_STATUS_BLOCK Status. No code changes.
svn path=/trunk/; revision=63827
Irp = DataQueueEntry->Irp;
- if ((DataQueueEntry->DataEntryType == 0) && (Irp))
+ if ((DataQueueEntry->DataEntryType == Buffered) && (Irp))
{
DataLeft = DataQueueEntry->DataSize - ByteOffset;
DataQueue->BytesInQueue -= QueueEntry->DataSize;
--DataQueue->EntriesInQueue;
- HasWrites = 1;
+ HasWrites = TRUE;
if (DataQueue->QueueState != WriteEntries ||
DataQueue->QuotaUsed < DataQueue->Quota ||
!QueueEntry->QuotaInEntry)
{
- HasWrites = 0;
+ HasWrites = FALSE;
}
DataQueue->QuotaUsed -= QueueEntry->QuotaInEntry;
if (IsListEmpty(&DataQueue->Queue))
{
DataQueue->QueueState = Empty;
- HasWrites = 0;
+ HasWrites = FALSE;
}
Irp = QueueEntry->Irp;
NextEntry != &DataQueue->Queue;
NextEntry = DataQueue->Queue.Flink)
{
- DataEntry = CONTAINING_RECORD(NextEntry, NP_DATA_QUEUE_ENTRY, QueueEntry);
+ DataEntry = CONTAINING_RECORD(NextEntry,
+ NP_DATA_QUEUE_ENTRY,
+ QueueEntry);
Type = DataEntry->DataEntryType;
if (Type == Buffered || Type == Unbuffered) break;
NpAcquireExclusiveVcb();
}
- DataEntry = (PNP_DATA_QUEUE_ENTRY)Irp->Tail.Overlay.DriverContext[3];
+ DataEntry = Irp->Tail.Overlay.DriverContext[3];
if (DataEntry)
{
if (DataEntry->QueueEntry.Blink == &DataQueue->Queue)
{
DataQueue->ByteOffset = 0;
- FirstEntry = 1;
+ FirstEntry = TRUE;
}
else
{
- FirstEntry = 0;
+ FirstEntry = FALSE;
}
RemoveEntryList(&DataEntry->QueueEntry);
ClientSecurityContext = DataEntry->ClientSecurityContext;
- CompleteWrites = 1;
+ CompleteWrites = TRUE;
if (DataQueue->QueueState != WriteEntries ||
DataQueue->QuotaUsed < DataQueue->Quota ||
!DataEntry->QuotaInEntry)
{
- CompleteWrites = 0;
+ CompleteWrites = FALSE;
}
DataQueue->BytesInQueue -= DataEntry->DataSize;
IO_STATUS_BLOCK
NTAPI
-NpReadDataQueue(IN PNP_DATA_QUEUE DataQueue,
+NpReadDataQueue(IN PNP_DATA_QUEUE DataQueue,
IN BOOLEAN Peek,
IN BOOLEAN ReadOverflowOperation,
IN PVOID Buffer,
- IN ULONG BufferSize,
- IN ULONG Mode,
+ IN ULONG BufferSize,
+ IN ULONG Mode,
IN PNP_CCB Ccb,
IN PLIST_ENTRY List)
{
PVOID DataBuffer;
ULONG DataSize, DataLength, TotalBytesCopied, RemainingSize, Offset;
PIRP Irp;
- IO_STATUS_BLOCK Status;
+ IO_STATUS_BLOCK IoStatus;
BOOLEAN CompleteWrites = FALSE;
PAGED_CODE();
if (ReadOverflowOperation) Peek = TRUE;
RemainingSize = BufferSize;
- Status.Status = STATUS_SUCCESS;
+ IoStatus.Status = STATUS_SUCCESS;
TotalBytesCopied = 0;
if (Peek)
{
if (Mode == FILE_PIPE_MESSAGE_MODE)
{
- Status.Status = STATUS_BUFFER_OVERFLOW;
+ IoStatus.Status = STATUS_BUFFER_OVERFLOW;
break;
}
}
if (Mode == FILE_PIPE_MESSAGE_MODE)
{
- Status.Status = STATUS_SUCCESS;
+ IoStatus.Status = STATUS_SUCCESS;
break;
}
}
}
- Status.Information = TotalBytesCopied;
+ IoStatus.Information = TotalBytesCopied;
if (CompleteWrites) NpCompleteStalledWrites(DataQueue, List);
- return Status;
+ return IoStatus;
}
/* EOF */
VOID
NTAPI
-NpCancelWaitQueueIrp(IN PDEVICE_OBJECT DeviceObject,
+NpCancelWaitQueueIrp(IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
{
KIRQL OldIrql;
Irp->IoStatus.Status = STATUS_CANCELLED;
IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT);
}
-
+
VOID
NTAPI
NpTimerDispatch(IN PKDPC Dpc,
WaitEntry->WaitQueue = WaitQueue;
WaitEntry->Irp = Irp;
- WaitBuffer = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer;
+ WaitBuffer = Irp->AssociatedIrp.SystemBuffer;
if (WaitBuffer->TimeoutSpecified)
{
DueTime = WaitBuffer->Timeout;
KeSetTimer(&WaitEntry->Timer, DueTime, &WaitEntry->Dpc);
WaitEntry = NULL;
-
}
KeReleaseSpinLock(&WaitQueue->WaitLock, OldIrql);