Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 60036: [SVCHOST] * CMake file improvements.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 11 18:33:36 2013 New Revision: 60036 URL: http://svn.reactos.org/svn/reactos?rev=60036&view=rev Log: [SVCHOST] * CMake file improvements. Modified: trunk/reactos/base/services/svchost/CMakeLists.txt Modified: trunk/reactos/base/services/svchost/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/CMak… ============================================================================== --- trunk/reactos/base/services/svchost/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/CMakeLists.txt [iso-8859-1] Wed Sep 11 18:33:36 2013 @@ -1,6 +1,13 @@ -add_executable(svchost globals.c registry.c security.cxx rpcsrv.c netbios.c svchost.c svchost.rc) +list(APPEND SOURCE + globals.c + registry.c + security.cxx + rpcsrv.c + netbios.c + svchost.c) +add_executable(svchost ${SOURCE} svchost.rc) target_link_libraries(svchost uuid) set_module_type(svchost win32cui UNICODE) add_importlibs(svchost advapi32 netapi32 rpcrt4 ole32 kernel32 ntdll)

11 years

[akhaldi] 60035: [SVCHOST] * Use the DbgPrintEx based SvchostDbgPrint macro. We no longer have traces enabled by default here.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 11 18:20:30 2013 New Revision: 60035 URL: http://svn.reactos.org/svn/reactos?rev=60035&view=rev Log: [SVCHOST] * Use the DbgPrintEx based SvchostDbgPrint macro. We no longer have traces enabled by default here. Modified: trunk/reactos/base/services/svchost/svchost.h Modified: trunk/reactos/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.h [iso-8859-1] Wed Sep 11 18:20:30 2013 @@ -21,7 +21,6 @@ // // This prints out a SVCHOST-specific debug print, with the PID/TID // -#if _EX_ #define SvchostDbgPrint(lev, fmt, ...) \ DbgPrintEx(DPFLTR_SVCHOST_ID, \ DPFLTR_MASK | lev, \ @@ -29,13 +28,7 @@ GetCurrentProcessId(), \ GetCurrentThreadId(), \ __VA_ARGS__); -#else -#define SvchostDbgPrint(lev, fmt, ...) \ - DbgPrint("[SVCHOST] %lx.%lx: " fmt, \ - GetCurrentProcessId(), \ - GetCurrentThreadId(), \ - __VA_ARGS__); -#endif + #define DBG_ERR(fmt, ...) SvchostDbgPrint(1, fmt, __VA_ARGS__) #define DBG_TRACE(fmt, ...) SvchostDbgPrint(4, fmt, __VA_ARGS__)

11 years

[ion] 60034: [NPFS-NEW]: Use locking and IRP completion macros from NPFS snippet at "Common Driver Reliability Issues - Microsoft download.microsoft.com/download/5/7/7/577a5684-8a83.../drvqa.doc". ...

by ion＠svn.reactos.org

