Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 22788: - Same sort of changes for NtSetVolumeInformationFile.
by ion＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: ion Date: Mon Jul 3 02:19:29 2006 New Revision: 22788 URL: http://svn.reactos.org/svn/reactos?rev=22788&view=rev Log: - Same sort of changes for NtSetVolumeInformationFile. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Mon Jul 3 02:19:29 2006 @@ -25,7 +25,7 @@ // // TODO: // - Lock/Unlock <= DONE -// - Query/Set Volume Info +// - Query/Set Volume Info <= DONE // - Read/Write file // - QuerySet/ File Info // - NtQueryDirectoryFile @@ -2649,7 +2649,6 @@ BOOLEAN LocalEvent = FALSE; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - OBJECT_HANDLE_INFORMATION HandleInformation; IO_STATUS_BLOCK KernelIosb; PAGED_CODE(); @@ -2684,7 +2683,7 @@ IoFileObjectType, PreviousMode, (PVOID*)&FileObject, - &HandleInformation); + NULL); if (!NT_SUCCESS(Status)) return Status; /* Check if we should use Sync IO or not */ @@ -2788,125 +2787,135 @@ IN FS_INFORMATION_CLASS FsInformationClass) { PFILE_OBJECT FileObject; + PIRP Irp; + PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; - PIRP Irp; + PKEVENT Event = NULL; + BOOLEAN LocalEvent = FALSE; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PIO_STACK_LOCATION StackPtr; - PVOID SystemBuffer; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - + IO_STATUS_BLOCK KernelIosb; + PAGED_CODE(); + + /* Check if we're called from user mode */ if (PreviousMode != KernelMode) { + /* Enter SEH for probing */ _SEH_TRY { - if (IoStatusBlock) - { - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - } - + /* Probe the I/O Status block */ + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + + /* Probe the information */ if (Length) ProbeForRead(FsInformation, Length, 1); } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Check if probing failed */ if (!NT_SUCCESS(Status)) return Status; } + /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, - FILE_WRITE_ATTRIBUTES, - NULL, + 0, // FIXME + IoFileObjectType, PreviousMode, (PVOID*)&FileObject, NULL); - if (Status != STATUS_SUCCESS) return Status; - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize,TRUE); - if (!Irp) - { + if (!NT_SUCCESS(Status)) return Status; + + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Lock it */ + IopLockFileObject(FileObject); + } + else + { + /* Use local event */ + Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); + KeInitializeEvent(Event, SynchronizationEvent, FALSE); + LocalEvent = TRUE; + } + + /* Get the device object */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + + /* Clear File Object event */ + KeClearEvent(&FileObject->Event); + + /* Allocate the IRP */ + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return IopCleanupFailedIrp(FileObject, Event); + + /* Set up the IRP */ + Irp->RequestorMode = PreviousMode; + Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + Irp->UserIosb = (LocalEvent) ? &KernelIosb : IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? Event : NULL; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + Irp->UserBuffer = FsInformation; + Irp->AssociatedIrp.SystemBuffer = NULL; + Irp->MdlAddress = NULL; + + /* Set up Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_SET_VOLUME_INFORMATION; + StackPtr->FileObject = FileObject; + + /* Allocate system buffer */ + Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + if (!Irp->AssociatedIrp.SystemBuffer) + { + /* Fail */ + IoFreeIrp(Irp); + if (Event) ObDereferenceObject(Event); ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_SYSB); - if (!SystemBuffer) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto failfreeirp; - } - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - /* no need to probe again */ - RtlCopyMemory(SystemBuffer, FsInformation, Length); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(SystemBuffer, TAG_SYSB); -failfreeirp: - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return Status; - } - } - else - { - RtlCopyMemory(SystemBuffer, FsInformation, Length); - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; - Irp->AssociatedIrp.SystemBuffer = SystemBuffer; - KeResetEvent( &FileObject->Event ); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_SET_VOLUME_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; + /* Copy the data into the buffer */ + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, FsInformation, Length); + + /* Set the flags for this buffered + deferred I/O */ + Irp->Flags |= (IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER); + + /* Set Parameters */ StackPtr->Parameters.SetVolume.Length = Length; - StackPtr->Parameters.SetVolume.FsInformationClass = - FsInformationClass; - - Status = IoCallDriver(DeviceObject,Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - UserRequest, - PreviousMode, - FALSE, - NULL); - _SEH_TRY - { - Status = IoStatusBlock->Status; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - ExFreePool(SystemBuffer); + StackPtr->Parameters.SetVolume.FsInformationClass = FsInformationClass; + + /* Call the Driver */ + Status = IopPerformSynchronousRequest(DeviceObject, + Irp, + FileObject, + TRUE, + PreviousMode, + !LocalEvent, + IopOtherTransfer); + + /* Check if this was async I/O */ + if (LocalEvent) + { + /* It was, finalize this request */ + Status = IopFinalizeAsynchronousIo(Status, + Event, + Irp, + PreviousMode, + &KernelIosb, + IoStatusBlock); + } + + /* Return status */ return Status; }

