Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 59999: [NPFS-NEW]: Implement Close, Cleanup, Disconnect, Flush, Listen, Peek, SetInfo, Transceive, Wait, Write. Only QueryInfo remains as critical functionality to support the Kernel32 APIs. ...
by ion＠svn.reactos.org 10 Sep '13

10 Sep '13

Author: ion Date: Tue Sep 10 02:23:32 2013 New Revision: 59999 URL: http://svn.reactos.org/svn/reactos?rev=59999&view=rev Log: [NPFS-NEW]: Implement Close, Cleanup, Disconnect, Flush, Listen, Peek, SetInfo, Transceive, Wait, Write. Only QueryInfo remains as critical functionality to support the Kernel32 APIs. Code is WIP, untested, and ugly! But it is now 90% complete. r60000 should hopefully finalize the implementation. As long as I didn't forget a file :) Added: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c (with props) trunk/reactos/drivers/filesystems/npfs_new/close.c (with props) trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c (with props) trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c (with props) trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c (with props) trunk/reactos/drivers/filesystems/npfs_new/write.c (with props) trunk/reactos/drivers/filesystems/npfs_new/writesup.c (with props) Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt 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/statesup.c trunk/reactos/drivers/filesystems/npfs_new/strucsup.c trunk/reactos/drivers/filesystems/npfs_new/waitsup.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] Tue Sep 10 02:23:32 2013 @@ -1,8 +1,13 @@ 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 @@ -10,7 +15,9 @@ secursup.c statesup.c strucsup.c - waitsup.c) + waitsup.c + write.c + writesup.c) add_library(npfs_new SHARED ${SOURCE}) set_module_type(npfs_new kernelmodedriver) Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/cleanup.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,73 @@ +#include "npfs.h" + +NTSTATUS +NTAPI +NpCommonCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + NODE_TYPE_CODE NodeTypeCode; + LIST_ENTRY List; + PNP_FCB Fcb; + PNP_CCB Ccb; + BOOLEAN ServerSide; + PLIST_ENTRY ThisEntry, NextEntry; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + InitializeListHead(&List); + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, + (PVOID*)&Fcb, + &Ccb, + &ServerSide); + if (NodeTypeCode == NPFS_NTC_CCB ) + { + if ( ServerSide == 1 ) + { + ASSERT(Ccb->Fcb->ServerOpenCount != 0); + --Ccb->Fcb->ServerOpenCount; + } + + NpSetClosingPipeState(Ccb, Irp, ServerSide, &List); + } + + ExReleaseResourceLite(&NpVcb->Lock); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NpFsdCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PAGED_CODE(); + + FsRtlEnterFileSystem(); + + Status = NpCommonCleanup(DeviceObject, Irp); + + FsRtlExitFileSystem(); + + if ( Status != STATUS_PENDING ) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + + return Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/close.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,68 @@ +#include "npfs.h" + +NTSTATUS +NTAPI +NpCommonClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + NODE_TYPE_CODE NodeTypeCode; + LIST_ENTRY List; + PNP_FCB Fcb; + PNP_CCB Ccb; + BOOLEAN ServerSide; + PLIST_ENTRY ThisEntry, NextEntry; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + InitializeListHead(&List); + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, + (PVOID*)&Fcb, + &Ccb, + &ServerSide); + if (NodeTypeCode == NPFS_NTC_ROOT_DCB) + { + --Fcb->CurrentInstances; + NpDeleteCcb(Ccb, &List); + } + else if (NodeTypeCode == NPFS_NTC_VCB) + { + --NpVcb->ReferenceCount; + } + + ExReleaseResourceLite(&NpVcb->Lock); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NpFsdClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PAGED_CODE(); + + FsRtlEnterFileSystem(); + + Status = NpCommonClose(DeviceObject, Irp); + + FsRtlExitFileSystem(); + + return Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/close.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,178 @@ +#include "npfs.h" + +NTSTATUS +NTAPI +NpSetBasicInfo(IN PNP_CCB Ccb, + IN PFILE_BASIC_INFORMATION Buffer) +{ + PAGED_CODE(); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NpSetPipeInfo(IN PNP_FCB Fcb, + IN PNP_CCB Ccb, + IN PFILE_PIPE_INFORMATION Buffer, + IN ULONG ServerSide, + IN PLIST_ENTRY List) +{ + NTSTATUS Status; + PNP_DATA_QUEUE ReadQueue, WriteQueue; + ULONG CompletionMode; + PAGED_CODE(); + + if ( Buffer->ReadMode == FILE_PIPE_MESSAGE_MODE && Fcb->NamedPipeType == FILE_PIPE_BYTE_STREAM_TYPE ) + { + return STATUS_INVALID_PARAMETER; + } + + if ( ServerSide ) + { + if ( ServerSide != 1 ) KeBugCheckEx(NPFS_FILE_SYSTEM, 0xA04EFu, ServerSide, 0, 0); + ReadQueue = &Ccb->InQueue; + WriteQueue = &Ccb->OutQueue; + CompletionMode = Ccb->ServerCompletionMode; + } + else + { + ReadQueue = &Ccb->OutQueue; + WriteQueue = &Ccb->InQueue; + CompletionMode = Ccb->ClientCompletionMode; + } + + if ( Buffer->CompletionMode != FILE_PIPE_COMPLETE_OPERATION || + CompletionMode == FILE_PIPE_COMPLETE_OPERATION || + (ReadQueue->QueueState == ReadEntries && + WriteQueue->QueueState != WriteEntries )) + { + if (ServerSide) + { + Ccb->ServerReadMode = Buffer->ReadMode & 0xFF; + Ccb->ServerCompletionMode = Buffer->CompletionMode & 0xFF; + } + else + { + Ccb->ClientReadMode = Buffer->ReadMode & 0xFF; + Ccb->ClientCompletionMode = Buffer->CompletionMode & 0xFF; + } + + NpCheckForNotify(Fcb->ParentDcb, 0, List); + Status = 0; + } + else + { + Status = STATUS_PIPE_BUSY; + } + + return Status; +} + +NTSTATUS +NTAPI +NpCommonSetInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + NODE_TYPE_CODE NodeTypeCode; + PIO_STACK_LOCATION IoStack; + ULONG InfoClass; + PVOID Buffer; + PNP_FCB Fcb; + PNP_CCB Ccb; + BOOLEAN ServerSide; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, + (PVOID*)&Fcb, + &Ccb, + &ServerSide); + if ( !NodeTypeCode ) return STATUS_PIPE_DISCONNECTED; + if ( NodeTypeCode != NPFS_NTC_CCB ) return STATUS_INVALID_PARAMETER; + + InfoClass = IoStack->Parameters.QueryFile.FileInformationClass; + Buffer = Irp->AssociatedIrp.SystemBuffer; + + if ( InfoClass == FileBasicInformation ) return NpSetBasicInfo(Ccb, Buffer); + + if ( InfoClass != FilePipeInformation ) return STATUS_INVALID_PARAMETER; + + return NpSetPipeInfo(Fcb, Ccb, Buffer, ServerSide, List); +} + +NTSTATUS +NTAPI +NpFsdSetInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + LIST_ENTRY List; + PLIST_ENTRY NextEntry, ThisEntry; + PAGED_CODE(); + + InitializeListHead(&List); + + FsRtlEnterFileSystem(); + ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + + Status = NpCommonSetInformation(DeviceObject, Irp, &List); + + ExReleaseResourceLite(&NpVcb->Lock); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + FsRtlExitFileSystem(); + + if ( Status != STATUS_PENDING ) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + + return Status; +} + +NTSTATUS +NTAPI +NpCommonQueryInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpFsdQueryInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PAGED_CODE(); + + FsRtlEnterFileSystem(); + ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + + Status = NpCommonQueryInformation(DeviceObject, Irp); + + ExReleaseResourceLite(&NpVcb->Lock); + FsRtlExitFileSystem(); + + if ( Status != STATUS_PENDING ) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + + return Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,68 @@ +#include "npfs.h" + +NTSTATUS +NTAPI +NpCommonFlushBuffers(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NODE_TYPE_CODE NodeTypeCode; + PNP_CCB Ccb; + BOOLEAN ServerSide; + NTSTATUS Status; + PNP_DATA_QUEUE FlushQueue; + PAGED_CODE(); + + NodeTypeCode = NpDecodeFileObject(IoGetCurrentIrpStackLocation(Irp)->FileObject, + NULL, + &Ccb, + &ServerSide); + if (NodeTypeCode != NPFS_NTC_CCB ) return STATUS_PIPE_DISCONNECTED; + + ExAcquireResourceExclusiveLite(&Ccb->NonPagedCcb->Lock, TRUE); + //ms_exc.registration.TryLevel = 0; + + FlushQueue = &Ccb->OutQueue; + if ( ServerSide != 1 ) FlushQueue = &Ccb->InQueue; + + if ( FlushQueue->QueueState == WriteEntries) + { + Status = NpAddDataQueueEntry(ServerSide, + Ccb, + FlushQueue, + 1, + 2u, + 0, + Irp, + NULL, + 0); + } + else + { + Status = STATUS_SUCCESS; + } + + // ms_exc.registration.TryLevel = -1; + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + + return Status; +} + +NTSTATUS +NTAPI +NpFsdFlushBuffers(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PAGED_CODE(); + + FsRtlEnterFileSystem(); + ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + + Status = NpCommonFlushBuffers(DeviceObject, Irp); + + ExReleaseResourceLite(&NpVcb->Lock); + FsRtlExitFileSystem(); + + return Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,692 @@ +#include "npfs.h" + +IO_STATUS_BLOCK NpUserIoStatusBlock; + +NTSTATUS +NTAPI +NpInternalTransceive(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpInternalRead(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN BOOLEAN Overflow, + IN PLIST_ENTRY List) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpInternalWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpQueryClientProcess(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpSetClientProcess(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpAssignEvent(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpQueryEvent(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpImpersonate(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpDisconnect(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + BOOLEAN ServerSide; + PNP_CCB Ccb; + NTSTATUS Status; + NODE_TYPE_CODE NodeTypeCode; + PIO_STACK_LOCATION IoStack; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, NULL, &Ccb, &ServerSide); + if (NodeTypeCode == NPFS_NTC_CCB) + { + if ( ServerSide == 1 ) + { + ExAcquireResourceExclusiveLite(&Ccb->NonPagedCcb->Lock, TRUE); + + Status = NpSetDisconnectedPipeState(Ccb, List); + + NpUninitializeSecurity(Ccb); + + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + } + else + { + Status = STATUS_ILLEGAL_FUNCTION; + } + } + else + { + Status = STATUS_PIPE_DISCONNECTED; + } + + return Status; +} + +NTSTATUS +NTAPI +NpListen(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + BOOLEAN ServerSide; + PNP_CCB Ccb; + NTSTATUS Status; + NODE_TYPE_CODE NodeTypeCode; + PIO_STACK_LOCATION IoStack; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, NULL, &Ccb, &ServerSide); + if (NodeTypeCode == NPFS_NTC_CCB) + { + if ( ServerSide == 1 ) + { + ExAcquireResourceExclusiveLite(&Ccb->NonPagedCcb->Lock, TRUE); + + Status = NpSetListeningPipeState(Ccb, Irp, List); + + NpUninitializeSecurity(Ccb); + + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + } + else + { + Status = STATUS_ILLEGAL_FUNCTION; + } + } + else + { + Status = STATUS_ILLEGAL_FUNCTION; + } + + return Status; +} + +NTSTATUS +NTAPI +NpPeek(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + PIO_STACK_LOCATION IoStack; + NODE_TYPE_CODE Type; + ULONG InputLength; + BOOLEAN ServerSide; + PNP_CCB Ccb; + PFILE_PIPE_PEEK_BUFFER PeekBuffer; + PNP_DATA_QUEUE DataQueue; + ULONG BytesPeeked; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + PNP_DATA_QUEUE_ENTRY DataEntry; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + InputLength = IoStack->Parameters.FileSystemControl.OutputBufferLength; + Type = NpDecodeFileObject(IoStack->FileObject, NULL, &Ccb, &ServerSide); + if (!Type) return STATUS_PIPE_DISCONNECTED; + + if ((Type != NPFS_NTC_CCB) && (InputLength < sizeof(*PeekBuffer))) + { + return STATUS_INVALID_PARAMETER; + } + + PeekBuffer = (PFILE_PIPE_PEEK_BUFFER)Irp->AssociatedIrp.SystemBuffer; + if ( ServerSide ) + { + if ( ServerSide != 1 ) + { + KeBugCheckEx(NPFS_FILE_SYSTEM, 0xD02E5, ServerSide, 0, 0); + } + DataQueue = &Ccb->InQueue; + } + else + { + DataQueue = &Ccb->OutQueue; + } + + if ( Ccb->NamedPipeState != FILE_PIPE_CONNECTED_STATE ) + { + if ( Ccb->NamedPipeState != FILE_PIPE_CLOSING_STATE ) + { + return STATUS_INVALID_PIPE_STATE; + } + if ( DataQueue->QueueState != WriteEntries) + { + return STATUS_PIPE_BROKEN; + } + } + + PeekBuffer->NamedPipeState = 0; + PeekBuffer->ReadDataAvailable = 0; + PeekBuffer->NumberOfMessages = 0; + PeekBuffer->MessageLength = 0; + PeekBuffer->NamedPipeState = Ccb->NamedPipeState; + BytesPeeked = sizeof(*PeekBuffer); + + if ( DataQueue->QueueState == WriteEntries) + { + DataEntry = CONTAINING_RECORD(DataQueue->Queue.Flink, + NP_DATA_QUEUE_ENTRY, + QueueEntry); + ASSERT((DataEntry->DataEntryType == Buffered) || (DataEntry->DataEntryType == Unbuffered)); + + PeekBuffer->ReadDataAvailable = DataQueue->BytesInQueue - DataQueue->ByteOffset; + if ( Ccb->Fcb->NamedPipeType == FILE_PIPE_MESSAGE_TYPE) + { + PeekBuffer->NumberOfMessages = DataQueue->EntriesInQueue; + PeekBuffer->MessageLength = DataEntry->DataSize - DataQueue->ByteOffset; + } + if ( InputLength == sizeof(*PeekBuffer) ) + { + Status = PeekBuffer->ReadDataAvailable != 0 ? STATUS_BUFFER_OVERFLOW : STATUS_SUCCESS; + } + else + { + IoStatus = NpReadDataQueue(DataQueue, + TRUE, + FALSE, + PeekBuffer->Data, + InputLength - sizeof(*PeekBuffer), + Ccb->Fcb->NamedPipeType == FILE_PIPE_MESSAGE_TYPE, + Ccb, + List); + Status = IoStatus.Status; + BytesPeeked = IoStatus.Information + sizeof(*PeekBuffer); + } + } + else + { + Status = STATUS_SUCCESS; + } + + Irp->IoStatus.Information = BytesPeeked; + return Status; +} + +NTSTATUS +NTAPI +NpCompleteTransceiveIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PAGED_CODE(); + + if ( Irp->AssociatedIrp.SystemBuffer ) + { + ExFreePool(Irp->AssociatedIrp.SystemBuffer); + } + + IoFreeIrp(Irp); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI +NpTransceive(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + PIO_STACK_LOCATION IoStack; + PVOID InBuffer, OutBuffer; + ULONG InLength, OutLength, ReadMode, BytesWritten; + NODE_TYPE_CODE NodeTypeCode; + PNP_CCB Ccb; + BOOLEAN ServerSide; + PNP_NONPAGED_CCB NonPagedCcb; + PNP_DATA_QUEUE ReadQueue, WriteQueue; + PNP_EVENT_BUFFER EventBuffer; + NTSTATUS Status; + PIRP NewIrp; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + InLength = IoStack->Parameters.FileSystemControl.InputBufferLength; + InBuffer = IoStack->Parameters.FileSystemControl.Type3InputBuffer; + OutLength = IoStack->Parameters.FileSystemControl.OutputBufferLength; + OutBuffer = Irp->UserBuffer; + + if ( Irp->RequestorMode == UserMode) + { + _SEH2_TRY + { + ProbeForRead(InBuffer, InLength, sizeof(CHAR)); + ProbeForWrite(OutBuffer, OutLength, sizeof(CHAR)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ASSERT(FALSE); + } + _SEH2_END; + } + + NodeTypeCode = NpDecodeFileObject(IoStack->FileObject, NULL, &Ccb, &ServerSide); + if (NodeTypeCode != NPFS_NTC_CCB ) + { + return STATUS_PIPE_DISCONNECTED; + } + + NonPagedCcb = Ccb->NonPagedCcb; + ExAcquireResourceExclusiveLite(&NonPagedCcb->Lock, TRUE); + + //ms_exc.registration.TryLevel = 1; + if ( Ccb->NamedPipeState != FILE_PIPE_CONNECTED_STATE ) + { + Status = STATUS_INVALID_PIPE_STATE; + goto Quickie; + } + + if ( ServerSide ) + { + if ( ServerSide != 1 ) KeBugCheckEx(NPFS_FILE_SYSTEM, 0xD0538, ServerSide, 0, 0); + ReadQueue = &Ccb->InQueue; + WriteQueue = &Ccb->OutQueue; + WriteQueue = &Ccb->OutQueue; + EventBuffer = NonPagedCcb->EventBufferServer; + ReadMode = Ccb->ServerReadMode; + } + else + { + ReadQueue = &Ccb->OutQueue; + WriteQueue = &Ccb->InQueue; + EventBuffer = NonPagedCcb->EventBufferClient; + ReadMode = Ccb->ClientReadMode; + WriteQueue = &Ccb->InQueue; + } + + if (Ccb->Fcb->NamedPipeConfiguration != FILE_PIPE_FULL_DUPLEX || + ReadMode != FILE_PIPE_MESSAGE_MODE ) + { + Status = STATUS_INVALID_PIPE_STATE; + goto Quickie; + } + + if ( ReadQueue->QueueState != Empty) + { + Status = STATUS_PIPE_BUSY; + goto Quickie; + } + + Status = NpWriteDataQueue(WriteQueue, + 1, + InBuffer, + InLength, + Ccb->Fcb->NamedPipeType, + &BytesWritten, + Ccb, + ServerSide, + Irp->Tail.Overlay.Thread, + List); + if ( Status == STATUS_MORE_PROCESSING_REQUIRED ) + { + ASSERT(WriteQueue->QueueState != ReadEntries); + NewIrp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + if ( !NewIrp ) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + IoSetCompletionRoutine(Irp, NpCompleteTransceiveIrp, NULL, TRUE, TRUE, TRUE); + + if ( BytesWritten ) + { + NewIrp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithQuotaTag(PagedPool, BytesWritten, 'wFpN'); + if ( !NewIrp->AssociatedIrp.SystemBuffer ) + { + IoFreeIrp(NewIrp); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + RtlCopyMemory(NewIrp->AssociatedIrp.SystemBuffer, + (PVOID)((ULONG_PTR)InBuffer + InLength - BytesWritten), + BytesWritten); + //ms_exc.registration.TryLevel = 1; + } + else + { + NewIrp->AssociatedIrp.SystemBuffer = NULL; + } + + IoStack = IoGetNextIrpStackLocation(NewIrp); + IoSetNextIrpStackLocation(NewIrp); + + NewIrp->Tail.Overlay.Thread = Irp->Tail.Overlay.Thread; + NewIrp->IoStatus.Information = BytesWritten; + + IoStack->Parameters.Read.Length = BytesWritten; + IoStack->MajorFunction = IRP_MJ_WRITE; + + if ( BytesWritten > 0 ) NewIrp->Flags = IRP_DEALLOCATE_BUFFER | IRP_BUFFERED_IO; + NewIrp->UserIosb = &NpUserIoStatusBlock; + + Status = NpAddDataQueueEntry(ServerSide, + Ccb, + WriteQueue, + WriteEntries, + 1, + BytesWritten, + NewIrp, + NULL, + 0); + if ( Status != STATUS_PENDING ) + { + NewIrp->IoStatus.Status = Status; + InsertTailList(List, &NewIrp->Tail.Overlay.ListEntry); + } + } + + if (!NT_SUCCESS(Status)) goto Quickie; + + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, 0, 0); + ASSERT(ReadQueue->QueueState == Empty); + Status = NpAddDataQueueEntry(ServerSide, + Ccb, + ReadQueue, + ReadEntries, + 0, + OutLength, + Irp, + NULL, + 0); + if (NT_SUCCESS(Status)) + { + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, 0, 0); + } + +Quickie: + //ms_exc.registration.TryLevel = -1; + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + return Status; +} + +NTSTATUS +NTAPI +NpWaitForNamedPipe(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + ULONG InLength, NameLength; + UNICODE_STRING SourceString, Prefix; + BOOLEAN ServerSide; + PNP_CCB Ccb; + PFILE_PIPE_WAIT_FOR_BUFFER Buffer; + NTSTATUS Status; + NODE_TYPE_CODE NodeTypeCode; + PLIST_ENTRY NextEntry; + PNP_FCB Fcb; + PAGED_CODE(); + + IoStack = IoGetCurrentIrpStackLocation(Irp); + InLength = IoStack->Parameters.DeviceIoControl.InputBufferLength; + + SourceString.Buffer = NULL; + + //ms_exc.registration.TryLevel = 0; + + if (NpDecodeFileObject(IoStack->FileObject, NULL, &Ccb, &ServerSide) != NPFS_NTC_ROOT_DCB ) + { + Status = STATUS_ILLEGAL_FUNCTION; + goto Quickie; + } + + Buffer = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer; + if (InLength < sizeof(*Buffer)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + NameLength = Buffer->NameLength; + if ((NameLength > 0xFFFD) || ((NameLength + sizeof(*Buffer)) > InLength )) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + SourceString.Length = (USHORT)NameLength + sizeof(OBJ_NAME_PATH_SEPARATOR); + SourceString.Buffer = ExAllocatePoolWithTag(PagedPool, SourceString.Length, 'WFpN'); + if (!SourceString.Buffer ) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + SourceString.Buffer[0] = OBJ_NAME_PATH_SEPARATOR; + RtlCopyMemory(&SourceString.Buffer[1], Buffer->Name, Buffer->NameLength); + + Status = STATUS_SUCCESS; + //Status = NpTranslateAlias(&SourceString); + if (!NT_SUCCESS(Status)) goto Quickie; + + Fcb = NpFindPrefix(&SourceString, TRUE, &Prefix); + Fcb = (PNP_FCB)((ULONG_PTR)Fcb & ~1); + + NodeTypeCode = Fcb ? Fcb->NodeType : 0; + if ( NodeTypeCode != NPFS_NTC_FCB ) + { + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Quickie; + } + + for (NextEntry = Fcb->CcbList.Flink; + NextEntry != &Fcb->CcbList; + NextEntry = NextEntry->Flink) + { + Ccb = CONTAINING_RECORD(NextEntry, NP_CCB, CcbEntry); + if ( Ccb->NamedPipeState == FILE_PIPE_LISTENING_STATE ) break; + } + + if ( NextEntry == &Fcb->CcbList ) + { + Status = STATUS_SUCCESS; + } + else + { + Status = NpAddWaiter(&NpVcb->WaitQueue, + Fcb->Timeout, + Irp, + &SourceString); + } + +Quickie: + //ms_exc.registration.TryLevel = -1; + if ( SourceString.Buffer ) ExFreePool(SourceString.Buffer); + return Status; +} + +NTSTATUS +NTAPI +NpCommonFileSystemControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + ULONG Fsctl; + BOOLEAN Overflow = FALSE; + LIST_ENTRY List; + PLIST_ENTRY NextEntry, ThisEntry; + NTSTATUS Status; + PAGED_CODE(); + + InitializeListHead(&List); + Fsctl = IoGetCurrentIrpStackLocation(Irp)->Parameters.FileSystemControl.FsControlCode; + + switch (Fsctl) + { + case FSCTL_PIPE_PEEK: + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpPeek(DeviceObject, Irp, &List); + break; + + case FSCTL_PIPE_INTERNAL_WRITE: + ExAcquireResourceSharedLite(&NpVcb->Lock, 1u); + Status = NpInternalWrite(DeviceObject, Irp, &List); + break; + + case FSCTL_PIPE_TRANSCEIVE: + ExAcquireResourceSharedLite(&NpVcb->Lock, 1u); + Status = NpTransceive(DeviceObject, Irp, &List); + break; + + case FSCTL_PIPE_INTERNAL_TRANSCEIVE: + ExAcquireResourceSharedLite(&NpVcb->Lock, 1u); + Status = NpInternalTransceive(DeviceObject, Irp, &List); + break; + + case FSCTL_PIPE_INTERNAL_READ_OVFLOW: + Overflow = TRUE; + // on purpose + + case FSCTL_PIPE_INTERNAL_READ: + ExAcquireResourceSharedLite(&NpVcb->Lock, 1u); + Status = NpInternalRead(DeviceObject, Irp, Overflow, &List); + break; + + case FSCTL_PIPE_QUERY_CLIENT_PROCESS: + + ExAcquireResourceSharedLite(&NpVcb->Lock, 1u); + Status = NpQueryClientProcess(DeviceObject, Irp); + break; + + case FSCTL_PIPE_ASSIGN_EVENT: + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpAssignEvent(DeviceObject, Irp); + break; + + case FSCTL_PIPE_DISCONNECT: + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpDisconnect(DeviceObject, Irp, &List); + break; + + case FSCTL_PIPE_LISTEN: + + ExAcquireResourceSharedLite(&NpVcb->Lock, 1u); + Status = NpListen(DeviceObject, Irp, &List); + break; + + case FSCTL_PIPE_QUERY_EVENT: + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpQueryEvent(DeviceObject, Irp); + break; + + case FSCTL_PIPE_WAIT: + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpWaitForNamedPipe(DeviceObject, Irp); + break; + + case FSCTL_PIPE_IMPERSONATE: + + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpImpersonate(DeviceObject, Irp); + break; + + case FSCTL_PIPE_SET_CLIENT_PROCESS: + ExAcquireResourceExclusiveLite(&NpVcb->Lock, 1u); + Status = NpSetClientProcess(DeviceObject, Irp); + break; + + default: + return STATUS_NOT_SUPPORTED; + } + + ExReleaseResourceLite(&NpVcb->Lock); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + return Status; +} + +NTSTATUS +NTAPI +NpFsdFileSystemControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PAGED_CODE(); + + FsRtlEnterFileSystem(); + + Status = NpCommonFileSystemControl(DeviceObject, Irp); + + FsRtlExitFileSystem(); + + if ( Status != STATUS_PENDING ) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + + return Status; +} + + Propchange: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Tue Sep 10 02:23:32 2013 @@ -4,8 +4,8 @@ NTSTATUS NTAPI -NpFsdClose(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +NpFsdSetSecurity(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { UNIMPLEMENTED; @@ -18,36 +18,8 @@ NTSTATUS NTAPI -NpFsdWrite(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NpFsdQueryInformation(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NpFsdSetInformation(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +NpFsdQuerySecurity(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { UNIMPLEMENTED; @@ -74,49 +46,7 @@ NTSTATUS NTAPI -NpFsdCleanup(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NpFsdFlushBuffers(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI NpFsdDirectoryControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NpFsdFileSystemControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { UNIMPLEMENTED; @@ -152,14 +82,12 @@ 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] = - // NpfsQuerySecurity; - // DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = - // NpfsSetSecurity; + DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] = NpFsdQuerySecurity; + DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = NpFsdSetSecurity; DriverObject->DriverUnload = NULL; - RtlInitUnicodeString(&DeviceName, L"\\Device\\NamedPipe"); + RtlInitUnicodeString(&DeviceName, L"\\Device\\NamedPipe2"); Status = IoCreateDevice(DriverObject, sizeof(NP_VCB), &DeviceName, 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] Tue Sep 10 02:23:32 2013 @@ -81,6 +81,19 @@ LIST_ENTRY WaitList; KSPIN_LOCK WaitLock; } NP_WAIT_QUEUE, *PNP_WAIT_QUEUE; + +// +// The Entries in the Queue above, one for each Waiter. +// +typedef struct _NP_WAIT_QUEUE_ENTRY +{ + PIRP Irp; + KDPC Dpc; + KTIMER Timer; + PNP_WAIT_QUEUE WaitQueue; + UNICODE_STRING String; + PFILE_OBJECT FileObject; +} NP_WAIT_QUEUE_ENTRY, *PNP_WAIT_QUEUE_ENTRY; // // The event buffer in the NonPaged CCB @@ -225,6 +238,11 @@ extern PNP_VCB NpVcb; +BOOLEAN +NTAPI +NpDeleteEventTableEntry(IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer); + VOID NTAPI NpInitializeWaitQueue(IN PNP_WAIT_QUEUE WaitQueue); @@ -322,9 +340,44 @@ NTSTATUS NTAPI +NpFsdClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + +NTSTATUS +NTAPI +NpFsdCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdFileSystemControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI NpSetConnectedPipeState(IN PNP_CCB Ccb, IN PFILE_OBJECT FileObject, IN PLIST_ENTRY List); + +NTSTATUS +NTAPI +NpSetListeningPipeState(IN PNP_CCB Ccb, + IN PIRP Irp, + IN PLIST_ENTRY List); + + +NTSTATUS +NTAPI +NpSetDisconnectedPipeState(IN PNP_CCB Ccb, + IN PLIST_ENTRY List); + +NTSTATUS +NTAPI +NpSetClosingPipeState(IN PNP_CCB Ccb, + IN PIRP Irp, + IN ULONG NamedPipeEnd, + IN PLIST_ENTRY List); VOID NTAPI @@ -385,6 +438,13 @@ NpCheckForNotify(IN PNP_DCB Dcb, IN BOOLEAN SecondList, IN PLIST_ENTRY List); + +NTSTATUS +NTAPI +NpAddWaiter(IN PNP_WAIT_QUEUE WaitQueue, + IN LARGE_INTEGER WaitTime, + IN PIRP Irp, + IN PUNICODE_STRING Name); NTSTATUS NTAPI @@ -405,8 +465,43 @@ IN PNP_CCB Ccb, IN PLIST_ENTRY List); + +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 BOOLEAN ServerSide, + IN PETHREAD Thread, + IN PLIST_ENTRY List); + NTSTATUS NTAPI NpFsdRead(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdFlushBuffers(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdSetInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdQueryInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + 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] Tue Sep 10 02:23:32 2013 @@ -12,7 +12,6 @@ IN PLIST_ENTRY List) { NODE_TYPE_CODE NodeType; - ULONG NamedPipeConfiguation; PNP_DATA_QUEUE Queue; PNP_EVENT_BUFFER EventBuffer; NTSTATUS Status; @@ -51,10 +50,8 @@ ASSERT((Ccb->NamedPipeState == FILE_PIPE_CONNECTED_STATE) || (Ccb->NamedPipeState == FILE_PIPE_CLOSING_STATE)); - NamedPipeConfiguation = Ccb->Fcb->NamedPipeConfiguration; - - if ((ServerSide == 1 && NamedPipeConfiguation == FILE_PIPE_OUTBOUND) || - (ServerSide == 0 && NamedPipeConfiguation == FILE_PIPE_INBOUND) ) + if ((ServerSide == 1 && Ccb->Fcb->NamedPipeConfiguration == FILE_PIPE_OUTBOUND) || + (ServerSide == 0 && Ccb->Fcb->NamedPipeConfiguration == FILE_PIPE_INBOUND )) { IoStatus->Status = STATUS_INVALID_PARAMETER; ReadOk = TRUE; @@ -109,30 +106,32 @@ goto Quickie; } - if ( Irp ) + if ( !Irp ) { - Status = NpAddDataQueueEntry(ServerSide, - Ccb, - Queue, - 0, - 0, - BufferSize, - Irp, - 0, - 0); - IoStatus->Status = Status; - if (!NT_SUCCESS(Status)) - { - ReadOk = FALSE; - goto Quickie; - } + ReadOk = FALSE; + goto Quickie; + } + Status = NpAddDataQueueEntry(ServerSide, + Ccb, + Queue, + 0, + 0, + BufferSize, + Irp, + 0, + 0); + IoStatus->Status = Status; + if (!NT_SUCCESS(Status)) + { + ReadOk = FALSE; + } + else + { ReadOk = TRUE; if ( EventBuffer ) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); - goto Quickie; } - ReadOk = FALSE; Quickie: //ms_exc.registration.TryLevel = -1; ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); @@ -182,7 +181,7 @@ { Irp->IoStatus.Information = IoStatus.Information; Irp->IoStatus.Status = IoStatus.Status; - IofCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); } return IoStatus.Status; 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] Tue Sep 10 02:23:32 2013 @@ -1,4 +1,21 @@ #include "npfs.h" + +VOID +NTAPI +NpCancelListeningQueueIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + FsRtlEnterFileSystem(); + ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + FsRtlExitFileSystem(); + ExReleaseResourceLite(&NpVcb->Lock); + + Irp->IoStatus.Status = STATUS_CANCELLED; + IofCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); +} NTSTATUS NTAPI @@ -37,3 +54,316 @@ return STATUS_SUCCESS; } + +NTSTATUS +NTAPI +NpSetDisconnectedPipeState(IN PNP_CCB Ccb, + IN PLIST_ENTRY List) +{ + PIRP Irp; + PNP_NONPAGED_CCB NonPagedCcb; + NTSTATUS Status; + PLIST_ENTRY NextEntry; + PNP_EVENT_BUFFER EventBuffer; + + NonPagedCcb = Ccb->NonPagedCcb; + + switch (Ccb->NamedPipeState) + { + case FILE_PIPE_DISCONNECTED_STATE: + Status = STATUS_PIPE_DISCONNECTED; + break; + + case FILE_PIPE_LISTENING_STATE: + while (!IsListEmpty(&Ccb->IrpList)) + { + NextEntry = RemoveHeadList(&Ccb->IrpList); + + Irp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + if (IoSetCancelRoutine(Irp, NULL)) + { + Irp->IoStatus.Status = STATUS_PIPE_DISCONNECTED; + InsertTailList(List, NextEntry); + } + else + { + InitializeListHead(NextEntry); + } + } + + Status = STATUS_SUCCESS; + break; + + case FILE_PIPE_CONNECTED_STATE: + + EventBuffer = NonPagedCcb->EventBufferClient; + while (Ccb->InQueue.QueueState != Empty) + { + Irp = NpRemoveDataQueueEntry(&Ccb->InQueue, FALSE, List); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_PIPE_DISCONNECTED; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + + while ( Ccb->OutQueue.QueueState != Empty) + { + Irp = NpRemoveDataQueueEntry(&Ccb->OutQueue, FALSE, List); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_PIPE_DISCONNECTED; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, 0, 0); + + Status = STATUS_SUCCESS; + break; + + case FILE_PIPE_CLOSING_STATE: + + EventBuffer = NonPagedCcb->EventBufferClient; + while (Ccb->InQueue.QueueState != Empty) + { + Irp = NpRemoveDataQueueEntry(&Ccb->InQueue, FALSE, List); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_PIPE_DISCONNECTED; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + + ASSERT(Ccb->OutQueue.QueueState == Empty); + + NpDeleteEventTableEntry(&NpVcb->EventTable, EventBuffer); + NonPagedCcb->EventBufferClient = NULL; + + NpSetFileObject(Ccb->ClientFileObject, NULL, NULL, FALSE); + Ccb->ClientFileObject = NULL; + + NpUninitializeSecurity(Ccb); + + if ( Ccb->ClientSession ) + { + ExFreePool(Ccb->ClientSession); + Ccb->ClientSession = NULL; + } + + Status = STATUS_SUCCESS; + break; + + default: + KeBugCheckEx(NPFS_FILE_SYSTEM, 0x1603DD, Ccb->NamedPipeState, 0, 0); + break; + } + + Ccb->NamedPipeState = FILE_PIPE_DISCONNECTED_STATE; + return Status; +} + +NTSTATUS +NTAPI +NpSetListeningPipeState(IN PNP_CCB Ccb, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + NTSTATUS Status; + + switch (Ccb->NamedPipeState) + { + case FILE_PIPE_DISCONNECTED_STATE: + + Status = NpCancelWaiter(&NpVcb->WaitQueue, + &Ccb->Fcb->FullName, + STATUS_SUCCESS, + List); + if (!NT_SUCCESS(Status)) return Status; + + // + // Drop down on purpose + // + + case FILE_PIPE_LISTENING_STATE: + + if ( Ccb->ServerCompletionMode == FILE_PIPE_COMPLETE_OPERATION) + { + Ccb->NamedPipeState = FILE_PIPE_LISTENING_STATE; + return STATUS_PIPE_LISTENING; + } + + IoSetCancelRoutine(Irp, NpCancelListeningQueueIrp); + if ( Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + { + return STATUS_CANCELLED; + } + + Ccb->NamedPipeState = FILE_PIPE_LISTENING_STATE; + IoMarkIrpPending(Irp); + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + return STATUS_PENDING; + + case FILE_PIPE_CONNECTED_STATE: + Status = STATUS_PIPE_CONNECTED; + break; + + case FILE_PIPE_CLOSING_STATE: + Status = STATUS_PIPE_CLOSING; + break; + + default: + KeBugCheckEx(NPFS_FILE_SYSTEM, 0x160133, Ccb->NamedPipeState, 0, 0); + break; + } + + return Status; +} + +NTSTATUS +NTAPI +NpSetClosingPipeState(IN PNP_CCB Ccb, + IN PIRP Irp, + IN ULONG NamedPipeEnd, + IN PLIST_ENTRY List) +{ + PNP_NONPAGED_CCB NonPagedCcb; + PNP_FCB Fcb; + PLIST_ENTRY NextEntry; + PNP_DATA_QUEUE ReadQueue, WriteQueue, DataQueue; + PNP_EVENT_BUFFER EventBuffer; + + NonPagedCcb = Ccb->NonPagedCcb; + Fcb = Ccb->Fcb; + + switch (Ccb->NamedPipeState) + { + case FILE_PIPE_LISTENING_STATE: + + ASSERT(NamedPipeEnd == FILE_PIPE_SERVER_END); + + while (!IsListEmpty(&Ccb->IrpList)) + { + NextEntry = RemoveHeadList(&Ccb->IrpList); + + Irp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + if (IoSetCancelRoutine(Irp, NULL)) + { + Irp->IoStatus.Status = STATUS_PIPE_BROKEN; + InsertTailList(List, NextEntry); + } + else + { + InitializeListHead(NextEntry); + } + } + + // Drop on purpose + + case FILE_PIPE_DISCONNECTED_STATE: + + ASSERT(NamedPipeEnd == FILE_PIPE_SERVER_END); + + NpSetFileObject(Ccb->ServerFileObject, NULL, NULL, TRUE); + Ccb->ServerFileObject = NULL; + + NpSetFileObject(Ccb->ClientFileObject, NULL, NULL, FALSE); + Ccb->ClientFileObject = NULL; + + NpDeleteCcb(Ccb, List); + if ( !Fcb->CurrentInstances ) NpDeleteFcb(Fcb, List); + break; + + case FILE_PIPE_CLOSING_STATE: + + if ( NamedPipeEnd == FILE_PIPE_SERVER_END) + { + DataQueue = &Ccb->InQueue; + } + else + { + DataQueue = &Ccb->OutQueue; + } + + NpSetFileObject(Ccb->ServerFileObject, NULL, NULL, TRUE); + Ccb->ServerFileObject = NULL; + + NpSetFileObject(Ccb->ClientFileObject, NULL, NULL, FALSE); + Ccb->ClientFileObject = NULL; + + while (Ccb->InQueue.QueueState != Empty) + { + Irp = NpRemoveDataQueueEntry(&Ccb->InQueue, FALSE, List); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_PIPE_BROKEN; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + + NpUninitializeSecurity(Ccb); + + if ( Ccb->ClientSession ) + { + ExFreePool(Ccb->ClientSession); + Ccb->ClientSession = 0; + } + + NpDeleteCcb(Ccb, List); + if ( !Fcb->CurrentInstances ) NpDeleteFcb(Fcb, List); + break; + + case FILE_PIPE_CONNECTED_STATE: + if ( NamedPipeEnd == FILE_PIPE_SERVER_END) + { + ReadQueue = &Ccb->InQueue; + WriteQueue = &Ccb->OutQueue; + EventBuffer = NonPagedCcb->EventBufferServer; + + NpSetFileObject(Ccb->ServerFileObject, NULL, NULL, TRUE); + Ccb->ServerFileObject = 0; + } + else + { + ReadQueue = &Ccb->OutQueue; + WriteQueue = &Ccb->InQueue; + EventBuffer = NonPagedCcb->EventBufferClient; + + NpSetFileObject(Ccb->ClientFileObject, NULL, NULL, FALSE); + Ccb->ClientFileObject = 0; + } + + Ccb->NamedPipeState = FILE_PIPE_CLOSING_STATE; + + while (Ccb->InQueue.QueueState != Empty) + { + Irp = NpRemoveDataQueueEntry(&Ccb->InQueue, 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); + } + } + + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, 0, 0); + break; + + default: + KeBugCheckEx(0x25u, 0x1602F9, Ccb->NamedPipeState, 0, 0); + break; + } + return STATUS_SUCCESS; +} + 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] Tue Sep 10 02:23:32 2013 @@ -37,8 +37,10 @@ NpDeleteEventTableEntry(IN PRTL_GENERIC_TABLE Table, IN PVOID Buffer) { - UNIMPLEMENTED; - return FALSE; + if (!Buffer) return FALSE; + + ObfDereferenceObject(((PNP_EVENT_BUFFER)Buffer)->Event); + return RtlDeleteElementGenericTable(Table, Buffer); } VOID Modified: trunk/reactos/drivers/filesystems/npfs_new/waitsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/waitsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/waitsup.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -1,4 +1,75 @@ #include "npfs.h" + +VOID +NTAPI +NpCancelWaitQueueIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + KIRQL OldIrql; + PNP_WAIT_QUEUE_ENTRY WaitEntry; + PNP_WAIT_QUEUE WaitQueue; + + IoReleaseCancelSpinLock(Irp->CancelIrql); + + WaitQueue = (PNP_WAIT_QUEUE)Irp->Tail.Overlay.DriverContext[0]; + + OldIrql = KfAcquireSpinLock(&WaitQueue->WaitLock); + + WaitEntry = (PNP_WAIT_QUEUE_ENTRY)Irp->Tail.Overlay.DriverContext[1]; + if ( WaitEntry ) + { + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + if ( !KeCancelTimer(&WaitEntry->Timer) ) + { + WaitEntry->Irp = NULL; + WaitEntry = NULL; + } + } + + KfReleaseSpinLock(&WaitQueue->WaitLock, OldIrql); + + if ( WaitEntry ) + { + ObfDereferenceObject(WaitEntry->FileObject); + ExFreePool(WaitEntry); + } + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_CANCELLED; + IofCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); +} + +VOID +NTAPI +NpTimerDispatch(IN PKDPC Dpc, + IN PVOID Context, + IN PVOID Argument1, + IN PVOID Argument2) +{ + PIRP Irp; + KIRQL OldIrql; + PNP_WAIT_QUEUE_ENTRY WaitEntry = Context; + + OldIrql = KfAcquireSpinLock(&WaitEntry->WaitQueue->WaitLock); + Irp = WaitEntry->Irp; + if ( Irp); + { + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + if ( !IoSetCancelRoutine(Irp, NULL)) + { + Irp->Tail.Overlay.DriverContext[1] = NULL; + Irp = NULL; + } + } + KfReleaseSpinLock(&WaitEntry->WaitQueue->WaitLock, OldIrql); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_IO_TIMEOUT; + IofCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + ObfDereferenceObject(WaitEntry->FileObject); + ExFreePoolWithTag(WaitEntry, 0); +} VOID NTAPI @@ -33,3 +104,88 @@ ExFreePool(DestinationString.Buffer); return STATUS_SUCCESS; } + +NTSTATUS +NTAPI +NpAddWaiter(IN PNP_WAIT_QUEUE WaitQueue, + IN LARGE_INTEGER WaitTime, + IN PIRP Irp, + IN PUNICODE_STRING Name) +{ + PIO_STACK_LOCATION IoStack; + KIRQL OldIrql; + NTSTATUS Status; + PNP_WAIT_QUEUE_ENTRY WaitEntry; + PFILE_PIPE_WAIT_FOR_BUFFER WaitBuffer; + LARGE_INTEGER DueTime; + ULONG i; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + WaitEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, sizeof(*WaitEntry), 'wFpN'); + if ( WaitEntry ) + { + KeInitializeDpc(&WaitEntry->Dpc, NpTimerDispatch, WaitEntry); + KeInitializeTimer(&WaitEntry->Timer); + + if ( Name ) + { + WaitEntry->String = *Name; + } + else + { + WaitEntry->String.Length = 0; + WaitEntry->String.Buffer = 0; + } + + WaitEntry->WaitQueue = WaitQueue; + WaitEntry->Irp = Irp; + + WaitBuffer = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer; + if ( WaitBuffer->TimeoutSpecified ) + { + DueTime = WaitBuffer->Timeout; + } + else + { + DueTime = WaitTime; + } + + for (i = 0; i < WaitBuffer->NameLength / sizeof(WCHAR); i++) + { + WaitBuffer->Name[i] = RtlUpcaseUnicodeChar(WaitBuffer->Name[i]); + } + + Irp->Tail.Overlay.DriverContext[0] = WaitQueue; + Irp->Tail.Overlay.DriverContext[1] = WaitEntry; + OldIrql = KfAcquireSpinLock(&WaitQueue->WaitLock); + + IoSetCancelRoutine(Irp, NpCancelWaitQueueIrp); + + if ( Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + { + Status = STATUS_CANCELLED; + } + else + { + InsertTailList(&WaitQueue->WaitList, &Irp->Tail.Overlay.ListEntry); + + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + + WaitEntry->FileObject = IoStack->FileObject; + ObfReferenceObject(WaitEntry->FileObject); + + KeSetTimer(&WaitEntry->Timer, DueTime, &WaitEntry->Dpc); + WaitEntry = NULL; + + } + KfReleaseSpinLock(&WaitQueue->WaitLock, OldIrql); + if ( WaitEntry ) ExFreePool(WaitEntry); + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + return Status; +} Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/write.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,204 @@ +#include "npfs.h" + +LONG NpSlowWriteCalls; + +BOOLEAN +NTAPI +NpCommonWrite(IN PFILE_OBJECT FileObject, + IN PVOID Buffer, + IN ULONG DataSize, + IN PETHREAD Thread, + IN PIO_STATUS_BLOCK IoStatus, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + NODE_TYPE_CODE NodeType; + BOOLEAN WriteOk, ServerSide; + PNP_CCB Ccb; + PNP_NONPAGED_CCB NonPagedCcb; + PNP_DATA_QUEUE WriteQueue; + NTSTATUS Status; + PNP_EVENT_BUFFER EventBuffer; + ULONG BytesWritten; + PAGED_CODE(); + + IoStatus->Information = 0; + NodeType = NpDecodeFileObject(FileObject, NULL, &Ccb, &ServerSide); + + if (!NodeType) + { + IoStatus->Status = STATUS_PIPE_DISCONNECTED; + return TRUE; + } + + if ( NodeType != NPFS_NTC_CCB ) + { + IoStatus->Status = STATUS_INVALID_PARAMETER; + return TRUE; + } + + NonPagedCcb = Ccb->NonPagedCcb; + ExAcquireResourceExclusiveLite(&NonPagedCcb->Lock, TRUE); + + // ms_exc.registration.TryLevel = 0; + + if ( Ccb->NamedPipeState == FILE_PIPE_DISCONNECTED_STATE ) + { + IoStatus->Status = STATUS_PIPE_DISCONNECTED; + 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 ((ServerSide == 1 && Ccb->Fcb->NamedPipeConfiguration == FILE_PIPE_INBOUND) || + (ServerSide == 0 && Ccb->Fcb->NamedPipeConfiguration == FILE_PIPE_OUTBOUND)) + { + IoStatus->Status = STATUS_INVALID_PARAMETER; + WriteOk = TRUE; + goto Quickie; + } + + IoStatus->Status = 0; + IoStatus->Information = DataSize; + + if ( ServerSide == 1 ) + { + WriteQueue = &Ccb->OutQueue; + EventBuffer = NonPagedCcb->EventBufferClient; + } + else + { + WriteQueue = &Ccb->InQueue; + EventBuffer = NonPagedCcb->EventBufferServer; + } + + if (WriteQueue->QueueState != ReadEntries || + WriteQueue->BytesInQueue >= DataSize || + WriteQueue->Quota >= DataSize - WriteQueue->BytesInQueue ) + { + if (WriteQueue->QueueState != ReadEntries || + WriteQueue->Quota - WriteQueue->QuotaUsed >= DataSize ) + { + goto DoWrite; + } + } + + if (Ccb->Fcb->NamedPipeType == FILE_PIPE_BYTE_STREAM_TYPE && + Ccb->ServerCompletionMode & FILE_PIPE_COMPLETE_OPERATION) + { + IoStatus->Information = 0; + IoStatus->Status = 0; + WriteOk = TRUE; + goto Quickie; + } + + if (!Irp ) + { + WriteOk = 0; + goto Quickie; + } + +DoWrite: + Status = NpWriteDataQueue(WriteQueue, + ServerSide ? Ccb->ClientReadMode : Ccb->ServerReadMode, + Buffer, + DataSize, + Ccb->Fcb->NamedPipeType, + &BytesWritten, + Ccb, + ServerSide, + Thread, + List); + IoStatus->Status = Status; + if ( Status == STATUS_MORE_PROCESSING_REQUIRED ) + { + ASSERT(WriteQueue->QueueState != ReadEntries); + if ( (Ccb->ServerCompletionMode & FILE_PIPE_COMPLETE_OPERATION || !Irp) + && WriteQueue->Quota - WriteQueue->QuotaUsed < BytesWritten ) + { + IoStatus->Information = DataSize - BytesWritten; + IoStatus->Status = 0; + } + else + { + ASSERT(WriteQueue->QueueState != ReadEntries); + + IoStatus->Status = NpAddDataQueueEntry(ServerSide, + Ccb, + WriteQueue, + WriteEntries, + 0, + DataSize, + Irp, + Buffer, + DataSize - BytesWritten); + } + } + + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, 0, 0); + WriteOk = 1; + +Quickie: + //ms_exc.registration.TryLevel = -1; + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + return WriteOk; +} + +NTSTATUS +NTAPI +NpFsdWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + IO_STATUS_BLOCK IoStatus; + LIST_ENTRY List; + PLIST_ENTRY NextEntry, ThisEntry; + PAGED_CODE(); + NpSlowWriteCalls++; + + InitializeListHead(&List); + IoStack = IoGetCurrentIrpStackLocation(Irp); + + FsRtlEnterFileSystem(); + ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + + NpCommonWrite(IoStack->FileObject, + Irp->UserBuffer, + IoStack->Parameters.Write.Length, + Irp->Tail.Overlay.Thread, + &IoStatus, + Irp, + &List); + + ExReleaseResourceLite(&NpVcb->Lock); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + FsRtlExitFileSystem(); + + if ( IoStatus.Status != STATUS_PENDING ) + { + Irp->IoStatus.Information = IoStatus.Information; + Irp->IoStatus.Status = IoStatus.Status; + IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + + return IoStatus.Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/write.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/writesup.c [iso-8859-1] Tue Sep 10 02:23:32 2013 @@ -0,0 +1,151 @@ +#include "npfs.h" + +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 BOOLEAN ServerSide, + IN PETHREAD Thread, + IN PLIST_ENTRY List) +{ + BOOLEAN HaveContext = FALSE, MoreProcessing, AllocatedBuffer; + PNP_DATA_QUEUE_ENTRY DataEntry; + ULONG DataSize, BufferSize; + PIRP WriteIrp; + PIO_STACK_LOCATION IoStack; + PVOID Buffer; + NTSTATUS Status; + PSECURITY_CLIENT_CONTEXT ClientContext; + PAGED_CODE(); + + *BytesWritten = OutBufferSize; + + MoreProcessing = 1; + if ( PipeType != FILE_PIPE_OUTBOUND || (OutBufferSize) ) MoreProcessing = 0; + + for (DataEntry = NpGetNextRealDataQueueEntry(WriteQueue, List); + ((WriteQueue->QueueState == ReadEntries) && + ((*BytesWritten > 0) || (MoreProcessing))); + DataEntry = NpGetNextRealDataQueueEntry(WriteQueue, List)) + { + DataSize = DataEntry->DataSize; + + IoStack = IoGetCurrentIrpStackLocation( DataEntry->Irp); + + if ( IoStack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && + IoStack->Parameters.FileSystemControl.FsControlCode == FSCTL_PIPE_INTERNAL_WRITE && + (DataSize < OutBufferSize || MoreProcessing) ) + { + WriteIrp = NpRemoveDataQueueEntry(WriteQueue, 1, List); + if (WriteIrp ) + { + WriteIrp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + InsertTailList(List, &WriteIrp->Tail.Overlay.ListEntry); + } + continue; + } + + if ( DataEntry->DataEntryType == Unbuffered ) + { + DataEntry->Irp->Overlay.AllocationSize.QuadPart = 0; + } + + BufferSize = *BytesWritten; + if ( BufferSize >= DataSize ) BufferSize = DataSize; + + if ( DataEntry->DataEntryType != Unbuffered && BufferSize ) + { + Buffer = ExAllocatePoolWithTag(NonPagedPool, BufferSize, 'RFpN'); + if ( !Buffer ) return STATUS_INSUFFICIENT_RESOURCES; + AllocatedBuffer = 1; + } + else + { + Buffer = DataEntry->Irp->AssociatedIrp.SystemBuffer; + AllocatedBuffer = 0; + } + + _SEH2_TRY + { + RtlCopyMemory(Buffer, + (PVOID)((ULONG_PTR)OutBuffer + OutBufferSize - *BytesWritten), + BufferSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ASSERT(FALSE); + } + _SEH2_END; + + if ( !HaveContext ) + { + HaveContext = 1; + Status = NpGetClientSecurityContext(ServerSide, Ccb, Thread, &ClientContext); + if (!NT_SUCCESS(Status)) + { + if ( AllocatedBuffer ) ExFreePool(Buffer); + return Status; + } + + if ( ClientContext ) + { + NpFreeClientSecurityContext(Ccb->ClientContext); + Ccb->ClientContext = ClientContext; + } + } + + WriteIrp = NpRemoveDataQueueEntry(WriteQueue, 1, List); + if ( WriteIrp ) + { + *BytesWritten -= BufferSize; + WriteIrp->IoStatus.Information = BufferSize; + + if ( AllocatedBuffer ) + { + WriteIrp->AssociatedIrp.SystemBuffer = Buffer; + WriteIrp->Flags |= IRP_DEALLOCATE_BUFFER | IRP_BUFFERED_IO | IRP_INPUT_OPERATION; + } + + if ( !*BytesWritten ) + { + MoreProcessing = 0; + WriteIrp->IoStatus.Status = 0; + InsertTailList(List, &WriteIrp->Tail.Overlay.ListEntry); + continue; + } + + if ( Mode == FILE_PIPE_MESSAGE_MODE ) + { + WriteIrp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + } + else + { + WriteIrp->IoStatus.Status = 0; + } + + InsertTailList(List, &WriteIrp->Tail.Overlay.ListEntry); + } + else if ( AllocatedBuffer ) + { + ExFreePool(Buffer); + } + } + + if ( *BytesWritten > 0 || MoreProcessing ) + { + ASSERT(WriteQueue->QueueState != ReadEntries); + Status = STATUS_MORE_PROCESSING_REQUIRED; + } + else + { + Status = STATUS_SUCCESS; + } + + return Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/writesup.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ion] 59998: [NPFS-NEW]: Add data queue management routines, and add read support. Implement NpFsdRead & NpfsCommonRead (Peek is inherently implemented too, just didn't write the FSCTL handlers yet...
by ion＠svn.reactos.org 09 Sep '13