Author: ion Date: Wed Sep 11 17:10:30 2013 New Revision: 60034 URL: http://svn.reactos.org/svn/reactos?rev=60034&view=rev Log: [NPFS-NEW]: Use locking and IRP completion macros from NPFS snippet at "Common Driver Reliability Issues - Microsoft download.microsoft.com/download/5/7/7/577a5684-8a83.../drvqa.doc". Fix a few incorrect exclusive vs shared lock acquires. Modified: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c trunk/reactos/drivers/filesystems/npfs_new/close.c trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/main.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/read.c trunk/reactos/drivers/filesystems/npfs_new/seinfo.c trunk/reactos/drivers/filesystems/npfs_new/statesup.c trunk/reactos/drivers/filesystems/npfs_new/write.c Modified: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/cleanup.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -7,18 +7,16 @@ { PIO_STACK_LOCATION IoStack; NODE_TYPE_CODE NodeTypeCode; - LIST_ENTRY List; + LIST_ENTRY DeferredList; PNP_FCB Fcb; PNP_CCB Ccb; ULONG NamedPipeEnd; - PLIST_ENTRY ThisEntry, NextEntry; - PIRP LocalIrp; PAGED_CODE(); IoStack = IoGetCurrentIrpStackLocation(Irp); - InitializeListHead(&List); + InitializeListHead(&DeferredList); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, (PVOID*)&Fcb, &Ccb, @@ -31,20 +29,11 @@ --Ccb->Fcb->ServerOpenCount; } - NpSetClosingPipeState(Ccb, Irp, NamedPipeEnd, &List); + NpSetClosingPipeState(Ccb, Irp, NamedPipeEnd, &DeferredList); } - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); - } + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/filesystems/npfs_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/close.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -7,18 +7,16 @@ { PIO_STACK_LOCATION IoStack; NODE_TYPE_CODE NodeTypeCode; - LIST_ENTRY List; + LIST_ENTRY DeferredList; PNP_FCB Fcb; PNP_CCB Ccb; ULONG NamedPipeEnd; - PLIST_ENTRY ThisEntry, NextEntry; - PIRP LocalIrp; PAGED_CODE(); IoStack = IoGetCurrentIrpStackLocation(Irp); - InitializeListHead(&List); + InitializeListHead(&DeferredList); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, (PVOID*)&Fcb, &Ccb, @@ -26,24 +24,15 @@ if (NodeTypeCode == NPFS_NTC_ROOT_DCB) { --Fcb->CurrentInstances; - NpDeleteCcb(Ccb, &List); + NpDeleteCcb(Ccb, &DeferredList); } else if (NodeTypeCode == NPFS_NTC_VCB) { --NpVcb->ReferenceCount; } - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); - } + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); 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] Wed Sep 11 17:10:30 2013 @@ -205,12 +205,10 @@ PNP_FCB Fcb; PNP_DCB Dcb; ACCESS_MASK DesiredAccess; - LIST_ENTRY List; - PLIST_ENTRY NextEntry, ThisEntry; + LIST_ENTRY DeferredList; UNICODE_STRING Prefix; - PIRP ListIrp; - - InitializeListHead(&List); + + InitializeListHead(&DeferredList); IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; RelatedFileObject = FileObject->RelatedFileObject; @@ -240,7 +238,7 @@ Irp->IoStatus = NpOpenNamedPipeRootDirectory(NpVcb->RootDcb, FileObject, DesiredAccess, - &List); + &DeferredList); goto Quickie; } } @@ -255,7 +253,7 @@ Irp->IoStatus = NpOpenNamedPipeRootDirectory(NpVcb->RootDcb, FileObject, DesiredAccess, - &List); + &DeferredList); goto Quickie; } @@ -329,21 +327,11 @@ SL_FORCE_ACCESS_CHECK ? UserMode : Irp->RequestorMode, Irp->Tail.Overlay.Thread, - &List); + &DeferredList); Quickie: ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(ListIrp, IO_NAMED_PIPE_INCREMENT); - } - + NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -622,16 +610,14 @@ PFILE_OBJECT RelatedFileObject; USHORT Disposition, ShareAccess; PEPROCESS Process; - LIST_ENTRY LocalList; - PLIST_ENTRY NextEntry, ThisEntry; + LIST_ENTRY DeferredList; UNICODE_STRING FileName; PNP_FCB Fcb; UNICODE_STRING Prefix; PNAMED_PIPE_CREATE_PARAMETERS Parameters; IO_STATUS_BLOCK IoStatus; - PIRP ListIrp; - - InitializeListHead(&LocalList); + + InitializeListHead(&DeferredList); Process = IoGetRequestorProcess(Irp); IoStack = (PEXTENDED_IO_STACK_LOCATION) IoGetCurrentIrpStackLocation(Irp); @@ -650,7 +636,7 @@ IoStatus.Information = 0; FsRtlEnterFileSystem(); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); if (RelatedFileObject) { @@ -701,7 +687,7 @@ ShareAccess, Parameters, Process, - &LocalList, + &DeferredList, &IoStatus); goto Quickie; } @@ -731,21 +717,11 @@ ShareAccess, Parameters, Process, - &LocalList); + &DeferredList); Quickie: - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = LocalList.Flink; - while (NextEntry != &LocalList) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(ListIrp, IO_NAMED_PIPE_INCREMENT); - } - + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); Irp->IoStatus = IoStatus; Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -129,7 +129,7 @@ if (Irp && IoSetCancelRoutine(Irp, NULL)) { - Irp->Tail.Overlay.DriverContext[3] = 0; + Irp->Tail.Overlay.DriverContext[3] = NULL; } ExFreePool(QueueEntry); @@ -188,15 +188,13 @@ { PNP_DATA_QUEUE DataQueue; PNP_DATA_QUEUE_ENTRY DataEntry; - LIST_ENTRY List; + LIST_ENTRY DeferredList; PSECURITY_CLIENT_CONTEXT ClientSecurityContext; BOOLEAN CompleteWrites, FirstEntry; - PLIST_ENTRY NextEntry, ThisEntry; - PIRP LocalIrp; if (DeviceObject) IoReleaseCancelSpinLock(Irp->CancelIrql); - InitializeListHead(&List); + InitializeListHead(&DeferredList); DataQueue = (PNP_DATA_QUEUE)Irp->Tail.Overlay.DriverContext[2]; ClientSecurityContext = NULL; @@ -204,7 +202,7 @@ if (DeviceObject) { FsRtlEnterFileSystem(); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); } DataEntry = (PNP_DATA_QUEUE_ENTRY)Irp->Tail.Overlay.DriverContext[3]; @@ -245,18 +243,18 @@ { if (FirstEntry) { - NpGetNextRealDataQueueEntry(DataQueue, &List); + NpGetNextRealDataQueueEntry(DataQueue, &DeferredList); } if (CompleteWrites) { - NpCompleteStalledWrites(DataQueue, &List); + NpCompleteStalledWrites(DataQueue, &DeferredList); } } } if (DeviceObject) { - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); FsRtlExitFileSystem(); } @@ -266,15 +264,7 @@ Irp->IoStatus.Status = STATUS_CANCELLED; IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); - } + NpCompleteDeferredIrps(&DeferredList); } NTSTATUS Modified: trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -100,30 +100,18 @@ IN PIRP Irp) { NTSTATUS Status; - LIST_ENTRY List; - PLIST_ENTRY NextEntry, ThisEntry; - PIRP LocalIrp; - PAGED_CODE(); - - InitializeListHead(&List); + LIST_ENTRY DeferredList; + PAGED_CODE(); + + InitializeListHead(&DeferredList); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); - - Status = NpCommonSetInformation(DeviceObject, Irp, &List); - - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); - } - + NpAcquireExclusiveVcb(); + + Status = NpCommonSetInformation(DeviceObject, Irp, &DeferredList); + + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); if (Status != STATUS_PENDING) @@ -462,11 +450,11 @@ PAGED_CODE(); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireSharedVcb(); Status = NpCommonQueryInformation(DeviceObject, Irp); - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); FsRtlExitFileSystem(); if (Status != STATUS_PENDING) Modified: trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -59,11 +59,11 @@ PAGED_CODE(); FsRtlEnterFileSystem(); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireSharedVcb(); Status = NpCommonFlushBuffers(DeviceObject, Irp); - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); FsRtlExitFileSystem(); return Status; 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] Wed Sep 11 17:10:30 2013 @@ -569,35 +569,33 @@ { ULONG Fsctl; BOOLEAN Overflow = FALSE; - LIST_ENTRY List; - PLIST_ENTRY NextEntry, ThisEntry; + LIST_ENTRY DeferredList; NTSTATUS Status; - PIRP LocalIrp; - PAGED_CODE(); - - InitializeListHead(&List); + PAGED_CODE(); + + InitializeListHead(&DeferredList); Fsctl = IoGetCurrentIrpStackLocation(Irp)->Parameters.FileSystemControl.FsControlCode; switch (Fsctl) { case FSCTL_PIPE_PEEK: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); - Status = NpPeek(DeviceObject, Irp, &List); + NpAcquireExclusiveVcb(); + Status = NpPeek(DeviceObject, Irp, &DeferredList); break; case FSCTL_PIPE_INTERNAL_WRITE: - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); - Status = NpInternalWrite(DeviceObject, Irp, &List); + NpAcquireSharedVcb(); + Status = NpInternalWrite(DeviceObject, Irp, &DeferredList); break; case FSCTL_PIPE_TRANSCEIVE: - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); - Status = NpTransceive(DeviceObject, Irp, &List); + NpAcquireSharedVcb(); + Status = NpTransceive(DeviceObject, Irp, &DeferredList); break; case FSCTL_PIPE_INTERNAL_TRANSCEIVE: - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); - Status = NpInternalTransceive(DeviceObject, Irp, &List); + NpAcquireSharedVcb(); + Status = NpInternalTransceive(DeviceObject, Irp, &DeferredList); break; case FSCTL_PIPE_INTERNAL_READ_OVFLOW: @@ -605,54 +603,54 @@ // on purpose case FSCTL_PIPE_INTERNAL_READ: - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); - Status = NpInternalRead(DeviceObject, Irp, Overflow, &List); + NpAcquireSharedVcb(); + Status = NpInternalRead(DeviceObject, Irp, Overflow, &DeferredList); break; case FSCTL_PIPE_QUERY_CLIENT_PROCESS: - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireSharedVcb(); Status = NpQueryClientProcess(DeviceObject, Irp); break; case FSCTL_PIPE_ASSIGN_EVENT: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpAssignEvent(DeviceObject, Irp); break; case FSCTL_PIPE_DISCONNECT: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); - Status = NpDisconnect(DeviceObject, Irp, &List); + NpAcquireExclusiveVcb(); + Status = NpDisconnect(DeviceObject, Irp, &DeferredList); break; case FSCTL_PIPE_LISTEN: - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); - Status = NpListen(DeviceObject, Irp, &List); + NpAcquireSharedVcb(); + Status = NpListen(DeviceObject, Irp, &DeferredList); break; case FSCTL_PIPE_QUERY_EVENT: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpQueryEvent(DeviceObject, Irp); break; case FSCTL_PIPE_WAIT: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpWaitForNamedPipe(DeviceObject, Irp); break; case FSCTL_PIPE_IMPERSONATE: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpImpersonate(DeviceObject, Irp); break; case FSCTL_PIPE_SET_CLIENT_PROCESS: - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpSetClientProcess(DeviceObject, Irp); break; @@ -660,17 +658,8 @@ return STATUS_NOT_SUPPORTED; } - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); - } + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); return Status; } Modified: trunk/reactos/drivers/filesystems/npfs_new/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -40,8 +40,8 @@ DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = NpFsdFlushBuffers; DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = NpFsdDirectoryControl; DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = NpFsdFileSystemControl; - DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] = NpFsdQuerySecurity; - DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = NpFsdSetSecurity; + DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] = NpFsdQuerySecurityInfo; + DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = NpFsdSetSecurityInfo; DriverObject->DriverUnload = NULL; 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] Wed Sep 11 17:10:30 2013 @@ -263,6 +263,60 @@ extern PNP_VCB NpVcb; +// +// Functions to lock/unlock the global VCB lock +// +FORCEINLINE +VOID +NpAcquireSharedVcb(VOID) +{ + /* Acquire the lock in shared mode */ + ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); +} + +FORCEINLINE +VOID +NpAcquireExclusiveVcb(VOID) +{ + /* Acquire the lock in exclusive mode */ + ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); +} + +FORCEINLINE +VOID +NpReleaseVcb(VOID) +{ + /* Release the lock */ + ExReleaseResourceLite(&NpVcb->Lock); +} + +// +// Function to process deferred IRPs outside the VCB lock but still within the +// critical region +// +VOID +FORCEINLINE +NpCompleteDeferredIrps(IN PLIST_ENTRY DeferredList) +{ + PLIST_ENTRY ThisEntry, NextEntry; + PIRP Irp; + + /* Loop the list */ + ThisEntry = DeferredList->Flink; + while (ThisEntry != DeferredList) + { + /* Remember the next entry, but don't switch to it yet */ + NextEntry = ThisEntry->Flink; + + /* Complete the IRP for this entry */ + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + + /* And now switch to the next one */ + ThisEntry = NextEntry; + } +} + BOOLEAN NTAPI NpDeleteEventTableEntry(IN PRTL_GENERIC_TABLE Table, @@ -533,13 +587,13 @@ NTSTATUS NTAPI -NpFsdQuerySecurity(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -NTSTATUS -NTAPI -NpFsdSetSecurity(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +NpFsdQuerySecurityInfo(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdSetSecurityInfo(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); NTSTATUS NTAPI Modified: trunk/reactos/drivers/filesystems/npfs_new/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -142,37 +142,25 @@ { PIO_STACK_LOCATION IoStack; IO_STATUS_BLOCK IoStatus; - LIST_ENTRY List; - PLIST_ENTRY NextEntry, ThisEntry; - PIRP LocalIrp; + LIST_ENTRY DeferredList; PAGED_CODE(); NpSlowReadCalls++; - InitializeListHead(&List); + InitializeListHead(&DeferredList); IoStack = IoGetCurrentIrpStackLocation(Irp); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireSharedVcb(); NpCommonRead(IoStack->FileObject, Irp->UserBuffer, IoStack->Parameters.Read.Length, &IoStatus, Irp, - &List); + &DeferredList); - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); - } - + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); if (IoStatus.Status != STATUS_PENDING) Modified: trunk/reactos/drivers/filesystems/npfs_new/seinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/seinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/seinfo.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -78,18 +78,18 @@ NTSTATUS NTAPI -NpFsdQuerySecurity(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +NpFsdQuerySecurityInfo(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { NTSTATUS Status; PAGED_CODE(); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpCommonQuerySecurityInfo(DeviceObject, Irp); - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); FsRtlExitFileSystem(); if (Status != STATUS_PENDING) @@ -103,18 +103,18 @@ NTSTATUS NTAPI -NpFsdSetSecurity(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +NpFsdSetSecurityInfo(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { NTSTATUS Status; PAGED_CODE(); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); Status = NpCommonQuerySecurityInfo(DeviceObject, Irp); - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); FsRtlExitFileSystem(); if (Status != STATUS_PENDING) Modified: trunk/reactos/drivers/filesystems/npfs_new/statesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -6,12 +6,12 @@ IN PIRP Irp) { FsRtlEnterFileSystem(); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); RemoveEntryList(&Irp->Tail.Overlay.ListEntry); FsRtlExitFileSystem(); - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); Irp->IoStatus.Status = STATUS_CANCELLED; IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); Modified: trunk/reactos/drivers/filesystems/npfs_new/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/write.c [iso-8859-1] Wed Sep 11 17:10:30 2013 @@ -156,17 +156,15 @@ { PIO_STACK_LOCATION IoStack; IO_STATUS_BLOCK IoStatus; - LIST_ENTRY List; - PLIST_ENTRY NextEntry, ThisEntry; - PIRP ListIrp; + LIST_ENTRY DeferredList; PAGED_CODE(); NpSlowWriteCalls++; - InitializeListHead(&List); + InitializeListHead(&DeferredList); IoStack = IoGetCurrentIrpStackLocation(Irp); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireSharedVcb(); NpCommonWrite(IoStack->FileObject, Irp->UserBuffer, @@ -174,20 +172,10 @@ Irp->Tail.Overlay.Thread, &IoStatus, Irp, - &List); + &DeferredList); - ExReleaseResourceLite(&NpVcb->Lock); - - NextEntry = List.Flink; - while (NextEntry != &List) - { - ThisEntry = NextEntry; - NextEntry = NextEntry->Flink; - - ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(ListIrp, IO_NAMED_PIPE_INCREMENT); - } - + NpReleaseVcb(); + NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); if (IoStatus.Status != STATUS_PENDING)

