From f3d151acd3dea5cf5c7990b8d23556b0f8624b65 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 6 Apr 2014 07:54:57 +0000 Subject: [PATCH] [NPFS] - Fix some uninitialized and over-initialized variables and some DPRINTs. CID 1102515 svn path=/trunk/; revision=62641 --- reactos/drivers/filesystems/npfs/create.c | 36 +++++++++++------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/reactos/drivers/filesystems/npfs/create.c b/reactos/drivers/filesystems/npfs/create.c index d1b6479d1f6..7fde99d3e29 100644 --- a/reactos/drivers/filesystems/npfs/create.c +++ b/reactos/drivers/filesystems/npfs/create.c @@ -96,7 +96,7 @@ NpOpenNamedPipeRootDirectory(IN PNP_DCB Dcb, IoStatus.Information = 0; } - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -122,7 +122,6 @@ NpCreateClientEnd(IN PNP_FCB Fcb, PNP_CCB Ccb = NULL; TRACE("Entered\n"); - IoStatus.Status = STATUS_SUCCESS; IoStatus.Information = 0; Privileges = NULL; @@ -172,7 +171,7 @@ NpCreateClientEnd(IN PNP_FCB Fcb, ((GrantedAccess & FILE_WRITE_DATA) && (NamedPipeConfiguration == FILE_PIPE_OUTBOUND))) { IoStatus.Status = STATUS_ACCESS_DENIED; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -191,7 +190,7 @@ NpCreateClientEnd(IN PNP_FCB Fcb, if (NextEntry == ListHead) { IoStatus.Status = STATUS_PIPE_NOT_AVAILABLE; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -202,7 +201,7 @@ NpCreateClientEnd(IN PNP_FCB Fcb, if (!NT_SUCCESS(IoStatus.Status)) { NpUninitializeSecurity(Ccb); - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -211,7 +210,7 @@ NpCreateClientEnd(IN PNP_FCB Fcb, IoStatus.Information = FILE_OPENED; IoStatus.Status = STATUS_SUCCESS; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -373,7 +372,6 @@ NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, ACCESS_MASK DesiredAccess; LIST_ENTRY DeferredList; UNICODE_STRING Prefix; - NTSTATUS Status; TRACE("Entered\n"); InitializeListHead(&DeferredList); @@ -384,7 +382,6 @@ NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, DesiredAccess = IoStack->Parameters.CreatePipe.SecurityContext->DesiredAccess; IoStatus.Information = 0; - IoStatus.Status = STATUS_SUCCESS; FsRtlEnterFileSystem(); ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); @@ -428,8 +425,8 @@ NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, goto Quickie; } - Status = NpTranslateAlias(&FileName); - if (!NT_SUCCESS(Status)) goto Quickie; + IoStatus.Status = NpTranslateAlias(&FileName); + if (!NT_SUCCESS(IoStatus.Status)) goto Quickie; if (RelatedFileObject) { @@ -543,6 +540,8 @@ NpCreateExistingNamedPipe(IN PNP_FCB Fcb, SubjectSecurityContext = &AccessState->SubjectSecurityContext; SeLockSubjectContext(SubjectSecurityContext); + IoStatus.Information = 0; + AccessGranted = SeAccessCheck(Fcb->SecurityDescriptor, SubjectSecurityContext, TRUE, @@ -581,21 +580,21 @@ NpCreateExistingNamedPipe(IN PNP_FCB Fcb, SeUnlockSubjectContext(SubjectSecurityContext); if (!AccessGranted) { - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } if (Fcb->CurrentInstances >= Fcb->MaximumInstances) { IoStatus.Status = STATUS_INSTANCE_NOT_AVAILABLE; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } if (Disposition == FILE_CREATE) { IoStatus.Status = STATUS_ACCESS_DENIED; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -616,7 +615,7 @@ NpCreateExistingNamedPipe(IN PNP_FCB Fcb, if (CheckShareAccess != ShareAccess) { IoStatus.Status = STATUS_ACCESS_DENIED; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -638,7 +637,7 @@ NpCreateExistingNamedPipe(IN PNP_FCB Fcb, { --Ccb->Fcb->CurrentInstances; NpDeleteCcb(Ccb, List); - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -647,8 +646,8 @@ NpCreateExistingNamedPipe(IN PNP_FCB Fcb, NpCheckForNotify(Fcb->ParentDcb, 0, List); IoStatus.Status = STATUS_SUCCESS; - IoStatus.Information = 1; - TRACE("Leaving, IoStatus = %lx\n", IoStatus); + IoStatus.Information = FILE_OPENED; + TRACE("Leaving, IoStatus.Status = %lx\n", IoStatus.Status); return IoStatus; } @@ -664,7 +663,7 @@ NpCreateNewNamedPipe(IN PNP_DCB Dcb, IN PNAMED_PIPE_CREATE_PARAMETERS Parameters, IN PEPROCESS Process, IN PLIST_ENTRY List, - IN PIO_STATUS_BLOCK IoStatus) + OUT PIO_STATUS_BLOCK IoStatus) { NTSTATUS Status; USHORT NamedPipeConfiguration; @@ -817,7 +816,6 @@ NpFsdCreateNamedPipe(IN PDEVICE_OBJECT DeviceObject, FileName = FileObject->FileName; - IoStatus.Status = STATUS_SUCCESS; IoStatus.Information = 0; FsRtlEnterFileSystem();