09 Sep '13

Author: ion Date: Mon Sep 9 01:16:06 2013 New Revision: 59998 URL: http://svn.reactos.org/svn/reactos?rev=59998&view=rev Log: [NPFS-NEW]: Add data queue management routines, and add read support. Implement NpFsdRead & NpfsCommonRead (Peek is inherently implemented too, just didn't write the FSCTL handlers yet). Next up will be Write/Peek/Close/Cleanup. Code is WIP. Added: trunk/reactos/drivers/filesystems/npfs_new/read.c (with props) trunk/reactos/drivers/filesystems/npfs_new/readsup.c (with props) Modified: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/main.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/secursup.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] Mon Sep 9 01:16:06 2013 @@ -1,17 +1,20 @@ list(APPEND SOURCE - create.c - datasup.c - fileobsup.c - main.c - prefxsup.c - secursup.c - statesup.c - strucsup.c - waitsup.c) + create.c + datasup.c + fileobsup.c + main.c + prefxsup.c + read.c + readsup.c + secursup.c + statesup.c + strucsup.c + waitsup.c) add_library(npfs_new SHARED ${SOURCE}) set_module_type(npfs_new kernelmodedriver) +target_link_libraries(npfs_new ${PSEH_LIB}) add_importlibs(npfs_new ntoskrnl hal) add_pch(npfs_new npfs.h) add_cd_file(TARGET npfs_new DESTINATION reactos/system32/drivers FOR all) 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] Mon Sep 9 01:16:06 2013 @@ -25,6 +25,435 @@ DataQueue->ByteOffset = 0; DataQueue->QueueState = Empty; DataQueue->Quota = Quota; - InitializeListHead(&DataQueue->List); + InitializeListHead(&DataQueue->Queue); return STATUS_SUCCESS; } + +VOID +NTAPI +NpCompleteStalledWrites(IN PNP_DATA_QUEUE DataQueue, + IN PLIST_ENTRY List) +{ + ULONG QuotaLeft, ByteOffset, DataLeft, NewQuotaLeft; + PNP_DATA_QUEUE_ENTRY DataQueueEntry; + PIRP Irp; + PLIST_ENTRY NextEntry; + + QuotaLeft = DataQueue->Quota - DataQueue->QuotaUsed; + ByteOffset = DataQueue->ByteOffset; + + NextEntry = DataQueue->Queue.Flink; + while (NextEntry != &DataQueue->Queue) + { + if ( !QuotaLeft ) break; + + DataQueueEntry = CONTAINING_RECORD(NextEntry, NP_DATA_QUEUE_ENTRY, Irp); + + Irp = DataQueueEntry->Irp; + + if ((DataQueueEntry->DataEntryType == 0) && (Irp)) + { + DataLeft = DataQueueEntry->DataSize - ByteOffset; + + if ( DataQueueEntry->QuotaInEntry < DataLeft ) + { + NewQuotaLeft = DataLeft - DataQueueEntry->QuotaInEntry; + if ( NewQuotaLeft > QuotaLeft ) NewQuotaLeft = QuotaLeft; + + QuotaLeft -= NewQuotaLeft; + DataQueueEntry->QuotaInEntry += NewQuotaLeft; + + if (DataQueueEntry->QuotaInEntry == DataLeft && + IoSetCancelRoutine(Irp, NULL)) + { + DataQueueEntry->Irp = NULL; + + Irp->IoStatus.Status = 0; + Irp->IoStatus.Information = DataQueueEntry->DataSize; + + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + } + + NextEntry = NextEntry->Flink; + ByteOffset = 0; + } + + DataQueue->QuotaUsed = DataQueue->Quota - QuotaLeft; +} + +PIRP +NTAPI +NpRemoveDataQueueEntry(IN PNP_DATA_QUEUE DataQueue, + IN BOOLEAN Flag, + IN PLIST_ENTRY List) +{ + PIRP Irp; + PNP_DATA_QUEUE_ENTRY QueueEntry; + BOOLEAN HasWrites; + + if ( DataQueue->QueueState == Empty) + { + Irp = NULL; + ASSERT(IsListEmpty(&DataQueue->Queue)); + ASSERT(DataQueue->EntriesInQueue == 0); + ASSERT(DataQueue->BytesInQueue == 0); + ASSERT(DataQueue->QuotaUsed == 0); + } + else + { + QueueEntry = CONTAINING_RECORD(RemoveHeadList(&DataQueue->Queue), + NP_DATA_QUEUE_ENTRY, + QueueEntry); + + DataQueue->BytesInQueue -= QueueEntry->DataSize; + --DataQueue->EntriesInQueue; + + HasWrites = 1; + if ( !DataQueue->QueueState != WriteEntries || DataQueue->QuotaUsed < DataQueue->Quota || !QueueEntry->QuotaInEntry ) + { + HasWrites = 0; + } + + DataQueue->QuotaUsed -= QueueEntry->QuotaInEntry; + + if (DataQueue->Queue.Flink == &DataQueue->Queue) + { + DataQueue->QueueState = Empty; + HasWrites = 0; + } + + Irp = QueueEntry->Irp; + NpFreeClientSecurityContext(QueueEntry->ClientSecurityContext); + + if (Irp && IoSetCancelRoutine(Irp, NULL)) + { + Irp->Tail.Overlay.DriverContext[3] = 0; + } + + ExFreePool(QueueEntry); + + if ( Flag ) + { + NpGetNextRealDataQueueEntry(DataQueue, List); + } + + if ( HasWrites ) + { + NpCompleteStalledWrites(DataQueue, List); + } + } + + DataQueue->ByteOffset = 0; + return Irp; +} + +PNP_DATA_QUEUE_ENTRY +NTAPI +NpGetNextRealDataQueueEntry(IN PNP_DATA_QUEUE DataQueue, + IN PLIST_ENTRY List) +{ + PNP_DATA_QUEUE_ENTRY DataEntry; + ULONG Type; + PIRP Irp; + PLIST_ENTRY NextEntry; + PAGED_CODE(); + + DataEntry = NULL; + + NextEntry = DataQueue->Queue.Flink; + while (NextEntry != &DataQueue->Queue) + { + DataEntry = CONTAINING_RECORD(NextEntry, NP_DATA_QUEUE_ENTRY, QueueEntry); + + Type = DataEntry->DataEntryType; + if ( Type == Buffered || Type == Unbuffered ) break; + + Irp = NpRemoveDataQueueEntry(DataQueue, 0, List); + if ( Irp ) + { + Irp->IoStatus.Status = STATUS_SUCCESS; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + + return DataEntry; +} + +VOID +NTAPI +NpCancelDataQueueIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PNP_DATA_QUEUE DataQueue; + PNP_DATA_QUEUE_ENTRY DataEntry; + LIST_ENTRY List; + PSECURITY_CLIENT_CONTEXT ClientSecurityContext; + BOOLEAN CompleteWrites, FirstEntry; + PLIST_ENTRY NextEntry, ThisEntry; + + if ( DeviceObject ) IoReleaseCancelSpinLock(Irp->CancelIrql); + + InitializeListHead(&List); + + DataQueue = (PNP_DATA_QUEUE)Irp->Tail.Overlay.DriverContext[2]; + ClientSecurityContext = NULL; + + if ( DeviceObject ) + { + FsRtlEnterFileSystem(); + ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + } + + DataEntry = (PNP_DATA_QUEUE_ENTRY)Irp->Tail.Overlay.DriverContext[3]; + if ( DataEntry ) + { + if (DataEntry->QueueEntry.Blink == &DataQueue->Queue ) + { + DataQueue->ByteOffset = 0; + FirstEntry = 1; + } + else + { + FirstEntry = 0; + } + + RemoveEntryList(&DataEntry->QueueEntry); + + ClientSecurityContext = DataEntry->ClientSecurityContext; + + CompleteWrites = 1; + if ( !DataQueue->QueueState != WriteEntries || DataQueue->QuotaUsed < DataQueue->Quota || !DataEntry->QuotaInEntry ) + { + CompleteWrites = 0; + } + + DataQueue->BytesInQueue -= DataEntry->DataSize; + DataQueue->QuotaUsed -= DataEntry->QuotaInEntry; + --DataQueue->EntriesInQueue; + + if (DataQueue->Queue.Flink == &DataQueue->Queue ) + { + DataQueue->QueueState = Empty; + ASSERT(DataQueue->BytesInQueue == 0); + ASSERT(DataQueue->EntriesInQueue == 0); + ASSERT(DataQueue->QuotaUsed == 0); + } + else + { + if ( FirstEntry ) + { + NpGetNextRealDataQueueEntry(DataQueue, &List); + } + if ( CompleteWrites ) + { + NpCompleteStalledWrites(DataQueue, &List); + } + } + } + + if ( DeviceObject ) + { + ExReleaseResourceLite(&NpVcb->Lock); + FsRtlExitFileSystem(); + } + + if ( DataEntry ) ExFreePool(DataEntry); + + NpFreeClientSecurityContext(ClientSecurityContext); + Irp->IoStatus.Status = STATUS_CANCELLED; + IofCompleteRequest(Irp, IO_DISK_INCREMENT); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } +} + +NTSTATUS +NTAPI +NpAddDataQueueEntry(IN BOOLEAN ServerSide, + IN PNP_CCB Ccb, + IN PNP_DATA_QUEUE DataQueue, + IN ULONG Who, + IN ULONG Type, + IN ULONG DataSize, + IN PIRP Irp, + IN PVOID Buffer, + IN ULONG ByteOffset) +{ + NTSTATUS Status; + PNP_DATA_QUEUE_ENTRY DataEntry; + SIZE_T EntrySize; + ULONG QuotaInEntry; + PSECURITY_CLIENT_CONTEXT ClientContext; + BOOLEAN HasSpace; + + ClientContext = NULL; + ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); + + Status = STATUS_SUCCESS; + + if ((Type != 2) && (Who == WriteEntries)) + { + Status = NpGetClientSecurityContext(ServerSide, + Ccb, + Irp ? Irp->Tail.Overlay.Thread : + PsGetCurrentThread(), + &ClientContext); + if (!NT_SUCCESS(Status)) return Status; + } + + switch (Type) + { + case Unbuffered: + case 2: + case 3: + + ASSERT(Irp != NULL); + DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, sizeof(*DataEntry), 'rFpN'); + 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; + + case Buffered: + + EntrySize = sizeof(*DataEntry); + if ( Who != Empty) + { + EntrySize = DataSize + sizeof(*DataEntry); + if ((DataSize + sizeof(*DataEntry)) < DataSize ) + { + NpFreeClientSecurityContext(ClientContext); + return STATUS_INVALID_PARAMETER; + } + } + + QuotaInEntry = DataSize - ByteOffset; + if ( DataQueue->Quota - DataQueue->QuotaUsed < QuotaInEntry ) + { + QuotaInEntry = DataQueue->Quota - DataQueue->QuotaUsed; + HasSpace = 1; + } + else + { + HasSpace = 0; + } + + DataEntry = ExAllocatePoolWithQuotaTag(NonPagedPool, EntrySize, 'rFpN'); + if ( !DataEntry ) + { + NpFreeClientSecurityContext(ClientContext); + return STATUS_INSUFFICIENT_RESOURCES; + } + + DataEntry->QuotaInEntry = QuotaInEntry; + DataEntry->Irp = Irp; + DataEntry->DataEntryType = Buffered; + DataEntry->ClientSecurityContext = ClientContext; + DataEntry->DataSize = DataSize; + + if ( Who == ReadEntries) + { + ASSERT(Irp); + + Status = STATUS_PENDING; + ASSERT((DataQueue->QueueState == Empty) || + (DataQueue->QueueState == Who)); + } + else + { + _SEH2_TRY + { + RtlCopyMemory(DataEntry + 1, + Irp ? Irp->UserBuffer: Buffer, + DataSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + NpFreeClientSecurityContext(ClientContext); + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if ( HasSpace && Irp ) + { + Status = STATUS_PENDING; + } + else + { + DataEntry->Irp = 0; + Status = STATUS_SUCCESS; + } + + ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); + } + + default: + ASSERT(FALSE); + NpFreeClientSecurityContext(ClientContext); + return STATUS_INVALID_PARAMETER; + } + + ASSERT((DataQueue->QueueState == Empty) || (DataQueue->QueueState == Who)); + if ( DataQueue->QueueState == Empty ) + { + ASSERT(DataQueue->BytesInQueue == 0); + ASSERT(DataQueue->EntriesInQueue == 0); + ASSERT(IsListEmpty (&DataQueue->Queue)); + } + else + { + ASSERT(DataQueue->QueueState == Who); + ASSERT(DataQueue->QueueState != Empty); + ASSERT(DataQueue->EntriesInQueue != 0); + } + + DataQueue->QuotaUsed += DataEntry->QuotaInEntry; + DataQueue->QueueState = Who; + DataQueue->BytesInQueue += DataEntry->DataSize; + ++DataQueue->EntriesInQueue; + if ( ByteOffset ) + { + DataQueue->ByteOffset = ByteOffset; + ASSERT(Who == WriteEntries); + ASSERT(ByteOffset < DataEntry->DataSize); + ASSERT(DataQueue->EntriesInQueue == 1); + } + + InsertTailList(&DataQueue->Queue, &DataEntry->QueueEntry); + + if ( Status == STATUS_PENDING ) + { + IoMarkIrpPending(Irp); + Irp->Tail.Overlay.DriverContext[2] = DataQueue; + Irp->Tail.Overlay.DriverContext[3] = DataEntry; + + IoSetCancelRoutine(Irp, NpCancelDataQueueIrp); + + if ( Irp->Cancel ) + { + IoSetCancelRoutine(Irp, NULL); + NpCancelDataQueueIrp(0, Irp); + } + } + + 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] Mon Sep 9 01:16:06 2013 @@ -5,20 +5,6 @@ NTSTATUS NTAPI NpFsdClose(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NpFsdRead(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { UNIMPLEMENTED; 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] Mon Sep 9 01:16:06 2013 @@ -3,6 +3,7 @@ // #include <ntifs.h> #include <ntndk.h> +#include <pseh/pseh2.h> #define UNIMPLEMENTED #define DPRINT1 DbgPrint @@ -31,15 +32,26 @@ // typedef enum _NP_DATA_QUEUE_STATE { + ReadEntries = 0, + WriteEntries = 1, Empty = 2 } NP_DATA_QUEUE_STATE; // +// Data Queue Entry Types +// +typedef enum _NP_DATA_QUEUE_ENTRY_TYPE +{ + Buffered = 0, + Unbuffered +} NP_DATA_QUEUE_ENTRY_TYPE; + +// // An Input or Output Data Queue. Each CCB has two of these. // typedef struct _NP_DATA_QUEUE { - LIST_ENTRY List; + LIST_ENTRY Queue; ULONG QueueState; ULONG BytesInQueue; ULONG EntriesInQueue; @@ -49,6 +61,19 @@ } NP_DATA_QUEUE, *PNP_DATA_QUEUE; // +// The Entries that go into the Queue +// +typedef struct _NP_DATA_QUEUE_ENTRY +{ + LIST_ENTRY QueueEntry; + ULONG DataEntryType; + PIRP Irp; + ULONG QuotaInEntry; + PSECURITY_CLIENT_CONTEXT ClientSecurityContext; + ULONG DataSize; +} NP_DATA_QUEUE_ENTRY, *PNP_DATA_QUEUE_ENTRY; + +// // A Wait Queue. Only the VCB has one of these. // typedef struct _NP_WAIT_QUEUE @@ -56,6 +81,14 @@ LIST_ENTRY WaitList; KSPIN_LOCK WaitLock; } NP_WAIT_QUEUE, *PNP_WAIT_QUEUE; + +// +// The event buffer in the NonPaged CCB +// +typedef struct _NP_EVENT_BUFFER +{ + PKEVENT Event; +} NP_EVENT_BUFFER, *PNP_EVENT_BUFFER; // // The CCB for the Root DCB @@ -76,7 +109,7 @@ LIST_ENTRY DcbEntry; PVOID ParentDcb; ULONG CurrentInstances; - ULONG OtherCount; + ULONG ServerOpenCount; PSECURITY_DESCRIPTOR SecurityDescriptor; } NP_CB_HEADER, *PNP_CB_HEADER; @@ -144,8 +177,8 @@ typedef struct _NP_NONPAGED_CCB { NODE_TYPE_CODE NodeType; - PVOID EventBufferClient; - PVOID EventBufferServer; + PNP_EVENT_BUFFER EventBufferClient; + PNP_EVENT_BUFFER EventBufferServer; ERESOURCE Lock; } NP_NONPAGED_CCB, *PNP_NONPAGED_CCB; @@ -201,6 +234,34 @@ NTAPI NpUninitializeDataQueue(IN PNP_DATA_QUEUE DataQueue); +PNP_DATA_QUEUE_ENTRY +NTAPI +NpGetNextRealDataQueueEntry(IN PNP_DATA_QUEUE DataQueue, + IN PLIST_ENTRY List); + +PIRP +NTAPI +NpRemoveDataQueueEntry(IN PNP_DATA_QUEUE DataQueue, + IN BOOLEAN Flag, + IN PLIST_ENTRY List); + +NTSTATUS +NTAPI +NpAddDataQueueEntry(IN BOOLEAN ServerSide, + IN PNP_CCB Ccb, + IN PNP_DATA_QUEUE DataQueue, + IN ULONG Who, + IN ULONG Type, + IN ULONG DataSize, + IN PIRP Irp, + IN PVOID Buffer, + IN ULONG ByteOffset); + +VOID +NTAPI +NpCompleteStalledWrites(IN PNP_DATA_QUEUE DataQueue, + IN PLIST_ENTRY List); + NTSTATUS NTAPI NpInitializeDataQueue(IN PNP_DATA_QUEUE DataQueue, @@ -267,6 +328,15 @@ VOID NTAPI +NpFreeClientSecurityContext(IN PSECURITY_CLIENT_CONTEXT ClientContext); + +VOID +NTAPI +NpCopyClientContext(IN PNP_CCB Ccb, + IN PNP_DATA_QUEUE_ENTRY DataQueueEntry); + +VOID +NTAPI NpUninitializeSecurity(IN PNP_CCB Ccb); NTSTATUS @@ -274,6 +344,13 @@ NpInitializeSecurity(IN PNP_CCB Ccb, IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, IN PETHREAD Thread); + +NTSTATUS +NTAPI +NpGetClientSecurityContext(IN BOOLEAN ServerSide, + IN PNP_CCB Ccb, + IN PETHREAD Thread, + IN PSECURITY_CLIENT_CONTEXT *Context); VOID NTAPI @@ -316,3 +393,20 @@ IN NTSTATUS Status, IN PLIST_ENTRY ListEntry); + +IO_STATUS_BLOCK +NTAPI +NpReadDataQueue(IN PNP_DATA_QUEUE DataQueue, + IN BOOLEAN Peek, + IN BOOLEAN ReadOverflowOperation, + IN PVOID Buffer, + IN ULONG BufferSize, + IN ULONG Mode, + IN PNP_CCB Ccb, + IN PLIST_ENTRY List); + +NTSTATUS +NTAPI +NpFsdRead(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] Mon Sep 9 01:16:06 2013 @@ -0,0 +1,189 @@ +#include "npfs.h" + +LONG NpSlowReadCalls; + +BOOLEAN +NTAPI +NpCommonRead(IN PFILE_OBJECT FileObject, + IN PVOID Buffer, + IN ULONG BufferSize, + OUT PIO_STATUS_BLOCK IoStatus, + IN PIRP Irp, + IN PLIST_ENTRY List) +{ + NODE_TYPE_CODE NodeType; + ULONG NamedPipeConfiguation; + PNP_DATA_QUEUE Queue; + PNP_EVENT_BUFFER EventBuffer; + NTSTATUS Status; + BOOLEAN ServerSide; + PNP_CCB Ccb; + PNP_NONPAGED_CCB NonPagedCcb; + BOOLEAN ReadOk; + PAGED_CODE(); + + IoStatus->Information = 0; + NodeType = NpDecodeFileObject(FileObject, NULL, &Ccb, &ServerSide); + + if (!NodeType) + { + IoStatus->Status = STATUS_PIPE_DISCONNECTED; + return TRUE; + } + + if ( NodeType != NPFS_NTC_CCB ) + { + IoStatus->Status = STATUS_INVALID_PARAMETER; + return TRUE; + } + + NonPagedCcb = Ccb->NonPagedCcb; + ExAcquireResourceExclusiveLite(&NonPagedCcb->Lock, TRUE); + + //ms_exc.registration.TryLevel = 0; + + if ( Ccb->NamedPipeState == FILE_PIPE_DISCONNECTED_STATE || Ccb->NamedPipeState == FILE_PIPE_LISTENING_STATE ) + { + IoStatus->Status = Ccb->NamedPipeState != FILE_PIPE_DISCONNECTED_STATE ? STATUS_PIPE_LISTENING : STATUS_PIPE_DISCONNECTED; + ReadOk = TRUE; + goto Quickie; + } + + ASSERT((Ccb->NamedPipeState == FILE_PIPE_CONNECTED_STATE) || (Ccb->NamedPipeState == FILE_PIPE_CLOSING_STATE)); + + NamedPipeConfiguation = Ccb->Fcb->NamedPipeConfiguration; + + if ((ServerSide == 1 && NamedPipeConfiguation == FILE_PIPE_OUTBOUND) || + (ServerSide == 0 && NamedPipeConfiguation == FILE_PIPE_INBOUND) ) + { + IoStatus->Status = STATUS_INVALID_PARAMETER; + ReadOk = TRUE; + goto Quickie; + } + + if ( ServerSide == 1 ) + { + Queue = &Ccb->InQueue; + EventBuffer = NonPagedCcb->EventBufferClient; + } + else + { + Queue = &Ccb->OutQueue; + EventBuffer = NonPagedCcb->EventBufferServer; + } + + if ( Queue->QueueState == WriteEntries ) + { + *IoStatus = NpReadDataQueue(Queue, + FALSE, + FALSE, + Buffer, + BufferSize, + ServerSide ? Ccb->ServerReadMode : Ccb->ClientReadMode, + Ccb, + List); + if (!NT_SUCCESS(IoStatus->Status)) + { + ReadOk = TRUE; + goto Quickie; + } + + ReadOk = TRUE; + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); + goto Quickie; + } + + if ( Ccb->NamedPipeState == FILE_PIPE_CLOSING_STATE ) + { + IoStatus->Status = STATUS_PIPE_BROKEN; + ReadOk = TRUE; + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); + goto Quickie; + } + + if ((ServerSide ? Ccb->ServerCompletionMode : Ccb->ServerCompletionMode) == FILE_PIPE_COMPLETE_OPERATION) + { + IoStatus->Status = STATUS_PIPE_EMPTY; + ReadOk = TRUE; + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); + goto Quickie; + } + + if ( Irp ) + { + Status = NpAddDataQueueEntry(ServerSide, + Ccb, + Queue, + 0, + 0, + BufferSize, + Irp, + 0, + 0); + IoStatus->Status = Status; + if (!NT_SUCCESS(Status)) + { + ReadOk = FALSE; + goto Quickie; + } + + ReadOk = TRUE; + if ( EventBuffer ) KeSetEvent(EventBuffer->Event, IO_NO_INCREMENT, FALSE); + goto Quickie; + } + + ReadOk = FALSE; +Quickie: + //ms_exc.registration.TryLevel = -1; + ExReleaseResourceLite(&Ccb->NonPagedCcb->Lock); + return ReadOk; +} + +NTSTATUS +NTAPI +NpFsdRead(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + IO_STATUS_BLOCK IoStatus; + LIST_ENTRY List; + PLIST_ENTRY NextEntry, ThisEntry; + PAGED_CODE(); + NpSlowReadCalls++; + + InitializeListHead(&List); + IoStack = IoGetCurrentIrpStackLocation(Irp); + + FsRtlEnterFileSystem(); + ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + + NpCommonRead(IoStack->FileObject, + Irp->UserBuffer, + IoStack->Parameters.Read.Length, + &IoStatus, + Irp, + &List); + + ExReleaseResourceLite(&NpVcb->Lock); + + NextEntry = List.Flink; + while (NextEntry != &List) + { + ThisEntry = NextEntry; + NextEntry = NextEntry->Flink; + + Irp = CONTAINING_RECORD(ThisEntry, IRP, Tail.Overlay.ListEntry); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + } + + FsRtlExitFileSystem(); + + if ( IoStatus.Status != STATUS_PENDING ) + { + Irp->IoStatus.Information = IoStatus.Information; + Irp->IoStatus.Status = IoStatus.Status; + IofCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT); + } + + return IoStatus.Status; +} Propchange: trunk/reactos/drivers/filesystems/npfs_new/read.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/npfs_new/readsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/readsup.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/readsup.c [iso-8859-1] Mon Sep 9 01:16:06 2013 @@ -0,0 +1,138 @@ +#include "npfs.h" + +IO_STATUS_BLOCK +NTAPI +NpReadDataQueue(IN PNP_DATA_QUEUE DataQueue, + IN BOOLEAN Peek, + IN BOOLEAN ReadOverflowOperation, + IN PVOID Buffer, + IN ULONG BufferSize, + IN ULONG Mode, + IN PNP_CCB Ccb, + IN PLIST_ENTRY List) +{ + PNP_DATA_QUEUE_ENTRY DataEntry, TempDataEntry; + PVOID DataBuffer; + ULONG DataSize, DataLength, TotalBytesCopied, RemainingSize, Offset; + PIRP Irp; + IO_STATUS_BLOCK Status; + BOOLEAN CompleteWrites = FALSE; + PAGED_CODE(); + + if ( ReadOverflowOperation ) Peek = TRUE; + + RemainingSize = BufferSize; + Status.Status = 0; + TotalBytesCopied = 0; + + if ( Peek ) + { + DataEntry = CONTAINING_RECORD(DataQueue->Queue.Flink, + NP_DATA_QUEUE_ENTRY, + QueueEntry); + } + else + { + DataEntry = NpGetNextRealDataQueueEntry(DataQueue, List); + } + + while (&DataEntry->QueueEntry != &DataQueue->Queue && RemainingSize ) + { + if ( !Peek || (DataEntry->DataEntryType == Buffered || DataEntry->DataEntryType == Unbuffered )) + { + if ( DataEntry->DataEntryType == Unbuffered ) + { + DataBuffer = DataEntry->Irp->AssociatedIrp.SystemBuffer; + } + else + { + DataBuffer = &DataEntry[1]; + } + DataSize = DataEntry->DataSize; + Offset = DataSize; + + if (&DataEntry->QueueEntry == DataQueue->Queue.Flink) + { + Offset = DataSize - DataQueue->ByteOffset; + } + + DataLength = Offset; + if ( Offset >= RemainingSize ) DataLength = RemainingSize; + + _SEH2_TRY + { + RtlCopyMemory((PVOID)((ULONG_PTR)Buffer + BufferSize - RemainingSize), + (PVOID)((ULONG_PTR)DataBuffer + DataSize - Offset), + DataLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ASSERT(FALSE); + } + _SEH2_END; + + + RemainingSize -= DataLength; + Offset -= DataLength; + TotalBytesCopied += DataLength; + if ( !Peek ) + { + DataEntry->QuotaInEntry -= DataLength; + DataQueue->QuotaUsed -= DataLength; + DataQueue->ByteOffset += DataLength; + CompleteWrites = TRUE;; + } + + NpCopyClientContext(Ccb, DataEntry); + + if ( Offset || (ReadOverflowOperation && !TotalBytesCopied )) + { + if ( Mode == FILE_PIPE_MESSAGE_MODE ) + { + Status.Status = STATUS_BUFFER_OVERFLOW; + break; + } + } + else + { + if ( !Peek || ReadOverflowOperation ) + { + if ( ReadOverflowOperation) + { + TempDataEntry = NpGetNextRealDataQueueEntry(DataQueue, List); + ASSERT(TempDataEntry == DataEntry); + } + + Irp = NpRemoveDataQueueEntry(DataQueue, TRUE, List); + if ( Irp ) + { + Irp->IoStatus.Information = DataSize; + Irp->IoStatus.Status = STATUS_SUCCESS; + InsertTailList(List, &Irp->Tail.Overlay.ListEntry); + } + } + if ( Mode == FILE_PIPE_MESSAGE_MODE ) + { + Status.Status = STATUS_SUCCESS; + break; + } + ASSERT(!ReadOverflowOperation); + } + } + if ( Peek ) + { + DataEntry = CONTAINING_RECORD(DataEntry->QueueEntry.Flink, + NP_DATA_QUEUE_ENTRY, + QueueEntry); + } + else + { + DataEntry = NpGetNextRealDataQueueEntry(DataQueue, List); + } + } + + Status.Information = TotalBytesCopied; + if ( CompleteWrites ) NpCompleteStalledWrites(DataQueue, List); + return Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/readsup.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/npfs_new/secursup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/secursup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/secursup.c [iso-8859-1] Mon Sep 9 01:16:06 2013 @@ -1,25 +1,45 @@ #include "npfs.h" + +VOID +NTAPI +NpFreeClientSecurityContext(IN PSECURITY_CLIENT_CONTEXT ClientContext) +{ + TOKEN_TYPE TokenType; + PVOID ClientToken; + + if (!ClientContext) return; + + TokenType = SeTokenType(ClientContext->ClientToken); + ClientToken = ClientContext->ClientToken; + if ((TokenType == TokenPrimary) || (ClientToken)) + { + ObfDereferenceObject(ClientToken); + } + ExFreePool(ClientContext); +} + +VOID +NTAPI +NpCopyClientContext(IN PNP_CCB Ccb, + IN PNP_DATA_QUEUE_ENTRY DataQueueEntry) +{ + PAGED_CODE(); + + if (!DataQueueEntry->ClientSecurityContext) return; + + NpFreeClientSecurityContext(Ccb->ClientContext); + Ccb->ClientContext = DataQueueEntry->ClientSecurityContext; + DataQueueEntry->ClientSecurityContext = NULL; +} VOID NTAPI NpUninitializeSecurity(IN PNP_CCB Ccb) { - PACCESS_TOKEN ClientToken; - PSECURITY_CLIENT_CONTEXT ClientContext; - TOKEN_TYPE TokenType; PAGED_CODE(); - ClientContext = Ccb->ClientContext; - if (!ClientContext) return; - - TokenType = SeTokenType(ClientContext->ClientToken); - ClientToken = Ccb->ClientContext->ClientToken; - if ((TokenType == TokenPrimary) || (ClientToken)) - { - ObfDereferenceObject(ClientToken); - } - ExFreePool(Ccb->ClientContext); - Ccb->ClientContext = 0; + NpFreeClientSecurityContext(Ccb->ClientContext); + Ccb->ClientContext = NULL; } NTSTATUS @@ -63,3 +83,36 @@ Ccb->ClientContext = 0; return Status; } + +NTSTATUS +NTAPI +NpGetClientSecurityContext(IN BOOLEAN ServerSide, + IN PNP_CCB Ccb, + IN PETHREAD Thread, + IN PSECURITY_CLIENT_CONTEXT *Context) +{ + + PSECURITY_CLIENT_CONTEXT NewContext; + NTSTATUS Status; + PAGED_CODE(); + + if ( ServerSide || Ccb->ClientQos.ContextTrackingMode != 1 ) + { + NewContext = NULL; + Status = STATUS_SUCCESS; + } + else + { + NewContext = ExAllocatePoolWithQuotaTag(PagedPool, sizeof(*NewContext), 'sFpN'); + if ( !NewContext ) return STATUS_INSUFFICIENT_RESOURCES; + + Status = SeCreateClientSecurity(Thread, &Ccb->ClientQos, 0, NewContext); + if (!NT_SUCCESS(Status)) + { + ExFreePool(NewContext); + NewContext = NULL; + } + } + *Context = NewContext; + return Status; +}