11 years

[akhaldi] 60033: [SCRRUN] * Import from Wine 1.7.1.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 11 12:44:58 2013 New Revision: 60033 URL: http://svn.reactos.org/svn/reactos?rev=60033&view=rev Log: [SCRRUN] * Import from Wine 1.7.1. Added: trunk/reactos/dll/win32/scrrun/ (with props) trunk/reactos/dll/win32/scrrun/CMakeLists.txt (with props) trunk/reactos/dll/win32/scrrun/dictionary.c (with props) trunk/reactos/dll/win32/scrrun/filesystem.c (with props) trunk/reactos/dll/win32/scrrun/scrrun.c (with props) trunk/reactos/dll/win32/scrrun/scrrun.idl (with props) trunk/reactos/dll/win32/scrrun/scrrun.rc (with props) trunk/reactos/dll/win32/scrrun/scrrun.rgs (with props) trunk/reactos/dll/win32/scrrun/scrrun.spec (with props) trunk/reactos/dll/win32/scrrun/scrrun_private.h (with props) trunk/reactos/dll/win32/scrrun/scrrun_tlb.rgs (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE trunk/reactos/media/inf/syssetup.inf [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… Added: trunk/reactos/dll/win32/scrrun/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/CMakeList… Added: trunk/reactos/dll/win32/scrrun/dictionary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/dictionar… Added: trunk/reactos/dll/win32/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/filesyste… Added: trunk/reactos/dll/win32/scrrun/scrrun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.c?… Added: trunk/reactos/dll/win32/scrrun/scrrun.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.id… Added: trunk/reactos/dll/win32/scrrun/scrrun.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.rc… Added: trunk/reactos/dll/win32/scrrun/scrrun.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.rg… Added: trunk/reactos/dll/win32/scrrun/scrrun.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.sp… Added: trunk/reactos/dll/win32/scrrun/scrrun_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun_pr… Added: trunk/reactos/dll/win32/scrrun/scrrun_tlb.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun_tl… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev…

11 years

[akhaldi] 60032: [KERNEL32_WINETEST] * Sync with Wine 1.7.1.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 11 11:32:57 2013 New Revision: 60032 URL: http://svn.reactos.org/svn/reactos?rev=60032&view=rev Log: [KERNEL32_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/kernel32/actctx.c trunk/rostests/winetests/kernel32/codepage.c trunk/rostests/winetests/kernel32/comm.c trunk/rostests/winetests/kernel32/console.c trunk/rostests/winetests/kernel32/debugger.c trunk/rostests/winetests/kernel32/drive.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/heap.c trunk/rostests/winetests/kernel32/loader.c trunk/rostests/winetests/kernel32/locale.c trunk/rostests/winetests/kernel32/path.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/sync.c trunk/rostests/winetests/kernel32/thread.c trunk/rostests/winetests/kernel32/time.c trunk/rostests/winetests/kernel32/virtual.c trunk/rostests/winetests/kernel32/volume.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/actctx… Modified: trunk/rostests/winetests/kernel32/codepage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/codepa… Modified: trunk/rostests/winetests/kernel32/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/comm.c… Modified: trunk/rostests/winetests/kernel32/console.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/consol… Modified: trunk/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugg… Modified: trunk/rostests/winetests/kernel32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/drive.… Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… Modified: trunk/rostests/winetests/kernel32/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/heap.c… Modified: trunk/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader… Modified: trunk/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/locale… Modified: trunk/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/path.c… Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… Modified: trunk/rostests/winetests/kernel32/sync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/sync.c… Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… Modified: trunk/rostests/winetests/kernel32/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/time.c… Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… Modified: trunk/rostests/winetests/kernel32/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/volume…

11 years

[akhaldi] 60031: [WINE/INCLUDES] * Update Wine's atlbase.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 11 11:09:23 2013 New Revision: 60031 URL: http://svn.reactos.org/svn/reactos?rev=60031&view=rev Log: [WINE/INCLUDES] * Update Wine's atlbase.h. Modified: trunk/reactos/include/reactos/wine/atlbase.h Modified: trunk/reactos/include/reactos/wine/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/atlba… ============================================================================== --- trunk/reactos/include/reactos/wine/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/atlbase.h [iso-8859-1] Wed Sep 11 11:09:23 2013 @@ -22,6 +22,17 @@ #define __WINE_ATLBASE_H__ #include <atliface.h> +#include <comcat.h> + +/* Wine extension: we (ab)use _ATL_VER to handle struct layout differences between ATL versions. */ +#define _ATL_VER_30 0x0300 +#define _ATL_VER_70 0x0700 +#define _ATL_VER_80 0x0800 +#define _ATL_VER_100 0x0a00 + +#ifndef _ATL_VER +#define _ATL_VER _ATL_VER_100 +#endif typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void* pv, REFIID riid, LPVOID* ppv); typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD dw); @@ -31,6 +42,8 @@ typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(void); typedef void (WINAPI _ATL_TERMFUNC)(DWORD dw); +typedef CRITICAL_SECTION CComCriticalSection; + typedef struct _ATL_OBJMAP_ENTRYA_V1_TAG { const CLSID* pclsid; @@ -77,7 +90,7 @@ _ATL_DESCRIPTIONFUNCW* pfnGetObjectDescription; _ATL_CATMAPFUNC* pfnGetCategoryMap; void (WINAPI *pfnObjectMain)(BOOL bStarting); -} _ATL_OBJMAP_ENTRYW; +} _ATL_OBJMAP_ENTRYW, _ATL_OBJMAP_ENTRY30, _ATL_OBJMAP_ENTRY; typedef struct _ATL_TERMFUNC_ELEM_TAG @@ -148,6 +161,46 @@ _ATL_TERMFUNC_ELEM* m_pTermFuncs; } _ATL_MODULEW; +typedef struct +{ + void *m_aT; + int m_nSize; + int m_nAllocSize; +} CSimpleArray; + +typedef struct _ATL_MODULE70 +{ + UINT cbSize; + LONG m_nLockCnt; + _ATL_TERMFUNC_ELEM *m_pTermFuncs; + CComCriticalSection m_csStaticDataInitAndTypeInfo; +} _ATL_MODULE70; + +typedef struct _ATL_WIN_MODULE70 +{ + UINT cbSize; + CComCriticalSection m_csWindowCreate; + _AtlCreateWndData *m_pCreateWndList; + CSimpleArray /* <ATOM> */ m_rgWindowClassAtoms; +} _ATL_WIN_MODULE70; + +typedef struct _ATL_COM_MODULE70 +{ + UINT cbSize; + HINSTANCE m_hInstTypeLib; + _ATL_OBJMAP_ENTRY **m_ppAutoObjMapFirst; + _ATL_OBJMAP_ENTRY **m_ppAutoObjMapLast; + CComCriticalSection m_csObjMap; +} _ATL_COM_MODULE70, _ATL_COM_MODULE; + +#if _ATL_VER >= _ATL_VER_70 +typedef _ATL_MODULE70 _ATL_MODULE; +typedef _ATL_WIN_MODULE70 _ATL_WIN_MODULE; +#else +typedef _ATL_MODULEW _ATL_MODULE; +typedef _ATL_MODULEW _ATL_WIN_MODULE; +#endif + typedef struct _ATL_INTMAP_ENTRY_TAG { const IID* piid; @@ -160,6 +213,16 @@ LPCOLESTR szKey; LPCOLESTR szData; }; + +struct _ATL_CATMAP_ENTRY +{ + int iType; + const CATID *pcatid; +}; + +#define _ATL_CATMAP_ENTRY_END 0 +#define _ATL_CATMAP_ENTRY_IMPLEMENTED 1 +#define _ATL_CATMAP_ENTRY_REQUIRED 2 HRESULT WINAPI AtlAdvise(IUnknown *pUnkCP, IUnknown *pUnk, const IID * iid, LPDWORD dpw); HRESULT WINAPI AtlAxAttachControl(IUnknown*,HWND,IUnknown**); @@ -169,7 +232,11 @@ HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject); HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream); void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); -HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); +HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE*); +void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE*,_AtlCreateWndData*,void*); +void* WINAPI AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE*); +HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); +void WINAPI AtlCallTermFunc(_ATL_MODULE*); void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM); HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib); @@ -183,5 +250,16 @@ HRESULT WINAPI AtlUnadvise(IUnknown *pUnkCP, const IID * iid, DWORD dw); HRESULT WINAPI AtlUnmarshalPtr(IStream *pStream, const IID *iid, IUnknown **ppUnk); HRESULT WINAPI AtlCreateRegistrar(IRegistrar**); +HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE,LPCOLESTR,BOOL,struct _ATL_REGMAP_ENTRY*,IRegistrar*); +HRESULT WINAPI AtlLoadTypeLib(HINSTANCE,LPCOLESTR,BSTR*,ITypeLib**); +HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE,LPCOLESTR); +HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID,const struct _ATL_CATMAP_ENTRY*,BOOL); +HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE*,REFCLSID,REFIID,void**); +HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE*,DWORD,DWORD); +HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); +BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); +HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown*,GUID*,IID*,unsigned short*,unsigned short*); +HRESULT WINAPI AtlSetPerUserRegistration(unsigned char /*bool*/); +HRESULT WINAPI AtlGetPerUserRegistration(unsigned char /*bool*/ *); #endif /* __WINE_ATLBASE_H__ */