1 0

[ion] 22787: - Fix sync usage in NtQueryVolumeInformationFile, set the right IRP flags so that the I/O manager can handle copying the data back and freeing the buffer, and enable deferred completion.
by ion＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: ion Date: Mon Jul 3 02:14:20 2006 New Revision: 22787 URL: http://svn.reactos.org/svn/reactos?rev=22787&view=rev Log: - Fix sync usage in NtQueryVolumeInformationFile, set the right IRP flags so that the I/O manager can handle copying the data back and freeing the buffer, and enable deferred completion. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Mon Jul 3 02:14:20 2006 @@ -2642,111 +2642,137 @@ IN FS_INFORMATION_CLASS FsInformationClass) { PFILE_OBJECT FileObject; + PIRP Irp; + PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; - PIRP Irp; + PKEVENT Event = NULL; + BOOLEAN LocalEvent = FALSE; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PIO_STACK_LOCATION StackPtr; - PVOID SystemBuffer; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - + OBJECT_HANDLE_INFORMATION HandleInformation; + IO_STATUS_BLOCK KernelIosb; + PAGED_CODE(); + + /* Check if we're called from user mode */ if (PreviousMode != KernelMode) { + /* Enter SEH for probing */ _SEH_TRY { - if (IoStatusBlock) - { - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - } - + /* Probe the I/O Status block */ + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + + /* Probe the information */ if (Length) ProbeForWrite(FsInformation, Length, 1); } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - + /* Check if probing failed */ + if (!NT_SUCCESS(Status)) return Status; + } + + /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, - 0, /* FIXME - depends on the information class! */ + 0, // FIXME IoFileObjectType, PreviousMode, (PVOID*)&FileObject, - NULL); + &HandleInformation); if (!NT_SUCCESS(Status)) return Status; - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (!Irp) - { + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Lock it */ + IopLockFileObject(FileObject); + } + else + { + /* Use local event */ + Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); + KeInitializeEvent(Event, SynchronizationEvent, FALSE); + LocalEvent = TRUE; + } + + /* Get the device object */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + + /* Clear File Object event */ + KeClearEvent(&FileObject->Event); + + /* Allocate the IRP */ + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return IopCleanupFailedIrp(FileObject, Event); + + /* Set up the IRP */ + Irp->RequestorMode = PreviousMode; + Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + Irp->UserIosb = (LocalEvent) ? &KernelIosb : IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? Event : NULL; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + Irp->UserBuffer = FsInformation; + Irp->AssociatedIrp.SystemBuffer = NULL; + Irp->MdlAddress = NULL; + + /* Set up Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; + StackPtr->FileObject = FileObject; + + /* Allocate system buffer */ + Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + if (!Irp->AssociatedIrp.SystemBuffer) + { + /* Fail */ + IoFreeIrp(Irp); + if (Event) ObDereferenceObject(Event); ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_SYSB); - if (!SystemBuffer) - { - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - - Irp->RequestorMode = PreviousMode; - Irp->AssociatedIrp.SystemBuffer = SystemBuffer; - KeResetEvent( &FileObject->Event ); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; + /* Set the flags for this buffered + deferred I/O */ + Irp->Flags |= (IRP_BUFFERED_IO | + IRP_DEALLOCATE_BUFFER | + IRP_INPUT_OPERATION | + IRP_DEFER_IO_COMPLETION); + + /* Set Parameters */ StackPtr->Parameters.QueryVolume.Length = Length; - StackPtr->Parameters.QueryVolume.FsInformationClass = - FsInformationClass; - - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - UserRequest, - PreviousMode, - FALSE, - NULL); - Status = IoStatusBlock->Status; - } - - if (NT_SUCCESS(Status)) - { - _SEH_TRY - { - RtlCopyMemory(FsInformation, - SystemBuffer, - IoStatusBlock->Information); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - ExFreePool(SystemBuffer); + StackPtr->Parameters.QueryVolume.FsInformationClass = FsInformationClass; + + /* Call the Driver */ + Status = IopPerformSynchronousRequest(DeviceObject, + Irp, + FileObject, + TRUE, + PreviousMode, + !LocalEvent, + IopOtherTransfer); + + /* Check if this was async I/O */ + if (LocalEvent) + { + /* It was, finalize this request */ + Status = IopFinalizeAsynchronousIo(Status, + Event, + Irp, + PreviousMode, + &KernelIosb, + IoStatusBlock); + } + + /* Return status */ return Status; }

1 0

[ion] 22786: - Add proper sync handling to NtUnlockFile.
by ion＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: ion Date: Mon Jul 3 02:07:20 2006 New Revision: 22786 URL: http://svn.reactos.org/svn/reactos?rev=22786&view=rev Log: - Add proper sync handling to NtUnlockFile. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Mon Jul 3 02:07:20 2006 @@ -20,6 +20,17 @@ __FUNCTION__, Irp); #endif + +/// +// +// TODO: +// - Lock/Unlock <= DONE +// - Query/Set Volume Info +// - Read/Write file +// - QuerySet/ File Info +// - NtQueryDirectoryFile +// +/// /* PRIVATE FUNCTIONS *********************************************************/ @@ -1104,8 +1115,8 @@ IN BOOLEAN ExclusiveLock) { PFILE_OBJECT FileObject; - PLARGE_INTEGER LocalLength = NULL; - PIRP Irp = NULL; + PLARGE_INTEGER LocalLength; + PIRP Irp; PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; PKEVENT Event = NULL; @@ -2231,19 +2242,19 @@ IN PLARGE_INTEGER Length, IN ULONG Key OPTIONAL) { - PFILE_OBJECT FileObject = NULL; - PLARGE_INTEGER LocalLength = NULL; - PIRP Irp = NULL; + PFILE_OBJECT FileObject; + PLARGE_INTEGER LocalLength; + PIRP Irp; PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; - KEVENT Event; + PKEVENT Event = NULL; BOOLEAN LocalEvent = FALSE; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + LARGE_INTEGER CapturedByteOffset, CapturedLength; NTSTATUS Status = STATUS_SUCCESS; - LARGE_INTEGER CapturedByteOffset, CapturedLength; OBJECT_HANDLE_INFORMATION HandleInformation; + IO_STATUS_BLOCK KernelIosb; PAGED_CODE(); - CapturedByteOffset.QuadPart = 0; CapturedLength.QuadPart = 0; @@ -2256,38 +2267,47 @@ &HandleInformation); if (!NT_SUCCESS(Status)) return Status; + /* Check if we're called from user mode */ if (PreviousMode != KernelMode) { - /* Must have either FILE_READ_DATA or FILE_WRITE_DATA access unless we're - in KernelMode! */ - if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) + /* Must have either FILE_READ_DATA or FILE_WRITE_DATA access */ + if (!(HandleInformation.GrantedAccess & + (FILE_WRITE_DATA | FILE_READ_DATA))) { ObDereferenceObject(FileObject); return STATUS_ACCESS_DENIED; } + /* Enter SEH for probing */ _SEH_TRY { + /* Probe the I/O Status block */ ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); + + /* Probe and capture the large integers */ CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); CapturedLength = ProbeForReadLargeInteger(Length); } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Check if probing failed */ if (!NT_SUCCESS(Status)) { + /* Dereference the object and return exception code */ ObDereferenceObject(FileObject); return Status; } } else { + /* Otherwise, capture them directly */ CapturedByteOffset = *ByteOffset; CapturedLength = *Length; } @@ -2305,23 +2325,38 @@ /* Check if we should use Sync IO or not */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { - /* Use File Object event */ - KeClearEvent(&FileObject->Event); + /* Lock it */ + IopLockFileObject(FileObject); } else { /* Use local event */ - KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); + KeInitializeEvent(Event, SynchronizationEvent, FALSE); LocalEvent = TRUE; } + + /* Clear File Object event */ + KeClearEvent(&FileObject->Event); /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } + if (!Irp) return IopCleanupFailedIrp(FileObject, Event); + + /* Set up the IRP */ + Irp->RequestorMode = PreviousMode; + Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + Irp->UserIosb = (LocalEvent) ? &KernelIosb : IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? Event : NULL; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + + /* Set up Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_LOCK_CONTROL; + StackPtr->MinorFunction = IRP_MN_UNLOCK_SINGLE; + StackPtr->FileObject = FileObject; /* Allocate local buffer */ LocalLength = ExAllocatePoolWithTag(NonPagedPool, @@ -2329,56 +2364,44 @@ TAG_LOCK); if (!LocalLength) { + /* Fail */ IoFreeIrp(Irp); + if (Event) ObDereferenceObject(Event); ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } + + /* Set the length */ *LocalLength = CapturedLength; - /* Set up the IRP */ - Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; - Irp->RequestorMode = PreviousMode; - Irp->UserIosb = IoStatusBlock; - Irp->UserEvent = (LocalEvent) ? &Event : NULL; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->Tail.Overlay.OriginalFileObject = FileObject; - - /* Set up Stack Data */ - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_LOCK_CONTROL; - StackPtr->MinorFunction = IRP_MN_UNLOCK_SINGLE; - StackPtr->FileObject = FileObject; - /* Set Parameters */ + Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID)LocalLength; StackPtr->Parameters.LockControl.Length = LocalLength; StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset; StackPtr->Parameters.LockControl.Key = Key; /* Call the Driver */ - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - if (LocalEvent) - { - KeWaitForSingleObject(&Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = IoStatusBlock->Status; - } - else - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = FileObject->FinalStatus; - } - } - - /* Return the Status */ + Status = IopPerformSynchronousRequest(DeviceObject, + Irp, + FileObject, + FALSE, + PreviousMode, + !LocalEvent, + IopOtherTransfer); + + /* Check if this was async I/O */ + if (LocalEvent) + { + /* It was, finalize this request */ + Status = IopFinalizeAsynchronousIo(Status, + Event, + Irp, + PreviousMode, + &KernelIosb, + IoStatusBlock); + } + + /* Return status */ return Status; }