1 0

[dreimer] 59997: Update Rapps Database to most recent versions.
by dreimer＠svn.reactos.org 08 Sep '13

08 Sep '13

Author: dreimer Date: Sun Sep 8 10:34:18 2013 New Revision: 59997 URL: http://svn.reactos.org/svn/reactos?rev=59997&view=rev Log: Update Rapps Database to most recent versions. Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/doublecommander.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt trunk/reactos/base/applications/rapps/rapps/lazaruside.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/npp.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/putty.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,7 +2,7 @@ [Section] Name = Abyss Web server X1 -Version = 2.9 +Version = 2.9.0.1 Licence = Freeware Description = Abyss Web Server enables you to host your Web sites on your computer. It supports secure SSL/TLS connections (HTTPS) as well as a wide range of Web technologies. It can also run advanced PHP, Perl, Python, ASP, ASP.NET, and Ruby on Rails Web applications, which can be backed by databases such as MySQL, SQLite, MS SQL Server, MS Access, or Oracle. Size = 2.1MB Modified: trunk/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/doublecommander.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/doublecommander.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = Double Commander -Version = 0.5.5 +Version = 0.5.6 Beta Licence = GPL Description = Double Commander is an open source file manager with two panels side by side. You need 7-Zip or a similar Utility to extract it. Size = 7.5MB Category = 12 URLSite = http://doublecmd.sourceforge.net/ -URLDownload = http://freefr.dl.sourceforge.net/project/doublecmd/DC%20for%20Windows%2032%… +URLDownload = http://freefr.dl.sourceforge.net/project/doublecmd/DC%20for%20Windows%2032%… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -1,78 +1,78 @@ ï»¿; UTF-8 [Section] -Name = Mozilla Firefox 22 -Version = 22.0 +Name = Mozilla Firefox 23 +Version = 23.0.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 20.3MB +Size = 21.4MB Category = 5 URLSite = http://www.mozilla.org/en-US/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/en-US/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/en-US/… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 20.17MB +Size = 21.21MB URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/de/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/de/Fir… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. -Size = 20.13MB +Size = 21.17MB URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/es-ES/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/es-ES/… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. -Size = 20,46 Mo +Size = 21,51 Mo URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/fr/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/fr/Fir… [Section.0410] Description = Il piÃ¹ popolare e uno dei migliori web browser gratuiti. -Size = 20.1MB +Size = 21.16MB URLSite = http://www.mozilla-europe.org/it/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/it/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/it/Fir… [Section.0413] Description = De meest populaire en een van de beste gratis Web browsers. -Size = 20.82MB +Size = 21.86MB URLSite = http://www.mozilla-europe.org/nl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/nl/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/nl/Fir… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. -Size = 20.18MB +Size = 21.21MB URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/nb-NO/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/nb-NO/… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 21.03MB +Size = 22.08MB URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/pl/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/pl/Fir… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune navigatoare web gratuite existente. -Size = 20,65 Mo +Size = 21,69 Mo URLSite = http://www.mozilla-europe.org/ro/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/ro/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/ro/Fir… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 20.59MB +Size = 21.62MB URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/ru/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/ru/Fir… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. -Size = 20.84MB +Size = 21.89MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/sk/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/sk/Fir… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². -Size = 20.6MB +Size = 21.63MB URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/22.0/win32/uk/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/23.0.1/win32/uk/Fir… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = FreeBASIC -Version = 0.90.0 +Version = 0.90.1 Licence = GPL/LGPL Description = Open Source BASIC Compiler. The BASIC syntax is compatible to QBASIC. -Size = 7.3MB +Size = 7.4MB Category = 7 URLSite = http://www.freebasic.net/ -URLDownload = http://garr.dl.sourceforge.net/project/fbc/Binaries%20-%20Windows/FreeBASIC… +URLDownload = http://garr.dl.sourceforge.net/project/fbc/Binaries%20-%20Windows/FreeBASIC… CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = Compilateur BASIC open source. La syntaxe du BASIC est compatible avec le QBASIC. -Size = 7,3 Mo +Size = 7,4 Mo [Section.0410] Description = Compilatore BASIC open source. La sintassi del BASIC Ã¨ compatibile con il QBASIC. @@ -29,7 +29,7 @@ [Section.0419] Description = Compilator (open-source) BASIC. Sintaxa BASIC este compatibilÄ cu QBASIC. -Size = 7,3 Mo +Size = 7,4 Mo [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ ÐºÐ¾Ð¼Ð¿ÑÐ»ÑÑÐ¾Ñ BASIC. Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ ÑÑÐ¼ÑÑÐ½Ð¸Ð¹ Ð· QBASIC. Modified: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,7 +2,7 @@ [Section] Name = IrfanView Plugins -Version = 4.35 +Version = 4.36 Licence = Freeware (for personal use) Description = Additional Plugins for supporting more file types. Size = 9.85MB Modified: trunk/reactos/base/applications/rapps/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lazaruside.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lazaruside.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = Lazarus -Version = 1.0.10 +Version = 1.0.12 Licence = modified LGPL, GPL Description = A cross-platform integrated development environment (IDE) that lets you create visual (GUI) and non-visual Object Pascal programs, and uses the Free Pascal compiler to generate your executable. Size = 106MB Category = 7 URLSite = http://www.lazarus.freepascal.org/ -URLDownload = http://garr.dl.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bit… +URLDownload = http://garr.dl.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bit… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 4.0.4 +Version = 4.1.1 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. -Size = 182.5MB +Size = 205.09MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.0.4/win/x86/Lib… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.1.1/win/x86/Lib… CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = PrÃ©cÃ©demment appelÃ© OpenOffice. Suite bureautique open source. -Size = 182,5 Mo +Size = 205,09 Mo [Section.0410] Description = Precedentemente chiamato OpenOffice. Open Source Office Suite. @@ -32,7 +32,7 @@ [Section.0418] Description = Fostul OpenOffice. Suita de aplicaÈii de biroticÄ open-source. -Size = 182,5 Mo +Size = 205,09 Mo [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.10.14 +Version = 0.10.16 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 2.81MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.10.14-unicode.exe +URLDownload = http://files.miranda-im.org/stable/0.10.16.0/miranda-im-v0.10.16-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/npp.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/npp.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = Notepad++ -Version = 6.4.1 +Version = 6.4.5 Licence = GPL Description = A text editor. Size = 7.1MB Category = 6 URLSite = http://notepad-plus-plus.org/ -URLDownload = http://download.tuxfamily.org/notepadplus/6.4.1/npp.6.4.1.Installer.exe +URLDownload = http://download.tuxfamily.org/notepadplus/6.4.5/npp.6.4.5.Installer.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = OpenTTD -Version = 1.3.1 +Version = 1.3.2 Licence = GPL v2 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon. -Size = 4.9MB +Size = 6.75MB Category = 4 URLSite = http://www.openttd.org/ -URLDownload = http://binaries.openttd.org/releases/1.3.1/openttd-1.3.1-windows-win32.exe +URLDownload = http://binaries.openttd.org/releases/1.3.2/openttd-1.3.2-windows-win32.exe CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = Clone open source du moteur de jeu "Transport Tycoon Deluxe". Vous aurez besoin d'une copie de Transport Tycoon. -Size = 4,9 Mo +Size = 6,75 Mo [Section.0410] Description = Clone open source del motore di gioco di "Transport Tycoon Deluxe". Hai bisogno di una copia di Transport Tycoon. @@ -32,7 +32,7 @@ [Section.0418] Description = Clona (open-source a) motorului de joc "Transport Tycoon Deluxe". Este necesarÄ o copie a jocului Transport Tycoon. -Size = 4,9 Mo +Size = 6,75 Mo [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ ÐºÐ»Ð¾Ð½ Ð´Ð²Ð¸Ð³ÑÐ½Ð° Ð³ÑÐ¸ "Transport Tycoon Deluxe". ÐÐ°Ð¼ Ð¿Ð¾ÑÑÑÐ±Ð½Ð° ÐºÐ¾Ð¿ÑÑ Ð³ÑÐ¸ Transport Tycoon. Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = Opera -Version = 12.15 +Version = 12.16 Licence = Freeware Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client. Size = 12.56MB Category = 5 URLSite = http://www.opera.com/ -URLDownload = http://ftp.opera.com/pub/opera/win/1215/int/Opera_1215_int_Setup.exe +URLDownload = http://ftp.opera.com/pub/opera/win/1216/int/Opera_1216_int_Setup.exe CDPath = none [Section.0405] Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = PuTTY -Version = 0.62 +Version = 0.63 Licence = MIT Description = A free SSH, Telnet, rlogin, and raw TCP client. -Size = 1.76MB +Size = 1.78MB Category = 5 URLSite = http://www.chiark.greenend.org.uk/~sgtatham/putty/ -URLDownload = http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.62-installer.exe +URLDownload = http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.63-installer.exe CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = Un client SSH, Telnet, rlogin et raw TCP gratuit. -Size = 1,76 Mo +Size = 1,78 Mo [Section.0410] Description = Un client SSH, Telnet, rlogin, and raw TCP gratuito. @@ -32,7 +32,7 @@ [Section.0418] Description = Un client gratuit de SSH, Telnet, rlogin, and TCP brut. -Size = 1,76 Mo +Size = 1,78 Mo [Section.0422] Description = ÐÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ð¹ SSH, Telnet, rlogin ÑÐ° raw TCP ÐºÐ»ÑÑÐ½Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = SciTE -Version = 3.3.3 +Version = 3.3.5 Licence = Freeware Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. -Size = 702kB +Size = 716kB Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.3.3/Sc333.exe +URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.3.5/Sc335.exe CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = SciTE est un Ã©diteur de texte basÃ© sur SCIntilla. Originelement rÃ©alisÃ© pour montrer Scintilla, il a Ã©voluÃ© pour devenir un Ã©diteur gÃ©nÃ©ralement utile avec des options pour compiler et lancer des programmes. -Size = 702 ko +Size = 716 ko [Section.0410] Description = SciTE Ã¨ un editor di testo basato scintilla. Originariamente costruito per dimostrare Scintilla, Ã¨ cresciuto fino a essere un editor generalmente utile con strutture per la creazione e l'esecuzione di programmi. @@ -33,7 +33,7 @@ [Section.0418] Licence = GratuitÄ Description = SciTE este un editor de text bazat pe SCIntilla. Construit iniÈial pentru a demonstra Scintilla, a crescut ulterior Ã®ntr-un editor de uz general cu funcÈionalitÄÈi de compilare Èi execuÈie a programelor. -Size = 702 ko +Size = 716 ko [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ñ SCIntilla. ÐÑÐ² Ð·ÑÐ±ÑÐ°Ð½Ð¸Ð¹ ÑÐº Ð¿ÑÐµÐ·ÐµÐ½ÑÐ°ÑÑÑ Scintilla, Ð°Ð»Ðµ Ð²Ð¸ÑÑÑ Ð´Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ° Ð·Ð°Ð³Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð· Ð·Ð°ÑÐ¾Ð±Ð°Ð¼Ð¸ Ð·Ð±Ð¸ÑÐ°Ð½Ð½Ñ ÑÐ° Ð·Ð°Ð¿ÑÑÐºÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼. Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,44 +2,44 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.17.1 +Version = 2.20 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. -Size = 21.61MB +Size = 21.83MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/en-U… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/en-US/… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. -Size = 21.56MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/de/S… +Size = 21.71MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/de/Sea… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. -Size = 21.51MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/es-E… +Size = 21.69MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/es-ES/… [Section.040c] Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin. -Size = 21,8 Mo -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/fr/S… +Size = 21,97 Mo +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/fr/Sea… [Section.0410] Description = Mozilla Suite Ã¨ vivo. Questo Ã¨ l'unico e solo Browser, Mail, Chat, e Composer di cui avrete mai bisogno... -Size = 21.5MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/it/S… +Size = 21.62MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/it/Sea… [Section.0413] Description = Mozilla Suite bundelt alle applicaties voor het Web: Browser, Mail, Chat, Composer. -Size = 22.1MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/nl/S… +Size = 22.31MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/nl/Sea… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. -Size = 22.41MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/pl/S… +Size = 22.56MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/pl/Sea… [Section.0418] Description = Suita Mozilla. Acest pachet ce Ã®ncorporeazÄ navigator, poÈtÄ electronicÄ, client IRC Èi editor HTML, acoperind astfel o arie largÄ de necesitÄÈi. @@ -47,10 +47,10 @@ [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. -Size = 22.03MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/ru/S… +Size = 22.17MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/ru/Sea… [Section.0422] Description = ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Mozilla Suite. ÐÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑÑÐ½Ñ, IRC-ÐºÐ»ÑÑÐ½Ñ ÑÐ° HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 22.03MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.17.1/win32/ru/S… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.20/win32/ru/Sea… Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = SMPlayer -Version = 0.8.5 +Version = 0.8.6 Licence = GPL Description = Graphical Frontend for MPlayer. -Size = 16.09MB +Size = 16.98MB Category = 1 URLSite = http://smplayer.sourceforge.net/ -URLDownload = http://freefr.dl.sourceforge.net/project/smplayer/SMPlayer/0.8.5/smplayer-0… +URLDownload = http://freefr.dl.sourceforge.net/project/smplayer/SMPlayer/0.8.6/smplayer-0… CDPath = none [Section.0407] @@ -20,7 +20,7 @@ Description = Interfaz grÃ¡fico para Mplayer (reproductor multimedia). [Section.040c] -Size = 16,09 Mo +Size = 16,98 Mo URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=fr [Section.0410] @@ -36,7 +36,7 @@ [Section.0418] Description = Lector multimedia (interfaÈÄ pentru MPlayer). -Size = 16,09 Mo +Size = 16,98 Mo URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=ro [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,65 +2,65 @@ [Section] Name = Mozilla Thunderbird 17 -Version = 17.0.7 +Version = 17.0.8 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 18.91MB Category = 5 URLSite = http://www.mozilla.org/en/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/en… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/en… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 18.77MB URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/de… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/de… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 18.73MB URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/es… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/es… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 19,06 Mo URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/fr… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/fr… [Section.0410] Description = Il piÃ¹ popolare e il migliore Clients mail gratuito. Size = 18.7MB URLSite = http://www.mozilla-europe.org/it/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/it… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/it… [Section.0413] Description = De meest populaire en een van de beste gratis e-mail-programma's. Size = 19.28MB URLSite = http://www.mozilla-europe.org/nl/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/nl… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/nl… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 19.62MB URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/pl… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/pl… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune clientele gratuite de poÈtÄ electronicÄ. Size = 19,28 Mo URLSite = http://www.mozilla-europe.org/ro/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/ro… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/ro… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 19.19MB URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/ru… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/ru… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 19.21MB URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.7/win32/uk… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.8/win32/uk… Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Sun Sep 8 10:34:18 2013 @@ -2,13 +2,13 @@ [Section] Name = VLC media player -Version = 2.0.7 +Version = 2.0.8 Licence = GPL Description = A media player. -Size = 21.88MB +Size = 21.94MB Category = 1 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://mirror.de.leaseweb.net/videolan/vlc/2.0.7/win32/vlc-2.0.7-win32.exe +URLDownload = http://mirror.de.leaseweb.net/videolan/vlc/2.0.8/win32/vlc-2.0.8-win32.exe CDPath = none [Section.0407] @@ -19,7 +19,7 @@ [Section.040c] Description = Un lecteur media. -Size = 21,88 Mo +Size = 21,94 Mo [Section.0410] Description = Lettore multimediale. @@ -32,7 +32,7 @@ [Section.0418] Description = Lector multimedia. -Size = 21,88 Mo +Size = 21,94 Mo [Section.0419] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½ÑÐ¹ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ.