11 years

[akhaldi] 60030: [COMDLG32] * Move the resource files to the appropriate folders.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 11 10:46:07 2013 New Revision: 60030 URL: http://svn.reactos.org/svn/reactos?rev=60030&view=rev Log: [COMDLG32] * Move the resource files to the appropriate folders. Added: trunk/reactos/dll/win32/comdlg32/lang/ (with props) trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Bg.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Ca.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Cs.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_De.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_El.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_En.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Eo.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Es.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Fi.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Fr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_He.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Hu.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_It.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Ja.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Ko.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Lt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Nl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Pl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Ro.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Sk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Sr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Sv.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Th.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Tr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Tw.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdlg_Zh.rc trunk/reactos/dll/win32/comdlg32/res/ (with props) trunk/reactos/dll/win32/comdlg32/res/bitmaps/ (with props) trunk/reactos/dll/win32/comdlg32/res/bitmaps/800.bmp - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/800.bmp trunk/reactos/dll/win32/comdlg32/res/bitmaps/fontpics.bmp - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/fontpics.bmp trunk/reactos/dll/win32/comdlg32/res/icons/ (with props) trunk/reactos/dll/win32/comdlg32/res/icons/cdrom.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/cdrom.ico trunk/reactos/dll/win32/comdlg32/res/icons/floppy.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/floppy.ico trunk/reactos/dll/win32/comdlg32/res/icons/folder.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/folder.ico trunk/reactos/dll/win32/comdlg32/res/icons/folder2.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/folder2.ico trunk/reactos/dll/win32/comdlg32/res/icons/hdisk.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/hdisk.ico trunk/reactos/dll/win32/comdlg32/res/icons/network.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/network.ico trunk/reactos/dll/win32/comdlg32/res/icons/pd32_collate.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/pd32_collate.ico trunk/reactos/dll/win32/comdlg32/res/icons/pd32_landscape.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/pd32_landscape.ico trunk/reactos/dll/win32/comdlg32/res/icons/pd32_nocollate.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/pd32_nocollate.ico trunk/reactos/dll/win32/comdlg32/res/icons/pd32_portrait.ico - copied unchanged from r60021, trunk/reactos/dll/win32/comdlg32/pd32_portrait.ico Removed: trunk/reactos/dll/win32/comdlg32/800.bmp trunk/reactos/dll/win32/comdlg32/cdlg_Bg.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ca.rc trunk/reactos/dll/win32/comdlg32/cdlg_Cs.rc trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/cdlg_De.rc trunk/reactos/dll/win32/comdlg32/cdlg_El.rc trunk/reactos/dll/win32/comdlg32/cdlg_En.rc trunk/reactos/dll/win32/comdlg32/cdlg_Eo.rc trunk/reactos/dll/win32/comdlg32/cdlg_Es.rc trunk/reactos/dll/win32/comdlg32/cdlg_Fi.rc trunk/reactos/dll/win32/comdlg32/cdlg_Fr.rc trunk/reactos/dll/win32/comdlg32/cdlg_He.rc trunk/reactos/dll/win32/comdlg32/cdlg_Hu.rc trunk/reactos/dll/win32/comdlg32/cdlg_It.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ja.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ko.rc trunk/reactos/dll/win32/comdlg32/cdlg_Lt.rc trunk/reactos/dll/win32/comdlg32/cdlg_Nl.rc trunk/reactos/dll/win32/comdlg32/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/cdlg_Pl.rc trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ro.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc trunk/reactos/dll/win32/comdlg32/cdlg_Sk.rc trunk/reactos/dll/win32/comdlg32/cdlg_Sr.rc trunk/reactos/dll/win32/comdlg32/cdlg_Sv.rc trunk/reactos/dll/win32/comdlg32/cdlg_Th.rc trunk/reactos/dll/win32/comdlg32/cdlg_Tr.rc trunk/reactos/dll/win32/comdlg32/cdlg_Tw.rc trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/cdlg_Zh.rc trunk/reactos/dll/win32/comdlg32/cdrom.ico trunk/reactos/dll/win32/comdlg32/floppy.ico trunk/reactos/dll/win32/comdlg32/folder.ico trunk/reactos/dll/win32/comdlg32/folder2.ico trunk/reactos/dll/win32/comdlg32/fontpics.bmp trunk/reactos/dll/win32/comdlg32/hdisk.ico trunk/reactos/dll/win32/comdlg32/network.ico trunk/reactos/dll/win32/comdlg32/pd32_collate.ico trunk/reactos/dll/win32/comdlg32/pd32_landscape.ico trunk/reactos/dll/win32/comdlg32/pd32_nocollate.ico trunk/reactos/dll/win32/comdlg32/pd32_portrait.ico Modified: trunk/reactos/dll/win32/comdlg32/cdlg_xx.rc trunk/reactos/dll/win32/comdlg32/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/win32/comdlg32/800.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/800.bmp… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Bg… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Ca.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ca… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Cs… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Da… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_De… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_El… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_En… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Eo… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Es… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Fi… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Fr… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_He… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Hu… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_It… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ja… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ko… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Lt… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Nl… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_No… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Pl… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Pt… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ro… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ru… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Si… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Sk… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Sr… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Sv… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Th… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Tr… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Tw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Tw… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Uk… Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Zh… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_xx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_xx… Removed: trunk/reactos/dll/win32/comdlg32/cdrom.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdrom.i… Removed: trunk/reactos/dll/win32/comdlg32/floppy.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/floppy.… Removed: trunk/reactos/dll/win32/comdlg32/folder.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/folder.… Removed: trunk/reactos/dll/win32/comdlg32/folder2.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/folder2… Removed: trunk/reactos/dll/win32/comdlg32/fontpics.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontpic… Removed: trunk/reactos/dll/win32/comdlg32/hdisk.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/hdisk.i… Removed: trunk/reactos/dll/win32/comdlg32/network.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/network… Removed: trunk/reactos/dll/win32/comdlg32/pd32_collate.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/pd32_co… Removed: trunk/reactos/dll/win32/comdlg32/pd32_landscape.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/pd32_la… Removed: trunk/reactos/dll/win32/comdlg32/pd32_nocollate.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/pd32_no… Removed: trunk/reactos/dll/win32/comdlg32/pd32_portrait.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/pd32_po… Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/rsrc.rc…

11 years

[akhaldi] 60029: [ATL] * Add _ATL_VER definition.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 11 10:20:46 2013 New Revision: 60029 URL: http://svn.reactos.org/svn/reactos?rev=60029&view=rev Log: [ATL] * Add _ATL_VER definition. Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/CMakeLists.txt [iso-8859-1] Wed Sep 11 10:20:46 2013 @@ -1,5 +1,7 @@ -add_definitions(-D__WINESRC__) +add_definitions( + -D__WINESRC__ + -D_ATL_VER=_ATL_VER_30) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600)

11 years

[ion] 60028: [NPFS-NEW]: NpfsCreate: 339 tests executed (0 marked as todo, 0 failures), 0 skipped. NpfsConnect: 679 tests executed (0 marked as todo, 0 failures), 0 skipped. NpfsReadWrite: 7154 tes...

by ion＠svn.reactos.org

Author: ion Date: Wed Sep 11 07:05:15 2013 New Revision: 60028 URL: http://svn.reactos.org/svn/reactos?rev=60028&view=rev Log: [NPFS-NEW]: NpfsCreate: 339 tests executed (0 marked as todo, 0 failures), 0 skipped. NpfsConnect: 679 tests executed (0 marked as todo, 0 failures), 0 skipped. NpfsReadWrite: 7154 tests executed (0 marked as todo, 0 failures), 0 skipped. NpfsReadWriteAsync: 1176 tests executed (0 marked as todo, 0 failures), 0 skipped. 'Nuff said. Modified: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c trunk/reactos/drivers/filesystems/npfs_new/close.c trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/main.c trunk/reactos/drivers/filesystems/npfs_new/read.c trunk/reactos/drivers/filesystems/npfs_new/statesup.c trunk/reactos/drivers/filesystems/npfs_new/write.c trunk/reactos/drivers/filesystems/npfs_new/writesup.c Modified: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/cleanup.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -12,6 +12,7 @@ PNP_CCB Ccb; ULONG NamedPipeEnd; PLIST_ENTRY ThisEntry, NextEntry; + PIRP LocalIrp; PAGED_CODE(); IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -41,8 +42,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); } return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/npfs_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/close.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -12,6 +12,7 @@ PNP_CCB Ccb; ULONG NamedPipeEnd; PLIST_ENTRY ThisEntry, NextEntry; + PIRP LocalIrp; PAGED_CODE(); IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -40,8 +41,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); } Irp->IoStatus.Status = STATUS_SUCCESS; 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] Wed Sep 11 07:05:15 2013 @@ -217,11 +217,6 @@ FileName = FileObject->FileName; DesiredAccess = IoStack->Parameters.CreatePipe.SecurityContext->DesiredAccess; - DPRINT1("NpfsCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - DPRINT1("FileObject %p\n", FileObject); - DPRINT1("FileName %wZ\n", &FileObject->FileName); - DPRINT1("FileName->Length: %hu RelatedFileObject: %p\n", FileName.Length, RelatedFileObject); - FsRtlEnterFileSystem(); ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); @@ -346,7 +341,7 @@ NextEntry = NextEntry->Flink; ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(ListIrp, IO_DISK_INCREMENT); + IoCompleteRequest(ListIrp, IO_NAMED_PIPE_INCREMENT); } FsRtlExitFileSystem(); @@ -636,8 +631,6 @@ IO_STATUS_BLOCK IoStatus; PIRP ListIrp; - DPRINT1("NpFsdCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - InitializeListHead(&LocalList); Process = IoGetRequestorProcess(Irp); @@ -658,10 +651,6 @@ FsRtlEnterFileSystem(); ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); - - DPRINT1("FileObject %p\n", FileObject); - DPRINT1("FileName %wZ\n", &FileObject->FileName); - DPRINT1("FileName->Length: %hu RelatedFileObject: %p\n", FileName.Length, RelatedFileObject); if (RelatedFileObject) { @@ -754,13 +743,13 @@ NextEntry = NextEntry->Flink; ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(ListIrp, IO_DISK_INCREMENT); + IoCompleteRequest(ListIrp, IO_NAMED_PIPE_INCREMENT); } FsRtlExitFileSystem(); Irp->IoStatus = IoStatus; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); return IoStatus.Status; } Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -192,6 +192,7 @@ PSECURITY_CLIENT_CONTEXT ClientSecurityContext; BOOLEAN CompleteWrites, FirstEntry; PLIST_ENTRY NextEntry, ThisEntry; + PIRP LocalIrp; if (DeviceObject) IoReleaseCancelSpinLock(Irp->CancelIrql); @@ -263,7 +264,7 @@ NpFreeClientSecurityContext(ClientSecurityContext); Irp->IoStatus.Status = STATUS_CANCELLED; - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); NextEntry = List.Flink; while (NextEntry != &List) @@ -271,8 +272,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); } } @@ -307,7 +308,10 @@ Irp ? Irp->Tail.Overlay.Thread : PsGetCurrentThread(), &ClientContext); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + return Status; + } } switch (Type) @@ -317,29 +321,31 @@ case 3: ASSERT(Irp != NULL); - DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, sizeof(*DataEntry), NPFS_DATA_ENTRY_TAG); - if (DataEntry) - { - DataEntry->DataEntryType = Type; - DataEntry->QuotaInEntry = 0; - DataEntry->Irp = Irp; - DataEntry->DataSize = DataSize; - DataEntry->ClientSecurityContext = ClientContext; - ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); - Status = STATUS_PENDING; - break; - } - - NpFreeClientSecurityContext(ClientContext); - return STATUS_INSUFFICIENT_RESOURCES; - + DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, + sizeof(*DataEntry), + NPFS_DATA_ENTRY_TAG); + if (!DataEntry) + { + NpFreeClientSecurityContext(ClientContext); + return STATUS_INSUFFICIENT_RESOURCES; + } + + DataEntry->DataEntryType = Type; + DataEntry->QuotaInEntry = 0; + DataEntry->Irp = Irp; + DataEntry->DataSize = DataSize; + DataEntry->ClientSecurityContext = ClientContext; + ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); + Status = STATUS_PENDING; + break; + case Buffered: EntrySize = sizeof(*DataEntry); - if (Who != Empty) - { - EntrySize = DataSize + sizeof(*DataEntry); - if ((DataSize + sizeof(*DataEntry)) < DataSize) + if (Who != ReadEntries) + { + EntrySize += DataSize; + if (EntrySize < DataSize) { NpFreeClientSecurityContext(ClientContext); return STATUS_INVALID_PARAMETER; @@ -350,14 +356,16 @@ if (DataQueue->Quota - DataQueue->QuotaUsed < QuotaInEntry) { QuotaInEntry = DataQueue->Quota - DataQueue->QuotaUsed; - HasSpace = 1; + HasSpace = TRUE; } else { - HasSpace = 0; - } - - DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, EntrySize, NPFS_DATA_ENTRY_TAG); + HasSpace = FALSE; + } + + DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, + EntrySize, + NPFS_DATA_ENTRY_TAG); if (!DataEntry) { NpFreeClientSecurityContext(ClientContext); @@ -382,9 +390,9 @@ { _SEH2_TRY { - RtlCopyMemory(DataEntry + 1, - Irp ? Irp->UserBuffer: Buffer, - DataSize); + RtlCopyMemory(DataEntry + 1, + Irp ? Irp->UserBuffer: Buffer, + DataSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -399,12 +407,14 @@ } else { - DataEntry->Irp = 0; + DataEntry->Irp = NULL; Status = STATUS_SUCCESS; } - - ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); - } + + ASSERT((DataQueue->QueueState == Empty) || + (DataQueue->QueueState == Who)); + } + break; default: ASSERT(FALSE); @@ -429,7 +439,8 @@ DataQueue->QuotaUsed += DataEntry->QuotaInEntry; DataQueue->QueueState = Who; DataQueue->BytesInQueue += DataEntry->DataSize; - ++DataQueue->EntriesInQueue; + DataQueue->EntriesInQueue++; + if (ByteOffset) { DataQueue->ByteOffset = ByteOffset; @@ -448,9 +459,8 @@ IoSetCancelRoutine(Irp, NpCancelDataQueueIrp); - if (Irp->Cancel) - { - IoSetCancelRoutine(Irp, NULL); + if ((Irp->Cancel) && (IoSetCancelRoutine(Irp, NULL))) + { NpCancelDataQueueIrp(NULL, Irp); } } Modified: trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -102,6 +102,7 @@ NTSTATUS Status; LIST_ENTRY List; PLIST_ENTRY NextEntry, ThisEntry; + PIRP LocalIrp; PAGED_CODE(); InitializeListHead(&List); @@ -119,8 +120,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); } FsRtlExitFileSystem(); 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] Wed Sep 11 07:05:15 2013 @@ -572,6 +572,7 @@ LIST_ENTRY List; PLIST_ENTRY NextEntry, ThisEntry; NTSTATUS Status; + PIRP LocalIrp; PAGED_CODE(); InitializeListHead(&List); @@ -667,8 +668,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); } return Status; Modified: trunk/reactos/drivers/filesystems/npfs_new/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -61,8 +61,7 @@ /* Initialize the device object */ NpfsDeviceObject = DeviceObject; - DeviceObject->Flags |= DO_DIRECT_IO; - DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + DeviceObject->Flags |= DO_LONG_TERM_REQUESTS; /* Initialize the Volume Control Block (VCB) */ NpVcb = DeviceObject->DeviceExtension; Modified: trunk/reactos/drivers/filesystems/npfs_new/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -144,6 +144,7 @@ IO_STATUS_BLOCK IoStatus; LIST_ENTRY List; PLIST_ENTRY NextEntry, ThisEntry; + PIRP LocalIrp; PAGED_CODE(); NpSlowReadCalls++; @@ -168,8 +169,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + LocalIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(LocalIrp, IO_NAMED_PIPE_INCREMENT); } FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/npfs_new/statesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -235,6 +235,7 @@ PLIST_ENTRY NextEntry; PNP_DATA_QUEUE ReadQueue, WriteQueue, DataQueue; PNP_EVENT_BUFFER EventBuffer; + PIRP ListIrp; NonPagedCcb = Ccb->NonPagedCcb; Fcb = Ccb->Fcb; @@ -249,11 +250,11 @@ { NextEntry = RemoveHeadList(&Ccb->IrpList); - Irp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); - - if (IoSetCancelRoutine(Irp, NULL)) - { - Irp->IoStatus.Status = STATUS_PIPE_BROKEN; + ListIrp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + if (IoSetCancelRoutine(ListIrp, NULL)) + { + ListIrp->IoStatus.Status = STATUS_PIPE_BROKEN; InsertTailList(List, NextEntry); } else @@ -297,11 +298,11 @@ while (DataQueue->QueueState != Empty) { - Irp = NpRemoveDataQueueEntry(DataQueue, FALSE, List); - if (Irp) - { - Irp->IoStatus.Status = STATUS_PIPE_BROKEN; - InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + ListIrp = NpRemoveDataQueueEntry(DataQueue, FALSE, List); + if (ListIrp) + { + ListIrp->IoStatus.Status = STATUS_PIPE_BROKEN; + InsertTailList(List, &ListIrp->Tail.Overlay.ListEntry); } } @@ -342,21 +343,21 @@ while (ReadQueue->QueueState != Empty) { - Irp = NpRemoveDataQueueEntry(ReadQueue, FALSE, List); - if (Irp) - { - Irp->IoStatus.Status = STATUS_PIPE_BROKEN; - InsertTailList(List, &Irp->Tail.Overlay.ListEntry); - } - } - - while (WriteQueue->QueueState == WriteEntries) - { - Irp = NpRemoveDataQueueEntry(WriteQueue, FALSE, List); - if (Irp) - { - Irp->IoStatus.Status = STATUS_PIPE_BROKEN; - InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + ListIrp = NpRemoveDataQueueEntry(ReadQueue, FALSE, List); + if (ListIrp) + { + ListIrp->IoStatus.Status = STATUS_PIPE_BROKEN; + InsertTailList(List, &ListIrp->Tail.Overlay.ListEntry); + } + } + + while (WriteQueue->QueueState == ReadEntries) + { + ListIrp = NpRemoveDataQueueEntry(WriteQueue, FALSE, List); + if (ListIrp) + { + ListIrp->IoStatus.Status = STATUS_PIPE_BROKEN; + InsertTailList(List, &ListIrp->Tail.Overlay.ListEntry); } } Modified: trunk/reactos/drivers/filesystems/npfs_new/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/write.c [iso-8859-1] Wed Sep 11 07:05:15 2013 @@ -40,21 +40,25 @@ NonPagedCcb = Ccb->NonPagedCcb; ExAcquireResourceExclusiveLite(&NonPagedCcb->Lock, TRUE); - if (Ccb->NamedPipeState == FILE_PIPE_DISCONNECTED_STATE) - { - IoStatus->Status = STATUS_PIPE_DISCONNECTED; + if (Ccb->NamedPipeState != FILE_PIPE_CONNECTED_STATE) + { + if (Ccb->NamedPipeState == FILE_PIPE_DISCONNECTED_STATE) + { + IoStatus->Status = STATUS_PIPE_DISCONNECTED; + } + else if (Ccb->NamedPipeState == FILE_PIPE_LISTENING_STATE) + { + IoStatus->Status = STATUS_PIPE_LISTENING; + } + else + { + ASSERT(Ccb->NamedPipeState == FILE_PIPE_CLOSING_STATE); + IoStatus->Status = STATUS_PIPE_CLOSING; + } + WriteOk = TRUE; goto Quickie; } - - if (Ccb->NamedPipeState == FILE_PIPE_LISTENING_STATE || Ccb->NamedPipeState == FILE_PIPE_CLOSING_STATE) - { - IoStatus->Status = Ccb->NamedPipeState != FILE_PIPE_LISTENING_STATE ? STATUS_PIPE_LISTENING : STATUS_PIPE_CLOSING; - WriteOk = TRUE; - goto Quickie; - } - - ASSERT(Ccb->NamedPipeState == FILE_PIPE_CONNECTED_STATE); if ((NamedPipeEnd == FILE_PIPE_SERVER_END && Ccb->Fcb->NamedPipeConfiguration == FILE_PIPE_INBOUND) || (NamedPipeEnd == FILE_PIPE_CLIENT_END && Ccb->Fcb->NamedPipeConfiguration == FILE_PIPE_OUTBOUND)) @@ -111,6 +115,7 @@ Thread, List); IoStatus->Status = Status; + if (Status == STATUS_MORE_PROCESSING_REQUIRED) { ASSERT(WriteQueue->QueueState != ReadEntries); @@ -153,6 +158,7 @@ IO_STATUS_BLOCK IoStatus; LIST_ENTRY List; PLIST_ENTRY NextEntry, ThisEntry; + PIRP ListIrp; PAGED_CODE(); NpSlowWriteCalls++; @@ -178,8 +184,8 @@ ThisEntry = NextEntry; NextEntry = NextEntry->Flink; - Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); - IoCompleteRequest(Irp, IO_DISK_INCREMENT); + ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(ListIrp, IO_NAMED_PIPE_INCREMENT); } FsRtlExitFileSystem(); 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] Wed Sep 11 07:05:15 2013 @@ -3,14 +3,14 @@ NTSTATUS NTAPI NpWriteDataQueue(IN PNP_DATA_QUEUE WriteQueue, - IN ULONG Mode, - IN PVOID OutBuffer, - IN ULONG OutBufferSize, - IN ULONG PipeType, - OUT PULONG BytesWritten, - IN PNP_CCB Ccb, - IN ULONG NamedPipeEnd, - IN PETHREAD Thread, + IN ULONG Mode, + IN PVOID OutBuffer, + IN ULONG OutBufferSize, + IN ULONG PipeType, + OUT PULONG BytesNotWritten, + IN PNP_CCB Ccb, + IN ULONG NamedPipeEnd, + IN PETHREAD Thread, IN PLIST_ENTRY List) { BOOLEAN HaveContext = FALSE, MoreProcessing, AllocatedBuffer; @@ -23,7 +23,7 @@ PSECURITY_CLIENT_CONTEXT ClientContext; PAGED_CODE(); - *BytesWritten = OutBufferSize; + *BytesNotWritten = OutBufferSize; MoreProcessing = TRUE; if ((PipeType != FILE_PIPE_MESSAGE_MODE) || (OutBufferSize)) @@ -33,7 +33,7 @@ for (DataEntry = NpGetNextRealDataQueueEntry(WriteQueue, List); ((WriteQueue->QueueState == ReadEntries) && - ((*BytesWritten > 0) || (MoreProcessing))); + ((*BytesNotWritten > 0) || (MoreProcessing))); DataEntry = NpGetNextRealDataQueueEntry(WriteQueue, List)) { DataSize = DataEntry->DataSize; @@ -58,7 +58,7 @@ DataEntry->Irp->Overlay.AllocationSize.QuadPart = 0; } - BufferSize = *BytesWritten; + BufferSize = *BytesNotWritten; if (BufferSize >= DataSize) BufferSize = DataSize; if (DataEntry->DataEntryType != Unbuffered && BufferSize) @@ -76,7 +76,7 @@ _SEH2_TRY { RtlCopyMemory(Buffer, - (PVOID)((ULONG_PTR)OutBuffer + OutBufferSize - *BytesWritten), + (PVOID)((ULONG_PTR)OutBuffer + OutBufferSize - *BytesNotWritten), BufferSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -106,7 +106,7 @@ WriteIrp = NpRemoveDataQueueEntry(WriteQueue, TRUE, List); if (WriteIrp) { - *BytesWritten -= BufferSize; + *BytesNotWritten -= BufferSize; WriteIrp->IoStatus.Information = BufferSize; if (AllocatedBuffer) @@ -115,7 +115,7 @@ WriteIrp->Flags |= IRP_DEALLOCATE_BUFFER | IRP_BUFFERED_IO | IRP_INPUT_OPERATION; } - if (!*BytesWritten) + if (!*BytesNotWritten) { MoreProcessing = FALSE; WriteIrp->IoStatus.Status = STATUS_SUCCESS; @@ -140,7 +140,7 @@ } } - if (*BytesWritten > 0 || MoreProcessing) + if (*BytesNotWritten > 0 || MoreProcessing) { ASSERT(WriteQueue->QueueState != ReadEntries); Status = STATUS_MORE_PROCESSING_REQUIRED;

11 years

[ion] 60027: [NPFS-NEW]: Multiple code fixes to almost all code paths. Mainly a collection of small bugs, structural errors, logic flaws, off-by-ones, etc. But they were enough to make the driver e...

by ion＠svn.reactos.org

Author: ion Date: Wed Sep 11 02:04:17 2013 New Revision: 60027 URL: http://svn.reactos.org/svn/reactos?rev=60027&view=rev Log: [NPFS-NEW]: Multiple code fixes to almost all code paths. Mainly a collection of small bugs, structural errors, logic flaws, off-by-ones, etc. But they were enough to make the driver essentially useless. Now Thomas's kmtests NpfsCreate and NpfsConnect return absolutely zero failures. On to NpfsReadWrite.... Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/statesup.c trunk/reactos/drivers/filesystems/npfs_new/strucsup.c 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] Wed Sep 11 02:04:17 2013 @@ -14,6 +14,7 @@ ListHead = &Dcb->NotifyList; for (i = 0; i < 2; i++) { + ASSERT(IsListEmpty(ListHead)); while (!IsListEmpty(ListHead)) { NextEntry = RemoveHeadList(ListHead); @@ -47,7 +48,7 @@ NpSetFileObject(FileObject, NpVcb, NULL, FALSE); ++NpVcb->ReferenceCount; - Status.Information = 1; + Status.Information = FILE_OPENED; Status.Status = STATUS_SUCCESS; return Status; } @@ -69,7 +70,7 @@ NpSetFileObject(FileObject, Dcb, Ccb, FALSE); ++Dcb->CurrentInstances; - Status.Information = 1; + Status.Information = FILE_OPENED; Status.Status = STATUS_SUCCESS; } else @@ -130,7 +131,7 @@ if (AccessGranted) { AccessState->PreviouslyGrantedAccess |= GrantedAccess; - AccessState->RemainingDesiredAccess &= ~(GrantedAccess | 0x2000000); + AccessState->RemainingDesiredAccess &= ~(GrantedAccess | MAXIMUM_ALLOWED); } ObjectTypeName.Buffer = L"NamedPipe"; @@ -147,14 +148,14 @@ SeUnlockSubjectContext(SubjectSecurityContext); if (!AccessGranted) return IoStatus; - if (((GrantedAccess & 1) && (NamedPipeConfiguration == FILE_PIPE_INBOUND)) || - ((GrantedAccess & 2) && (NamedPipeConfiguration == FILE_PIPE_OUTBOUND))) + if (((AccessGranted & FILE_READ_DATA) && (NamedPipeConfiguration == FILE_PIPE_INBOUND)) || + ((AccessGranted & FILE_WRITE_DATA) && (NamedPipeConfiguration == FILE_PIPE_OUTBOUND))) { IoStatus.Status = STATUS_ACCESS_DENIED; return IoStatus; } - if (!(GrantedAccess & 3)) SecurityQos = NULL; + if (!(GrantedAccess & (FILE_READ_DATA | FILE_WRITE_DATA))) SecurityQos = NULL; ListHead = &Fcb->CcbList; NextEntry = ListHead->Flink; @@ -185,7 +186,7 @@ Ccb->ClientSession = NULL; Ccb->Process = IoThreadToProcess(Thread); - IoStatus.Information = 1; + IoStatus.Information = FILE_OPENED; IoStatus.Status = STATUS_SUCCESS; return IoStatus; } @@ -205,7 +206,9 @@ PNP_DCB Dcb; ACCESS_MASK DesiredAccess; LIST_ENTRY List; + PLIST_ENTRY NextEntry, ThisEntry; UNICODE_STRING Prefix; + PIRP ListIrp; InitializeListHead(&List); IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); @@ -235,20 +238,22 @@ if (FileName.Length) { - if ((FileName.Length == sizeof(WCHAR)) && + if ((FileName.Length == sizeof(OBJ_NAME_PATH_SEPARATOR)) && (FileName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR) && !(RelatedFileObject)) { Irp->IoStatus = NpOpenNamedPipeRootDirectory(NpVcb->RootDcb, - FileObject, - DesiredAccess, - &List); + FileObject, + DesiredAccess, + &List); + goto Quickie; } } else if (!(RelatedFileObject) || (Type == NPFS_NTC_VCB)) { Irp->IoStatus = NpOpenNamedPipeFileSystem(FileObject, DesiredAccess); + goto Quickie; } else if (Type == NPFS_NTC_ROOT_DCB) { @@ -256,77 +261,94 @@ FileObject, DesiredAccess, &List); - } - else - { - // Status = NpTranslateAlias(&FileName);; // ignore this for now - // if (!NT_SUCCESS(Status)) goto Quickie; - - if (RelatedFileObject) - { - if (Type == NPFS_NTC_ROOT_DCB) + goto Quickie; + } + + // Status = NpTranslateAlias(&FileName);; // ignore this for now + // if (!NT_SUCCESS(Status)) goto Quickie; + if (RelatedFileObject) + { + if (Type == NPFS_NTC_ROOT_DCB) + { + Dcb = (PNP_DCB)Ccb; + Irp->IoStatus.Status = NpFindRelativePrefix(Dcb, + &FileName, + 1, + &Prefix, + &Fcb); + if (!NT_SUCCESS(Irp->IoStatus.Status)) { - Dcb = (PNP_DCB)Ccb; - Irp->IoStatus.Status = NpFindRelativePrefix(Dcb, - &FileName, - 1, - &Prefix, - &Fcb); - if (!NT_SUCCESS(Irp->IoStatus.Status)) goto Quickie; - } - else if ((Type != NPFS_NTC_CCB) || (FileName.Length)) - { - Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; goto Quickie; } - else - { - Prefix.Length = 0; - } + } + else if ((Type != NPFS_NTC_CCB) || (FileName.Length)) + { + Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; + goto Quickie; } else { - if ((FileName.Length <= sizeof(WCHAR)) || - (FileName.Buffer[0] != OBJ_NAME_PATH_SEPARATOR)) - { - Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; - goto Quickie; - } - - Fcb = NpFindPrefix(&FileName, 1, &Prefix); - } - - if (Prefix.Length) - { - Irp->IoStatus.Status = Fcb->NodeType != NPFS_NTC_FCB ? - STATUS_OBJECT_NAME_NOT_FOUND : - STATUS_OBJECT_NAME_INVALID; - } - - if (!Fcb->CurrentInstances) - { - Irp->IoStatus.Status = STATUS_OBJECT_NAME_NOT_FOUND; - } - else - { - Irp->IoStatus = NpCreateClientEnd(Fcb, - FileObject, - DesiredAccess, - IoStack->Parameters.CreatePipe. - SecurityContext->SecurityQos, - IoStack->Parameters.CreatePipe. - SecurityContext->AccessState, - IoStack->Flags & - SL_FORCE_ACCESS_CHECK ? - UserMode : Irp->RequestorMode, - Irp->Tail.Overlay.Thread, - &List); - } - } + Prefix.Length = 0; + } + } + else + { + if ((FileName.Length <= sizeof(OBJ_NAME_PATH_SEPARATOR)) || + (FileName.Buffer[0] != OBJ_NAME_PATH_SEPARATOR)) + { + Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; + goto Quickie; + } + + Fcb = NpFindPrefix(&FileName, TRUE, &Prefix); + } + + if (Prefix.Length) + { + Irp->IoStatus.Status = Fcb->NodeType != NPFS_NTC_FCB ? + STATUS_OBJECT_NAME_NOT_FOUND : + STATUS_OBJECT_NAME_INVALID; + goto Quickie; + } + + if (Fcb->NodeType != NPFS_NTC_FCB) + { + Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; + goto Quickie; + } + + if (!Fcb->ServerOpenCount) + { + Irp->IoStatus.Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Quickie; + } + + Irp->IoStatus = NpCreateClientEnd(Fcb, + FileObject, + DesiredAccess, + IoStack->Parameters.CreatePipe. + SecurityContext->SecurityQos, + IoStack->Parameters.CreatePipe. + SecurityContext->AccessState, + IoStack->Flags & + SL_FORCE_ACCESS_CHECK ? + UserMode : Irp->RequestorMode, + Irp->Tail.Overlay.Thread, + &List); Quickie: ExReleaseResourceLite(&NpVcb->Lock); - ASSERT(IsListEmpty(&List) == TRUE); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(ListIrp, IO_DISK_INCREMENT); + } + FsRtlExitFileSystem(); IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -582,10 +604,11 @@ NpSetFileObject(FileObject, Ccb, Ccb->NonPagedCcb, TRUE); Ccb->FileObject[FILE_PIPE_SERVER_END] = FileObject; - NpCheckForNotify(Dcb, 1, List); + NpCheckForNotify(Dcb, TRUE, List); IoStatus->Status = STATUS_SUCCESS; - IoStatus->Information = 2; + IoStatus->Information = FILE_CREATED; + return STATUS_SUCCESS; Quickie: @@ -605,11 +628,13 @@ USHORT Disposition, ShareAccess; PEPROCESS Process; LIST_ENTRY LocalList; + PLIST_ENTRY NextEntry, ThisEntry; UNICODE_STRING FileName; PNP_FCB Fcb; UNICODE_STRING Prefix; PNAMED_PIPE_CREATE_PARAMETERS Parameters; IO_STATUS_BLOCK IoStatus; + PIRP ListIrp; DPRINT1("NpFsdCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -655,16 +680,21 @@ TRUE, &Prefix, &Fcb); - if (!NT_SUCCESS(IoStatus.Status)) goto Quickie; + if (!NT_SUCCESS(IoStatus.Status)) + { + goto Quickie; + } } else { - if (FileName.Length <= 2u || *FileName.Buffer != '\\') + if (FileName.Length <= sizeof(OBJ_NAME_PATH_SEPARATOR) || + FileName.Buffer[0] != OBJ_NAME_PATH_SEPARATOR) { IoStatus.Status = STATUS_OBJECT_NAME_INVALID; goto Quickie; } - Fcb = NpFindPrefix(&FileName, 1u, &Prefix); + + Fcb = NpFindPrefix(&FileName, TRUE, &Prefix); } if (Prefix.Length) @@ -683,7 +713,7 @@ Parameters, Process, &LocalList, - &Irp->IoStatus); + &IoStatus); goto Quickie; } else @@ -692,30 +722,40 @@ goto Quickie; } } + if (Fcb->NodeType != NPFS_NTC_FCB) { IoStatus.Status = STATUS_OBJECT_NAME_INVALID; goto Quickie; } - Irp->IoStatus = NpCreateExistingNamedPipe(Fcb, - FileObject, - IoStack->Parameters.CreatePipe. - SecurityContext->DesiredAccess, - IoStack->Parameters.CreatePipe. - SecurityContext->AccessState, - IoStack->Flags & - SL_FORCE_ACCESS_CHECK ? - UserMode : Irp->RequestorMode, - Disposition, - ShareAccess, - Parameters, - Process, - &LocalList); + IoStatus = NpCreateExistingNamedPipe(Fcb, + FileObject, + IoStack->Parameters.CreatePipe. + SecurityContext->DesiredAccess, + IoStack->Parameters.CreatePipe. + SecurityContext->AccessState, + IoStack->Flags & + SL_FORCE_ACCESS_CHECK ? + UserMode : Irp->RequestorMode, + Disposition, + ShareAccess, + Parameters, + Process, + &LocalList); Quickie: ExReleaseResourceLite(&NpVcb->Lock); - ASSERT(IsListEmpty(&LocalList)); + + NextEntry = LocalList.Flink; + while (NextEntry != &LocalList) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + ListIrp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(ListIrp, IO_DISK_INCREMENT); + } FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] Wed Sep 11 02:04:17 2013 @@ -437,7 +437,7 @@ ASSERT(ByteOffset < DataEntry->DataSize); ASSERT(DataQueue->EntriesInQueue == 1); } - + InsertTailList(&DataQueue->Queue, &DataEntry->QueueEntry); if (Status == STATUS_PENDING) Modified: trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] Wed Sep 11 02:04:17 2013 @@ -327,7 +327,7 @@ { InfoBuffer->ReadDataAvailable = InQueue->BytesInQueue - InQueue->ByteOffset; } - InfoBuffer->WriteQuotaAvailable = OutQueue->QuotaUsed; + InfoBuffer->WriteQuotaAvailable = OutQueue->Quota - OutQueue->QuotaUsed; } else { @@ -335,7 +335,7 @@ { InfoBuffer->ReadDataAvailable = OutQueue->BytesInQueue - OutQueue->ByteOffset; } - InfoBuffer->WriteQuotaAvailable = InQueue->QuotaUsed; + InfoBuffer->WriteQuotaAvailable = OutQueue->Quota - InQueue->QuotaUsed; } return STATUS_SUCCESS; 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] Wed Sep 11 02:04:17 2013 @@ -181,6 +181,7 @@ LIST_ENTRY NotifyList; LIST_ENTRY NotifyList2; LIST_ENTRY FcbList; + ULONG Pad; // // Common Footer @@ -212,6 +213,8 @@ // NP_CB_FOOTER; } NP_FCB, *PNP_FCB; + +C_ASSERT(FIELD_OFFSET(NP_FCB, PrefixTableEntry) == FIELD_OFFSET(NP_DCB, PrefixTableEntry)); // // The nonpaged portion of the CCB Modified: trunk/reactos/drivers/filesystems/npfs_new/statesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] Wed Sep 11 02:04:17 2013 @@ -96,7 +96,7 @@ break; case FILE_PIPE_CONNECTED_STATE: - + EventBuffer = NonPagedCcb->EventBuffer[FILE_PIPE_CLIENT_END]; while (Ccb->DataQueue[FILE_PIPE_INBOUND].QueueState != Empty) @@ -121,12 +121,13 @@ if (EventBuffer) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); - Status = STATUS_SUCCESS; - break; + // drop down on purpose... queue will be empty so flush code is nop + ASSERT(Ccb->DataQueue[FILE_PIPE_OUTBOUND].QueueState == Empty); case FILE_PIPE_CLOSING_STATE: EventBuffer = NonPagedCcb->EventBuffer[FILE_PIPE_CLIENT_END]; + while (Ccb->DataQueue[FILE_PIPE_INBOUND].QueueState != Empty) { Irp = NpRemoveDataQueueEntry(&Ccb->DataQueue[FILE_PIPE_INBOUND], FALSE, List); @@ -177,11 +178,11 @@ { case FILE_PIPE_DISCONNECTED_STATE: - Status = NpCancelWaiter(&NpVcb->WaitQueue, - &Ccb->Fcb->FullName, - STATUS_SUCCESS, - List); - if (!NT_SUCCESS(Status)) return Status; + Status = NpCancelWaiter(&NpVcb->WaitQueue, + &Ccb->Fcb->FullName, + STATUS_SUCCESS, + List); + if (!NT_SUCCESS(Status)) return Status; // // Drop down on purpose @@ -203,7 +204,7 @@ Ccb->NamedPipeState = FILE_PIPE_LISTENING_STATE; IoMarkIrpPending(Irp); - InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + InsertTailList(&Ccb->IrpList, &Irp->Tail.Overlay.ListEntry); return STATUS_PENDING; case FILE_PIPE_CONNECTED_STATE: 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] Wed Sep 11 02:04:17 2013 @@ -53,7 +53,7 @@ PAGED_CODE(); Dcb = Fcb->ParentDcb; - if (!Fcb->CurrentInstances) KeBugCheckEx(NPFS_FILE_SYSTEM, 0x17025F, 0, 0, 0); + if (Fcb->CurrentInstances) KeBugCheckEx(NPFS_FILE_SYSTEM, 0x17025F, 0, 0, 0); NpCancelWaiter(&NpVcb->WaitQueue, &Fcb->FullName, @@ -205,23 +205,26 @@ BOOLEAN RootPipe; PWCHAR NameBuffer; ULONG BufferOffset; - USHORT PipeNameLength; - PAGED_CODE(); - - PipeNameLength = PipeName->Length; - - if ((PipeNameLength < sizeof(WCHAR)) || - ((PipeNameLength + sizeof(WCHAR)) < PipeNameLength) || - (PipeName->Buffer[0] != OBJ_NAME_PATH_SEPARATOR)) + USHORT Length, MaximumLength; + PAGED_CODE(); + + Length = PipeName->Length; + MaximumLength = Length + sizeof(UNICODE_NULL); + + if ((Length < sizeof(WCHAR)) || (MaximumLength < Length)) { return STATUS_INVALID_PARAMETER; } RootPipe = FALSE; - if (PipeNameLength == sizeof(WCHAR)) - { + if (PipeName->Buffer[0] != OBJ_NAME_PATH_SEPARATOR) + { + MaximumLength += sizeof(OBJ_NAME_PATH_SEPARATOR); RootPipe = TRUE; - PipeNameLength += sizeof(WCHAR); + if (MaximumLength < sizeof(WCHAR)) + { + return STATUS_INVALID_PARAMETER; + } } Fcb = ExAllocatePoolWithTag(PagedPool, sizeof(*Fcb), NPFS_FCB_TAG); @@ -235,7 +238,7 @@ InitializeListHead(&Fcb->CcbList); NameBuffer = ExAllocatePoolWithTag(PagedPool, - PipeName->Length + (RootPipe ? 4 : 2), + MaximumLength, NPFS_NAME_BLOCK_TAG); if (!NameBuffer) { @@ -248,19 +251,19 @@ BufferOffset = 0; if (RootPipe) { - *NameBuffer = OBJ_NAME_PATH_SEPARATOR; + NameBuffer[0] = OBJ_NAME_PATH_SEPARATOR; BufferOffset = 1; } - RtlCopyMemory(NameBuffer + BufferOffset, PipeName->Buffer, PipeNameLength); - NameBuffer[BufferOffset + (PipeNameLength / sizeof(WCHAR))] = UNICODE_NULL; - - Fcb->FullName.Length = PipeNameLength - sizeof(WCHAR); - Fcb->FullName.MaximumLength = PipeNameLength; + RtlCopyMemory(NameBuffer + BufferOffset, PipeName->Buffer, Length); + NameBuffer[BufferOffset + (Length / sizeof(WCHAR))] = UNICODE_NULL; + + Fcb->FullName.Length = Length; + Fcb->FullName.MaximumLength = MaximumLength; Fcb->FullName.Buffer = NameBuffer; - Fcb->ShortName.MaximumLength = PipeNameLength - sizeof(WCHAR); - Fcb->ShortName.Length = PipeNameLength - 2 * sizeof(WCHAR); + Fcb->ShortName.MaximumLength = Length; + Fcb->ShortName.Length = Length - sizeof(OBJ_NAME_PATH_SEPARATOR); Fcb->ShortName.Buffer = NameBuffer + 1; if (!RtlInsertUnicodePrefix(&NpVcb->PrefixTable, @@ -333,6 +336,8 @@ InsertTailList(&Fcb->CcbList, &Ccb->CcbEntry); + Fcb->CurrentInstances++; + Fcb->ServerOpenCount++; InitializeListHead(&Ccb->IrpList); ExInitializeResourceLite(&Ccb->NonPagedCcb->Lock); *NewCcb = Ccb;

11 years

← Newer
1
...
43
44
45
46
47
48
49
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2013