1 0

[fireball] 22785: Mikhail Zvyozdochkin: Fix compiling on linux (adding missing headers inclusion)
by fireball＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: fireball Date: Mon Jul 3 02:03:40 2006 New Revision: 22785 URL: http://svn.reactos.org/svn/reactos?rev=22785&view=rev Log: Mikhail Zvyozdochkin: Fix compiling on linux (adding missing headers inclusion) Modified: trunk/reactos/tools/rbuild/pch.h trunk/reactos/tools/ssprintf.cpp Modified: trunk/reactos/tools/rbuild/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/pch.h?rev=227… ============================================================================== --- trunk/reactos/tools/rbuild/pch.h (original) +++ trunk/reactos/tools/rbuild/pch.h Mon Jul 3 02:03:40 2006 @@ -32,6 +32,8 @@ #ifndef MAX_PATH #define MAX_PATH _MAX_PATH #endif//MAX_PATH +#else +#include <unistd.h> #endif//WIN32 #include <stdarg.h> Modified: trunk/reactos/tools/ssprintf.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ssprintf.cpp?rev=227… ============================================================================== --- trunk/reactos/tools/ssprintf.cpp (original) +++ trunk/reactos/tools/ssprintf.cpp Mon Jul 3 02:03:40 2006 @@ -25,6 +25,7 @@ #include "ssprintf.h" #ifndef WIN32 +#include <ctype.h> #define _finite __finite #define _isnan __isnan inline int iswdigit ( wchar_t c )

1 0

[fireball] 22784: Mikhail Zvyozdochkin: Fix compiling on linux (adding proper include path for halxbox)
by fireball＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: fireball Date: Mon Jul 3 01:59:04 2006 New Revision: 22784 URL: http://svn.reactos.org/svn/reactos?rev=22784&view=rev Log: Mikhail Zvyozdochkin: Fix compiling on linux (adding proper include path for halxbox) Modified: trunk/reactos/hal/halx86/xbox/halxbox.rbuild Modified: trunk/reactos/hal/halx86/xbox/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halxbox.rb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/halxbox.rbuild (original) +++ trunk/reactos/hal/halx86/xbox/halxbox.rbuild Mon Jul 3 01:59:04 2006 @@ -1,6 +1,7 @@ <module name="halxbox" type="kernelmodedll" allowwarnings="true"> <importlibrary definition="../../hal/hal.def" /> <include base="hal_generic">../include</include> + <include base="halxbox">.</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="UP" />

1 0

[hpoussin] 22783: Implement make command
by hpoussin＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: hpoussin Date: Mon Jul 3 01:58:24 2006 New Revision: 22783 URL: http://svn.reactos.org/svn/reactos?rev=22783&view=rev Log: Implement make command Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=22783&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Mon Jul 3 01:58:24 2006 @@ -9,6 +9,7 @@ IF "%1" == "createrbuild" GOTO createrbuild IF "%1" == "link" GOTO link IF "%1" == "merge" GOTO merge +IF "%1" == "make" GOTO make IF "%1" == "fullprocessing" GOTO fullprocessing :help @@ -17,6 +18,7 @@ ECHO %0 createrbuild {wine_lib} [{wine_lib} ...] ECHO %0 link {path_to_reactos} {wine_lib} ECHO %0 merge {path_to_reactos} {wine_lib} [{wine_lib} ...] +ECHO %0 make {path_to_reactos} {wine_lib} [{wine_lib} ...] ECHO %0 fullprocessing {path_to_reactos} {wine_lib} [{wine_lib} ...] GOTO :eof @@ -162,6 +164,26 @@ ECHO http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 GOTO :eof +:make +SETLOCAL ENABLEEXTENSIONS +IF "%3" == "" GOTO help +IF NOT EXIST "%2\ReactOS.rbuild" ( + ECHO %2\ReactOS.rbuild doesn't exit. + GOTO :help +) +SET WINE_LIST= +SET WINE_ROS_DIR=%2 +:make_filllist +SHIFT +IF "%2" == "" GOTO make_doit +SET WINE_LIST=%WINE_LIST% %2 +GOTO make_filllist +:make_doit +PUSHD "%WINE_ROS_DIR%" +make.exe %WINE_LIST% +POPD +GOTO :eof + :fullprocessing SETLOCAL ENABLEEXTENSIONS IF "%3" == "" GOTO help @@ -182,9 +204,7 @@ CALL :merge merge "%WINE_ROS_DIR%" %WINE_LIST% IF ERRORLEVEL 1 GOTO :eof IF EXIST "%WINE_ROS_DIR%\makefile.auto" DEL "%WINE_ROS_DIR%\makefile.auto" -PUSHD "%WINE_ROS_DIR%" -make.exe %WINE_LIST% -POPD +CALL :make make "%WINE_ROS_DIR%" %WINE_LIST% IF ERRORLEVEL 1 GOTO :eof ECHO Compilation successful. You should try to run ReactOS to see if ECHO no visible regressions appeared before committing the changes.

1 0

[hpoussin] 22782: Delete now useless code
by hpoussin＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: hpoussin Date: Mon Jul 3 01:35:31 2006 New Revision: 22782 URL: http://svn.reactos.org/svn/reactos?rev=22782&view=rev Log: Delete now useless code Removed: trunk/reactos/dll/win32/lzexpand/

1 0

[hpoussin] 22781: Delete now useless code
by hpoussin＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: hpoussin Date: Mon Jul 3 01:35:06 2006 New Revision: 22781 URL: http://svn.reactos.org/svn/reactos?rev=22781&view=rev Log: Delete now useless code Removed: trunk/reactos/dll/win32/richedit/

1 0

[hpoussin] 22780: Rename richedit to riched32 and lzexpand to lz32
by hpoussin＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: hpoussin Date: Mon Jul 3 01:33:02 2006 New Revision: 22780 URL: http://svn.reactos.org/svn/reactos?rev=22780&view=rev Log: Rename richedit to riched32 and lzexpand to lz32 Added: trunk/reactos/dll/win32/lz32/ - copied from r22778, trunk/reactos/dll/win32/lzexpand/ trunk/reactos/dll/win32/riched32/ - copied from r22778, trunk/reactos/dll/win32/richedit/ Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Mon Jul 3 01:33:02 2006 @@ -166,7 +166,7 @@ dll\win32\iphlpapi\iphlpapi.dll 1 dll\win32\kernel32\kernel32.dll 1 dll\win32\lsasrv\lsasrv.dll 1 -dll\win32\lzexpand\lz32.dll 1 +dll\win32\lz32\lz32.dll 1 dll\win32\mapi32\mapi32.dll 1 dll\win32\winmm\midimap\midimap.dll 1 dll\win32\mmdrv\mmdrv.dll 1 @@ -194,7 +194,7 @@ dll\win32\psapi\psapi.dll 1 dll\win32\powrprof\powrprof.dll 1 dll\win32\riched20\riched20.dll 1 -dll\win32\richedit\riched32.dll 1 +dll\win32\riched32\riched32.dll 1 dll\win32\rpcrt4\rpcrt4.dll 1 dll\win32\samlib\samlib.dll 1 dll\win32\samsrv\samsrv.dll 1 Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Mon Jul 3 01:33:02 2006 @@ -91,8 +91,8 @@ <directory name="lsasrv"> <xi:include href="lsasrv/lsasrv.rbuild" /> </directory> -<directory name="lzexpand"> - <xi:include href="lzexpand/lz32.rbuild" /> +<directory name="lz32"> + <xi:include href="lz32/lz32.rbuild" /> </directory> <directory name="mapi32"> <xi:include href="mapi32/mapi32.rbuild" /> @@ -172,8 +172,8 @@ <directory name="riched20"> <xi:include href="riched20/riched20.rbuild" /> </directory> -<directory name="richedit"> - <xi:include href="richedit/riched32.rbuild" /> +<directory name="riched32"> + <xi:include href="riched32/riched32.rbuild" /> </directory> <directory name="rpcrt4"> <xi:include href="rpcrt4/rpcrt4.rbuild" />

1 0

[hpoussin] 22779: Misc fixes/changes due to Fireball feedback
by hpoussin＠svn.reactos.org 02 Jul '06

02 Jul '06