1 0

[akhaldi] 59996: [NPFS_NEW] * Beginnings of windows-compatible NPFS driver. Still rough WIP, supports CreateNamedPipe and Create IRPs for now only. This is mainly to lay out all the structures (VCB...
by akhaldi＠svn.reactos.org 07 Sep '13

07 Sep '13

Author: akhaldi Date: Sat Sep 7 15:32:29 2013 New Revision: 59996 URL: http://svn.reactos.org/svn/reactos?rev=59996&view=rev Log: [NPFS_NEW] * Beginnings of windows-compatible NPFS driver. Still rough WIP, supports CreateNamedPipe and Create IRPs for now only. This is mainly to lay out all the structures (VCB, DCB, FCB and CCB). Work on read/write (and hence data queue management) is next. Brought to you by Alex Ionescu. Added: trunk/reactos/drivers/filesystems/npfs_new/ (with props) trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt (with props) trunk/reactos/drivers/filesystems/npfs_new/create.c (with props) trunk/reactos/drivers/filesystems/npfs_new/datasup.c (with props) trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c (with props) trunk/reactos/drivers/filesystems/npfs_new/main.c (with props) trunk/reactos/drivers/filesystems/npfs_new/npfs.h (with props) trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c (with props) trunk/reactos/drivers/filesystems/npfs_new/secursup.c (with props) trunk/reactos/drivers/filesystems/npfs_new/statesup.c (with props) trunk/reactos/drivers/filesystems/npfs_new/strucsup.c (with props) trunk/reactos/drivers/filesystems/npfs_new/waitsup.c (with props) Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/CMakeL… ============================================================================== --- trunk/reactos/drivers/filesystems/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/CMakeLists.txt [iso-8859-1] Sat Sep 7 15:32:29 2013 @@ -7,4 +7,5 @@ add_subdirectory(msfs) add_subdirectory(mup) add_subdirectory(npfs) +add_subdirectory(npfs_new) add_subdirectory(ntfs) Propchange: trunk/reactos/drivers/filesystems/npfs_new/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Sep 7 15:32:29 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/drivers/filesystems/npfs_new/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/drivers/filesystems/npfs_new/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/drivers/filesystems/npfs_new/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt [iso-8859-1] Sat Sep 7 15:32:29 2013 @@ -0,0 +1,17 @@ + +list(APPEND SOURCE + create.c + datasup.c + fileobsup.c + main.c + prefxsup.c + secursup.c + statesup.c + strucsup.c + waitsup.c) + +add_library(npfs_new SHARED ${SOURCE}) +set_module_type(npfs_new kernelmodedriver) +add_importlibs(npfs_new ntoskrnl hal) +add_pch(npfs_new npfs.h) +add_cd_file(TARGET npfs_new DESTINATION reactos/system32/drivers FOR all) Propchange: trunk/reactos/drivers/filesystems/npfs_new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] Sat Sep 7 15:32:29 2013 @@ -0,0 +1,726 @@ +#include "npfs.h" + +VOID +NTAPI +NpCheckForNotify(IN PNP_DCB Dcb, + IN BOOLEAN SecondList, + IN PLIST_ENTRY List) +{ + PLIST_ENTRY NextEntry, ListHead; + PIRP Irp; + ULONG i; + PAGED_CODE(); + + ListHead = &Dcb->NotifyList; + for (i = 0; i < 2; i++) + { + while (!IsListEmpty(ListHead)) + { + NextEntry = RemoveHeadList(ListHead); + + Irp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + if (IoSetCancelRoutine(Irp, NULL)) + { + Irp->IoStatus.Status = STATUS_SUCCESS; + InsertTailList(List, NextEntry); + } + else + { + InitializeListHead(NextEntry); + } + } + + if (!SecondList) break; + ListHead = &Dcb->NotifyList2; + } +} + +IO_STATUS_BLOCK +NTAPI +NpOpenNamedPipeFileSystem(IN PFILE_OBJECT FileObject, + IN ACCESS_MASK DesiredAccess) +{ + IO_STATUS_BLOCK Status; + PAGED_CODE(); + + NpSetFileObject(FileObject, NpVcb, NULL, FALSE); + ++NpVcb->ReferenceCount; + + Status.Information = 1; + Status.Status = STATUS_SUCCESS; + return Status; +} + +IO_STATUS_BLOCK +NTAPI +NpOpenNamedPipeRootDirectory(IN PNP_DCB Dcb, + IN PFILE_OBJECT FileObject, + IN ACCESS_MASK DesiredAccess, + IN PLIST_ENTRY List) +{ + IO_STATUS_BLOCK Status; + PNP_ROOT_DCB_FCB Ccb; + PAGED_CODE(); + + Status.Status = NpCreateRootDcbCcb(&Ccb); + if (NT_SUCCESS(Status.Status)) + { + NpSetFileObject(FileObject, Dcb, Ccb, FALSE); + ++Dcb->CurrentInstances; + + Status.Information = 1; + Status.Status = STATUS_SUCCESS; + } + else + { + Status.Information = 0; + } + + return Status; +} + +IO_STATUS_BLOCK +NTAPI +NpCreateClientEnd(IN PNP_FCB Fcb, + IN PFILE_OBJECT FileObject, + IN ACCESS_MASK DesiredAccess, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, + IN PACCESS_STATE AccessState, + IN KPROCESSOR_MODE PreviousMode, + IN PETHREAD Thread, + IN PLIST_ENTRY List) +{ + PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext; + BOOLEAN AccessGranted; + ACCESS_MASK GrantedAccess; + PPRIVILEGE_SET Privileges; + UNICODE_STRING ObjectTypeName; + IO_STATUS_BLOCK IoStatus; + USHORT NamedPipeConfiguration; + PLIST_ENTRY NextEntry, ListHead; + PNP_CCB Ccb = NULL; + + IoStatus.Status = STATUS_SUCCESS; + IoStatus.Information = 0; + Privileges = NULL; + + NamedPipeConfiguration = Fcb->NamedPipeConfiguration; + + SubjectSecurityContext = &AccessState->SubjectSecurityContext; + SeLockSubjectContext(SubjectSecurityContext); + + AccessGranted = SeAccessCheck(Fcb->SecurityDescriptor, + SubjectSecurityContext, + TRUE, + DesiredAccess & ~4, + 0, + &Privileges, + IoGetFileObjectGenericMapping(), + PreviousMode, + &GrantedAccess, + &IoStatus.Status); + + if (Privileges) + { + SeAppendPrivileges(AccessState, Privileges); + SeFreePrivileges(Privileges); + } + + if (AccessGranted) + { + AccessState->PreviouslyGrantedAccess |= GrantedAccess; + AccessState->RemainingDesiredAccess &= ~(GrantedAccess | 0x2000000); + } + + ObjectTypeName.Buffer = L"NamedPipe"; + ObjectTypeName.Length = 18; + SeOpenObjectAuditAlarm(&ObjectTypeName, + NULL, + &FileObject->FileName, + Fcb->SecurityDescriptor, + AccessState, + FALSE, + AccessGranted, + PreviousMode, + &AccessState->GenerateOnClose); + SeUnlockSubjectContext(SubjectSecurityContext); + if (!AccessGranted) return IoStatus; + + if (((GrantedAccess & 1) && (NamedPipeConfiguration == FILE_PIPE_INBOUND)) || + ((GrantedAccess & 2) && (NamedPipeConfiguration == FILE_PIPE_OUTBOUND))) + { + IoStatus.Status = STATUS_ACCESS_DENIED; + return IoStatus; + } + + if (!(GrantedAccess & 3)) SecurityQos = NULL; + + ListHead = &Fcb->CcbList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + Ccb = CONTAINING_RECORD(NextEntry, NP_CCB, CcbEntry); + if (Ccb->NamedPipeState == FILE_PIPE_LISTENING_STATE) break; + + NextEntry = NextEntry->Flink; + } + + if (NextEntry == ListHead) + { + IoStatus.Status = STATUS_PIPE_NOT_AVAILABLE; + return IoStatus; + } + + IoStatus.Status = NpInitializeSecurity(Ccb, SecurityQos, Thread); + if (!NT_SUCCESS(IoStatus.Status)) return IoStatus; + + IoStatus.Status = NpSetConnectedPipeState(Ccb, FileObject, List); + if (!NT_SUCCESS(IoStatus.Status)) + { + NpUninitializeSecurity(Ccb); + return IoStatus; + } + + Ccb->ClientSession = NULL; + Ccb->Process = IoThreadToProcess(Thread); + + IoStatus.Information = 1; + IoStatus.Status = STATUS_SUCCESS; + return IoStatus; +} + +NTSTATUS +NTAPI +NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PEXTENDED_IO_STACK_LOCATION IoStack; + UNICODE_STRING FileName; + PFILE_OBJECT FileObject; + PFILE_OBJECT RelatedFileObject; + NODE_TYPE_CODE Type; + PNP_CCB Ccb; + PNP_FCB Fcb; + PNP_DCB Dcb; + ACCESS_MASK DesiredAccess; + LIST_ENTRY List; + UNICODE_STRING Prefix; + + InitializeListHead(&List); + IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); + FileObject = IoStack->FileObject; + RelatedFileObject = FileObject->RelatedFileObject; + 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); + + if (RelatedFileObject) + { + Type = NpDecodeFileObject(RelatedFileObject, (PVOID*)&Fcb, &Ccb, FALSE); + } + else + { + Type = 0; + Fcb = NULL; + Ccb = NULL; + } + + if (FileName.Length) + { + if ((FileName.Length == sizeof(WCHAR)) && + (FileName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR) && + !(RelatedFileObject)) + { + Irp->IoStatus = NpOpenNamedPipeRootDirectory(NpVcb->RootDcb, + FileObject, + DesiredAccess, + &List); + } + } + else if (!(RelatedFileObject) || (Type == NPFS_NTC_VCB)) + { + Irp->IoStatus = NpOpenNamedPipeFileSystem(FileObject, + DesiredAccess); + } + else if (Type == NPFS_NTC_ROOT_DCB) + { + Irp->IoStatus = NpOpenNamedPipeRootDirectory(NpVcb->RootDcb, + 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) + { + 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 ((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); + } + } + +Quickie: + ExReleaseResourceLite(&NpVcb->Lock); + ASSERT(IsListEmpty(&List) == TRUE); + FsRtlExitFileSystem(); + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Irp->IoStatus.Status; +} + +IO_STATUS_BLOCK +NTAPI +NpCreateExistingNamedPipe(IN PNP_FCB Fcb, + IN PFILE_OBJECT FileObject, + IN ACCESS_MASK DesiredAccess, + IN PACCESS_STATE AccessState, + IN KPROCESSOR_MODE PreviousMode, + IN ULONG Disposition, + IN ULONG ShareAccess, + IN PNAMED_PIPE_CREATE_PARAMETERS Parameters, + IN PEPROCESS Process, + OUT PLIST_ENTRY List) +{ + PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext; + IO_STATUS_BLOCK IoStatus; + UNICODE_STRING ObjectTypeName; + ACCESS_MASK GrantedAccess; + PNP_CCB Ccb; + PPRIVILEGE_SET Privileges; + USHORT NamedPipeConfiguration, CheckShareAccess; + BOOLEAN AccessGranted; + PAGED_CODE(); + + Privileges = NULL; + + NamedPipeConfiguration = Fcb->NamedPipeConfiguration; + + SubjectSecurityContext = &AccessState->SubjectSecurityContext; + SeLockSubjectContext(SubjectSecurityContext); + + AccessGranted = SeAccessCheck(Fcb->SecurityDescriptor, + SubjectSecurityContext, + TRUE, + DesiredAccess | 4, + 0, + &Privileges, + IoGetFileObjectGenericMapping(), + PreviousMode, + &GrantedAccess, + &IoStatus.Status); + + if (Privileges) + { + SeAppendPrivileges(AccessState, Privileges); + SeFreePrivileges(Privileges); + } + + if (AccessGranted) + { + AccessState->PreviouslyGrantedAccess |= GrantedAccess; + AccessState->RemainingDesiredAccess &= ~(GrantedAccess | 0x2000000); + } + + + ObjectTypeName.Buffer = L"NamedPipe"; + ObjectTypeName.Length = 18; + SeOpenObjectAuditAlarm(&ObjectTypeName, + NULL, + &FileObject->FileName, + Fcb->SecurityDescriptor, + AccessState, + FALSE, + AccessGranted, + PreviousMode, + &AccessState->GenerateOnClose); + + SeUnlockSubjectContext(SubjectSecurityContext); + if ( !AccessGranted ) return IoStatus; + + if ( Fcb->CurrentInstances >= Fcb->MaximumInstances ) + { + IoStatus.Status = STATUS_INSTANCE_NOT_AVAILABLE; + return IoStatus; + } + + if ( Disposition == FILE_CREATE ) + { + IoStatus.Status = STATUS_ACCESS_DENIED; + return IoStatus; + } + + CheckShareAccess = 0; + if (NamedPipeConfiguration == FILE_PIPE_FULL_DUPLEX) + { + CheckShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE; + } + else if (NamedPipeConfiguration == FILE_PIPE_OUTBOUND) + { + CheckShareAccess = FILE_SHARE_READ; + } + else if (NamedPipeConfiguration == FILE_PIPE_INBOUND) + { + CheckShareAccess = FILE_SHARE_WRITE; + } + + if ( CheckShareAccess != ShareAccess ) + { + IoStatus.Status = STATUS_ACCESS_DENIED; + return IoStatus; + } + + IoStatus.Status = NpCreateCcb(Fcb, + FileObject, + FILE_PIPE_LISTENING_STATE, + Parameters->ReadMode & 0xFF, + Parameters->CompletionMode & 0xFF, + Parameters->InboundQuota, + Parameters->OutboundQuota, + &Ccb); + if (!NT_SUCCESS(IoStatus.Status)) return IoStatus; + + IoStatus.Status = NpCancelWaiter(&NpVcb->WaitQueue, + &Fcb->FullName, + FALSE, + List); + if (!NT_SUCCESS(IoStatus.Status)) + { + --Ccb->Fcb->CurrentInstances; + NpDeleteCcb(Ccb, List); + return IoStatus; + } + + NpSetFileObject(FileObject, Ccb, Ccb->NonPagedCcb, TRUE); + Ccb->ServerFileObject = FileObject; + NpCheckForNotify(Fcb->ParentDcb, 0, List); + + IoStatus.Status = STATUS_SUCCESS; + IoStatus.Information = 1; + return IoStatus; +} + +NTSTATUS +NTAPI +NpCreateNewNamedPipe(IN PNP_DCB Dcb, + IN PFILE_OBJECT FileObject, + IN UNICODE_STRING PipeName, + IN ACCESS_MASK DesiredAccess, + IN PACCESS_STATE AccessState, + IN USHORT Disposition, + IN USHORT ShareAccess, + IN PNAMED_PIPE_CREATE_PARAMETERS Parameters, + IN PEPROCESS Process, + IN PLIST_ENTRY List, + IN PIO_STATUS_BLOCK IoStatus) +{ + NTSTATUS Status; + USHORT NamedPipeConfiguration; + PSECURITY_SUBJECT_CONTEXT SecurityContext; + PSECURITY_DESCRIPTOR SecurityDescriptor, CachedSecurityDescriptor; + PNP_CCB Ccb; + PNP_FCB Fcb; + PAGED_CODE(); + + if (!(Parameters->TimeoutSpecified) || + !(Parameters->MaximumInstances) || + (Parameters->DefaultTimeout.HighPart >= 0)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + if (Disposition == FILE_OPEN) + { + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Quickie; + } + + if (ShareAccess == (FILE_SHARE_READ | FILE_SHARE_WRITE)) + { + NamedPipeConfiguration = FILE_PIPE_FULL_DUPLEX; + } + else if (ShareAccess == FILE_SHARE_READ) + { + NamedPipeConfiguration = FILE_PIPE_OUTBOUND; + } + else if (ShareAccess == FILE_SHARE_WRITE) + { + NamedPipeConfiguration = FILE_PIPE_INBOUND; + } + else + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + if ( !Parameters->NamedPipeType && Parameters->ReadMode == 1 ) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + Status = NpCreateFcb(Dcb, + &PipeName, + Parameters->MaximumInstances, + Parameters->DefaultTimeout, + NamedPipeConfiguration, + Parameters->NamedPipeType & 0xFFFF, + &Fcb); + if (!NT_SUCCESS(Status)) goto Quickie; + + Status = NpCreateCcb(Fcb, + FileObject, + FILE_PIPE_LISTENING_STATE, + Parameters->ReadMode & 0xFF, + Parameters->CompletionMode & 0xFF, + Parameters->InboundQuota, + Parameters->OutboundQuota, + &Ccb); + if (!NT_SUCCESS(Status)) + { + NpDeleteFcb(Fcb, List); + goto Quickie; + } + + SecurityContext = &AccessState->SubjectSecurityContext; + SeLockSubjectContext(&AccessState->SubjectSecurityContext); + + Status = SeAssignSecurity(0, + AccessState->SecurityDescriptor, + &SecurityDescriptor, + 0, + SecurityContext, + IoGetFileObjectGenericMapping(), + PagedPool); + SeUnlockSubjectContext(SecurityContext); + if (!NT_SUCCESS(Status)) + { + NpDeleteCcb(Ccb, List); + NpDeleteFcb(Fcb, List); + goto Quickie; + } + + Status = ObLogSecurityDescriptor(SecurityDescriptor, + &CachedSecurityDescriptor, + 1); + ExFreePool(SecurityDescriptor); + + if (!NT_SUCCESS(Status)) + { + NpDeleteCcb(Ccb, List); + NpDeleteFcb(Fcb, List); + goto Quickie; + } + + Fcb->SecurityDescriptor = CachedSecurityDescriptor; + + NpSetFileObject(FileObject, Ccb, Ccb->NonPagedCcb, TRUE); + Ccb->ServerFileObject = FileObject; + + NpCheckForNotify(Dcb, 1, List); + + IoStatus->Status = 0; + IoStatus->Information = 2; + return STATUS_SUCCESS; + +Quickie: + IoStatus->Information = 0; + IoStatus->Status = Status; + return Status; +} + +NTSTATUS +NTAPI +NpFsdCreateNamedPipe(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PEXTENDED_IO_STACK_LOCATION IoStack; + PFILE_OBJECT FileObject; + PFILE_OBJECT RelatedFileObject; + USHORT Disposition, ShareAccess; + PEPROCESS Process; + LIST_ENTRY LocalList; + UNICODE_STRING FileName; + PNP_FCB Fcb; + UNICODE_STRING Prefix; + PNAMED_PIPE_CREATE_PARAMETERS Parameters; + IO_STATUS_BLOCK IoStatus; + + DPRINT1("NpFsdCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp); + + InitializeListHead(&LocalList); + Process = IoGetRequestorProcess(Irp); + + IoStack = (PEXTENDED_IO_STACK_LOCATION) IoGetCurrentIrpStackLocation(Irp); + FileObject = IoStack->FileObject; + RelatedFileObject = FileObject->RelatedFileObject; + + Disposition = (IoStack->Parameters.CreatePipe.Options >> 24) & 0xFF; + ShareAccess = IoStack->Parameters.CreatePipe.ShareAccess & 0xFFFF; + Parameters = IoStack->Parameters.CreatePipe.Parameters; + + FileName.Buffer = FileObject->FileName.Buffer; + FileName.Length = FileObject->FileName.Length; + FileName.MaximumLength = FileObject->FileName.MaximumLength; + + IoStatus.Status = STATUS_SUCCESS; + IoStatus.Information = 0; + + 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 ) + { + Fcb = (PNP_FCB)((ULONG_PTR)RelatedFileObject->FsContext & ~1); + if (!(Fcb) || + (Fcb->NodeType != NPFS_NTC_ROOT_DCB) || + (FileName.Length < sizeof(WCHAR)) || + (FileName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR)) + { + IoStatus.Status = STATUS_OBJECT_NAME_INVALID; + goto Quickie; + } + + IoStatus.Status = NpFindRelativePrefix(RelatedFileObject->FsContext, + &FileName, + TRUE, + &Prefix, + &Fcb); + if (!NT_SUCCESS(IoStatus.Status)) goto Quickie; + } + else + { + if ( FileName.Length <= 2u || *FileName.Buffer != '\\' ) + { + IoStatus.Status = STATUS_OBJECT_NAME_INVALID; + goto Quickie; + } + Fcb = NpFindPrefix(&FileName, 1u, &Prefix); + } + + if ( Prefix.Length ) + { + if (Fcb->NodeType == NPFS_NTC_ROOT_DCB ) + { + IoStatus.Status = NpCreateNewNamedPipe((PNP_DCB)Fcb, + FileObject, + FileName, + IoStack->Parameters.CreatePipe. + SecurityContext->DesiredAccess, + IoStack->Parameters.CreatePipe. + SecurityContext->AccessState, + Disposition, + ShareAccess, + Parameters, + Process, + &LocalList, + &Irp->IoStatus); + goto Quickie; + } + else + { + IoStatus.Status = STATUS_OBJECT_NAME_INVALID; + 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); + +Quickie: + ExReleaseResourceLite(&NpVcb->Lock); + ASSERT(IsListEmpty(&LocalList)); + + FsRtlExitFileSystem(); + + Irp->IoStatus = IoStatus; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return IoStatus.Status; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/create.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] Sat Sep 7 15:32:29 2013 @@ -0,0 +1,30 @@ +#include "npfs.h" + +NTSTATUS +NTAPI +NpUninitializeDataQueue(IN PNP_DATA_QUEUE DataQueue) +{ + PAGED_CODE(); + + ASSERT(DataQueue->QueueState == Empty); + + RtlZeroMemory(DataQueue, sizeof(*DataQueue)); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NpInitializeDataQueue(IN PNP_DATA_QUEUE DataQueue, + IN ULONG Quota) +{ + PAGED_CODE(); + + DataQueue->BytesInQueue = 0; + DataQueue->EntriesInQueue = 0; + DataQueue->QuotaUsed = 0; + DataQueue->ByteOffset = 0; + DataQueue->QueueState = Empty; + DataQueue->Quota = Quota; + InitializeListHead(&DataQueue->List); + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/filesystems/npfs_new/datasup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c [iso-8859-1] Sat Sep 7 15:32:29 2013 @@ -0,0 +1,72 @@ +#include "npfs.h" + +NODE_TYPE_CODE +NTAPI +NpDecodeFileObject(IN PFILE_OBJECT FileObject, + OUT PVOID* PrimaryContext OPTIONAL, + OUT PNP_CCB* Ccb, + OUT PBOOLEAN ServerSide OPTIONAL) +{ + ULONG_PTR Context; + PNP_CCB Node; + PAGED_CODE(); + + Context = (ULONG_PTR)FileObject->FsContext; + if ((Context) && (Context != 1)) + { + if (ServerSide) *ServerSide = Context & 1; + + Node = (PVOID)(Context & ~1); + + switch (Node->NodeType) + { + case NPFS_NTC_VCB: + return NPFS_NTC_VCB; + + case NPFS_NTC_ROOT_DCB: + *Ccb = FileObject->FsContext2; + if (PrimaryContext) *PrimaryContext = Node; + return NPFS_NTC_ROOT_DCB; + + case NPFS_NTC_CCB: + *Ccb = Node; + if (PrimaryContext) *PrimaryContext = Node->Fcb; + return NPFS_NTC_CCB; + + default: + KeBugCheckEx(NPFS_FILE_SYSTEM, 0xB0108, Node->NodeType, 0, 0); + break; + } + } + + return 0; +} + +VOID +NTAPI +NpSetFileObject(IN PFILE_OBJECT FileObject, + IN PVOID PrimaryContext, + IN PVOID Ccb, + IN BOOLEAN ServerSide) +{ + BOOLEAN FileIsPipe; + PAGED_CODE(); + + if (!FileObject) return; + + if ((PrimaryContext) && (((PNP_CCB)PrimaryContext)->NodeType == NPFS_NTC_CCB)) + { + FileIsPipe = TRUE; + if (ServerSide) PrimaryContext = (PVOID)((ULONG_PTR)PrimaryContext | 1); + } + else + { + FileIsPipe = FALSE; + } + + FileObject->FsContext = PrimaryContext; + FileObject->FsContext2 = Ccb; + FileObject->PrivateCacheMap = (PVOID)1; + if (FileIsPipe) FileObject->Flags |= FO_NAMED_PIPE; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] Sat Sep 7 15:32:29 2013 @@ -0,0 +1,201 @@ +#include "npfs.h" + +PDEVICE_OBJECT NpfsDeviceObject; + +NTSTATUS +NTAPI +NpFsdClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpFsdRead(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpFsdWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpFsdQueryInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpFsdSetInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpFsdQueryVolumeInformation(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpFsdCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpFsdFlushBuffers(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpFsdDirectoryControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NpFsdFileSystemControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + PDEVICE_OBJECT DeviceObject; + UNICODE_STRING DeviceName; + NTSTATUS Status; + UNREFERENCED_PARAMETER(RegistryPath); + + DPRINT1("Next-Generation NPFS-Lite\n"); + + DriverObject->MajorFunction[IRP_MJ_CREATE] = NpFsdCreate; + DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = NpFsdCreateNamedPipe; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = NpFsdClose; + DriverObject->MajorFunction[IRP_MJ_READ] = NpFsdRead; + DriverObject->MajorFunction[IRP_MJ_WRITE] = NpFsdWrite; + DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = NpFsdQueryInformation; + DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = NpFsdSetInformation; + DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = NpFsdQueryVolumeInformation; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = NpFsdCleanup; + 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] = + // NpfsQuerySecurity; + // DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = + // NpfsSetSecurity; + + DriverObject->DriverUnload = NULL; + + RtlInitUnicodeString(&DeviceName, L"\\Device\\NamedPipe"); + Status = IoCreateDevice(DriverObject, + sizeof(NP_VCB), + &DeviceName, + FILE_DEVICE_NAMED_PIPE, + 0, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create named pipe device! (Status %lx)\n", Status); + return Status; + } + + /* Initialize the device object */ + NpfsDeviceObject = DeviceObject; + DeviceObject->Flags |= DO_DIRECT_IO; + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* Initialize the Volume Control Block (VCB) */ + NpVcb = DeviceObject->DeviceExtension; + NpInitializeVcb(); + Status = NpCreateRootDcb(); + ASSERT(Status == STATUS_SUCCESS); + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/filesystems/npfs_new/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] Sat Sep 7 15:32:29 2013 @@ -0,0 +1,318 @@ +// +// System Headers +// +#include <ntifs.h> +#include <ntndk.h> +#define UNIMPLEMENTED +#define DPRINT1 DbgPrint + +// +// Allow Microsoft Extensions +// +#ifdef _MSC_VER +#pragma warning(disable:4201) +#pragma warning(disable:4214) +#pragma warning(disable:4100) +#endif + +// +// Node Type Codes for NPFS +// +#define NPFS_NTC_VCB 1 +#define NPFS_NTC_ROOT_DCB 2 +#define NPFS_NTC_FCB 4 +#define NPFS_NTC_CCB 6 +#define NPFS_NTC_NONPAGED_CCB 7 +#define NPFS_NTC_ROOT_DCB_CCB 8 +typedef USHORT NODE_TYPE_CODE, *PNODE_TYPE_CODE; + +// +// Data Queue States +// +typedef enum _NP_DATA_QUEUE_STATE +{ + Empty = 2 +} NP_DATA_QUEUE_STATE; + +// +// An Input or Output Data Queue. Each CCB has two of these. +// +typedef struct _NP_DATA_QUEUE +{ + LIST_ENTRY List; + ULONG QueueState; + ULONG BytesInQueue; + ULONG EntriesInQueue; + ULONG QuotaUsed; + ULONG ByteOffset; + ULONG Quota; +} NP_DATA_QUEUE, *PNP_DATA_QUEUE; + +// +// A Wait Queue. Only the VCB has one of these. +// +typedef struct _NP_WAIT_QUEUE +{ + LIST_ENTRY WaitList; + KSPIN_LOCK WaitLock; +} NP_WAIT_QUEUE, *PNP_WAIT_QUEUE; + +// +// The CCB for the Root DCB +// +typedef struct _NP_ROOT_DCB_CCB +{ + NODE_TYPE_CODE NodeType; + PVOID Unknown; + ULONG Unknown2; +} NP_ROOT_DCB_CCB, *PNP_ROOT_DCB_FCB; + +// +// The header that both FCB and DCB share +// +typedef struct _NP_CB_HEADER +{ + NODE_TYPE_CODE NodeType; + LIST_ENTRY DcbEntry; + PVOID ParentDcb; + ULONG CurrentInstances; + ULONG OtherCount; + PSECURITY_DESCRIPTOR SecurityDescriptor; +} NP_CB_HEADER, *PNP_CB_HEADER; + +// +// The footer that both FCB and DCB share +// +typedef struct _NP_CB_FOOTER +{ + UNICODE_STRING FullName; + UNICODE_STRING ShortName; + UNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry; +} NP_CB_FOOTER; + +// +// A Directory Control Block (DCB) +// +typedef struct _NP_DCB +{ + // + // Common Header + // + NP_CB_HEADER; + + // + // DCB-specific data + // + LIST_ENTRY NotifyList; + LIST_ENTRY NotifyList2; + LIST_ENTRY FcbList; + + // + // Common Footer + // + NP_CB_FOOTER; +} NP_DCB, *PNP_DCB; + +// +// A File Control BLock (FCB) +// +typedef struct _NP_FCB +{ + // + // Common Header + // + NP_CB_HEADER; + + // + // FCB-specific fields + // + ULONG MaximumInstances; + USHORT NamedPipeConfiguration; + USHORT NamedPipeType; + LARGE_INTEGER Timeout; + LIST_ENTRY CcbList; + + // + // Common Footer + // + NP_CB_FOOTER; +} NP_FCB, *PNP_FCB; + +// +// The nonpaged portion of the CCB +// +typedef struct _NP_NONPAGED_CCB +{ + NODE_TYPE_CODE NodeType; + PVOID EventBufferClient; + PVOID EventBufferServer; + ERESOURCE Lock; +} NP_NONPAGED_CCB, *PNP_NONPAGED_CCB; + +// +// A Client Control Block (CCB) +// +typedef struct _NP_CCB +{ + NODE_TYPE_CODE NodeType; + UCHAR NamedPipeState; + UCHAR ClientReadMode:1; + UCHAR ClientCompletionMode:1; + UCHAR ServerReadMode:1; + UCHAR ClientReservedFlags:6; + UCHAR ServerCompletionMode:1; + UCHAR ServerReservedFlags:6; + SECURITY_QUALITY_OF_SERVICE ClientQos; + LIST_ENTRY CcbEntry; + PNP_FCB Fcb; + PFILE_OBJECT ClientFileObject; + PFILE_OBJECT ServerFileObject; + PEPROCESS Process; + PVOID ClientSession; + PNP_NONPAGED_CCB NonPagedCcb; + NP_DATA_QUEUE InQueue; + NP_DATA_QUEUE OutQueue; + PSECURITY_CLIENT_CONTEXT ClientContext; + LIST_ENTRY IrpList; +} NP_CCB, *PNP_CCB; + +// +// A Volume Control Block (VCB) +// +typedef struct _NP_VCB +{ + NODE_TYPE_CODE NodeType; + ULONG ReferenceCount; + PNP_DCB RootDcb; + UNICODE_PREFIX_TABLE PrefixTable; + ERESOURCE Lock; + RTL_GENERIC_TABLE EventTable; + NP_WAIT_QUEUE WaitQueue; +} NP_VCB, *PNP_VCB; + +extern PNP_VCB NpVcb; + +VOID +NTAPI +NpInitializeWaitQueue(IN PNP_WAIT_QUEUE WaitQueue); + + +NTSTATUS +NTAPI +NpUninitializeDataQueue(IN PNP_DATA_QUEUE DataQueue); + +NTSTATUS +NTAPI +NpInitializeDataQueue(IN PNP_DATA_QUEUE DataQueue, + IN ULONG Quota); + +NTSTATUS +NTAPI +NpCreateCcb(IN PNP_FCB Fcb, + IN PFILE_OBJECT FileObject, + IN UCHAR State, + IN UCHAR ReadMode, + IN UCHAR CompletionMode, + IN ULONG InQuota, + IN ULONG OutQuota, + OUT PNP_CCB* NewCcb); + +NTSTATUS +NTAPI +NpCreateFcb(IN PNP_DCB Dcb, + IN PUNICODE_STRING PipeName, + IN ULONG MaximumInstances, + IN LARGE_INTEGER Timeout, + IN USHORT NamedPipeConfiguration, + IN USHORT NamedPipeType, + OUT PNP_FCB *NewFcb); + +NTSTATUS +NTAPI +NpCreateRootDcb(VOID); + +NTSTATUS +NTAPI +NpCreateRootDcbCcb(IN PNP_ROOT_DCB_FCB* NewRootCcb); + +VOID +NTAPI +NpInitializeVcb(VOID); + +VOID +NTAPI +NpDeleteCcb(IN PNP_CCB Ccb, + IN PLIST_ENTRY ListEntry); + +VOID +NTAPI +NpDeleteFcb(IN PNP_FCB Fcb, + IN PLIST_ENTRY ListEntry); + +NTSTATUS +NTAPI +NpFsdCreateNamedPipe(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +NpSetConnectedPipeState(IN PNP_CCB Ccb, + IN PFILE_OBJECT FileObject, + IN PLIST_ENTRY List); + +VOID +NTAPI +NpUninitializeSecurity(IN PNP_CCB Ccb); + +NTSTATUS +NTAPI +NpInitializeSecurity(IN PNP_CCB Ccb, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, + IN PETHREAD Thread); + +VOID +NTAPI +NpSetFileObject(IN PFILE_OBJECT FileObject, + IN PVOID PrimaryContext, + IN PVOID Ccb, + IN BOOLEAN ServerSide); + +NODE_TYPE_CODE +NTAPI +NpDecodeFileObject(IN PFILE_OBJECT FileObject, + OUT PVOID* PrimaryContext OPTIONAL, + OUT PNP_CCB* Ccb, + OUT PBOOLEAN ServerSide OPTIONAL); + +PNP_FCB +NTAPI +NpFindPrefix(IN PUNICODE_STRING Name, + IN ULONG CaseInsensitiveIndex, + IN PUNICODE_STRING Prefix); + +NTSTATUS +NTAPI +NpFindRelativePrefix(IN PNP_DCB Dcb, + IN PUNICODE_STRING Name, + IN ULONG CaseInsensitiveIndex, + IN PUNICODE_STRING Prefix, + OUT PNP_FCB *FoundFcb); + +VOID +NTAPI +NpCheckForNotify(IN PNP_DCB Dcb, + IN BOOLEAN SecondList, + IN PLIST_ENTRY List); + +NTSTATUS +NTAPI +NpCancelWaiter(IN PNP_WAIT_QUEUE WaitQueue, + IN PUNICODE_STRING PipeName, + IN NTSTATUS Status, + IN PLIST_ENTRY ListEntry); + Propchange: trunk/reactos/drivers/filesystems/npfs_new/npfs.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c [iso-8859-1] Sat Sep 7 15:32:29 2013 @@ -0,0 +1,77 @@ +#include "npfs.h" + +PNP_FCB +NTAPI +NpFindPrefix(IN PUNICODE_STRING Name, + IN ULONG CaseInsensitiveIndex, + IN PUNICODE_STRING Prefix) +{ + PUNICODE_PREFIX_TABLE_ENTRY Entry; + PNP_FCB Fcb; + PAGED_CODE(); + + Entry = RtlFindUnicodePrefix(&NpVcb->PrefixTable, + Name, + CaseInsensitiveIndex); + if (!Entry) KeBugCheckEx(NPFS_FILE_SYSTEM, 0x100065u, 0, 0, 0); + + Fcb = CONTAINING_RECORD(Entry, NP_FCB, PrefixTableEntry); + + Prefix->Length = Name->Length - Fcb->FullName.Length; + Prefix->MaximumLength = Prefix->Length; + Prefix->Buffer = &Name->Buffer[Fcb->FullName.Length / sizeof(WCHAR)]; + + if ((Prefix->Length) && (Prefix->Buffer[0] == OBJ_NAME_PATH_SEPARATOR)) + { + Prefix->Length -= sizeof(WCHAR); + Prefix->MaximumLength -= sizeof(WCHAR); + ++Prefix->Buffer; + } + + return Fcb; +} + +NTSTATUS +NTAPI +NpFindRelativePrefix(IN PNP_DCB Dcb, + IN PUNICODE_STRING Name, + IN ULONG CaseInsensitiveIndex, + IN PUNICODE_STRING Prefix, + OUT PNP_FCB *FoundFcb) +{ + PWCHAR Buffer; + PNP_FCB Fcb; + UNICODE_STRING RootName; + USHORT Length, MaximumLength; + PAGED_CODE(); + + Length = Name->Length; + MaximumLength = Length + sizeof(OBJ_NAME_PATH_SEPARATOR) + sizeof(UNICODE_NULL); + if (MaximumLength < Length) return STATUS_INVALID_PARAMETER; + + ASSERT(Dcb->NodeType == NPFS_NTC_ROOT_DCB); + + Buffer = ExAllocatePoolWithTag(PagedPool, MaximumLength, 'nFpN'); + if (!Buffer) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + *Buffer = OBJ_NAME_PATH_SEPARATOR; + RtlCopyMemory(Buffer + 1, Name->Buffer, Length); + Buffer[(Length / sizeof(WCHAR)) + 1] = UNICODE_NULL; + + RootName.Length = Length + sizeof(OBJ_NAME_PATH_SEPARATOR); + RootName.MaximumLength = MaximumLength; + RootName.Buffer = Buffer; + + Fcb = NpFindPrefix(&RootName, CaseInsensitiveIndex, Prefix); + + ExFreePool(Buffer); + + Prefix->Buffer = &Name->Buffer[(Length - Prefix->Length) / sizeof(WCHAR)]; + *FoundFcb = Fcb; + + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/npfs_new/secursup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/secursup.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/secursup.c [iso-8859-1] Sat Sep 7 15:32:29 2013 @@ -0,0 +1,65 @@ +#include "npfs.h" + +VOID +NTAPI +NpUninitializeSecurity(IN PNP_CCB Ccb) +{ + PACCESS_TOKEN ClientToken; + PSECURITY_CLIENT_CONTEXT ClientContext; + TOKEN_TYPE TokenType; + PAGED_CODE(); + + ClientContext = Ccb->ClientContext; + if (!ClientContext) return; + + TokenType = SeTokenType(ClientContext->ClientToken); + ClientToken = Ccb->ClientContext->ClientToken; + if ((TokenType == TokenPrimary) || (ClientToken)) + { + ObfDereferenceObject(ClientToken); + } + ExFreePool(Ccb->ClientContext); + Ccb->ClientContext = 0; +} + +NTSTATUS +NTAPI +NpInitializeSecurity(IN PNP_CCB Ccb, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, + IN PETHREAD Thread) +{ + PSECURITY_CLIENT_CONTEXT ClientContext; + NTSTATUS Status; + PAGED_CODE(); + + if (SecurityQos) + { + Ccb->ClientQos = *SecurityQos; + } + else + { + Ccb->ClientQos.Length = 12; + Ccb->ClientQos.ImpersonationLevel = 2; + Ccb->ClientQos.ContextTrackingMode = 1; + Ccb->ClientQos.EffectiveOnly = 1; + } + + NpUninitializeSecurity(Ccb); + + if (Ccb->ClientQos.ContextTrackingMode) + { + Status = 0; + Ccb->ClientContext = 0; + return Status; + } + + ClientContext = ExAllocatePoolWithTag(PagedPool, sizeof(*ClientContext), 'sFpN'); + Ccb->ClientContext = ClientContext; + if (!ClientContext) return STATUS_INSUFFICIENT_RESOURCES; + + Status = SeCreateClientSecurity(Thread, &Ccb->ClientQos, 0, ClientContext); + if (Status >= 0) return Status; + ExFreePool(Ccb->ClientContext); + Ccb->ClientContext = 0; + return Status; +} Propchange: trunk/reactos/drivers/filesystems/npfs_new/secursup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] Sat Sep 7 15:32:29 2013 @@ -0,0 +1,39 @@ +#include "npfs.h" + +NTSTATUS +NTAPI +NpSetConnectedPipeState(IN PNP_CCB Ccb, + IN PFILE_OBJECT FileObject, + IN PLIST_ENTRY List) +{ + PLIST_ENTRY NextEntry; + PIRP Irp; + + ASSERT(Ccb->NamedPipeState == FILE_PIPE_LISTENING_STATE); + + Ccb->ClientReadMode = FILE_PIPE_BYTE_STREAM_MODE; + Ccb->ClientCompletionMode = FILE_PIPE_QUEUE_OPERATION; + Ccb->NamedPipeState = FILE_PIPE_CONNECTED_STATE; + Ccb->ClientFileObject = FileObject; + + NpSetFileObject(FileObject, Ccb, Ccb->NonPagedCcb, FALSE); + + while (!IsListEmpty(&Ccb->IrpList)) + { + NextEntry = RemoveHeadList(&Ccb->IrpList); + + Irp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + if (IoSetCancelRoutine(Irp, NULL)) + { + Irp->IoStatus.Status = STATUS_SUCCESS; + InsertTailList(List, NextEntry); + } + else + { + InitializeListHead(NextEntry); + } + } + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/filesystems/npfs_new/statesup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] Sat Sep 7 15:32:29 2013 @@ -0,0 +1,339 @@ +#include "npfs.h" + +#define UNIMPLEMENTED + +PWCHAR NpRootDCBName = L"\\"; +PNP_VCB NpVcb; + +RTL_GENERIC_COMPARE_RESULTS +NTAPI +NpEventTableCompareRoutine(IN PRTL_GENERIC_TABLE Table, + IN PVOID FirstStruct, + IN PVOID SecondStruct) +{ + UNIMPLEMENTED; + return GenericEqual; +} + +PVOID +NTAPI +NpEventTableAllocate(IN PRTL_GENERIC_TABLE Table, + IN CLONG ByteSize) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +NTAPI +NpEventTableDeallocate(IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer) +{ + UNIMPLEMENTED; +} + +BOOLEAN +NTAPI +NpDeleteEventTableEntry(IN PRTL_GENERIC_TABLE Table, + IN PVOID Buffer) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +NTAPI +NpDeleteFcb(IN PNP_FCB Fcb, + IN PLIST_ENTRY ListEntry) +{ + PNP_DCB Dcb; + + PAGED_CODE(); + + Dcb = Fcb->ParentDcb; + if (!Fcb->CurrentInstances) KeBugCheckEx(NPFS_FILE_SYSTEM, 0x17025F, 0, 0, 0); + + NpCancelWaiter(&NpVcb->WaitQueue, + &Fcb->FullName, + STATUS_OBJECT_NAME_NOT_FOUND, + ListEntry); + + RemoveEntryList(&Fcb->DcbEntry); + + if ( Fcb->SecurityDescriptor ) + { + ObDereferenceSecurityDescriptor(Fcb->SecurityDescriptor, 1); + } + + RtlRemoveUnicodePrefix(&NpVcb->PrefixTable, &Fcb->PrefixTableEntry); + ExFreePool(Fcb->FullName.Buffer); + ExFreePool(Fcb); + NpCheckForNotify(Dcb, TRUE, ListEntry); +} + +VOID +NTAPI +NpDeleteCcb(IN PNP_CCB Ccb, + IN PLIST_ENTRY ListEntry) +{ + PNP_ROOT_DCB_FCB RootDcbCcb; + PAGED_CODE(); + + RootDcbCcb = (PNP_ROOT_DCB_FCB)Ccb; + if ( Ccb->NodeType == NPFS_NTC_CCB ) + { + RemoveEntryList(&Ccb->CcbEntry); + --Ccb->Fcb->CurrentInstances; + + NpDeleteEventTableEntry(&NpVcb->EventTable, + Ccb->NonPagedCcb->EventBufferClient); + NpDeleteEventTableEntry(&NpVcb->EventTable, + Ccb->NonPagedCcb->EventBufferServer); + NpUninitializeDataQueue(&Ccb->InQueue); + NpUninitializeDataQueue(&Ccb->OutQueue); + NpCheckForNotify(Ccb->Fcb->ParentDcb, 0, ListEntry); + ExDeleteResourceLite(&Ccb->NonPagedCcb->Lock); + NpUninitializeSecurity(Ccb); + if ( Ccb->ClientSession ) + { + ExFreePool(Ccb->ClientSession); + Ccb->ClientSession = 0; + } + ExFreePool(Ccb->NonPagedCcb); + } + else if ( RootDcbCcb->NodeType == NPFS_NTC_ROOT_DCB_CCB && RootDcbCcb->Unknown) + { + ExFreePool(RootDcbCcb->Unknown); + } + + ExFreePool(Ccb); +} + +VOID +NTAPI +NpInitializeVcb(VOID) +{ + PAGED_CODE(); + + RtlZeroMemory(NpVcb, sizeof(*NpVcb)); + + NpVcb->NodeType = NPFS_NTC_VCB; + RtlInitializeUnicodePrefix(&NpVcb->PrefixTable); + ExInitializeResourceLite(&NpVcb->Lock); + RtlInitializeGenericTable(&NpVcb->EventTable, + NpEventTableCompareRoutine, + NpEventTableAllocate, + NpEventTableDeallocate, + 0); + NpInitializeWaitQueue(&NpVcb->WaitQueue); +} + +NTSTATUS +NTAPI +NpCreateRootDcbCcb(IN PNP_ROOT_DCB_FCB* NewRootCcb) +{ + PNP_ROOT_DCB_FCB RootCcb; + PAGED_CODE(); + + RootCcb = ExAllocatePoolWithTag(PagedPool, sizeof(*RootCcb), 'CFpN'); + if (!RootCcb) return STATUS_INSUFFICIENT_RESOURCES; + + RtlZeroMemory(RootCcb, sizeof(*RootCcb)); + RootCcb->NodeType = NPFS_NTC_ROOT_DCB_CCB; + *NewRootCcb = RootCcb; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NpCreateRootDcb(VOID) +{ + PNP_DCB Dcb; + PAGED_CODE(); + + if (NpVcb->RootDcb) + { + KeBugCheckEx(0x25, 0x1700F3, 0, 0, 0); + } + + NpVcb->RootDcb = ExAllocatePoolWithTag(PagedPool, sizeof(*Dcb), 'DFpN'); + if (!NpVcb->RootDcb) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Dcb = NpVcb->RootDcb; + RtlZeroMemory(Dcb, sizeof(*Dcb)); + Dcb->NodeType = NPFS_NTC_ROOT_DCB; + + InitializeListHead(&Dcb->DcbEntry); + InitializeListHead(&Dcb->NotifyList); + InitializeListHead(&Dcb->NotifyList2); + InitializeListHead(&Dcb->FcbList); + + Dcb->FullName.Buffer = NpRootDCBName; + Dcb->FullName.Length = 2; + Dcb->FullName.MaximumLength = 4; + + Dcb->ShortName.Length = Dcb->FullName.Length; + Dcb->ShortName.MaximumLength = Dcb->FullName.MaximumLength; + Dcb->ShortName.Buffer = Dcb->FullName.Buffer; + + if (!RtlInsertUnicodePrefix(&NpVcb->PrefixTable, + &Dcb->FullName, + &Dcb->PrefixTableEntry)) + { + KeBugCheckEx(0x25u, 0x170128, 0, 0, 0); + } + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NpCreateFcb(IN PNP_DCB Dcb, + IN PUNICODE_STRING PipeName, + IN ULONG MaximumInstances, + IN LARGE_INTEGER Timeout, + IN USHORT NamedPipeConfiguration, + IN USHORT NamedPipeType, + OUT PNP_FCB *NewFcb) +{ + PNP_FCB Fcb; + 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)) + { + return STATUS_INVALID_PARAMETER; + } + + RootPipe = FALSE; + if (PipeNameLength == sizeof(WCHAR)) + { + RootPipe = TRUE; + PipeNameLength += sizeof(WCHAR); + } + + Fcb = ExAllocatePoolWithTag(PagedPool, sizeof(*Fcb), 'FfpN'); + if (!Fcb) return STATUS_INSUFFICIENT_RESOURCES; + + RtlZeroMemory(Fcb, sizeof(*Fcb)); + Fcb->MaximumInstances = MaximumInstances; + Fcb->Timeout = Timeout; + Fcb->NodeType = NPFS_NTC_FCB; + Fcb->ParentDcb = Dcb; + InitializeListHead(&Fcb->CcbList); + + NameBuffer = ExAllocatePoolWithTag(PagedPool, + PipeName->Length + (RootPipe ? 4 : 2), + 'nFpN'); + if (!NameBuffer) + { + ExFreePool(Fcb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + InsertTailList(&Dcb->FcbList, &Fcb->DcbEntry); + + BufferOffset = 0; + if (RootPipe) + { + *NameBuffer = 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; + Fcb->FullName.Buffer = NameBuffer; + + Fcb->ShortName.MaximumLength = PipeNameLength - sizeof(WCHAR); + Fcb->ShortName.Length = PipeNameLength - 2 * sizeof(WCHAR); + Fcb->ShortName.Buffer = NameBuffer + 1; + + if (!RtlInsertUnicodePrefix(&NpVcb->PrefixTable, + &Fcb->FullName, + &Fcb->PrefixTableEntry)) + { + KeBugCheckEx(NPFS_FILE_SYSTEM, 0x170222, 0, 0, 0); + } + + Fcb->NamedPipeConfiguration = NamedPipeConfiguration; + Fcb->NamedPipeType = NamedPipeType; + *NewFcb = Fcb; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NpCreateCcb(IN PNP_FCB Fcb, + IN PFILE_OBJECT FileObject, + IN UCHAR State, + IN UCHAR ReadMode, + IN UCHAR CompletionMode, + IN ULONG InQuota, + IN ULONG OutQuota, + OUT PNP_CCB* NewCcb) +{ + PNP_CCB Ccb; + PNP_NONPAGED_CCB CcbNonPaged; + NTSTATUS Status; + PAGED_CODE(); + + Ccb = ExAllocatePoolWithTag(PagedPool, sizeof(*Ccb), 'cFpN'); + if (!Ccb) return STATUS_INSUFFICIENT_RESOURCES; + + CcbNonPaged = ExAllocatePoolWithTag(NonPagedPool, sizeof(*CcbNonPaged), 'cFpN'); + if (!CcbNonPaged) + { + ExFreePool(Ccb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(CcbNonPaged, sizeof(*CcbNonPaged)); + CcbNonPaged->NodeType = NPFS_NTC_NONPAGED_CCB; + + RtlZeroMemory(Ccb, sizeof(*Ccb)); + Ccb->NodeType = NPFS_NTC_CCB; + Ccb->NonPagedCcb = CcbNonPaged; + Ccb->ServerFileObject = FileObject; + Ccb->Fcb = Fcb; + Ccb->NamedPipeState = State; + Ccb->ServerReadMode = ReadMode; + Ccb->ServerCompletionMode = CompletionMode; + + Status = NpInitializeDataQueue(&Ccb->InQueue, InQuota); + if (!NT_SUCCESS(Status)) + { + ExFreePool(CcbNonPaged); + ExFreePool(Ccb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = NpInitializeDataQueue(&Ccb->OutQueue, InQuota); + if (!NT_SUCCESS(Status)) + { + NpUninitializeDataQueue(&Ccb->InQueue); + ExFreePool(CcbNonPaged); + ExFreePool(Ccb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + InsertTailList(&Fcb->CcbList, &Ccb->CcbEntry); + + InitializeListHead(&Ccb->IrpList); + ExInitializeResourceLite(&Ccb->NonPagedCcb->Lock); + *NewCcb = Ccb; + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/drivers/filesystems/npfs_new/strucsup.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/npfs_new/waitsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/waitsup.c (added) +++ trunk/reactos/drivers/filesystems/npfs_new/waitsup.c [iso-8859-1] Sat Sep 7 15:32:29 2013 @@ -0,0 +1,35 @@ +#include "npfs.h" + +VOID +NTAPI +NpInitializeWaitQueue(IN PNP_WAIT_QUEUE WaitQueue) +{ + InitializeListHead(&WaitQueue->WaitList); + KeInitializeSpinLock(&WaitQueue->WaitLock); +} + +NTSTATUS +NTAPI +NpCancelWaiter(IN PNP_WAIT_QUEUE WaitQueue, + IN PUNICODE_STRING PipeName, + IN NTSTATUS Status, + IN PLIST_ENTRY ListEntry) +{ + UNICODE_STRING DestinationString; + KIRQL OldIrql; + PWCHAR Buffer; + + Buffer = ExAllocatePoolWithTag(NonPagedPool, PipeName->Length,'tFpN'); + if (!Buffer) return STATUS_INSUFFICIENT_RESOURCES; + + RtlInitEmptyUnicodeString(&DestinationString, Buffer, PipeName->Length); + RtlUpcaseUnicodeString(&DestinationString, PipeName, FALSE); + + OldIrql = KfAcquireSpinLock(&WaitQueue->WaitLock); + + ASSERT(IsListEmpty(&WaitQueue->WaitList) == TRUE); + + KfReleaseSpinLock(&WaitQueue->WaitLock, OldIrql); + ExFreePool(DestinationString.Buffer); + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/filesystems/npfs_new/waitsup.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[aandrejevic] 59995: [SOFT386] Add the instructions implemented in the previous commit to the opcode table.
by aandrejevic＠svn.reactos.org 05 Sep '13

05 Sep '13

Author: aandrejevic Date: Thu Sep 5 23:50:42 2013 New Revision: 59995 URL: http://svn.reactos.org/svn/reactos?rev=59995&view=rev Log: [SOFT386] Add the instructions implemented in the previous commit to the opcode table. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Sep 5 23:50:42 2013 @@ -156,10 +156,10 @@ NULL, // TODO: OPCODE 0x81 NOT SUPPORTED NULL, // TODO: OPCODE 0x82 NOT SUPPORTED NULL, // TODO: OPCODE 0x83 NOT SUPPORTED - NULL, // TODO: OPCODE 0x84 NOT SUPPORTED - NULL, // TODO: OPCODE 0x85 NOT SUPPORTED - NULL, // TODO: OPCODE 0x86 NOT SUPPORTED - NULL, // TODO: OPCODE 0x87 NOT SUPPORTED + Soft386OpcodeTestByteModrm, + Soft386OpcodeTestModrm, + Soft386OpcodeXchgByteModrm, + Soft386OpcodeXchgModrm, NULL, // TODO: OPCODE 0x88 NOT SUPPORTED NULL, // TODO: OPCODE 0x89 NOT SUPPORTED NULL, // TODO: OPCODE 0x8A NOT SUPPORTED

1 0

[aandrejevic] 59994: [SOFT386] Implement the TEST instruction, and the XCHG instruction which uses MOD-REG-R/M for operands.
by aandrejevic＠svn.reactos.org 05 Sep '13

05 Sep '13

Author: aandrejevic Date: Thu Sep 5 23:48:07 2013 New Revision: 59994 URL: http://svn.reactos.org/svn/reactos?rev=59994&view=rev Log: [SOFT386] Implement the TEST instruction, and the XCHG instruction which uses MOD-REG-R/M for operands. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Sep 5 23:48:07 2013 @@ -2290,3 +2290,323 @@ return TRUE; } + +SOFT386_OPCODE_HANDLER(Soft386OpcodeTestByteModrm) +{ + UCHAR FirstValue, SecondValue, Result; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x84); + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + else if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Soft386ReadModrmByteOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + /* Calculate the result */ + Result = FirstValue & SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* The result is discarded */ + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeTestModrm) +{ + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x85); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_OPSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue & SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + } + else + { + USHORT FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue & SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + } + + /* The result is discarded */ + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeXchgByteModrm) +{ + UCHAR FirstValue, SecondValue; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x86); + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + else if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Soft386ReadModrmByteOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write the value from the register to the R/M */ + if (!Soft386WriteModrmByteOperands(State, + &ModRegRm, + FALSE, + FirstValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write the value from the R/M to the register */ + if (!Soft386WriteModrmByteOperands(State, + &ModRegRm, + TRUE, + SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeXchgModrm) +{ + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x87); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_OPSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG FirstValue, SecondValue; + + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write the value from the register to the R/M */ + if (!Soft386WriteModrmDwordOperands(State, + &ModRegRm, + FALSE, + FirstValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write the value from the R/M to the register */ + if (!Soft386WriteModrmDwordOperands(State, + &ModRegRm, + TRUE, + SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + USHORT FirstValue, SecondValue; + + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write the value from the register to the R/M */ + if (!Soft386WriteModrmWordOperands(State, + &ModRegRm, + FALSE, + FirstValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write the value from the R/M to the register */ + if (!Soft386WriteModrmWordOperands(State, + &ModRegRm, + TRUE, + SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + } + + /* The result is discarded */ + return TRUE; +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Thu Sep 5 23:48:07 2013 @@ -66,5 +66,9 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeXorModrm); SOFT386_OPCODE_HANDLER(Soft386OpcodeXorAl); SOFT386_OPCODE_HANDLER(Soft386OpcodeXorEax); +SOFT386_OPCODE_HANDLER(Soft386OpcodeTestByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeTestModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeXchgByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeXchgModrm); #endif // _OPCODES_H_

1 0

[hbelusca] 59993: [SOFT386]: Fix build (addendum to revision 59990).
by hbelusca＠svn.reactos.org 04 Sep '13

04 Sep '13

Author: hbelusca Date: Wed Sep 4 20:40:43 2013 New Revision: 59993 URL: http://svn.reactos.org/svn/reactos?rev=59993&view=rev Log: [SOFT386]: Fix build (addendum to revision 59990). Modified: branches/ntvdm/lib/soft386/common.c Modified: branches/ntvdm/lib/soft386/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.c [iso-8859-1] Wed Sep 4 20:40:43 2013 @@ -1243,7 +1243,7 @@ inline BOOLEAN -Soft386WriteModrnDwordOperands(PSOFT386_STATE State, +Soft386WriteModrmDwordOperands(PSOFT386_STATE State, PSOFT386_MOD_REG_RM ModRegRm, BOOLEAN WriteRegister, ULONG Value)

1 0

[tfaber] 59992: [KERNEL32] - Fix LoaderLock assert in TerminateThread. Spotted by Amine
by tfaber＠svn.reactos.org 04 Sep '13

04 Sep '13

Author: tfaber Date: Wed Sep 4 19:53:59 2013 New Revision: 59992 URL: http://svn.reactos.org/svn/reactos?rev=59992&view=rev Log: [KERNEL32] - Fix LoaderLock assert in TerminateThread. Spotted by Amine Modified: trunk/reactos/dll/win32/kernel32/client/thread.c Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Wed Sep 4 19:53:59 2013 @@ -571,8 +571,10 @@ IN DWORD dwExitCode) { NTSTATUS Status; +#if DBG PRTL_CRITICAL_SECTION LoaderLock; THREAD_BASIC_INFORMATION ThreadInfo; +#endif /* DBG */ /* Check for invalid thread handle */ if (!hThread) @@ -582,6 +584,7 @@ return FALSE; } +#if DBG /* Get the loader lock */ LoaderLock = NtCurrentPeb()->LoaderLock; if (LoaderLock) @@ -592,13 +595,14 @@ &ThreadInfo, sizeof(ThreadInfo), NULL); - if (!NT_SUCCESS(Status)) - { - /* Assert that we don't hold the loader lock */ - ASSERT(NtCurrentTeb()->ClientId.UniqueThread != ThreadInfo.ClientId.UniqueThread); - ASSERT(NtCurrentTeb()->ClientId.UniqueThread != LoaderLock->OwningThread); - } - } + if (NT_SUCCESS(Status)) + { + /* If terminating the current thread, we must not hold the loader lock */ + if (NtCurrentTeb()->ClientId.UniqueThread == ThreadInfo.ClientId.UniqueThread) + ASSERT(NtCurrentTeb()->ClientId.UniqueThread != LoaderLock->OwningThread); + } + } +#endif /* DBG */ /* Now terminate the thread */ Status = NtTerminateThread(hThread, dwExitCode);

1 0

[aandrejevic] 59991: [SOFT386] Implement the OR, AND and XOR instructions.
by aandrejevic＠svn.reactos.org 04 Sep '13

04 Sep '13

Author: aandrejevic Date: Wed Sep 4 18:28:58 2013 New Revision: 59991 URL: http://svn.reactos.org/svn/reactos?rev=59991&view=rev Log: [SOFT386] Implement the OR, AND and XOR instructions. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Wed Sep 4 18:28:58 2013 @@ -32,12 +32,12 @@ Soft386OpcodeAddEax, NULL, // TODO: OPCODE 0x06 NOT SUPPORTED NULL, // TODO: OPCODE 0x07 NOT SUPPORTED - NULL, // TODO: OPCODE 0x08 NOT SUPPORTED - NULL, // TODO: OPCODE 0x09 NOT SUPPORTED - NULL, // TODO: OPCODE 0x0A NOT SUPPORTED - NULL, // TODO: OPCODE 0x0B NOT SUPPORTED - NULL, // TODO: OPCODE 0x0C NOT SUPPORTED - NULL, // TODO: OPCODE 0x0D NOT SUPPORTED + Soft386OpcodeOrByteModrm, + Soft386OpcodeOrModrm, + Soft386OpcodeOrByteModrm, + Soft386OpcodeOrModrm, + Soft386OpcodeOrAl, + Soft386OpcodeOrEax, NULL, // TODO: OPCODE 0x0E NOT SUPPORTED NULL, // TODO: OPCODE 0x0F NOT SUPPORTED NULL, // TODO: OPCODE 0x10 NOT SUPPORTED @@ -56,12 +56,12 @@ NULL, // TODO: OPCODE 0x1D NOT SUPPORTED NULL, // TODO: OPCODE 0x1E NOT SUPPORTED NULL, // TODO: OPCODE 0x1F NOT SUPPORTED - NULL, // TODO: OPCODE 0x20 NOT SUPPORTED - NULL, // TODO: OPCODE 0x21 NOT SUPPORTED - NULL, // TODO: OPCODE 0x22 NOT SUPPORTED - NULL, // TODO: OPCODE 0x23 NOT SUPPORTED - NULL, // TODO: OPCODE 0x24 NOT SUPPORTED - NULL, // TODO: OPCODE 0x25 NOT SUPPORTED + Soft386OpcodeAndByteModrm, + Soft386OpcodeAndModrm, + Soft386OpcodeAndByteModrm, + Soft386OpcodeAndModrm, + Soft386OpcodeAndAl, + Soft386OpcodeAndEax, Soft386OpcodePrefix, NULL, // TODO: OPCODE 0x27 NOT SUPPORTED NULL, // TODO: OPCODE 0x28 NOT SUPPORTED @@ -72,12 +72,12 @@ NULL, // TODO: OPCODE 0x2D NOT SUPPORTED Soft386OpcodePrefix, NULL, // TODO: OPCODE 0x2F NOT SUPPORTED - NULL, // TODO: OPCODE 0x30 NOT SUPPORTED - NULL, // TODO: OPCODE 0x31 NOT SUPPORTED - NULL, // TODO: OPCODE 0x32 NOT SUPPORTED - NULL, // TODO: OPCODE 0x33 NOT SUPPORTED - NULL, // TODO: OPCODE 0x34 NOT SUPPORTED - NULL, // TODO: OPCODE 0x35 NOT SUPPORTED + Soft386OpcodeXorByteModrm, + Soft386OpcodeXorModrm, + Soft386OpcodeXorByteModrm, + Soft386OpcodeXorModrm, + Soft386OpcodeXorAl, + Soft386OpcodeXorEax, Soft386OpcodePrefix, NULL, // TODO: OPCODE 0x37 NOT SUPPORTED NULL, // TODO: OPCODE 0x38 NOT SUPPORTED @@ -282,6 +282,8 @@ NULL, // TODO: OPCODE 0xFF NOT SUPPORTED }; +/* PUBLIC FUNCTIONS ***********************************************************/ + SOFT386_OPCODE_HANDLER(Soft386OpcodePrefix) { BOOLEAN Valid = FALSE; @@ -1490,3 +1492,801 @@ return TRUE; } + +SOFT386_OPCODE_HANDLER(Soft386OpcodeOrByteModrm) +{ + UCHAR FirstValue, SecondValue, Result; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x08); + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + else if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Soft386ReadModrmByteOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue | SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeOrModrm) +{ + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x09); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_OPSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue | SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + USHORT FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue | SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeOrAl) +{ + UCHAR FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + UCHAR SecondValue, Result; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x0C); + + if (State->PrefixFlags) + { + /* This opcode doesn't take any prefixes */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (!Soft386FetchByte(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue | SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Result; + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeOrEax) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x0D); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + ULONG FirstValue = State->GeneralRegs[SOFT386_REG_EAX].Long; + ULONG SecondValue, Result; + + if (!Soft386FetchDword(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue | SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Result; + } + else + { + USHORT FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowWord; + USHORT SecondValue, Result; + + if (!Soft386FetchWord(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue | SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = Result; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAndByteModrm) +{ + UCHAR FirstValue, SecondValue, Result; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x20); + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + else if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Soft386ReadModrmByteOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue & SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAndModrm) +{ + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x21); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_OPSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue & SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + USHORT FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue & SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAndAl) +{ + UCHAR FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + UCHAR SecondValue, Result; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x24); + + if (State->PrefixFlags) + { + /* This opcode doesn't take any prefixes */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (!Soft386FetchByte(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue & SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Result; + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAndEax) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x25); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + ULONG FirstValue = State->GeneralRegs[SOFT386_REG_EAX].Long; + ULONG SecondValue, Result; + + if (!Soft386FetchDword(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue & SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Result; + } + else + { + USHORT FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowWord; + USHORT SecondValue, Result; + + if (!Soft386FetchWord(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue & SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = Result; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeXorByteModrm) +{ + UCHAR FirstValue, SecondValue, Result; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x30); + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + else if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Soft386ReadModrmByteOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue ^ SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmByteOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeXorModrm) +{ + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x31); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_OPSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue ^ SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + USHORT FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue ^ SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeXorAl) +{ + UCHAR FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + UCHAR SecondValue, Result; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x34); + + if (State->PrefixFlags) + { + /* This opcode doesn't take any prefixes */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (!Soft386FetchByte(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue ^ SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Result; + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeXorEax) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x35); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + ULONG FirstValue = State->GeneralRegs[SOFT386_REG_EAX].Long; + ULONG SecondValue, Result; + + if (!Soft386FetchDword(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue ^ SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Result; + } + else + { + USHORT FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowWord; + USHORT SecondValue, Result; + + if (!Soft386FetchWord(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue ^ SecondValue; + + /* Update the flags */ + State->Flags.Cf = FALSE; + State->Flags.Of = FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = Result; + } + + return TRUE; +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Wed Sep 4 18:28:58 2013 @@ -54,5 +54,17 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeAddModrm); SOFT386_OPCODE_HANDLER(Soft386OpcodeAddAl); SOFT386_OPCODE_HANDLER(Soft386OpcodeAddEax); +SOFT386_OPCODE_HANDLER(Soft386OpcodeOrByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeOrModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeOrAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeOrEax); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAndByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAndModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAndAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAndEax); +SOFT386_OPCODE_HANDLER(Soft386OpcodeXorByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeXorModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeXorAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeXorEax); #endif // _OPCODES_H_

1 0

[aandrejevic] 59990: [SOFT386] Fix a typo. Use a macro (SOFT386_OPCODE_HANDLER) for function definitions of opcode handlers. Implement the rest of the ADD opcodes.
by aandrejevic＠svn.reactos.org 04 Sep '13

04 Sep '13

Author: aandrejevic Date: Wed Sep 4 16:36:39 2013 New Revision: 59990 URL: http://svn.reactos.org/svn/reactos?rev=59990&view=rev Log: [SOFT386] Fix a typo. Use a macro (SOFT386_OPCODE_HANDLER) for function definitions of opcode handlers. Implement the rest of the ADD opcodes. Modified: branches/ntvdm/lib/soft386/common.h branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.h [iso-8859-1] Wed Sep 4 16:36:39 2013 @@ -201,7 +201,7 @@ inline BOOLEAN -Soft386WriteModrnDwordOperands +Soft386WriteModrmDwordOperands ( PSOFT386_STATE State, PSOFT386_MOD_REG_RM ModRegRm, Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Wed Sep 4 16:36:39 2013 @@ -24,12 +24,12 @@ SOFT386_OPCODE_HANDLER_PROC Soft386OpcodeHandlers[SOFT386_NUM_OPCODE_HANDLERS] = { - Soft386OpcodeAddByteModrm, // TODO: OPCODE 0x00 NOT SUPPORTED - NULL, // TODO: OPCODE 0x01 NOT SUPPORTED - Soft386OpcodeAddByteModrm, // TODO: OPCODE 0x02 NOT SUPPORTED - NULL, // TODO: OPCODE 0x03 NOT SUPPORTED - NULL, // TODO: OPCODE 0x04 NOT SUPPORTED - NULL, // TODO: OPCODE 0x05 NOT SUPPORTED + Soft386OpcodeAddByteModrm, + Soft386OpcodeAddModrm, + Soft386OpcodeAddByteModrm, + Soft386OpcodeAddModrm, + Soft386OpcodeAddAl, + Soft386OpcodeAddEax, NULL, // TODO: OPCODE 0x06 NOT SUPPORTED NULL, // TODO: OPCODE 0x07 NOT SUPPORTED NULL, // TODO: OPCODE 0x08 NOT SUPPORTED @@ -282,9 +282,7 @@ NULL, // TODO: OPCODE 0xFF NOT SUPPORTED }; -BOOLEAN -FASTCALL -Soft386OpcodePrefix(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodePrefix) { BOOLEAN Valid = FALSE; @@ -445,9 +443,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeIncrement(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeIncrement) { ULONG Value; BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; @@ -490,9 +486,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeDecrement(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeDecrement) { ULONG Value; BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; @@ -535,9 +529,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodePushReg(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodePushReg) { if ((State->PrefixFlags != SOFT386_PREFIX_OPSIZE) && (State->PrefixFlags != 0)) @@ -554,9 +546,7 @@ return Soft386StackPush(State, State->GeneralRegs[Opcode & 0x07].Long); } -BOOLEAN -FASTCALL -Soft386OpcodePopReg(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodePopReg) { ULONG Value; BOOLEAN Size = State->SegmentRegs[SOFT386_REG_SS].Size; @@ -587,9 +577,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeNop(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeNop) { if (State->PrefixFlags & ~(SOFT386_PREFIX_OPSIZE | SOFT386_PREFIX_REP)) { @@ -607,9 +595,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeExchangeEax(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeExchangeEax) { INT Reg = Opcode & 0x07; BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; @@ -650,9 +636,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeShortConditionalJmp(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeShortConditionalJmp) { BOOLEAN Jump = FALSE; CHAR Offset = 0; @@ -742,9 +726,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeClearCarry(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeClearCarry) { /* Make sure this is the right instruction */ ASSERT(Opcode == 0xF8); @@ -761,9 +743,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeSetCarry(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeSetCarry) { /* Make sure this is the right instruction */ ASSERT(Opcode == 0xF9); @@ -780,9 +760,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeComplCarry(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeComplCarry) { /* Make sure this is the right instruction */ ASSERT(Opcode == 0xF5); @@ -799,9 +777,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeClearInt(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeClearInt) { /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFA); @@ -839,9 +815,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeSetInt(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeSetInt) { /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFB); @@ -879,9 +853,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeClearDir(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeClearDir) { /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFC); @@ -898,9 +870,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeSetDir(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeSetDir) { /* Make sure this is the right instruction */ ASSERT(Opcode == 0xFD); @@ -917,9 +887,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeHalt(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeHalt) { /* Make sure this is the right instruction */ ASSERT(Opcode == 0xF4); @@ -945,9 +913,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeInByte(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeInByte) { UCHAR Data; ULONG Port; @@ -982,9 +948,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeIn(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeIn) { ULONG Port; BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; @@ -1048,9 +1012,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeOutByte(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeOutByte) { UCHAR Data; ULONG Port; @@ -1085,9 +1047,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeOut(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeOut) { ULONG Port; BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; @@ -1147,9 +1107,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeShortJump(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeShortJump) { CHAR Offset = 0; @@ -1169,9 +1127,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeMovRegImm(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovRegImm) { BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; @@ -1222,9 +1178,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeMovByteRegImm(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovByteRegImm) { UCHAR Value; @@ -1259,9 +1213,7 @@ return TRUE; } -BOOLEAN -FASTCALL -Soft386OpcodeAddByteModrm(PSOFT386_STATE State, UCHAR Opcode) +SOFT386_OPCODE_HANDLER(Soft386OpcodeAddByteModrm) { UCHAR FirstValue, SecondValue, Result; SOFT386_MOD_REG_RM ModRegRm; @@ -1319,3 +1271,222 @@ Opcode & SOFT386_OPCODE_WRITE_REG, Result); } + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAddModrm) +{ + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFD) == 0x01); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags + & ~(SOFT386_PREFIX_ADSIZE + | SOFT386_PREFIX_OPSIZE + | SOFT386_PREFIX_SEG + | SOFT386_PREFIX_LOCK)) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check the operand size */ + if (OperandSize) + { + ULONG FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmDwordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue; + + /* Update the flags */ + State->Flags.Cf = (Result < FirstValue) && (Result < SecondValue); + State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) == (SecondValue & SIGN_FLAG_LONG)) + && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } + else + { + USHORT FirstValue, SecondValue, Result; + + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue; + + /* Update the flags */ + State->Flags.Cf = (Result < FirstValue) && (Result < SecondValue); + State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) == (SecondValue & SIGN_FLAG_WORD)) + && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + Opcode & SOFT386_OPCODE_WRITE_REG, + Result); + } +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAddAl) +{ + UCHAR FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + UCHAR SecondValue, Result; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x04); + + if (State->PrefixFlags) + { + /* This opcode doesn't take any prefixes */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (!Soft386FetchByte(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue; + + /* Update the flags */ + State->Flags.Cf = (Result < FirstValue) && (Result < SecondValue); + State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) == (SecondValue & SIGN_FLAG_BYTE)) + && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_BYTE) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Result; + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeAddEax) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x05); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + ULONG FirstValue = State->GeneralRegs[SOFT386_REG_EAX].Long; + ULONG SecondValue, Result; + + if (!Soft386FetchDword(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue; + + /* Update the flags */ + State->Flags.Cf = (Result < FirstValue) && (Result < SecondValue); + State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) == (SecondValue & SIGN_FLAG_LONG)) + && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Result; + } + else + { + USHORT FirstValue = State->GeneralRegs[SOFT386_REG_EAX].LowWord; + USHORT SecondValue, Result; + + if (!Soft386FetchWord(State, &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Calculate the result */ + Result = FirstValue + SecondValue; + + /* Update the flags */ + State->Flags.Cf = (Result < FirstValue) && (Result < SecondValue); + State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) == (SecondValue & SIGN_FLAG_WORD)) + && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); + State->Flags.Af = (((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) ? TRUE : FALSE; + State->Flags.Zf = (Result == 0) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; + State->Flags.Pf = Soft386CalculateParity(Result); + + /* Write back the result */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = Result; + } + + return TRUE; +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Wed Sep 4 16:36:39 2013 @@ -17,6 +17,9 @@ #define SOFT386_NUM_OPCODE_HANDLERS 256 #define SOFT386_OPCODE_WRITE_REG (1 << 1) +#define SOFT386_OPCODE_HANDLER(x) BOOLEAN\ + FASTCALL\ + (x)(PSOFT386_STATE State, UCHAR Opcode) typedef BOOLEAN (FASTCALL *SOFT386_OPCODE_HANDLER_PROC)(PSOFT386_STATE, UCHAR); @@ -24,196 +27,32 @@ SOFT386_OPCODE_HANDLER_PROC Soft386OpcodeHandlers[SOFT386_NUM_OPCODE_HANDLERS]; -BOOLEAN -FASTCALL -Soft386OpcodePrefix -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeIncrement -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeDecrement -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodePushReg -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodePopReg -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeNop -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeExchangeEax -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeShortConditionalJmp -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeClearCarry -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeSetCarry -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeComplCarry -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeClearInt -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeSetInt -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeClearDir -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeSetDir -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeHalt -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeInByte -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeIn -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeOutByte -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeOut -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeShortJump -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeMovRegImm -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeMovByteRegImm -( - PSOFT386_STATE State, - UCHAR Opcode -); - -BOOLEAN -FASTCALL -Soft386OpcodeAddByteModrm -( - PSOFT386_STATE State, - UCHAR Opcode -); +SOFT386_OPCODE_HANDLER(Soft386OpcodePrefix); +SOFT386_OPCODE_HANDLER(Soft386OpcodeIncrement); +SOFT386_OPCODE_HANDLER(Soft386OpcodeDecrement); +SOFT386_OPCODE_HANDLER(Soft386OpcodePushReg); +SOFT386_OPCODE_HANDLER(Soft386OpcodePopReg); +SOFT386_OPCODE_HANDLER(Soft386OpcodeNop); +SOFT386_OPCODE_HANDLER(Soft386OpcodeExchangeEax); +SOFT386_OPCODE_HANDLER(Soft386OpcodeShortConditionalJmp); +SOFT386_OPCODE_HANDLER(Soft386OpcodeClearCarry); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSetCarry); +SOFT386_OPCODE_HANDLER(Soft386OpcodeComplCarry); +SOFT386_OPCODE_HANDLER(Soft386OpcodeClearInt); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSetInt); +SOFT386_OPCODE_HANDLER(Soft386OpcodeClearDir); +SOFT386_OPCODE_HANDLER(Soft386OpcodeSetDir); +SOFT386_OPCODE_HANDLER(Soft386OpcodeHalt); +SOFT386_OPCODE_HANDLER(Soft386OpcodeInByte); +SOFT386_OPCODE_HANDLER(Soft386OpcodeIn); +SOFT386_OPCODE_HANDLER(Soft386OpcodeOutByte); +SOFT386_OPCODE_HANDLER(Soft386OpcodeOut); +SOFT386_OPCODE_HANDLER(Soft386OpcodeShortJump); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovRegImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovByteRegImm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAddByteModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAddModrm); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAddAl); +SOFT386_OPCODE_HANDLER(Soft386OpcodeAddEax); #endif // _OPCODES_H_

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs