- Fix x64 build
- Some typo and style fixes

svn path=/trunk/; revision=60400
This commit is contained in:
Thomas Faber 2013-09-28 06:28:32 +00:00
parent d7afb702a8
commit a86e82a7d4
6 changed files with 45 additions and 40 deletions

View file

@ -75,25 +75,25 @@ NpOpenNamedPipeRootDirectory(IN PNP_DCB Dcb,
IN ACCESS_MASK DesiredAccess, IN ACCESS_MASK DesiredAccess,
IN PLIST_ENTRY List) IN PLIST_ENTRY List)
{ {
IO_STATUS_BLOCK Status; IO_STATUS_BLOCK IoStatus;
PNP_ROOT_DCB_FCB Ccb; PNP_ROOT_DCB_FCB Ccb;
PAGED_CODE(); PAGED_CODE();
Status.Status = NpCreateRootDcbCcb(&Ccb); IoStatus.Status = NpCreateRootDcbCcb(&Ccb);
if (NT_SUCCESS(Status.Status)) if (NT_SUCCESS(IoStatus.Status))
{ {
NpSetFileObject(FileObject, Dcb, Ccb, FALSE); NpSetFileObject(FileObject, Dcb, Ccb, FALSE);
++Dcb->CurrentInstances; ++Dcb->CurrentInstances;
Status.Information = FILE_OPENED; IoStatus.Information = FILE_OPENED;
Status.Status = STATUS_SUCCESS; IoStatus.Status = STATUS_SUCCESS;
} }
else else
{ {
Status.Information = 0; IoStatus.Information = 0;
} }
return Status; return IoStatus;
} }
IO_STATUS_BLOCK IO_STATUS_BLOCK

View file

@ -211,7 +211,7 @@ NpPeek(IN PDEVICE_OBJECT DeviceObject,
PNP_CCB Ccb; PNP_CCB Ccb;
PFILE_PIPE_PEEK_BUFFER PeekBuffer; PFILE_PIPE_PEEK_BUFFER PeekBuffer;
PNP_DATA_QUEUE DataQueue; PNP_DATA_QUEUE DataQueue;
ULONG BytesPeeked; ULONG_PTR BytesPeeked;
IO_STATUS_BLOCK IoStatus; IO_STATUS_BLOCK IoStatus;
NTSTATUS Status; NTSTATUS Status;
PNP_DATA_QUEUE_ENTRY DataEntry; PNP_DATA_QUEUE_ENTRY DataEntry;

View file

@ -34,7 +34,7 @@
// //
// Npf* -npfs.sys - Npfs Allocations // Npf* -npfs.sys - Npfs Allocations
// NpFc - npfs.sys - CCB, client control block // NpFc - npfs.sys - CCB, client control block
// NpFf - npts.sys - FCB, file control block // NpFf - npfs.sys - FCB, file control block
// NpFC - npfs.sys - ROOT_DCB CCB // NpFC - npfs.sys - ROOT_DCB CCB
// NpFD - npfs.sys - DCB, directory block // NpFD - npfs.sys - DCB, directory block
// NpFg - npfs.sys - Global storage // NpFg - npfs.sys - Global storage
@ -239,7 +239,9 @@ typedef struct _NP_DCB
LIST_ENTRY NotifyList; LIST_ENTRY NotifyList;
LIST_ENTRY NotifyList2; LIST_ENTRY NotifyList2;
LIST_ENTRY FcbList; LIST_ENTRY FcbList;
#ifndef _WIN64
ULONG Pad; ULONG Pad;
#endif
// //
// Common Footer // Common Footer
@ -265,6 +267,9 @@ typedef struct _NP_FCB
USHORT NamedPipeType; USHORT NamedPipeType;
LARGE_INTEGER Timeout; LARGE_INTEGER Timeout;
LIST_ENTRY CcbList; LIST_ENTRY CcbList;
#ifdef _WIN64
PVOID Pad[2];
#endif
// //
// Common Footer // Common Footer