28 Sep
2013
28 Sep
'13
6:28 a.m.
Author: tfaber
Date: Sat Sep 28 06:28:32 2013
New Revision: 60400
URL: http://svn.reactos.org/svn/reactos?rev=60400&view=rev
Log:
[NPFS]
- Fix x64 build
- Some typo and style fixes
Modified:
trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt
trunk/reactos/drivers/filesystems/npfs_new/create.c
trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c
trunk/reactos/drivers/filesystems/npfs_new/npfs.h
trunk/reactos/drivers/filesystems/npfs_new/strucsup.c
trunk/reactos/drivers/filesystems/npfs_new/writesup.c
Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt [iso-8859-1] Sat Sep 28
06:28:32 2013
@@ -1,25 +1,25 @@
list(APPEND SOURCE
- cleanup.c
- close.c
- create.c
- datasup.c
- fileinfo.c
- fileobsup.c
- flushbuf.c
- fsctrl.c
- main.c
- prefxsup.c
- read.c
- readsup.c
- secursup.c
- seinfo.c
- statesup.c
- strucsup.c
- volinfo.c
- waitsup.c
- write.c
- writesup.c)
+ cleanup.c
+ close.c
+ create.c
+ datasup.c
+ fileinfo.c
+ fileobsup.c
+ flushbuf.c
+ fsctrl.c
+ main.c
+ prefxsup.c
+ read.c
+ readsup.c
+ secursup.c
+ seinfo.c
+ statesup.c
+ strucsup.c
+ volinfo.c
+ waitsup.c
+ write.c
+ writesup.c)
add_library(npfs SHARED ${SOURCE})
set_module_type(npfs kernelmodedriver)
Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] Sat Sep 28 06:28:32
2013
@@ -75,25 +75,25 @@
IN ACCESS_MASK DesiredAccess,
IN PLIST_ENTRY List)
{
- IO_STATUS_BLOCK Status;
+ IO_STATUS_BLOCK IoStatus;
PNP_ROOT_DCB_FCB Ccb;
PAGED_CODE();
- Status.Status = NpCreateRootDcbCcb(&Ccb);
- if (NT_SUCCESS(Status.Status))
+ IoStatus.Status = NpCreateRootDcbCcb(&Ccb);
+ if (NT_SUCCESS(IoStatus.Status))
{
NpSetFileObject(FileObject, Dcb, Ccb, FALSE);
++Dcb->CurrentInstances;
- Status.Information = FILE_OPENED;
- Status.Status = STATUS_SUCCESS;
+ IoStatus.Information = FILE_OPENED;
+ IoStatus.Status = STATUS_SUCCESS;
}
else
{
- Status.Information = 0;
- }
-
- return Status;
+ IoStatus.Information = 0;
+ }
+
+ return IoStatus;
}
IO_STATUS_BLOCK
Modified: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] Sat Sep 28 06:28:32
2013
@@ -211,7 +211,7 @@
PNP_CCB Ccb;
PFILE_PIPE_PEEK_BUFFER PeekBuffer;
PNP_DATA_QUEUE DataQueue;
- ULONG BytesPeeked;
+ ULONG_PTR BytesPeeked;
IO_STATUS_BLOCK IoStatus;
NTSTATUS Status;
PNP_DATA_QUEUE_ENTRY DataEntry;
Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] Sat Sep 28 06:28:32
2013
@@ -34,7 +34,7 @@
//
// Npf* -npfs.sys - Npfs Allocations
// 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
// NpFD - npfs.sys - DCB, directory block
// NpFg - npfs.sys - Global storage
@@ -239,7 +239,9 @@
LIST_ENTRY NotifyList;
LIST_ENTRY NotifyList2;
LIST_ENTRY FcbList;
+#ifndef _WIN64
ULONG Pad;
+#endif
//
// Common Footer
@@ -265,6 +267,9 @@
USHORT NamedPipeType;
LARGE_INTEGER Timeout;
LIST_ENTRY CcbList;
+#ifdef _WIN64
+ PVOID Pad[2];
+#endif
//
// Common Footer
@@ -436,7 +441,7 @@
IN UCHAR CompletionMode,
IN ULONG InQuota,
IN ULONG OutQuota,
- OUT PNP_CCB* NewCcb);
+ OUT PNP_CCB *NewCcb);
NTSTATUS
NTAPI
@@ -454,7 +459,7 @@
NTSTATUS
NTAPI
-NpCreateRootDcbCcb(IN PNP_ROOT_DCB_FCB* NewRootCcb);
+NpCreateRootDcbCcb(IN PNP_ROOT_DCB_FCB *NewRootCcb);
VOID
NTAPI
@@ -561,8 +566,8 @@
NODE_TYPE_CODE
NTAPI
NpDecodeFileObject(IN PFILE_OBJECT FileObject,
- OUT PVOID* PrimaryContext OPTIONAL,
- OUT PNP_CCB* Ccb,
+ OUT PVOID *PrimaryContext OPTIONAL,
+ OUT PNP_CCB *Ccb,
OUT PULONG NamedPipeEnd OPTIONAL);
PNP_FCB
Modified: trunk/reactos/drivers/filesystems/npfs_new/strucsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] Sat Sep 28 06:28:32
2013
@@ -148,7 +148,7 @@
NTSTATUS
NTAPI
-NpCreateRootDcbCcb(IN PNP_ROOT_DCB_FCB* NewRootCcb)
+NpCreateRootDcbCcb(IN PNP_ROOT_DCB_FCB *NewRootCcb)
{
PNP_ROOT_DCB_FCB RootCcb;
PAGED_CODE();
@@ -304,7 +304,7 @@
IN UCHAR CompletionMode,
IN ULONG InQuota,
IN ULONG OutQuota,
- OUT PNP_CCB* NewCcb)
+ OUT PNP_CCB *NewCcb)
{
PNP_CCB Ccb;
PNP_NONPAGED_CCB CcbNonPaged;
Modified: trunk/reactos/drivers/filesystems/npfs_new/writesup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs_new/writesup.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs_new/writesup.c [iso-8859-1] Sat Sep 28 06:28:32
2013
@@ -61,7 +61,7 @@
if (IoStack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL &&
IoStack->Parameters.FileSystemControl.FsControlCode ==
FSCTL_PIPE_INTERNAL_READ_OVFLOW &&
- (DataSize < OutBufferSize || MoreProcessing))
+ (DataSize < OutBufferSize || MoreProcessing))
{
WriteIrp = NpRemoveDataQueueEntry(WriteQueue, TRUE, List);
if (WriteIrp)
@@ -74,7 +74,7 @@
if (DataEntry->DataEntryType == Unbuffered)
{
- DataEntry->Irp->Overlay.AllocationSize.QuadPart = 0;
+ DataEntry->Irp->Overlay.AllocationSize.QuadPart = 0;
}
BufferSize = *BytesNotWritten;
@@ -94,9 +94,9 @@
_SEH2_TRY
{
- RtlCopyMemory(Buffer,
- (PVOID)((ULONG_PTR)OutBuffer + OutBufferSize -
*BytesNotWritten),
- BufferSize);
+ RtlCopyMemory(Buffer,
+ (PVOID)((ULONG_PTR)OutBuffer + OutBufferSize -
*BytesNotWritten),
+ BufferSize);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
4107
days inactive
4107
days old
0 comments
1 participants
participants (1)
-
tfaber＠svn.reactos.org