From e24de43a0b2669527c93e6e0f9791245cea1654a Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Sun, 31 Oct 2004 23:00:41 +0000 Subject: [PATCH] cleanup.c: Fix typo Fix Named Pipe and Mailslot Creation Implementation. svn path=/trunk/; revision=11516 --- reactos/ntoskrnl/io/cleanup.c | 3 +-- reactos/ntoskrnl/io/mailslot.c | 13 +++++++------ reactos/ntoskrnl/io/npipe.c | 35 +++++++++++++++++----------------- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/reactos/ntoskrnl/io/cleanup.c b/reactos/ntoskrnl/io/cleanup.c index 5390672e82f..c0d5667233a 100644 --- a/reactos/ntoskrnl/io/cleanup.c +++ b/reactos/ntoskrnl/io/cleanup.c @@ -190,8 +190,7 @@ IoSecondStageCompletion( InitializeListHead(&Irp->ThreadListEntry); } - DPRINT("Tail Value %x, Irp Value %x\n", Irp->Tail.Overlay.CurrentStackLocation - (PIO_STACK_LOCATION)(Irp+1), Irp->CurrentLocation); - by + DPRINT("Tail Value %x, Irp Value %x\n", Irp->Tail.Overlay.CurrentStackLocation - (PIO_STACK_LOCATION)(Irp+1), Irp->CurrentLocation); DeviceObject = IoStack->DeviceObject; DPRINT("IoSecondStageCompletion(Irp %x, PriorityBoost %d)\n", Irp, PriorityBoost); diff --git a/reactos/ntoskrnl/io/mailslot.c b/reactos/ntoskrnl/io/mailslot.c index 4a41f76b9e7..aa328408515 100644 --- a/reactos/ntoskrnl/io/mailslot.c +++ b/reactos/ntoskrnl/io/mailslot.c @@ -23,11 +23,11 @@ NtCreateMailslotFile(OUT PHANDLE FileHandle, IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PIO_STATUS_BLOCK IoStatusBlock, IN ULONG CreateOptions, - IN ULONG Param, /* FIXME: ??? */ + IN ULONG MailslotQuota, IN ULONG MaxMessageSize, IN PLARGE_INTEGER TimeOut) { - IO_MAILSLOT_CREATE_BUFFER Buffer; + MAILSLOT_CREATE_PARAMETERS Buffer; DPRINT("NtCreateMailslotFile(FileHandle %x, DesiredAccess %x, " "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", @@ -38,14 +38,15 @@ NtCreateMailslotFile(OUT PHANDLE FileHandle, if (TimeOut != NULL) { - Buffer.TimeOut.QuadPart = TimeOut->QuadPart; + Buffer.ReadTimeout.QuadPart = TimeOut->QuadPart; + Buffer.TimeoutSpecified = TRUE; } else { - Buffer.TimeOut.QuadPart = 0; + Buffer.TimeoutSpecified = FALSE; } - Buffer.Param = Param; /* FIXME: ??? */ - Buffer.MaxMessageSize = MaxMessageSize; + Buffer.MailslotQuota = MailslotQuota; + Buffer.MaximumMessageSize = MaxMessageSize; return IoCreateFile(FileHandle, DesiredAccess, diff --git a/reactos/ntoskrnl/io/npipe.c b/reactos/ntoskrnl/io/npipe.c index 5a163454cde..bd447b78fe5 100644 --- a/reactos/ntoskrnl/io/npipe.c +++ b/reactos/ntoskrnl/io/npipe.c @@ -24,15 +24,15 @@ NtCreateNamedPipeFile(PHANDLE FileHandle, ULONG ShareAccess, ULONG CreateDisposition, ULONG CreateOptions, - BOOLEAN WriteModeMessage, - BOOLEAN ReadModeMessage, - BOOLEAN NonBlocking, - ULONG MaxInstances, - ULONG InBufferSize, - ULONG OutBufferSize, - PLARGE_INTEGER TimeOut) + BOOLEAN NamedPipeType, + BOOLEAN ReadMode, + BOOLEAN CompletionMode, + ULONG MaximumInstances, + ULONG InboundQuota, + ULONG OutboundQuota, + PLARGE_INTEGER DefaultTimeout) { - IO_PIPE_CREATE_BUFFER Buffer; + NAMED_PIPE_CREATE_PARAMETERS Buffer; DPRINT("NtCreateNamedPipeFile(FileHandle %x, DesiredAccess %x, " "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", @@ -41,20 +41,21 @@ NtCreateNamedPipeFile(PHANDLE FileHandle, ASSERT_IRQL(PASSIVE_LEVEL); - if (TimeOut != NULL) + if (DefaultTimeout != NULL) { - Buffer.TimeOut.QuadPart = TimeOut->QuadPart; + Buffer.DefaultTimeout.QuadPart = DefaultTimeout->QuadPart; + Buffer.TimeoutSpecified = TRUE; } else { - Buffer.TimeOut.QuadPart = 0; + Buffer.TimeoutSpecified = FALSE; } - Buffer.WriteModeMessage = WriteModeMessage; - Buffer.ReadModeMessage = ReadModeMessage; - Buffer.NonBlocking = NonBlocking; - Buffer.MaxInstances = MaxInstances; - Buffer.InBufferSize = InBufferSize; - Buffer.OutBufferSize = OutBufferSize; + Buffer.NamedPipeType = NamedPipeType; + Buffer.ReadMode = ReadMode; + Buffer.CompletionMode = CompletionMode; + Buffer.MaximumInstances = MaximumInstances; + Buffer.InboundQuota = InboundQuota; + Buffer.OutboundQuota = OutboundQuota; return IoCreateFile(FileHandle, DesiredAccess,