Author: hpoussin Date: Mon Jul 3 00:39:38 2006 New Revision: 22779 URL: http://svn.reactos.org/svn/reactos?rev=22779&view=rev Log: Misc fixes/changes due to Fireball feedback Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=22779&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Mon Jul 3 00:39:38 2006 @@ -6,7 +6,7 @@ IF "%1" == "" GOTO help IF "%1" == "download" GOTO download -IF "%1" == "process" GOTO process +IF "%1" == "createrbuild" GOTO createrbuild IF "%1" == "link" GOTO link IF "%1" == "merge" GOTO merge IF "%1" == "fullprocessing" GOTO fullprocessing @@ -14,7 +14,7 @@ :help ECHO Syntax: ECHO %0 download {wine_lib} [{wine_lib} ...] -ECHO %0 process {wine_lib} [{wine_lib} ...] +ECHO %0 createrbuild {wine_lib} [{wine_lib} ...] ECHO %0 link {path_to_reactos} {wine_lib} ECHO %0 merge {path_to_reactos} {wine_lib} [{wine_lib} ...] ECHO %0 fullprocessing {path_to_reactos} {wine_lib} [{wine_lib} ...] @@ -37,15 +37,15 @@ >NUL 2>NUL cvs.exe logout GOTO :eof -:process +:createrbuild SETLOCAL ENABLEEXTENSIONS SETLOCAL ENABLEDELAYEDEXPANSION SET WINE_BATCH=%0 IF "%2" == "" GOTO help -:startprocess +:startcreaterbuild IF NOT EXIST wine\dlls\%2\makefile.in ( ECHO WARNING: Did you forget "%WINE_BATCH% download %2"? - GOTO :processnext + GOTO :createrbuildnext ) SET WINE_LOWER=abcdefghijklmnopqrstuvwxyz0123456789 @@ -83,9 +83,9 @@ ECHO ^<file^>%2.spec^</file^> ECHO ^</module^> -:processnext -SHIFT -IF NOT "%2" == "" GOTO startprocess +:createrbuildnext +SHIFT +IF NOT "%2" == "" GOTO startcreaterbuild DEL %WINE_TMPFILE1% GOTO :eof @@ -103,7 +103,7 @@ ) IF NOT EXIST "wine\dlls\%3\%3.rbuild" ( ECHO wine\dlls\%3.rbuild doesn't exist. - ECHO Did you forget "%WINE_BATCH% process %3 >wine\dlls\%3\%3.rbuild"? + ECHO Did you forget "%WINE_BATCH% createrbuild %3 >wine\dlls\%3\%3.rbuild"? GOTO :eof ) >NUL 2>NUL junction.exe "%2\dll\win32\%3.wine" "wine\dlls\%3" @@ -124,6 +124,7 @@ SHIFT IF "%2" == "" GOTO :eof IF NOT EXIST "wine\dlls\%2" GOTO :mergenext +ATTRIB -R "%WINE_ROS_DIR%\dll\win32\%2\*" >NUL COPY /Y "wine\dlls\%2\*.*" "%WINE_ROS_DIR%\dll\win32\%2" >NUL FOR /F "delims=" %%f IN ('DIR /B "%WINE_ROS_DIR%\dll\win32\%2\*.*"') DO ( IF "%%f" == ".cvsignore" ( @@ -175,9 +176,8 @@ CALL :download download%WINE_LIST% IF ERRORLEVEL 1 GOTO :eof FOR %%m IN (%WINE_LIST%) DO ( - >wine\dlls\%%m\%%m.rbuild CALL :process process %%m - CALL :link link "%WINE_ROS_DIR%" %%m - IF ERRORLEVEL 1 GOTO :eof + >wine\dlls\%%m\%%m.rbuild CALL :createrbuild createrbuild %%m + >NUL CALL :link link "%WINE_ROS_DIR%" %%m ) CALL :merge merge "%WINE_ROS_DIR%" %WINE_LIST% IF ERRORLEVEL 1 GOTO :eof @@ -185,6 +185,9 @@ PUSHD "%WINE_ROS_DIR%" make.exe %WINE_LIST% POPD +IF ERRORLEVEL 1 GOTO :eof +ECHO Compilation successful. You should try to run ReactOS to see if +ECHO no visible regressions appeared before committing the changes. GOTO :eof :internal_analyseline

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