Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[ion] 15069: More IRP Completion changes. Use proper stack count and other semantics, as documented in NT File System Internals. These changes don't break anything :P

by ion＠svn.reactos.com

More IRP Completion changes. Use proper stack count and other semantics, as documented in NT File System Internals. These changes don't break anything :P Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-05-07 00:37:48 UTC (rev 15068) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-07 01:13:04 UTC (rev 15069) @@ -19,6 +19,187 @@ #define TAG_IRP TAG('I', 'R', 'P', ' ') #define TAG_SYS_BUF TAG('S', 'Y', 'S' , 'B') +/* PRIVATE FUNCTIONS ********************************************************/ + +VOID +STDCALL +IopFreeIrpKernelApc(PKAPC Apc, + PKNORMAL_ROUTINE *NormalRoutine, + PVOID *NormalContext, + PVOID *SystemArgument1, + PVOID *SystemArgument2) +{ + /* Free the IRP */ + IoFreeIrp(CONTAINING_RECORD(Apc, IRP, Tail.Apc)); +} + +VOID +STDCALL +IopAbortIrpKernelApc(PKAPC Apc) +{ + /* Free the IRP */ + IoFreeIrp(CONTAINING_RECORD(Apc, IRP, Tail.Apc)); +} + +/* + * FUNCTION: Performs the second stage of irp completion for read/write irps + * + * Called as a special kernel APC kernel-routine or directly from IofCompleteRequest() + * + * Note that we'll never see irp's flagged IRP_PAGING_IO (IRP_MOUNT_OPERATION) + * or IRP_CLOSE_OPERATION (IRP_MJ_CLOSE and IRP_MJ_CLEANUP) here since their + * cleanup/completion is fully taken care of in IoCompleteRequest. + * -Gunnar + */ +VOID +STDCALL +IopCompleteRequest(PKAPC Apc, + PKNORMAL_ROUTINE* NormalRoutine, + PVOID* NormalContext, + PVOID* SystemArgument1, + PVOID* SystemArgument2) +{ + PFILE_OBJECT FileObject; + PIRP Irp; + PMDL Mdl, NextMdl; + PKEVENT UserEvent; + BOOLEAN SyncIrp; + + if (Apc) DPRINT("IoSecondStageCompletition with APC: %x\n", Apc); + + /* Get data from the APC */ + FileObject = (PFILE_OBJECT)(*SystemArgument1); + Irp = CONTAINING_RECORD(Apc, IRP, Tail.Apc); + DPRINT("IoSecondStageCompletition, %x\n", Irp); + + /* Save the User Event */ + UserEvent = Irp->UserEvent; + + /* Remember if the IRP is Sync or not */ + SyncIrp = Irp->Flags & IRP_SYNCHRONOUS_API ? TRUE : FALSE; + + /* Handle Buffered case first */ + if (Irp->Flags & IRP_BUFFERED_IO) + { + /* Check if we have an input buffer and if we suceeded */ + if (Irp->Flags & IRP_INPUT_OPERATION && NT_SUCCESS(Irp->IoStatus.Status)) + { + /* Copy the buffer back to the user */ + RtlCopyMemory(Irp->UserBuffer, + Irp->AssociatedIrp.SystemBuffer, + Irp->IoStatus.Information); + } + + /* Also check if we should de-allocate it */ + if (Irp->Flags & IRP_DEALLOCATE_BUFFER) + { + ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, TAG_SYS_BUF); + } + } + + /* Now we got rid of these two... */ + Irp->Flags &= ~(IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER); + + /* Check if there's an MDL */ + if ((Mdl = Irp->MdlAddress)) + { + /* Clear all of them */ + do + { + NextMdl = Mdl->Next; + IoFreeMdl(Mdl); + Mdl = NextMdl; + } while (Mdl); + } + Irp->MdlAddress = NULL; + + /* Remove the IRP from the list of Thread Pending IRPs */ + RemoveEntryList(&Irp->ThreadListEntry); + InitializeListHead(&Irp->ThreadListEntry); + + if (NT_SUCCESS(Irp->IoStatus.Status) || Irp->PendingReturned) + { + _SEH_TRY + { + /* Save the IOSB Information */ + *Irp->UserIosb = Irp->IoStatus; + } + _SEH_HANDLE + { + /* Ignore any error */ + } + _SEH_END; + + if (FileObject) + { + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Set the Status */ + FileObject->FinalStatus = Irp->IoStatus.Status; + + /* FIXME: Remove this check when I/O code is fixed */ + if (UserEvent != &FileObject->Event) + { + /* Signal Event */ + KeSetEvent(&FileObject->Event, 0, FALSE); + } + } + } + + /* Signal the user event, if one exist */ + if (UserEvent) + { + KeSetEvent(UserEvent, 0, FALSE); + } + + /* Now call the User APC if one was requested */ + if (Irp->Overlay.AsynchronousParameters.UserApcRoutine) + { + KeInitializeApc(&Irp->Tail.Apc, + KeGetCurrentThread(), + CurrentApcEnvironment, + IopFreeIrpKernelApc, + IopAbortIrpKernelApc, + (PKNORMAL_ROUTINE)Irp->Overlay.AsynchronousParameters.UserApcRoutine, + Irp->RequestorMode, + Irp->Overlay.AsynchronousParameters.UserApcContext); + + KeInsertQueueApc(&Irp->Tail.Apc, + Irp->UserIosb, + NULL, + 2); + Irp = NULL; + } + else if (FileObject && FileObject->CompletionContext) + { + /* Call the IO Completion Port if we have one, instead */ + IoSetIoCompletion(FileObject->CompletionContext->Port, + FileObject->CompletionContext->Key, + Irp->Overlay.AsynchronousParameters.UserApcContext, + Irp->IoStatus.Status, + Irp->IoStatus.Information, + FALSE); + Irp = NULL; + } + } + + /* Free the Irp if it hasn't already */ + if (Irp) IoFreeIrp(Irp); + + if (FileObject) + { + /* Dereference the user event, if it is an event object */ + /* FIXME: Remove last check when I/O code is fixed */ + if (UserEvent && !SyncIrp && UserEvent != &FileObject->Event) + { + ObDereferenceObject(UserEvent); + } + + /* Dereference the File Object */ + ObDereferenceObject(FileObject); + } +} + /* FUNCTIONS *****************************************************************/ /* @@ -628,11 +809,7 @@ #endif /* * @implemented - */ -VOID FASTCALL -IofCompleteRequest(PIRP Irp, - CCHAR PriorityBoost) -/* + * * FUNCTION: Indicates the caller has finished all processing for a given * I/O request and is returning the given IRP to the I/O manager * ARGUMENTS: @@ -640,211 +817,190 @@ * PriorityBoost = Increment by which to boost the priority of the * thread making the request */ +VOID +FASTCALL +IofCompleteRequest(PIRP Irp, + CCHAR PriorityBoost) { - ULONG i; - NTSTATUS Status; - PFILE_OBJECT OriginalFileObject; - PDEVICE_OBJECT DeviceObject; - KIRQL oldIrql; - PMDL Mdl; - PIO_STACK_LOCATION Stack = (PIO_STACK_LOCATION)(Irp + 1); + PIO_STACK_LOCATION StackPtr; + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT FileObject = Irp->Tail.Overlay.OriginalFileObject; + PETHREAD Thread = Irp->Tail.Overlay.Thread; + NTSTATUS Status; + PMDL Mdl; - DPRINT("IoCompleteRequest(Irp %x, PriorityBoost %d) Event %x THread %x\n", - Irp,PriorityBoost, Irp->UserEvent, PsGetCurrentThread()); + DPRINT("IofCompleteRequest(Irp %x, PriorityBoost %d) Event %x THread %x\n", + Irp,PriorityBoost, Irp->UserEvent, PsGetCurrentThread()); - ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); - ASSERT(Irp->CancelRoutine == NULL); - ASSERT(Irp->IoStatus.Status != STATUS_PENDING); + ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + ASSERT(!Irp->CancelRoutine); + ASSERT(Irp->IoStatus.Status != STATUS_PENDING); + + /* Get the Current Stack */ + StackPtr = IoGetCurrentIrpStackLocation(Irp); + IoSkipCurrentIrpStackLocation(Irp); + + /* Loop the Stacks and complete the IRPs */ + for (;Irp->CurrentLocation <= (Irp->StackCount + 1); StackPtr++) + { + /* Set Pending Returned */ + Irp->PendingReturned = StackPtr->Control & SL_PENDING_RETURNED; + + /* + * Completion routines expect the current irp stack location to be the same as when + * IoSetCompletionRoutine was called to set them. A side effect is that completion + * routines set by highest level drivers without their own stack location will receive + * an invalid current stack location (at least it should be considered as invalid). + * Since the DeviceObject argument passed is taken from the current stack, this value + * is also invalid (NULL). + */ + if (Irp->CurrentLocation == (Irp->StackCount + 1)) + { + DeviceObject = NULL; + } + else + { + DeviceObject = IoGetCurrentIrpStackLocation(Irp)->DeviceObject; + } - Irp->PendingReturned = IoGetCurrentIrpStackLocation(Irp)->Control & SL_PENDING_RETURNED; - - /* - * Run the completion routines. - */ + /* Check if there is a Completion Routine to Call */ + if ((NT_SUCCESS(Irp->IoStatus.Status) && + (StackPtr->Control & SL_INVOKE_ON_SUCCESS)) || + (!NT_SUCCESS(Irp->IoStatus.Status) && + (StackPtr->Control & SL_INVOKE_ON_ERROR)) || + (Irp->Cancel && (StackPtr->Control & SL_INVOKE_ON_CANCEL))) + { + /* Call it */ + Status = StackPtr->CompletionRoutine(DeviceObject, + Irp, + StackPtr->Context); - for (i=Irp->CurrentLocation;i<(ULONG)Irp->StackCount;i++) - { - /* - Completion routines expect the current irp stack location to be the same as when - IoSetCompletionRoutine was called to set them. A side effect is that completion - routines set by highest level drivers without their own stack location will receive - an invalid current stack location (at least it should be considered as invalid). - Since the DeviceObject argument passed is taken from the current stack, this value - is also invalid (NULL). - */ - if (Irp->CurrentLocation < Irp->StackCount - 1) - { - IoSkipCurrentIrpStackLocation(Irp); - DeviceObject = IoGetCurrentIrpStackLocation(Irp)->DeviceObject; - } - else - { - DeviceObject = NULL; - } + /* Don't touch the Packet if this was returned. It might be gone! */ + if (Status == STATUS_MORE_PROCESSING_REQUIRED) return; + } + else + { + if ((Irp->CurrentLocation <= Irp->StackCount) && (Irp->PendingReturned)) + { + if (IoGetCurrentIrpStackLocation(Irp)->Control & SL_PENDING_RETURNED) + { + Irp->PendingReturned = TRUE; + } + } + } + + /* Move to next stack */ + IoSkipCurrentIrpStackLocation(Irp); + } - if (Stack[i].CompletionRoutine != NULL && - ((NT_SUCCESS(Irp->IoStatus.Status) && (Stack[i].Control & SL_INVOKE_ON_SUCCESS)) || - (!NT_SUCCESS(Irp->IoStatus.Status) && (Stack[i].Control & SL_INVOKE_ON_ERROR)) || - (Irp->Cancel && (Stack[i].Control & SL_INVOKE_ON_CANCEL)))) - { - Status = Stack[i].CompletionRoutine(DeviceObject, - Irp, - Stack[i].Context); + /* Windows NT File System Internals, page 165 */ + if (Irp->Flags & IRP_ASSOCIATED_IRP) + { + ULONG MasterIrpCount; + PIRP MasterIrp = Irp->AssociatedIrp.MasterIrp; - if (Status == STATUS_MORE_PROCESSING_REQUIRED) - { - return; - } - } - - if (IoGetCurrentIrpStackLocation(Irp)->Control & SL_PENDING_RETURNED) - { - Irp->PendingReturned = TRUE; - } - } + DPRINT("Handling Associated IRP\n"); + /* This should never happen! */ + ASSERT(IsListEmpty(&Irp->ThreadListEntry)); - /* Windows NT File System Internals, page 165 */ - if (Irp->Flags & IRP_ASSOCIATED_IRP) - { - ULONG MasterIrpCount; - PIRP MasterIrp = Irp->AssociatedIrp.MasterIrp; - - /* This should never happen! */ - ASSERT(IsListEmpty(&Irp->ThreadListEntry)); - - MasterIrpCount = InterlockedDecrement(&MasterIrp->AssociatedIrp.IrpCount); - while ((Mdl = Irp->MdlAddress)) - { - Irp->MdlAddress = Mdl->Next; - IoFreeMdl(Mdl); - } - IoFreeIrp(Irp); - if (MasterIrpCount == 0) - { - IofCompleteRequest(MasterIrp, IO_NO_INCREMENT); - } - return; - } - - /* - * Were done calling completion routines. Now do any cleanup that can be - * done in an arbitrarily context. - */ - - /* Windows NT File System Internals, page 165 */ - if (Irp->Flags & (IRP_PAGING_IO|IRP_CLOSE_OPERATION)) - { - /* This should never happen! */ - ASSERT(IsListEmpty(&Irp->ThreadListEntry)); - - /* - * If MDL_IO_PAGE_READ is set, then the caller is responsible - * for deallocating of the mdl. - */ - if (Irp->Flags & IRP_PAGING_IO && - Irp->MdlAddress && - !(Irp->MdlAddress->MdlFlags & MDL_IO_PAGE_READ)) - { - - if (Irp->MdlAddress->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) - { - MmUnmapLockedPages(Irp->MdlAddress->MappedSystemVa, Irp->MdlAddress); - } - - ExFreePool(Irp->MdlAddress); - } - - if (Irp->UserIosb) - { - _SEH_TRY - { - *Irp->UserIosb = Irp->IoStatus; - } - _SEH_HANDLE - { - DPRINT1("Unable to set UserIosb (at 0x%x) to 0x%x, Error: 0x%x\n", - Irp->UserIosb, Irp->IoStatus, _SEH_GetExceptionCode()); - } - _SEH_END; - } - - if (Irp->UserEvent) - { - KeSetEvent(Irp->UserEvent, PriorityBoost, FALSE); - } + /* Decrement and get the old count */ + MasterIrpCount = InterlockedDecrement(&MasterIrp->AssociatedIrp.IrpCount); + + /* Free MDLs and IRP */ + while ((Mdl = Irp->MdlAddress)) + { + Irp->MdlAddress = Mdl->Next; + IoFreeMdl(Mdl); + } + IoFreeIrp(Irp); - /* io manager frees the irp for close operations */ -// if (Irp->Flags & IRP_PAGING_IO) -// { - IoFreeIrp(Irp); -// } - - return; - } - - - /* - Hi Dave, - - I went through my old notes. You are correct and in most cases - IoCompleteRequest() will issue an MmUnlockPages() for each MDL in the IRP - chain. There are however few exceptions: one is MDLs for associated IRPs, - it's expected that those MDLs have been initialized with - IoBuildPartialMdl(). Another exception is PAGING_IO irps, the i/o completion - code doesn't do anything to MDLs of those IRPs. - - sara - -*/ - + /* Complete the Master IRP */ + if (!MasterIrpCount) IofCompleteRequest(MasterIrp, IO_NO_INCREMENT); + return; + } - for (Mdl = Irp->MdlAddress; Mdl; Mdl = Mdl->Next) - { - /* - * Undo the MmProbeAndLockPages. If MmGetSystemAddressForMdl was called - * on this mdl, this mapping (if any) is also undone by MmUnlockPages. - */ - MmUnlockPages(Mdl); - } - - //Windows NT File System Internals, page 154 - OriginalFileObject = Irp->Tail.Overlay.OriginalFileObject; + /* Windows NT File System Internals, page 165 */ + if (Irp->Flags & (IRP_PAGING_IO|IRP_CLOSE_OPERATION)) + { + DPRINT("Handling Paging or Close I/O\n"); + /* This should never happen! */ + ASSERT(IsListEmpty(&Irp->ThreadListEntry)); - if (Irp->PendingReturned || KeGetCurrentIrql() == DISPATCH_LEVEL) - { - BOOLEAN bStatus; - - DPRINT("Dispatching APC\n"); - - KeInitializeApc( &Irp->Tail.Apc, - &Irp->Tail.Overlay.Thread->Tcb, - Irp->ApcEnvironment, - IoSecondStageCompletion,//kernel routine + /* Handle a Close Operation or Sync Paging I/O (see page 165) */ + if (Irp->Flags & (IRP_SYNCHRONOUS_PAGING_IO | IRP_CLOSE_OPERATION)) + { + /* Set the I/O Status and Signal the Event */ + DPRINT("Handling Sync Paging or Close I/O\n"); + *Irp->UserIosb = Irp->IoStatus; + KeSetEvent(Irp->UserEvent, PriorityBoost, FALSE); + + /* Free the IRP for a Paging I/O Only, Close is handled by us */ + if (Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) + { + DPRINT("Handling Sync Paging I/O\n"); + IoFreeIrp(Irp); + } + } + else + { + DPRINT1("BUG BUG, YOU SHOULDNT BE HERE\n"); + #if 0 + /* Page 166 */ + /* When we'll actually support Async Paging I/O Properly... */ + KeInitializeApc(&Irp->Tail.Apc + &Irp->tail.Overlay.Thread->Tcb, + Irp->ApcEnvironment, + IopCompletePageWrite, + NULL, + NULL, + KernelMode, + NULL); + KeInsertQueueApc(&Irp->Tail.Apc, NULL, - (PKNORMAL_ROUTINE) NULL, - KernelMode, - NULL); - - bStatus = KeInsertQueueApc(&Irp->Tail.Apc, - (PVOID)OriginalFileObject, - NULL, // This is used for REPARSE stuff - PriorityBoost); + NULL, + PriorityBoost); + #endif + } + return; + } - if (bStatus == FALSE) - { - DPRINT1("Error queueing APC for thread. Thread has probably exited.\n"); - } + /* Unlock MDL Pages, page 167. */ + while ((Mdl = Irp->MdlAddress)) + { + DPRINT("Unlocking MDL: %x\n", Mdl); + Irp->MdlAddress = Mdl->Next; + MmUnlockPages(Mdl); + } - DPRINT("Finished dispatching APC\n"); - } - else - { - DPRINT("Calling IoSecondStageCompletion routine directly\n"); - KeRaiseIrql(APC_LEVEL, &oldIrql); - IoSecondStageCompletion(&Irp->Tail.Apc,NULL,NULL,(PVOID)&OriginalFileObj ect, NULL); - KeLowerIrql(oldIrql); - DPRINT("Finished completition routine\n"); - } + /* Check if we should exit because of a Deferred I/O (page 168) */ + if (Irp->Flags & IRP_DEFER_IO_COMPLETION && !Irp->PendingReturned) + { + DPRINT("Quick return\n"); + return; + } + + /* Now queue the special APC */ + if (!Irp->Cancel) + { + DPRINT("KMODE APC QUEUE\n"); + KeInitializeApc(&Irp->Tail.Apc, + &Thread->Tcb, + Irp->ApcEnvironment, + IopCompleteRequest, + NULL, + (PKNORMAL_ROUTINE) NULL, + KernelMode, + NULL); + KeInsertQueueApc(&Irp->Tail.Apc, + FileObject, + NULL, /* This is used for REPARSE stuff */ + PriorityBoost); + } + else + { + /* The IRP just got cancelled... don't think this happens in ROS yet */ + DPRINT1("The IRP was cancelled. Go Bug Alex\n"); + } } /* @@ -942,7 +1098,7 @@ Irp->Type = IO_TYPE_IRP; Irp->Size = PacketSize; Irp->StackCount = StackSize; - Irp->CurrentLocation = StackSize; + Irp->CurrentLocation = StackSize + 1; Irp->ApcEnvironment = KeGetCurrentThread()->ApcStateIndex; Irp->Tail.Overlay.CurrentStackLocation = (PIO_STACK_LOCATION)(Irp + 1) + StackSize; @@ -1181,183 +1337,4 @@ return IofCallDriver(DeviceObject, Irp); } -VOID -STDCALL -IoSecondStageCompletion_KernelApcRoutine(PKAPC Apc, - PKNORMAL_ROUTINE *NormalRoutine, - PVOID *NormalContext, - PVOID *SystemArgument1, - PVOID *SystemArgument2) -{ - /* Free the IRP */ - IoFreeIrp(CONTAINING_RECORD(Apc, IRP, Tail.Apc)); -} - -VOID -STDCALL -IoSecondStageCompletion_RundownApcRoutine(PKAPC Apc) -{ - /* Free the IRP */ - IoFreeIrp(CONTAINING_RECORD(Apc, IRP, Tail.Apc)); -} - -/* - * FUNCTION: Performs the second stage of irp completion for read/write irps - * - * Called as a special kernel APC kernel-routine or directly from IofCompleteRequest() - * - * Note that we'll never see irp's flagged IRP_PAGING_IO (IRP_MOUNT_OPERATION) - * or IRP_CLOSE_OPERATION (IRP_MJ_CLOSE and IRP_MJ_CLEANUP) here since their - * cleanup/completion is fully taken care of in IoCompleteRequest. - * -Gunnar - */ -VOID -STDCALL -IoSecondStageCompletion(PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArgument2) -{ - PFILE_OBJECT FileObject; - PIRP Irp; - PMDL Mdl, NextMdl; - PKEVENT UserEvent; - BOOLEAN SyncIrp; - - if (Apc) DPRINT("IoSecondStageCompletition with APC: %x\n", Apc); - - /* Get data from the APC */ - FileObject = (PFILE_OBJECT)(*SystemArgument1); - Irp = CONTAINING_RECORD(Apc, IRP, Tail.Apc); - DPRINT("IoSecondStageCompletition, %x\n", Irp); - - /* Save the User Event */ - UserEvent = Irp->UserEvent; - - /* Remember if the IRP is Sync or not */ - SyncIrp = Irp->Flags & IRP_SYNCHRONOUS_API ? TRUE : FALSE; - - /* Handle Buffered case first */ - if (Irp->Flags & IRP_BUFFERED_IO) - { - /* Check if we have an input buffer and if we suceeded */ - if (Irp->Flags & IRP_INPUT_OPERATION && NT_SUCCESS(Irp->IoStatus.Status)) - { - /* Copy the buffer back to the user */ - RtlCopyMemory(Irp->UserBuffer, - Irp->AssociatedIrp.SystemBuffer, - Irp->IoStatus.Information); - } - - /* Also check if we should de-allocate it */ - if (Irp->Flags & IRP_DEALLOCATE_BUFFER) - { - ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, TAG_SYS_BUF); - } - } - - /* Now we got rid of these two... */ - Irp->Flags &= ~(IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER); - - /* Check if there's an MDL */ - if ((Mdl = Irp->MdlAddress)) - { - /* Clear all of them */ - do - { - NextMdl = Mdl->Next; - IoFreeMdl(Mdl); - Mdl = NextMdl; - } while (Mdl); - } - Irp->MdlAddress = NULL; - - /* Remove the IRP from the list of Thread Pending IRPs */ - RemoveEntryList(&Irp->ThreadListEntry); - InitializeListHead(&Irp->ThreadListEntry); - - if (NT_SUCCESS(Irp->IoStatus.Status) || Irp->PendingReturned) - { - _SEH_TRY - { - /* Save the IOSB Information */ - *Irp->UserIosb = Irp->IoStatus; - } - _SEH_HANDLE - { - /* Ignore any error */ - } - _SEH_END; - - if (FileObject) - { - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Set the Status */ - FileObject->FinalStatus = Irp->IoStatus.Status; - - /* FIXME: Remove this check when I/O code is fixed */ - if (UserEvent != &FileObject->Event) - { - /* Signal Event */ - KeSetEvent(&FileObject->Event, 0, FALSE); - } - } - } - - /* Signal the user event, if one exist */ - if (UserEvent) - { - KeSetEvent(UserEvent, 0, FALSE); - } - - /* Now call the User APC if one was requested */ - if (Irp->Overlay.AsynchronousParameters.UserApcRoutine) - { - KeInitializeApc(&Irp->Tail.Apc, - KeGetCurrentThread(), - CurrentApcEnvironment, - IoSecondStageCompletion_KernelApcRoutine, - IoSecondStageCompletion_RundownApcRoutine, - (PKNORMAL_ROUTINE)Irp->Overlay.AsynchronousParameters.UserApcRoutine, - Irp->RequestorMode, - Irp->Overlay.AsynchronousParameters.UserApcContext); - - KeInsertQueueApc(&Irp->Tail.Apc, - Irp->UserIosb, - NULL, - 2); - Irp = NULL; - } - else if (FileObject && FileObject->CompletionContext) - { - /* Call the IO Completion Port if we have one, instead */ - IoSetIoCompletion(FileObject->CompletionContext->Port, - FileObject->CompletionContext->Key, - Irp->Overlay.AsynchronousParameters.UserApcContext, - Irp->IoStatus.Status, - Irp->IoStatus.Information, - FALSE); - Irp = NULL; - } - } - - /* Free the Irp if it hasn't already */ - if (Irp) IoFreeIrp(Irp); - - if (FileObject) - { - /* Dereference the user event, if it is an event object */ - /* FIXME: Remove last check when I/O code is fixed */ - if (UserEvent && !SyncIrp && UserEvent != &FileObject->Event) - { - ObDereferenceObject(UserEvent); - } - - /* Dereference the File Object */ - ObDereferenceObject(FileObject); - } -} - /* EOF */

19 years, 4 months

[ion] 15068: Update ETHREAD to latest version.

by ion＠svn.reactos.com

Update ETHREAD to latest version. Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-05-07 00:21:06 UTC (rev 15067) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-05-07 00:37:48 UTC (rev 15068) @@ -65,58 +65,101 @@ } PS_IMPERSONATION_INFORMATION, *PPS_IMPERSONATION_INFORMATION; #endif -#include <pshpack1.h> - -/* This needs to be fixed ASAP! */ +#include <pshpack4.h> +/* + * NAME: ETHREAD + * DESCRIPTION: Internal Executive Thread Structure. + * PORTABILITY: Architecture Independent. + * KERNEL VERSION: 5.2 + * DOCUMENTATION: http://reactos.com/wiki/index.php/ETHREAD + */ typedef struct _ETHREAD { - KTHREAD Tcb; - union { - LARGE_INTEGER CreateTime; - UCHAR NestedFaultCount:2; - UCHAR ApcNeeded:1; - }; - LARGE_INTEGER ExitTime; - LIST_ENTRY LpcReplyChain; - NTSTATUS ExitStatus; - PVOID OfsChain; - LIST_ENTRY PostBlockList; - union { - struct _TERMINATION_PORT *TerminationPort; - struct _ETHREAD* ReaperLink; - }; - KSPIN_LOCK ActiveTimerListLock; - LIST_ENTRY ActiveTimerListHead; - CLIENT_ID Cid; - KSEMAPHORE LpcReplySemaphore; - PVOID LpcReplyMessage; - ULONG LpcReplyMessageId; - ULONG PerformanceCountLow; - PPS_IMPERSONATION_INFORMATION ImpersonationInfo; - LIST_ENTRY IrpList; - PIRP TopLevelIrp; - PDEVICE_OBJECT DeviceToVerify; - ULONG ReadClusterSize; - UCHAR ForwardClusterOnly; - UCHAR DisablePageFaultClustering; - UCHAR DeadThread; - UCHAR HideFromDebugger; - ULONG HasTerminated; -#ifdef _ENABLE_THRDEVTPAIR - PVOID EventPair; -#endif /* _ENABLE_THRDEVTPAIR */ - ACCESS_MASK GrantedAccess; - struct _EPROCESS *ThreadsProcess; - PKSTART_ROUTINE StartAddress; - LPTHREAD_START_ROUTINE Win32StartAddress; - ULONG LpcReceivedMessageId; - UCHAR LpcExitThreadCalled; - UCHAR HardErrorsAreDisabled; - UCHAR LpcReceivedMsgIdValid; - UCHAR ActiveImpersonationInfo; - ULONG PerformanceCountHigh; - LIST_ENTRY ThreadListEntry; - BOOLEAN SystemThread; + KTHREAD Tcb; /* 1C0 */ + LARGE_INTEGER CreateTime; /* 1C0 */ + LARGE_INTEGER ExitTime; /* 1C0 */ + union { + LIST_ENTRY LpcReplyChain; /* 1C0 */ + LIST_ENTRY KeyedWaitChain; /* 1C0 */ + }; + union { + NTSTATUS ExitStatus; /* 1C8 */ + PVOID OfsChain; /* 1C8 */ + }; + LIST_ENTRY PostBlockList; /* 1CC */ + union { + struct _TERMINATION_PORT *TerminationPort; /* 1D4 */ + struct _ETHREAD *ReaperLink; /* 1D4 */ + PVOID KeyedWaitValue; /* 1D4 */ + }; + KSPIN_LOCK ActiveTimerListLock; /* 1D8 */ + LIST_ENTRY ActiveTimerListHead; /* 1D8 */ + CLIENT_ID Cid; /* 1E0 */ + union { + KSEMAPHORE LpcReplySemaphore; /* 1E4 */ + KSEMAPHORE KeyedReplySemaphore; /* 1E4 */ + }; + union { + PVOID LpcReplyMessage; /* 200 */ + PVOID LpcWaitingOnPort; /* 200 */ + }; + PPS_IMPERSONATION_INFORMATION ImpersonationInfo; /* 204 */ + LIST_ENTRY IrpList; /* 208 */ + ULONG TopLevelIrp; /* 210 */ + PDEVICE_OBJECT DeviceToVerify; /* 214 */ + struct _EPROCESS *ThreadsProcess; /* 218 */ + PKSTART_ROUTINE StartAddress; /* 21C */ + union { + LPTHREAD_START_ROUTINE Win32StartAddress; /* 220 */ + ULONG LpcReceivedMessageId; /* 220 */ + }; + LIST_ENTRY ThreadListEntry; /* 224 */ + EX_RUNDOWN_REF RundownProtect; /* 22C */ + EX_PUSH_LOCK ThreadLock; /* 230 */ + ULONG LpcReplyMessageId; /* 234 */ + ULONG ReadClusterSize; /* 238 */ + ACCESS_MASK GrantedAccess; /* 23C */ + union { + struct { + ULONG Terminated:1; + ULONG DeadThread:1; + ULONG HideFromDebugger:1; + ULONG ActiveImpersonationInfo:1; + ULONG SystemThread:1; + ULONG HardErrorsAreDisabled:1; + ULONG BreakOnTermination:1; + ULONG SkipCreationMsg:1; + ULONG SkipTerminationMsg:1; + }; + ULONG CrossThreadFlags; /* 240 */ + }; + union { + struct { + ULONG ActiveExWorker:1; + ULONG ExWorkerCanWaitUser:1; + ULONG MemoryMaker:1; + ULONG KeyedEventInUse:1; + }; + ULONG SameThreadPassiveFlags; /* 244 */ + }; + union { + struct { + ULONG LpcReceivedMsgIdValid:1; + ULONG LpcExitThreadCalled:1; + ULONG AddressSpaceOwner:1; + ULONG OwnsProcessWorkingSetExclusive:1; + ULONG OwnsProcessWorkingSetShared:1; + ULONG OwnsSystemWorkingSetExclusive:1; + ULONG OwnsSystemWorkingSetShared:1; + ULONG OwnsSessionWorkingSetExclusive:1; + ULONG OwnsSessionWorkingSetShared:1; + ULONG ApcNeeded:1; + }; + ULONG SameThreadPassiveFlags; /* 248 */ + }; + UCHAR ForwardClusterOnly; /* 24C */ + UCHAR DisablePageFaultClustering; /* 24D */ + UCHAR ActiveFaultCount; /* 24E */ } ETHREAD; #include <poppack.h> @@ -128,6 +171,13 @@ #endif /* __USE_W32API */ #include <pshpack4.h> +/* + * NAME: EPROCESS + * DESCRIPTION: Internal Executive Process Structure. + * PORTABILITY: Architecture Independent. + * KERNEL VERSION: 5.2 + * DOCUMENTATION: http://reactos.com/wiki/index.php/EPROCESS + */ struct _EPROCESS { KPROCESS Pcb; /* 000 */ _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-05-07 00:21:06 UTC (rev 15067) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-07 00:37:48 UTC (rev 15068) @@ -913,7 +913,7 @@ STDCALL IoGetTopLevelIrp(VOID) { - return(PsGetCurrentThread()->TopLevelIrp); + return (PIRP)PsGetCurrentThread()->TopLevelIrp; } /* @@ -1131,7 +1131,7 @@ STDCALL IoSetTopLevelIrp(IN PIRP Irp) { - PsGetCurrentThread()->TopLevelIrp = Irp; + PsGetCurrentThread()->TopLevelIrp = (ULONG)Irp; } /* _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-05-07 00:21:06 UTC (rev 15067) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-05-07 00:37:48 UTC (rev 15068) @@ -125,13 +125,13 @@ /* Set the Thread to running */ mov byte ptr [esi+KTHREAD_STATE], Running - + /* Save the Exception list */ push [ebx+KPCR_EXCEPTION_LIST] /* Switching, disable interrupts now */ cli - + #ifdef CONFIG_SMP /* Save FPU state if the thread has used it. */ mov dword ptr [ebx+KPCR_NPX_THREAD], 0 @@ -157,9 +157,14 @@ mov [edi+KTHREAD_KERNEL_STACK], esp mov esp, [esi+KTHREAD_KERNEL_STACK] + /* Change the address space */ + mov eax, [esi+KTHREAD_APCSTATE_PROCESS] + mov eax, [eax+KPROCESS_DIRECTORY_TABLE_BASE] + mov cr3, eax + /* Stack is OK, safe to enable interrupts now */ sti - + /* Check if address space switch is needed */ mov eax, [edi+KTHREAD_APCSTATE_PROCESS] cmp eax, [esi+KTHREAD_APCSTATE_PROCESS] _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-05-07 00:21:06 UTC (rev 15067) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-05-07 00:37:48 UTC (rev 15068) @@ -129,9 +129,9 @@ if (Thread != CurrentThread) { /* Make sure it didn't already terminate */ - if (!Thread->HasTerminated) { + if (!Thread->Terminated) { - Thread->HasTerminated = TRUE; + Thread->Terminated = TRUE; /* Terminate it by APC */ PspTerminateThreadByPointer(Thread, ExitStatus); @@ -485,7 +485,7 @@ /* mark our thread as terminating so attempts to terminate it, when unlocking the process, fail */ - CurrentThread->HasTerminated = TRUE; + CurrentThread->Terminated = TRUE; PsUnlockProcess(Process); @@ -549,9 +549,9 @@ PsLockProcess(Thread->ThreadsProcess, FALSE); /* This isn't our thread, terminate it if not already done */ - if (!Thread->HasTerminated) { + if (!Thread->Terminated) { - Thread->HasTerminated = TRUE; + Thread->Terminated = TRUE; /* Terminate it */ PspTerminateThreadByPointer(Thread, ExitStatus); @@ -564,7 +564,7 @@ } else { - Thread->HasTerminated = TRUE; + Thread->Terminated = TRUE; /* it's safe to dereference thread, there's at least the keep-alive reference which will be removed by the thread reaper causing the _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-05-07 00:21:06 UTC (rev 15067) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-05-07 00:37:48 UTC (rev 15068) @@ -46,7 +46,7 @@ "This is my IRQL: %d. This is my Thread Pointer: %x.\n", StartRoutine, StartContext, KeGetCurrentIrql(), Thread); - if (!Thread->HasTerminated) { + if (!Thread->Terminated) { /* Allocate the APC */ ThreadApc = ExAllocatePoolWithTag(NonPagedPool, sizeof(KAPC), TAG('T', 'h', 'r','d')); @@ -82,7 +82,7 @@ KeLowerIrql(PASSIVE_LEVEL); /* Make sure it's not terminated by now */ - if (!Thread->HasTerminated) { + if (!Thread->Terminated) { /* Call it */ (StartRoutine)(StartContext); @@ -483,7 +483,7 @@ STDCALL PsIsThreadTerminating(IN PETHREAD Thread) { - return (Thread->HasTerminated ? TRUE : FALSE); + return (Thread->Terminated ? TRUE : FALSE); } /*

19 years, 4 months

[weiden] 15067: ReadFile should return 0 to lpNumberOfBytesRead if NtReadFile returned STATUS_END_OF_FILE for synchronous operations

by weiden＠svn.reactos.com

ReadFile should return 0 to lpNumberOfBytesRead if NtReadFile returned STATUS_END_OF_FILE for synchronous operations Modified: trunk/reactos/lib/kernel32/file/rw.c _____ Modified: trunk/reactos/lib/kernel32/file/rw.c --- trunk/reactos/lib/kernel32/file/rw.c 2005-05-06 22:55:52 UTC (rev 15066) +++ trunk/reactos/lib/kernel32/file/rw.c 2005-05-07 00:21:06 UTC (rev 15067) @@ -221,7 +221,7 @@ /* lpNumberOfBytesRead must not be NULL here, in fact Win doesn't check that case either and crashes (only after the operation completed) */ - *lpNumberOfBytesRead = Iosb.Information; + *lpNumberOfBytesRead = 0; return TRUE; }

19 years, 4 months

[ion] 15066: Fix win32k to use new EPROCESS defintion

by ion＠svn.reactos.com

Fix win32k to use new EPROCESS defintion Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-05-06 22:54:40 UTC (rev 15065) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-05-06 22:55:52 UTC (rev 15066) @@ -93,7 +93,7 @@ { PW32PROCESS Win32Process; - Win32Process = Process->Win32Process; + Win32Process = (PW32PROCESS)Process->Win32Process; if (Create) { DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-05-06 22:54:40 UTC (rev 15065) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-05-06 22:55:52 UTC (rev 15066) @@ -234,9 +234,9 @@ if(RemoveFromProcess) { - IntLockProcessMenus(MenuObject->Process->Win32Process); + IntLockProcessMenus((PW32PROCESS)MenuObject->Process->Win32Process); RemoveEntryList(&MenuObject->ListEntry); - IntUnLockProcessMenus(MenuObject->Process->Win32Process); + IntUnLockProcessMenus((PW32PROCESS)MenuObject->Process->Win32Process); } Status = ObReferenceObjectByHandle(MenuObject->Process->Win32WindowStation, _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-05-06 22:54:40 UTC (rev 15065) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-05-06 22:55:52 UTC (rev 15066) @@ -71,12 +71,12 @@ return FALSE; } - LogonProcess = Process->Win32Process; + LogonProcess = (PW32PROCESS)Process->Win32Process; } else { /* Deregister the logon process */ - if (LogonProcess != Process->Win32Process) + if (LogonProcess != (PW32PROCESS)Process->Win32Process) { ObDereferenceObject(Process); return FALSE; @@ -1277,7 +1277,7 @@ return 0; } - W32Process = Process->Win32Process; + W32Process = (PW32PROCESS)Process->Win32Process; if(!W32Process) { ObDereferenceObject(Process); _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-05-06 22:54:40 UTC (rev 15065) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-05-06 22:55:52 UTC (rev 15066) @@ -566,7 +566,7 @@ ULONG Cnt = 0; Win32Thread = Thread->Tcb.Win32Thread; - Win32Process = Thread->ThreadsProcess->Win32Process; + Win32Process = (PW32PROCESS)Thread->ThreadsProcess->Win32Process; IntLockThreadWindows(Win32Thread); Current = Win32Thread->WindowListHead.Flink; _____ Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-05-06 22:54:40 UTC (rev 15065) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-05-06 22:55:52 UTC (rev 15066) @@ -660,7 +660,7 @@ { KeAttachProcess(Process); } - W32Process = Process->Win32Process; + W32Process = (PW32PROCESS)Process->Win32Process; ASSERT(W32Process); if(W32Process->GDIObjects > 0) @@ -1110,7 +1110,7 @@ Status = PsLookupProcessByProcessId((HANDLE)((ULONG_PTR)PrevProcId & ~0x1), &OldProcess); if(NT_SUCCESS(Status)) { - W32Process = OldProcess->Win32Process; + W32Process = (PW32PROCESS)OldProcess->Win32Process; if(W32Process != NULL) { InterlockedDecrement(&W32Process->GDIObjects); @@ -1221,7 +1221,7 @@ Status = PsLookupProcessByProcessId((HANDLE)((ULONG_PTR)PrevProcId & ~0x1), &OldProcess); if(NT_SUCCESS(Status)) { - W32Process = OldProcess->Win32Process; + W32Process = (PW32PROCESS)OldProcess->Win32Process; if(W32Process != NULL) { InterlockedDecrement(&W32Process->GDIObjects); @@ -1235,7 +1235,7 @@ ProcessId = PsGetProcessId(NewOwner); /* Increase the new process' object counter */ - W32Process = NewOwner->Win32Process; + W32Process = (PW32PROCESS)NewOwner->Win32Process; if(W32Process != NULL) { InterlockedIncrement(&W32Process->GDIObjects);

19 years, 4 months

[ion] 15065: Update EPROCESS to latest version. Basic Fast Referencing Stubs to allow Token access. Needs to be implemented. Use ActiveProcessLinks instead of ros-specific list.

by ion＠svn.reactos.com

Update EPROCESS to latest version. Basic Fast Referencing Stubs to allow Token access. Needs to be implemented. Use ActiveProcessLinks instead of ros-specific list. Modified: trunk/reactos/include/ddk/extypes.h Modified: trunk/reactos/include/ddk/setypes.h Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/include/internal/se.h Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/ob/object.c Modified: trunk/reactos/ntoskrnl/ps/debug.c Modified: trunk/reactos/ntoskrnl/ps/job.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ddk/extypes.h --- trunk/reactos/include/ddk/extypes.h 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/include/ddk/extypes.h 2005-05-06 22:54:40 UTC (rev 15065) @@ -94,6 +94,28 @@ }; } EX_RUNDOWN_REF, *PEX_RUNDOWN_REF; +typedef struct _EX_FAST_REF { + union { + PVOID Object; + ULONG RefCnt:3; + ULONG Value; + }; +} EX_FAST_REF, *PEX_FAST_REF; + +typedef struct _EX_PUSH_LOCK { + union { + struct { + ULONG Locked:1; + ULONG Waiting:1; + ULONG Waking:1; + ULONG MultipleShared:1; + ULONG Shared:28; + }; + ULONG Value; + PVOID Ptr; + }; +} EX_PUSH_LOCK, *PEX_PUSH_LOCK; + typedef struct { LONG Count; _____ Modified: trunk/reactos/include/ddk/setypes.h --- trunk/reactos/include/ddk/setypes.h 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/include/ddk/setypes.h 2005-05-06 22:54:40 UTC (rev 15065) @@ -151,6 +151,12 @@ TOKEN_CONTROL ClientTokenControl; } SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; +#ifndef __USE_W32API +typedef struct _SE_AUDIT_PROCESS_CREATION_INFO +{ + struct _OBJECT_NAME_INFORMATION *ImageFileName; +} SE_AUDIT_PROCESS_CREATION_INFO, *PSE_AUDIT_PROCESS_CREATION_INFO; +#endif typedef struct _SE_EXPORTS { _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -633,23 +633,17 @@ SpiCur->InheritedFromUniqueProcessId = pr->InheritedFromUniqueProcessId; SpiCur->HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); SpiCur->PeakVirtualSize = pr->PeakVirtualSize; - SpiCur->VirtualSize = pr->VirtualSize.QuadPart; - SpiCur->PageFaultCount = pr->LastFaultCount; + SpiCur->VirtualSize = pr->VirtualSize; + SpiCur->PageFaultCount = pr->Vm.PageFaultCount; SpiCur->PeakWorkingSetSize = pr->Vm.PeakWorkingSetSize; // Is this right using ->Vm. here ? SpiCur->WorkingSetSize = pr->Vm.WorkingSetSize; // Is this right using ->Vm. here ? - SpiCur->QuotaPeakPagedPoolUsage = - pr->QuotaPeakPoolUsage[0]; - SpiCur->QuotaPagedPoolUsage = - pr->QuotaPoolUsage[0]; - SpiCur->QuotaPeakNonPagedPoolUsage = - pr->QuotaPeakPoolUsage[1]; - SpiCur->QuotaNonPagedPoolUsage = - pr->QuotaPoolUsage[1]; - SpiCur->PagefileUsage = pr->PagefileUsage; // FIXME - SpiCur->PeakPagefileUsage = pr->PeakPagefileUsage; - // KJK::Hyperion: I don't know what does this mean. VM_COUNTERS - // doesn't seem to contain any equivalent field - //SpiCur->TotalPrivateBytes = pr->NumberOfPrivatePages; //FIXME: bytes != pages + SpiCur->QuotaPeakPagedPoolUsage = pr->QuotaPeak[0]; + SpiCur->QuotaPagedPoolUsage = pr->QuotaUsage[0]; + SpiCur->QuotaPeakNonPagedPoolUsage = pr->QuotaPeak[1]; + SpiCur->QuotaNonPagedPoolUsage = pr->QuotaUsage[1]; + SpiCur->PagefileUsage = pr->QuotaUsage[3]; + SpiCur->PeakPagefileUsage = pr->QuotaPeak[3]; + SpiCur->PrivateUsage = pr->CommitCharge; current_entry = pr->ThreadListHead.Flink; while (current_entry != &pr->ThreadListHead) _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-05-06 22:54:40 UTC (rev 15065) @@ -188,6 +188,28 @@ #endif /* __USE_W32API */ +typedef struct _MMADDRESS_NODE +{ + union { + ULONG Balance:2; + struct _MMADDRESS_NODE *Parent; + } u1; + struct _MMADDRESS_NODE *LeftChild; + struct _MMADDRESS_NODE *RightChild; + ULONG StartingVpn; + ULONG EndingVpn; +} MMADDRESS_NODE, *PMMADDRESS_NODE; + +typedef struct _MM_AVL_TABLE +{ + MMADDRESS_NODE BalancedRoot; + ULONG DepthOfTree:5; + ULONG Unused:3; + ULONG NumberGenericTableElements:24; + PVOID NodeHint; + PVOID NodeFreeHint; +} MM_AVL_TABLE, *PMM_AVL_TABLE; + typedef struct _MEMORY_AREA { PVOID StartingAddress; _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-05-06 22:54:40 UTC (rev 15065) @@ -209,7 +209,6 @@ POBJECT_TYPE ObjectType; } TYPE_OBJECT, *PTYPE_OBJECT; - /* * Enumeration of object types */ @@ -326,6 +325,25 @@ VOID ObpDereferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor); +VOID +FASTCALL +ObInitializeFastReference(IN PEX_FAST_REF FastRef, + PVOID Object); + +PVOID +FASTCALL +ObFastReplaceObject(IN PEX_FAST_REF FastRef, + PVOID Object); + +PVOID +FASTCALL +ObFastReferenceObject(IN PEX_FAST_REF FastRef); + +VOID +FASTCALL +ObFastDereferenceObject(IN PEX_FAST_REF FastRef, + PVOID Object); + /* Secure object information functions */ typedef struct _CAPTURED_OBJECT_ATTRIBUTES _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-05-06 22:54:40 UTC (rev 15065) @@ -126,127 +126,140 @@ typedef struct _ETHREAD *PETHREAD; #endif /* __USE_W32API */ - + +#include <pshpack4.h> struct _EPROCESS { - /* Microkernel specific process state. */ - KPROCESS Pcb; /* 000 */ - /* Exit status of the process. */ - NTSTATUS ExitStatus; /* 068 */ - /* Unknown. */ - KEVENT LockEvent; /* 06C */ - /* Unknown. */ - ULONG LockCount; /* 07C */ + KPROCESS Pcb; /* 000 */ + EX_PUSH_LOCK ProcessLock; /* 078 */ + LARGE_INTEGER CreateTime; /* 080 */ + LARGE_INTEGER ExitTime; /* 088 */ + EX_RUNDOWN_REF RundownProtect; /* 090 */ + HANDLE UniqueProcessId; /* 094 */ + LIST_ENTRY ActiveProcessLinks; /* 098 */ + ULONG QuotaUsage[3]; /* 0A0 */ + ULONG QuotaPeak[3]; /* 0AC */ + ULONG CommitCharge; /* 0B8 */ + ULONG PeakVirtualSize; /* 0BC */ + ULONG VirtualSize; /* 0C0 */ + LIST_ENTRY SessionProcessLinks; /* 0C4 */ + PVOID DebugPort; /* 0CC */ + PVOID ExceptionPort; /* 0D0 */ + PHANDLE_TABLE ObjectTable; /* 0D4 */ + EX_FAST_REF Token; /* 0D8 */ + ULONG WorkingSetPage; /* 0DC */ + KGUARDED_MUTEX AddressCreationLock; /* 0E0 */ + KSPIN_LOCK HyperSpaceLock; /* 100 */ + PETHREAD ForkInProgress; /* 104 */ + ULONG HardwareTrigger; /* 108 */ + MM_AVL_TABLE PhysicalVadroot; /* 10C */ + PVOID CloneRoot; /* 110 */ + ULONG NumberOfPrivatePages; /* 114 */ + ULONG NumberOfLockedPages; /* 118 */ + PVOID *Win32Process; /* 11C */ + struct _EJOB *Job; /* 120 */ + PVOID SectionObject; /* 124 */ + PVOID SectionBaseAddress; /* 128 */ + PEPROCESS_QUOTA_BLOCK QuotaBlock; /* 12C */ + PPAGEFAULT_HISTORY WorkingSetWatch; /* 130 */ + PVOID Win32WindowStation; /* 134 */ + HANDLE InheritedFromUniqueProcessId; /* 138 */ + PVOID LdtInformation; /* 13C */ + PVOID VadFreeHint; /* 140 */ + PVOID VdmObjects; /* 144 */ + PVOID DeviceMap; /* 148 */ + PVOID Spare0[3]; /* 14C */ + union { + HARDWARE_PTE_X86 PagedirectoryPte; /* 158 */ + ULONGLONG Filler; /* 158 */ + }; + ULONG Session; /* 160 */ + UCHAR ImageFileName[16]; /* 164 */ + LIST_ENTRY JobLinks; /* 174 */ + PVOID LockedPagesList; /* 17C */ + LIST_ENTRY ThreadListHead; /* 184 */ + PVOID SecurityPort; /* 188 */ + PVOID PaeTop; /* 18C */ + ULONG ActiveThreds; /* 190 */ + ACCESS_MASK GrantedAccess; /* 194 */ + ULONG DefaultHardErrorProcessing; /* 198 */ + NTSTATUS LastThreadExitStatus; /* 19C */ + PPEB Peb; /* 1A0 */ + EX_FAST_REF PrefetchTrace; /* 1A4 */ + LARGE_INTEGER ReadOperationCount; /* 1A8 */ + LARGE_INTEGER WriteOperationCount; /* 1B0 */ + LARGE_INTEGER OtherOperationCount; /* 1B8 */ + LARGE_INTEGER ReadTransferCount; /* 1C0 */ + LARGE_INTEGER WriteTransferCount; /* 1C8 */ + LARGE_INTEGER OtherTransferCount; /* 1D0 */ + ULONG CommitChargeLimit; /* 1D8 */ + ULONG CommitChargePeak; /* 1DC */ + PVOID AweInfo; /* 1E0 */ + SE_AUDIT_PROCESS_CREATION_INFO SeAuditProcessCreationInfo; /* 1E4 */ + MMSUPPORT Vm; /* 1E8 */ + LIST_ENTRY MmProcessLinks; /* 230 */ + ULONG ModifiedPageCount; /* 238 */ + ULONG JobStatus; /* 23C */ + union { + struct { + ULONG CreateReported:1; + ULONG NoDebugInherit:1; + ULONG ProcessExiting:1; + ULONG ProcessDelete:1; + ULONG Wow64SplitPages:1; + ULONG VmDeleted:1; + ULONG OutswapEnabled:1; + ULONG Outswapped:1; + ULONG ForkFailed:1; + ULONG Wow64VaSpace4Gb:1; + ULONG AddressSpaceInitialized:2; + ULONG SetTimerResolution:1; + ULONG BreakOnTermination:1; + ULONG SessionCreationUnderway:1; + ULONG WriteWatch:1; + ULONG ProcessInSession:1; + ULONG OverrideAddressSpace:1; + ULONG HasAddressSpace:1; + ULONG LaunchPrefetched:1; + ULONG InjectInpageErrors:1; + ULONG VmTopDown:1; + ULONG ImageNotifyDone:1; + ULONG PdeUpdateNeeded:1; + ULONG VdmAllowed:1; + ULONG SmapAllowed:1; + ULONG CreateFailed:1; + ULONG DefaultIoPriority:3; + ULONG Spare1:1; + ULONG Spare2:1; + }; + ULONG Flags; /* 240 */ + }; + + NTSTATUS ExitStatus; /* 244 */ + USHORT NextPageColor; /* 248 */ + union { + struct { + UCHAR SubSystemMinorVersion; /* 24A */ + UCHAR SubSystemMajorVersion; /* 24B */ + }; + USHORT SubSystemVersion; /* 24A */ + }; + UCHAR PriorityClass; /* 24C */ + MM_AVL_TABLE VadRoot; /* 250 */ + ULONG Cookie; /* 270 */ - /* Time of process creation. */ - LARGE_INTEGER CreateTime; /* 080 */ - - /* Time of process exit. */ - LARGE_INTEGER ExitTime; /* 088 */ - /* Unknown. */ - PKTHREAD LockOwner; /* 090 */ - /* Process id. */ - HANDLE UniqueProcessId; /* 094 */ - /* Unknown. */ - LIST_ENTRY ActiveProcessLinks; /* 098 */ - /* Unknown. */ - ULONG QuotaPeakPoolUsage[2]; /* 0A0 */ - /* Unknown. */ - ULONG QuotaPoolUsage[2]; /* 0A8 */ - /* Unknown. */ - ULONG PagefileUsage; /* 0B0 */ - /* Unknown. */ - ULONG CommitCharge; /* 0B4 */ - /* Unknown. */ - ULONG PeakPagefileUsage; /* 0B8 */ - /* Unknown. */ - ULONG PeakVirtualSize; /* 0BC */ - /* Unknown. */ - LARGE_INTEGER VirtualSize; /* 0C0 */ - - MMSUPPORT Vm; - LIST_ENTRY SessionProcessLinks; - struct _EPORT *DebugPort; - struct _EPORT *ExceptionPort; - PHANDLE_TABLE ObjectTable; - PVOID Token; - FAST_MUTEX WorkingSetLock; - ULONG WorkingSetPage; - UCHAR ProcessOutswapEnabled; - UCHAR ProcessOutswapped; - UCHAR AddressSpaceInitialized; - UCHAR AddressSpaceDeleted; - FAST_MUTEX AddressCreationLock; - KSPIN_LOCK HyperSpaceLock; - PETHREAD ForkInProgress; - USHORT VmOperation; - UCHAR ForkWasSuccessful; - UCHAR MmAgressiveWsTrimMask; - PKEVENT VmOperationEvent; - PVOID PaeTop; - ULONG LastFaultCount; - ULONG ModifiedPageCount; - PVOID VadRoot; - PVOID VadHint; - PVOID CloneRoot; - ULONG NumberOfPrivatePages; - ULONG NumberOfLockedPages; - USHORT NextPageColor; - UCHAR ExitProcessCalled; - UCHAR CreateProcessReported; - HANDLE SectionHandle; - PPEB Peb; - PVOID SectionBaseAddress; - PEPROCESS_QUOTA_BLOCK QuotaBlock; - NTSTATUS LastThreadExitStatus; - PPAGEFAULT_HISTORY WorkingSetWatch; - HANDLE Win32WindowStation; - HANDLE InheritedFromUniqueProcessId; - ULONG GrantedAccess; - ULONG DefaultHardErrorProcessing; - PVOID LdtInformation; - PVOID VadFreeHint; - PVOID VdmObjects; - PVOID DeviceObjects; - ULONG SessionId; - LIST_ENTRY PhysicalVadList; - HARDWARE_PTE_X86 PageDirectoryPte; - ULONGLONG Filler; - ULONG PaePageDirectoryPage; - CHAR ImageFileName[16]; - ULONG VmTrimFaultValue; - UCHAR SetTimerResolution; - UCHAR PriorityClass; - UCHAR SubSystemMinorVersion; - UCHAR SubSystemMajorVersion; - USHORT SubSystemVersion; - struct _W32PROCESS *Win32Process; - struct _EJOB *Job; - ULONG JobStatus; - LIST_ENTRY JobLinks; - PVOID LockedPagesList; - struct _EPORT *SecurityPort; - PWOW64_PROCESS Wow64; - LARGE_INTEGER ReadOperationCount; - LARGE_INTEGER WriteOperationCount; - LARGE_INTEGER OtherOperationCount; - LARGE_INTEGER ReadTransferCount; - LARGE_INTEGER WriteTransferCount; - LARGE_INTEGER OtherTransferCount; - ULONG CommitChargeLimit; - ULONG CommitChargePeak; - LIST_ENTRY ThreadListHead; - PRTL_BITMAP VadPhysicalPagesBitMap; - ULONG VadPhysicalPages; - KSPIN_LOCK AweLock; - ULONG Cookie; - - /* - * FIXME - ReactOS specified - remove the following fields ASAP!!! - */ - MADDRESS_SPACE AddressSpace; - LIST_ENTRY ProcessListEntry; +/*************************************************************** + * REACTOS SPECIFIC START + ***************************************************************/ + /* FIXME WILL BE DEPRECATED WITH PUSHLOCK SUPPORT IN 0.3.0 */ + KEVENT LockEvent; /* 274 */ + ULONG LockCount; /* 284 */ + struct _KTHREAD *LockOwner; /* 288 */ + + /* FIXME MOVE TO AVL TREES */ + MADDRESS_SPACE AddressSpace; /* 28C */ }; +#include <poppack.h> #define PROCESS_STATE_TERMINATED (1) #define PROCESS_STATE_ACTIVE (2) _____ Modified: trunk/reactos/ntoskrnl/include/internal/se.h --- trunk/reactos/ntoskrnl/include/internal/se.h 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/include/internal/se.h 2005-05-06 22:54:40 UTC (rev 15065) @@ -20,7 +20,6 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_SE_H #define __NTOSKRNL_INCLUDE_INTERNAL_SE_H - extern POBJECT_TYPE SepTokenObjectType; /* SID Authorities */ @@ -110,6 +109,8 @@ BOOLEAN SepInitDACLs(VOID); BOOLEAN SepInitSDs(VOID); +VOID SeDeassignPrimaryToken(struct _EPROCESS *Process); + NTSTATUS STDCALL SepCreateImpersonationTokenDacl(PTOKEN Token, PTOKEN PrimaryToken, _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -901,7 +901,7 @@ IoGetRequestorSessionId(IN PIRP Irp, OUT PULONG pSessionId) { - *pSessionId = IoGetRequestorProcess(Irp)->SessionId; + *pSessionId = IoGetRequestorProcess(Irp)->Session; return STATUS_SUCCESS; } _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -789,7 +789,7 @@ AProcess = PsActiveProcessHead.Flink; while(AProcess != &PsActiveProcessHead) { - Process = CONTAINING_RECORD(AProcess, EPROCESS, ProcessListEntry); + Process = CONTAINING_RECORD(AProcess, EPROCESS, ActiveProcessLinks); AThread = Process->ThreadListHead.Flink; if(AThread != &Process->ThreadListHead) { @@ -831,10 +831,10 @@ else { PETHREAD Thread = NULL; - AProcess = Process->ProcessListEntry.Flink; + AProcess = Process->ActiveProcessLinks.Flink; while(AProcess != &PsActiveProcessHead) { - Process = CONTAINING_RECORD(AProcess, EPROCESS, ProcessListEntry); + Process = CONTAINING_RECORD(AProcess, EPROCESS, ActiveProcessLinks); AThread = Process->ThreadListHead.Flink; if(AThread != &Process->ThreadListHead) { _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -1078,7 +1078,7 @@ KdbpPrint(" PID State Filename\n"); do { - Process = CONTAINING_RECORD(Entry, EPROCESS, ProcessListEntry); + Process = CONTAINING_RECORD(Entry, EPROCESS, ActiveProcessLinks); if (Process == KdbCurrentProcess) { _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -507,7 +507,7 @@ if (current) RtlpCreateUnicodeString (RemainingPath, current, NonPagedPool); - ExFreePool(PathString.Buffer); + RtlFreeUnicodeString (&PathString); *ReturnedObject = CurrentObject; return STATUS_SUCCESS; @@ -806,7 +806,7 @@ } RtlFreeUnicodeString(&Header->Name); RtlFreeUnicodeString(&RemainingPath); - ExFreePoolWithTag(Header, Header->ObjectType->Tag); + ExFreePool(Header); DPRINT("Create Failed\n"); return Status; } @@ -1000,7 +1000,7 @@ } DPRINT("ObPerformRetentionChecks() = Freeing object\n"); - ExFreePoolWithTag(Header, Header->ObjectType->Tag); + ExFreePool(Header); return(STATUS_SUCCESS); } @@ -1010,14 +1010,16 @@ ObpDeleteObjectWorkRoutine (IN PVOID Parameter) { PRETENTION_CHECK_PARAMS Params = (PRETENTION_CHECK_PARAMS)Parameter; - ULONG Tag; + /* ULONG Tag; */ /* See below */ ASSERT(Params); ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); /* We need PAGED_CODE somewhere... */ - Tag = Params->ObjectHeader->ObjectType->Tag; + /* Turn this on when we have ExFreePoolWithTag + Tag = Params->ObjectHeader->ObjectType->Tag; */ ObpDeleteObject(Params->ObjectHeader); - ExFreePoolWithTag(Params, Tag); + ExFreePool(Params); + /* ExFreePoolWithTag(Params, Tag); */ } @@ -1115,7 +1117,6 @@ } - /********************************************************************** * NAME EXPORTED * ObfDereferenceObject@4 @@ -1161,7 +1162,57 @@ } } +VOID +FASTCALL +ObInitializeFastReference(IN PEX_FAST_REF FastRef, + PVOID Object) +{ + /* FIXME: Fast Referencing is Unimplemented */ + FastRef->Object = Object; +} + +PVOID +FASTCALL +ObFastReferenceObject(IN PEX_FAST_REF FastRef) +{ + /* FIXME: Fast Referencing is Unimplemented */ + + /* Do a normal Reference */ + ObReferenceObject(FastRef->Object); + + /* Return the Object */ + return FastRef->Object; +} + +VOID +FASTCALL +ObFastDereferenceObject(IN PEX_FAST_REF FastRef, + PVOID Object) +{ + /* FIXME: Fast Referencing is Unimplemented */ + + /* Do a normal Dereference */ + ObDereferenceObject(FastRef->Object); +} + +PVOID +FASTCALL +ObFastReplaceObject(IN PEX_FAST_REF FastRef, + PVOID Object) +{ + PVOID OldObject = FastRef->Object; + + /* FIXME: Fast Referencing is Unimplemented */ + FastRef->Object = Object; + + /* Do a normal Dereference */ + ObDereferenceObject(OldObject); + + /* Return old Object*/ + return OldObject; +} + /********************************************************************** * NAME EXPORTED * ObGetObjectPointerCount@4 _____ Modified: trunk/reactos/ntoskrnl/ps/debug.c --- trunk/reactos/ntoskrnl/ps/debug.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/ps/debug.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -280,9 +280,8 @@ CurrentProcess = PsActiveProcessHead.Flink; while(CurrentProcess != &PsActiveProcessHead) { - /* Get the process */ - Process = CONTAINING_RECORD(CurrentProcess, EPROCESS, ProcessListEntry); + Process = CONTAINING_RECORD(CurrentProcess, EPROCESS, ActiveProcessLinks); /* Skip the Initial Process if requested */ if((Process != PsInitialSystemProcess) || _____ Modified: trunk/reactos/ntoskrnl/ps/job.c --- trunk/reactos/ntoskrnl/ps/job.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/ps/job.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -160,7 +160,7 @@ Status = PsLockProcess(Process, FALSE); if(NT_SUCCESS(Status)) { - if(Process->Job == NULL && Process->SessionId == Job->SessionId) + if(Process->Job == NULL && Process->Session == Job->SessionId) { /* Just store the pointer to the job object in the process, we'll assign it later. The reason we can't do this here is that locking @@ -263,7 +263,7 @@ /* setup the job object */ InitializeListHead(&Job->ProcessListHead); - Job->SessionId = CurrentProcess->SessionId; /* inherit the session id from the caller */ + Job->SessionId = CurrentProcess->Session; /* inherit the session id from the caller */ Status = ExInitializeResource(&Job->JobLock); if(!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -93,7 +93,7 @@ current_entry = PsActiveProcessHead.Flink; while (current_entry != &PsActiveProcessHead) { - current = CONTAINING_RECORD(current_entry, EPROCESS, ProcessListEntry); + current = CONTAINING_RECORD(current_entry, EPROCESS, ActiveProcessLinks); current_entry = current_entry->Flink; if (current->UniqueProcessId != PsInitialSystemProcess->UniqueProcessId && @@ -150,7 +150,7 @@ /* Remove it from the Active List */ ExAcquireFastMutex(&PspActiveProcessMutex); - RemoveEntryList(&Process->ProcessListEntry); + RemoveEntryList(&Process->ActiveProcessLinks); ExReleaseFastMutex(&PspActiveProcessMutex); /* Delete the CID Handle */ @@ -162,8 +162,10 @@ /* KDB hook */ KDB_DELETEPROCESS_HOOK(Process); - /* Dereference the Token and release Memory Information */ - ObDereferenceObject(Process->Token); + /* Dereference the Token */ + SeDeassignPrimaryToken(Process); + + /* Release Memory Information */ MmReleaseMmInfo(Process); /* Delete the W32PROCESS structure if there's one associated */ _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -135,12 +135,12 @@ { /* Get the Process Link */ PLIST_ENTRY Flink = (NextProcess == PsIdleProcess ? PsActiveProcessHead.Flink : - NextProcess->ProcessListEntry.Flink); + NextProcess->ActiveProcessLinks.Flink); /* Move to the next Process if we're not back at the beginning */ if (Flink != &PsActiveProcessHead) { - NextProcess = CONTAINING_RECORD(Flink, EPROCESS, ProcessListEntry); + NextProcess = CONTAINING_RECORD(Flink, EPROCESS, ActiveProcessLinks); } else { @@ -292,7 +292,7 @@ if (pParentProcess) { Process->InheritedFromUniqueProcessId = pParentProcess->UniqueProcessId; - Process->SessionId = pParentProcess->SessionId; + Process->Session = pParentProcess->Session; } /* FIXME: Set up the Quota Block from the Parent @@ -393,7 +393,7 @@ /* W00T! The process can now be activated */ DPRINT("Inserting into Active Process List\n"); ExAcquireFastMutex(&PspActiveProcessMutex); - InsertTailList(&PsActiveProcessHead, &Process->ProcessListEntry); + InsertTailList(&PsActiveProcessHead, &Process->ActiveProcessLinks); ExReleaseFastMutex(&PspActiveProcessMutex); /* FIXME: SeCreateAccessStateEx */ @@ -547,7 +547,7 @@ STDCALL PsGetProcessExitProcessCalled(PEPROCESS Process) { - return Process->ExitProcessCalled; + return Process->ProcessExiting; } /* @@ -636,7 +636,7 @@ STDCALL PsGetCurrentProcessSessionId(VOID) { - return PsGetCurrentProcess()->SessionId; + return PsGetCurrentProcess()->Session; } /* @@ -666,7 +666,7 @@ STDCALL PsGetProcessSessionId(PEPROCESS Process) { - return (HANDLE)Process->SessionId; + return (HANDLE)Process->Session; } /* _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -186,7 +186,7 @@ PsIdleProcess->Pcb.QuantumReset = 6; InitializeListHead(&PsIdleProcess->Pcb.ThreadListHead); InitializeListHead(&PsIdleProcess->ThreadListHead); - InitializeListHead(&PsIdleProcess->ProcessListEntry); + InitializeListHead(&PsIdleProcess->ActiveProcessLinks); KeInitializeDispatcherHeader(&PsIdleProcess->Pcb.Header, ProcessObject, sizeof(EPROCESS), @@ -248,7 +248,7 @@ PsInitialSystemProcess->Win32WindowStation = (HANDLE)0; InsertHeadList(&PsActiveProcessHead, - &PsInitialSystemProcess->ProcessListEntry); + &PsInitialSystemProcess->ActiveProcessLinks); InitializeListHead(&PsInitialSystemProcess->ThreadListHead); #ifndef SCHED_REWRITE @@ -257,7 +257,7 @@ /* No parent, this is the Initial System Process. Assign Boot Token */ BootToken = SepCreateSystemProcessToken(); BootToken->TokenInUse = TRUE; - PsInitialSystemProcess->Token = BootToken; + PsInitialSystemProcess->Token.Object = BootToken; /* FIXME */ ObReferenceObject(BootToken); #endif } _____ Modified: trunk/reactos/ntoskrnl/ps/query.c --- trunk/reactos/ntoskrnl/ps/query.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/ps/query.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -287,7 +287,7 @@ _SEH_TRY { - SessionInfo->SessionId = Process->SessionId; + SessionInfo->SessionId = Process->Session; if (ReturnLength) { *ReturnLength = sizeof(PROCESS_SESSION_INFORMATION); @@ -318,16 +318,16 @@ * incompatibilities in current headers (no unnamed union), * I opted for cast. */ - pOut->VirtualSize = (ULONG)Process->VirtualSize.QuadPart; + pOut->VirtualSize = (ULONG)Process->VirtualSize; pOut->PageFaultCount = Process->Vm.PageFaultCount; pOut->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; pOut->WorkingSetSize = Process->Vm.WorkingSetSize; - pOut->QuotaPeakPagedPoolUsage = Process->QuotaPeakPoolUsage[0]; // TODO: Verify! - pOut->QuotaPagedPoolUsage = Process->QuotaPoolUsage[0]; // TODO: Verify! - pOut->QuotaPeakNonPagedPoolUsage = Process->QuotaPeakPoolUsage[1]; // TODO: Verify! - pOut->QuotaNonPagedPoolUsage = Process->QuotaPoolUsage[1]; // TODO: Verify! - pOut->PagefileUsage = Process->PagefileUsage; - pOut->PeakPagefileUsage = Process->PeakPagefileUsage; + pOut->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; // TODO: Verify! + pOut->QuotaPagedPoolUsage = Process->QuotaUsage[0]; // TODO: Verify! + pOut->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; // TODO: Verify! + pOut->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; // TODO: Verify! + pOut->PagefileUsage = Process->QuotaUsage[2]; + pOut->PeakPagefileUsage = Process->QuotaPeak[2]; if (ReturnLength) { @@ -841,7 +841,7 @@ Status = PsLockProcess(Process, FALSE); if(NT_SUCCESS(Status)) { - Process->SessionId = SessionInfo.SessionId; + Process->Session = SessionInfo.SessionId; /* Update the session id in the PEB structure */ if(Process->Peb != NULL) _____ Modified: trunk/reactos/ntoskrnl/ps/security.c --- trunk/reactos/ntoskrnl/ps/security.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/ps/security.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -13,6 +13,32 @@ #define NDEBUG #include <internal/debug.h> +/* INTERNAL ******************************************************************/ + +/* FIXME: Turn into Macro */ +VOID +STDCALL +PspLockProcessSecurityShared(PEPROCESS Process) +{ + /* Enter a Guarded Region */ + KeEnterGuardedRegion(); + + /* Lock the Process */ + //ExAcquirePushLockShared(&Process->ProcessLock); +} + +/* FIXME: Turn into Macro */ +VOID +STDCALL +PspUnlockProcessSecurityShared(PEPROCESS Process) +{ + /* Unlock the Process */ + //ExReleasePushLockShared(&Process->ProcessLock); + + /* Leave Guarded Region */ + KeLeaveGuardedRegion(); +} + /* FUNCTIONS *****************************************************************/ /* @@ -104,12 +130,26 @@ STDCALL PsReferencePrimaryToken(PEPROCESS Process) { - /* Reference and return the Token */ - ObReferenceObjectByPointer(Process->Token, - TOKEN_ALL_ACCESS, - SepTokenObjectType, - KernelMode); - return(Process->Token); + PACCESS_TOKEN Token; + + /* Fast Reference the Token */ + Token = ObFastReferenceObject(&Process->Token); + + /* Check if we got the Token or if we got locked */ + if (!Token) + { + /* Lock the Process */ + PspLockProcessSecurityShared(Process); + + /* Do a Locked Fast Reference */ + //Token = ObFastReferenceObjectLocked(&Process->Token); + + /* Unlock the Process */ + PspUnlockProcessSecurityShared(Process); + } + + /* Return the Token */ + return Token; } /* @@ -156,7 +196,8 @@ PTOKEN pParentToken; OBJECT_ATTRIBUTES ObjectAttributes; - pParentToken = (PACCESS_TOKEN)Parent->Token; + /* Get the Parent Token */ + pParentToken = PsReferencePrimaryToken(Parent); /* Initialize the Object Attributes */ InitializeObjectAttributes(&ObjectAttributes, @@ -180,7 +221,11 @@ return Status; } - Process->Token = pNewToken; + /* Dereference the Token */ + ObFastDereferenceObject(&Parent->Token, pParentToken); + + /* Set the new Token */ + ObInitializeFastReference(&Process->Token, pNewToken); } else { @@ -227,7 +272,6 @@ Status = SeExchangePrimaryToken(Process, Token, &OldToken); /* Derefernece Tokens and Return */ - if (NT_SUCCESS(Status)) ObDereferenceObject(OldToken); ObDereferenceObject(Token); return(Status); } @@ -356,22 +400,37 @@ PEPROCESS Process; PACCESS_TOKEN Token; - if (Thread->ActiveImpersonationInfo == FALSE) { - + if (Thread->ActiveImpersonationInfo == FALSE) + { Process = Thread->ThreadsProcess; *TokenType = TokenPrimary; *EffectiveOnly = FALSE; - Token = Process->Token; - } else { - + /* Fast Reference the Token */ + Token = ObFastReferenceObject(&Process->Token); + + /* Check if we got the Token or if we got locked */ + if (!Token) + { + /* Lock the Process */ + PspLockProcessSecurityShared(Process); + + /* Do a Locked Fast Reference */ + //Token = ObFastReferenceObjectLocked(&Process->Token); + + /* Unlock the Process */ + PspUnlockProcessSecurityShared(Process); + } + } + else + { Token = Thread->ImpersonationInfo->Token; *TokenType = TokenImpersonation; *EffectiveOnly = Thread->ImpersonationInfo->EffectiveOnly; *Level = Thread->ImpersonationInfo->ImpersonationLevel; } - return(Token); + return Token; } NTSTATUS _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -423,7 +423,7 @@ STDCALL PsGetThreadSessionId(PETHREAD Thread) { - return (HANDLE)Thread->ThreadsProcess->SessionId; + return (HANDLE)Thread->ThreadsProcess->Session; } /* _____ Modified: trunk/reactos/ntoskrnl/ps/win32.c --- trunk/reactos/ntoskrnl/ps/win32.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/ps/win32.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -54,7 +54,7 @@ PW32PROCESS STDCALL PsGetWin32Process(VOID) { - return(PsGetCurrentProcess()->Win32Process); + return (PW32PROCESS)PsGetCurrentProcess()->Win32Process; } NTSTATUS STDCALL _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-05-06 22:38:00 UTC (rev 15064) +++ trunk/reactos/ntoskrnl/se/token.c 2005-05-06 22:54:40 UTC (rev 15065) @@ -79,35 +79,47 @@ return(STATUS_NOT_IMPLEMENTED); [truncated at 1000 lines; 105 more skipped]

19 years, 4 months

[gvg] 15064: Link against static lib instead of dll

by gvg＠svn.reactos.com

Link against static lib instead of dll Modified: branches/xmlbuildsystem/reactos/subsys/smss/smss.xml _____ Modified: branches/xmlbuildsystem/reactos/subsys/smss/smss.xml --- branches/xmlbuildsystem/reactos/subsys/smss/smss.xml 2005-05-06 22:25:30 UTC (rev 15063) +++ branches/xmlbuildsystem/reactos/subsys/smss/smss.xml 2005-05-06 22:38:00 UTC (rev 15064) @@ -1,8 +1,8 @@ <module name="smss" type="nativecui" installbase="system32" installname="smss.exe"> <include base="smss">.</include> <define name="_DISABLE_TIDENTS" /> + <library>smlib</library> <library>ntdll</library> - <library>smdll</library> <linkerflag>-lgcc</linkerflag> <file>client.c</file> <file>debug.c</file>

19 years, 4 months

[weiden] 15063: upgrade to PSEH2 (note, the new macros are still named _SEH_*, not _SEH2_*!)

by weiden＠svn.reactos.com

upgrade to PSEH2 (note, the new macros are still named _SEH_*, not _SEH2_*!) Modified: trunk/reactos/include/ddk/exfuncs.h Modified: trunk/reactos/include/pseh/framebased/internal.h Modified: trunk/reactos/include/pseh/framebased.h Modified: trunk/reactos/include/pseh/native.h Modified: trunk/reactos/include/pseh/setjmp.h Modified: trunk/reactos/include/pseh.h Modified: trunk/reactos/lib/dbghelp/msc.c Modified: trunk/reactos/lib/kernel32/k32.h Modified: trunk/reactos/lib/pseh/framebased.c Modified: trunk/reactos/lib/pseh/i386/framebased.asm Modified: trunk/reactos/lib/pseh/i386/setjmp.asm Modified: trunk/reactos/ntoskrnl/ex/error.c Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/time.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/subsys/win32k/w32k.h _____ Modified: trunk/reactos/include/ddk/exfuncs.h --- trunk/reactos/include/ddk/exfuncs.h 2005-05-06 21:18:20 UTC (rev 15062) +++ trunk/reactos/include/ddk/exfuncs.h 2005-05-06 22:25:30 UTC (rev 15063) @@ -719,9 +719,9 @@ SUITE_TYPE SuiteType ); -BOOLEAN +LONG STDCALL -ExSystemExceptionFilter(); +ExSystemExceptionFilter(VOID); VOID STDCALL _____ Modified: trunk/reactos/include/pseh/framebased/internal.h --- trunk/reactos/include/pseh/framebased/internal.h 2005-05-06 21:18:20 UTC (rev 15062) +++ trunk/reactos/include/pseh/framebased/internal.h 2005-05-06 22:25:30 UTC (rev 15063) @@ -43,6 +43,7 @@ _SEHRegistration_t; struct __SEHPortableFrame; +struct __SEHPortableTryLevel; typedef long (__stdcall * _SEHFilter_t) ( @@ -52,7 +53,7 @@ typedef __declspec(noreturn) void (__stdcall * _SEHHandler_t) ( - struct __SEHPortableFrame * + struct __SEHPortableTryLevel * ); typedef void (__stdcall * _SEHFinally_t) @@ -63,23 +64,69 @@ typedef struct __SEHHandlers { _SEHFilter_t SH_Filter; - _SEHHandler_t SH_Handler; _SEHFinally_t SH_Finally; } _SEHHandlers_t; +typedef struct __SEHPortableTryLevel +{ + struct __SEHPortableTryLevel * SPT_Next; + const _SEHHandlers_t * SPT_Handlers; +} +_SEHPortableTryLevel_t; + typedef struct __SEHPortableFrame { _SEHRegistration_t SPF_Registration; unsigned long SPF_Code; - int SPF_Handling; - const _SEHHandlers_t * SPF_Handlers; + _SEHHandler_t SPF_Handler; + _SEHPortableTryLevel_t * SPF_TopTryLevel; } _SEHPortableFrame_t; -extern void __stdcall _SEHEnter(_SEHPortableFrame_t *); -extern void __stdcall _SEHLeave(_SEHPortableFrame_t *); +#ifdef __cplusplus +extern "C" +{ +#endif +extern void __stdcall _SEHEnterFrame_s +( + _SEHPortableFrame_t *, + _SEHPortableTryLevel_t * +); + +extern void __stdcall _SEHEnterTry_s(_SEHPortableTryLevel_t *); +extern void __stdcall _SEHLeave_s(void); + +#if !defined(_SEH_NO_FASTCALL) +# ifdef _M_IX86 +# define _SEH_FASTCALL __fastcall +# else +# define _SEH_FASTCALL __stdcall +# endif + +extern void _SEH_FASTCALL _SEHEnterFrame_f +( + _SEHPortableFrame_t *, + _SEHPortableTryLevel_t * +); + +extern void _SEH_FASTCALL _SEHEnterTry_f(_SEHPortableTryLevel_t *); +extern void _SEH_FASTCALL _SEHLeave_f(void); + +# define _SEHEnterFrame _SEHEnterFrame_f +# define _SEHEnterTry _SEHEnterTry_f +# define _SEHLeave _SEHLeave_f +#else +# define _SEHEnterFrame _SEHEnterFrame_s +# define _SEHEnterTry _SEHEnterTry_s +# define _SEHLeave _SEHLeave_s #endif +#ifdef __cplusplus +} +#endif + +#endif + /* EOF */ _____ Modified: trunk/reactos/include/pseh/framebased.h --- trunk/reactos/include/pseh/framebased.h 2005-05-06 21:18:20 UTC (rev 15062) +++ trunk/reactos/include/pseh/framebased.h 2005-05-06 22:25:30 UTC (rev 15063) @@ -25,7 +25,6 @@ #include <pseh/framebased/internal.h> #include <pseh/excpt.h> -#include <malloc.h> #ifndef offsetof # include <stddef.h> @@ -46,35 +45,34 @@ # define _SEHSetJmp setjmp # define _SEHJmpBuf_t jmp_buf #endif - +unsigned long DbgPrint(char * Format,...); typedef struct __SEHFrame { _SEHPortableFrame_t SEH_Header; - _SEHJmpBuf_t SEH_JmpBuf; void * SEH_Locals; } _SEHFrame_t; -/* - Note: just define __inline to an empty symbol if your C compiler doesn't - support it -*/ -#ifdef __cplusplus -# ifndef __inline -# define __inline inline -# endif -#endif +typedef struct __SEHTryLevel +{ + _SEHPortableTryLevel_t ST_Header; + _SEHJmpBuf_t ST_JmpBuf; +} +_SEHTryLevel_t; static __declspec(noreturn) __inline void __stdcall _SEHCompilerSpecificHandler ( - _SEHPortableFrame_t * frame + _SEHPortableTryLevel_t * trylevel ) { - _SEHFrame_t * myframe; - myframe = (_SEHFrame_t *)(((char *)frame) - offsetof(_SEHFrame_t, SEH_Header)); - _SEHLongJmp(myframe->SEH_JmpBuf, 1); + _SEHTryLevel_t * mytrylevel; + mytrylevel = _SEH_CONTAINING_RECORD(trylevel, _SEHTryLevel_t, ST_Header); + _SEHLongJmp(mytrylevel->ST_JmpBuf, 1); } +static const int _SEHScopeKind = 1; +static _SEHPortableFrame_t * const _SEHPortableFrame = 0; + /* SHARED LOCALS */ /* Access the locals for the current frame */ #define _SEH_ACCESS_LOCALS(LOCALS_) \ @@ -111,7 +109,7 @@ /* FINALLY FUNCTIONS */ /* Declares a finally function's prototype */ -#define _SEH_FINALLY(NAME_) \ +#define _SEH_FINALLYFUNC(NAME_) \ void __stdcall NAME_ \ ( \ struct __SEHPortableFrame * _SEHPortableFrame \ @@ -122,200 +120,270 @@ _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ()) #define _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ARGS_) \ - static __inline _SEH_FINALLY(WRAPPER_) \ + static __inline _SEH_FINALLYFUNC(WRAPPER_) \ { \ NAME_ ARGS_; \ } #define _SEH_WRAP_FINALLY_LOCALS_ARGS(WRAPPER_, LOCALS_, NAME_, ARGS_) \ - static __inline _SEH_FINALLY(WRAPPER_) \ + static __inline _SEH_FINALLYFUNC(WRAPPER_) \ { \ _SEH_ACCESS_LOCALS(LOCALS_); \ NAME_ ARGS_; \ } /* SAFE BLOCKS */ -#define _SEH_TRY_FINALLY(FINALLY_) \ +#define _SEHX_TRY_FINALLY(FINALLY_) \ _SEH_TRY_FILTER_FINALLY \ ( \ _SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH), \ (FINALLY_) \ ) -#define _SEH_END_FINALLY _SEH_HANDLE _SEH_END +#define _SEHX_END_FINALLY _SEH_HANDLE _SEH_END -#define _SEH_TRY_FILTER(FILTER_) \ - _SEH_TRY_FILTER_FINALLY((FILTER_), NULL) +#define _SEHX_TRY_FILTER(FILTER_) \ + _SEH_TRY_FILTER_FINALLY((FILTER_), 0) -#define _SEH_TRY_HANDLE_FINALLY(FINALLY_) \ +#define _SEHX_TRY_HANDLE_FINALLY(FINALLY_) \ _SEH_TRY_FILTER_FINALLY \ ( \ _SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER), \ (FINALLY_) \ ) -#define _SEH_TRY \ - _SEH_TRY_HANDLE_FINALLY(NULL) +#define _SEHX_TRY \ + _SEH_TRY_HANDLE_FINALLY(0) #ifdef __cplusplus # define _SEH_DECLARE_HANDLERS(FILTER_, FINALLY_) \ - const _SEHHandlers_t _SEHHandlers = \ - { \ - (FILTER_), \ - _SEHCompilerSpecificHandler, \ - (FINALLY_) \ - }; + static const _SEHHandlers_t _SEHHandlers = { (FILTER_), (FINALLY_) }; #else # define _SEH_DECLARE_HANDLERS(FILTER_, FINALLY_) \ - _SEHHandlers_t _SEHHandlers = \ - { \ - (0), \ - _SEHCompilerSpecificHandler, \ - (0) \ - }; \ + _SEHHandlers_t _SEHHandlers = { (0), (0) }; \ _SEHHandlers.SH_Filter = (FILTER_); \ _SEHHandlers.SH_Finally = (FINALLY_); #endif -#define _SEH_TRY_FILTER_FINALLY(FILTER_, FINALLY_) \ +#define _SEHX_TRY_FILTER_FINALLY(FILTER_, FINALLY_) \ { \ - _SEHFrame_t * _SEHFrame; \ - volatile _SEHPortableFrame_t * _SEHPortableFrame; \ + _SEHPortableFrame_t * const _SEHCurPortableFrame = _SEHPortableFrame; \ \ - _SEH_DECLARE_HANDLERS(FILTER_, FINALLY_); \ + { \ + _SEHFrame_t _SEHFrame; \ + _SEHTryLevel_t _SEHTryLevel; \ + _SEHPortableFrame_t * const _SEHPortableFrame = \ + _SEHScopeKind ? &_SEHFrame.SEH_Header : _SEHCurPortableFrame; \ \ - _SEHFrame = _alloca(sizeof(_SEHFrame_t)); \ - _SEHFrame->SEH_Header.SPF_Handlers = &_SEHHandlers; \ - _SEHFrame->SEH_Locals = &_SEHLocals; \ + (void)_SEHPortableFrame; \ \ - _SEHPortableFrame = &_SEHFrame->SEH_Header; \ - (void)_SEHPortableFrame; \ + _SEH_DECLARE_HANDLERS((FILTER_), (FINALLY_)); \ \ - if(_SEHSetJmp(_SEHFrame->SEH_JmpBuf) == 0) \ - { \ - _SEHEnter(&_SEHFrame->SEH_Header); \ + _SEHTryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ \ - do \ - { - -#define _SEH_HANDLE \ + if(_SEHScopeKind) \ + { \ + if(&_SEHLocals != _SEHDummyLocals) \ + _SEHFrame.SEH_Locals = &_SEHLocals; \ \ + _SEHFrame.SEH_Header.SPF_Handler = _SEHCompilerSpecificHandler; \ + _SEHEnterFrame(&_SEHFrame.SEH_Header, &_SEHTryLevel.ST_Header); \ } \ - while(0); \ + else \ + _SEHEnterTry(&_SEHTryLevel.ST_Header); \ \ - _SEHLeave(&_SEHFrame->SEH_Header); \ - } \ - else \ - { \ - _SEHLeave(&_SEHFrame->SEH_Header); \ + { \ + static const int _SEHScopeKind = 0; \ + (void)_SEHScopeKind; \ + \ + if(_SEHSetJmp(_SEHTryLevel.ST_JmpBuf) == 0) \ + { \ + for(;;) \ + { -#define _SEH_END \ +#define _SEHX_HANDLE \ + \ + break; \ + } \ + \ + _SEHLeave(); \ + } \ + else \ + { \ + _SEHLeave(); + +#define _SEHX_END \ + } \ + \ + if(_SEHHandlers.SH_Finally) \ + _SEHHandlers.SH_Finally(_SEHPortableFrame); \ + } \ } \ - \ - if(_SEHHandlers.SH_Finally) \ - _SEHHandlers.SH_Finally(&_SEHFrame->SEH_Header); \ } -#define _SEH_LEAVE break +#define _SEHX_LEAVE break -#define _SEH_GetExceptionCode() (unsigned long)(_SEHPortableFrame->SPF_Code) +#define _SEHX_GetExceptionCode() (unsigned long)(_SEHPortableFrame->SPF_Code) -#define _SEH_GetExceptionPointers() \ +#define _SEHX_GetExceptionPointers() \ ((struct _EXCEPTION_POINTERS *)_SEHExceptionPointers) -#define _SEH_AbnormalTermination() (_SEHPortableFrame->SPF_Code != 0) +#define _SEHX_AbnormalTermination() (_SEHPortableFrame->SPF_Code != 0) /* New syntax */ -#define _SEH2_STATE_INIT_EXCEPT (1) -#define _SEH2_STATE_INIT_FINALLY (_SEH2_STATE_INIT_EXCEPT + 1) -#define _SEH2_STATE_BODY (_SEH2_STATE_INIT_FINALLY + 1) -#define _SEH2_STATE_HANDLER (_SEH2_STATE_BODY + 1) -#define _SEH2_STATE_DONE (_SEH2_STATE_HANDLER + 1) -#define _SEH2_LEAVE { _SEH2State = _SEH2_STATE_DONE; break; } +/* + NOTE: do not move, remove or modify any instance of _SEH2_ASSUME and + _SEH2_ASSUMING without doing extensive tests for correctness. Compilers can + generate the wrong code in presence of __assume in unpredictable ways. BE SURE + IT DOESN'T HAPPEN +*/ +#if defined(_MSC_VER) && (_MSC_VER > 1200) +# define _SEH2_ASSUME(X_) __assume(X_) +# if !defined(_SEH_NO_NATIVE_NLG) + /* + If we use the native setjmp, the compiler stops keeping track of variables, so + their actual values don't matter anymore. Optimize out some assignments + */ +# define _SEH2_ASSUMING(X_) +# else + /* No native setjmp, no magic, no assumptions. Actually set the values */ +# define _SEH2_ASSUMING(X_) X_ +# endif +#else +# define _SEH2_ASSUME(X_) +# define _SEH2_ASSUMING(X_) X_ +#endif -#define _SEH2_TRY \ -{ \ - int _SEH2State; \ - _SEHFilter_t _SEH2Filter; \ - _SEHFinally_t _SEH2Finally; \ +#ifdef __cplusplus +# define _SEH2_INIT_CONST static const +#else +# define _SEH2_INIT_CONST register const +#endif + +#define _SEH_LEAVE break + +#define _SEH_TRY \ + { \ + _SEH2_INIT_CONST int _SEH2TopTryLevel = (_SEHScopeKind != 0); \ + _SEHPortableFrame_t * const _SEH2CurPortableFrame = _SEHPortableFrame; \ \ - _SEHFrame_t * _SEHFrame; \ - volatile _SEHPortableFrame_t * _SEHPortableFrame; \ + { \ + static const int _SEHScopeKind = 0; \ + register int _SEH2State = 0; \ + register int _SEH2Handle = 0; \ + _SEHFrame_t _SEH2Frame; \ + _SEHTryLevel_t _SEH2TryLevel; \ + _SEHPortableFrame_t * const _SEHPortableFrame = \ + _SEH2TopTryLevel ? &_SEH2Frame.SEH_Header : _SEH2CurPortableFrame; \ \ - for(_SEH2State = 0; _SEH2State < _SEH2_STATE_DONE; ++ _SEH2State) \ - { \ - switch(_SEH2State) \ - { \ - case _SEH2_STATE_BODY: \ + (void)_SEHScopeKind; \ + (void)_SEHPortableFrame; \ + (void)_SEH2Handle; \ + \ + for(;;) \ { \ - _SEH_DECLARE_HANDLERS(_SEH2Filter, _SEH2Finally); \ + if(_SEH2State) \ + { \ + for(;;) \ + { \ + { + +#define _SEH_EXCEPT(FILTER_) \ + } \ \ - _SEHFrame = _alloca(sizeof(_SEHFrame_t)); \ - _SEHFrame->SEH_Header.SPF_Handlers = &_SEHHandlers; \ - _SEHFrame->SEH_Locals = &_SEHLocals; \ + break; \ + } \ \ - _SEHPortableFrame = &_SEHFrame->SEH_Header; \ - (void)_SEHPortableFrame; \ - \ - if(_SEHSetJmp(_SEHFrame->SEH_JmpBuf)) \ + _SEH2_ASSUME(_SEH2Handle == 0); \ break; \ + } \ + else \ + { \ + _SEH_DECLARE_HANDLERS((FILTER_), 0); \ \ - _SEHEnter(&_SEHFrame->SEH_Header); - -#define _SEH2_EXCEPT(FILTER_) \ - _SEHLeave(&_SEHFrame->SEH_Header); \ - _SEH2State = _SEH2_STATE_DONE; \ + _SEH2TryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ \ - break; \ - } \ + if(_SEH2TopTryLevel) \ + { \ + if(&_SEHLocals != _SEHDummyLocals) \ + _SEH2Frame.SEH_Locals = &_SEHLocals; \ \ - case _SEH2_STATE_INIT_EXCEPT: \ - { \ - _SEH2Filter = (FILTER_); \ - break; \ - } \ + _SEH2Frame.SEH_Header.SPF_Handler = _SEHCompilerSpecificHandler; \ + _SEHEnterFrame(&_SEH2Frame.SEH_Header, &_SEH2TryLevel.ST_Header); \ + } \ + else \ + _SEHEnterTry(&_SEH2TryLevel.ST_Header); \ \ - case _SEH2_STATE_HANDLER: \ - { \ - _SEHLeave(&_SEHFrame->SEH_Header); - -#define _SEH2_FINALLY(FINALLY_) \ + if((_SEH2Handle = _SEHSetJmp(_SEH2TryLevel.ST_JmpBuf)) == 0) \ + { \ + _SEH2_ASSUMING(++ _SEH2State); \ + _SEH2_ASSUME(_SEH2State != 0); \ + continue; \ + } \ + else \ + { \ + break; \ + } \ + } \ + \ break; \ } \ \ - case _SEH2_STATE_INIT_FINALLY: \ - { \ - _SEH2Finally = (FINALLY_); + _SEHLeave(); \ + \ + if(_SEH2Handle) \ + { -#define _SEH2_END \ - break; \ - } \ +#define _SEH_FINALLY(FINALLY_) \ + } \ \ - default: \ - { \ - switch(_SEH2State) \ + break; \ + } \ + \ + _SEHLeave(); \ + break; \ + } \ + else \ { \ - case _SEH2_STATE_INIT_EXCEPT: _SEH2Filter = NULL; break; \ - case _SEH2_STATE_INIT_FINALLY: _SEH2Finally = NULL; break; \ - case _SEH2_STATE_HANDLER: _SEHLeave(&_SEHFrame->SEH_Header); break; \ + _SEH_DECLARE_HANDLERS(0, (FINALLY_)); \ + \ + _SEH2TryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ + \ + if(_SEH2TopTryLevel) \ + { \ + if(&_SEHLocals != _SEHDummyLocals) \ + _SEH2Frame.SEH_Locals = &_SEHLocals; \ + \ + _SEH2Frame.SEH_Header.SPF_Handler = 0; \ + _SEHEnterFrame(&_SEH2Frame.SEH_Header, &_SEH2TryLevel.ST_Header); \ + } \ + else \ + _SEHEnterTry(&_SEH2TryLevel.ST_Header); \ + \ + ++ _SEH2State; \ + _SEH2_ASSUME(_SEH2State != 0); \ + continue; \ } \ \ break; \ } \ - } \ - } \ \ - if(_SEHHandlers.SH_Finally) \ - _SEHHandlers.SH_Finally(&_SEHFrame->SEH_Header); \ -} + (FINALLY_)(&_SEH2Frame.SEH_Header); \ + if(0) \ + { -#define _SEH2_HANDLE _SEH2_EXCEPT(_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) +#define _SEH_END \ + } \ + } \ + } -#define _SEH2_GetExceptionCode _SEH_GetExceptionCode -#define _SEH2_GetExceptionPointers _SEH_GetExceptionPointers -#define _SEH2_AbnormalTermination _SEH_AbnormalTermination +#define _SEH_HANDLE _SEH_EXCEPT(_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) +#define _SEH_GetExceptionCode _SEHX_GetExceptionCode +#define _SEH_GetExceptionPointers _SEHX_GetExceptionPointers +#define _SEH_AbnormalTermination _SEHX_AbnormalTermination + #endif /* EOF */ _____ Modified: trunk/reactos/include/pseh/native.h --- trunk/reactos/include/pseh/native.h 2005-05-06 21:18:20 UTC (rev 15062) +++ trunk/reactos/include/pseh/native.h 2005-05-06 22:25:30 UTC (rev 15063) @@ -111,7 +111,7 @@ /* FINALLY FUNCTIONS */ /* Declares a finally function's prototype */ -#define _SEH_FINALLY(NAME_) \ +#define _SEH_FINALLYFUNC(NAME_) \ void __stdcall NAME_ \ ( \ int _SEHAbnormalTermination, \ @@ -123,13 +123,13 @@ _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ()) #define _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ARGS_) \ - static __inline _SEH_FINALLY(WRAPPER_) \ + static __inline _SEH_FINALLYFUNC(WRAPPER_) \ { \ NAME_ ARGS_; \ } #define _SEH_WRAP_FINALLY_LOCALS_ARGS(WRAPPER_, LOCALS_, NAME_, ARGS_) \ - static __inline _SEH_FINALLY(WRAPPER_) \ + static __inline _SEH_FINALLYFUNC(WRAPPER_) \ { \ _SEH_ACCESS_LOCALS(LOCALS_); \ NAME_ ARGS_; \ _____ Modified: trunk/reactos/include/pseh/setjmp.h --- trunk/reactos/include/pseh/setjmp.h 2005-05-06 21:18:20 UTC (rev 15062) +++ trunk/reactos/include/pseh/setjmp.h 2005-05-06 22:25:30 UTC (rev 15063) @@ -36,10 +36,19 @@ _SEHJmpBuf_t[1]; #endif +#ifdef __cplusplus +extern "C" +{ +#endif + extern __declspec(noreturn) void __stdcall _SEHLongJmp(_SEHJmpBuf_t, int); extern __declspec(noreturn) void __stdcall _SEHLongJmp_KeepEsp(_SEHJmpBuf_t, int); extern int __stdcall _SEHSetJmp(_SEHJmpBuf_t); +#ifdef __cplusplus +} #endif +#endif + /* EOF */ _____ Modified: trunk/reactos/include/pseh.h --- trunk/reactos/include/pseh.h 2005-05-06 21:18:20 UTC (rev 15062) +++ trunk/reactos/include/pseh.h 2005-05-06 22:25:30 UTC (rev 15063) @@ -51,6 +51,16 @@ # define _SEH_CONCAT(X_, Y_) _SEH_CONCAT1(X_, Y_) #endif +/* + Note: just define __inline to an empty symbol if your C compiler doesn't + support it +*/ +#ifdef __cplusplus +# ifndef __inline +# define __inline inline +# endif +#endif + /* Locals sharing support */ #define _SEH_LOCALS_TYPENAME(BASENAME_) \ struct _SEH_CONCAT(_SEHLocalsTag, BASENAME_) @@ -64,8 +74,8 @@ _SEHPLocals = &_SEHLocals; /* Dummy locals */ -static _SEH_LOCALS_TYPENAME(_SEHDummyLocals) { int Dummy_; } _SEHLocals; -static void __inline _SEHDummyLocalsUser(void) { (void)_SEHLocals; } +static int _SEHLocals; +static void * const _SEHDummyLocals = &_SEHLocals; #include <pseh/framebased.h> _____ Modified: trunk/reactos/lib/dbghelp/msc.c --- trunk/reactos/lib/dbghelp/msc.c 2005-05-06 21:18:20 UTC (rev 15062) +++ trunk/reactos/lib/dbghelp/msc.c 2005-05-06 22:25:30 UTC (rev 15063) @@ -2259,7 +2259,7 @@ msc_dbg.nomap = 0; msc_dbg.omapp = NULL; - _SEH_TRY_FILTER(page_fault) + _SEH_TRY { ret = FALSE; @@ -2324,7 +2324,7 @@ #endif } - _SEH_HANDLE + _SEH_EXCEPT(page_fault) { ERR("Got a page fault while loading symbols\n"); ret = FALSE; _____ Modified: trunk/reactos/lib/kernel32/k32.h --- trunk/reactos/lib/kernel32/k32.h 2005-05-06 21:18:20 UTC (rev 15062) +++ trunk/reactos/lib/kernel32/k32.h 2005-05-06 22:25:30 UTC (rev 15063) @@ -6,6 +6,7 @@ #include <ctype.h> #include <stdarg.h> #include <stdio.h> +#include <malloc.h> #include <limits.h> #include <wchar.h> #include <string.h> _____ Modified: trunk/reactos/lib/pseh/framebased.c --- trunk/reactos/lib/pseh/framebased.c 2005-05-06 21:18:20 UTC (rev 15062) +++ trunk/reactos/lib/pseh/framebased.c 2005-05-06 22:25:30 UTC (rev 15063) @@ -24,28 +24,64 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include <pseh.h> #include <pseh/framebased/internal.h> #include <pseh/excpt.h> -#include <excpt.h> #include <pseh/framebased.h> +#include <excpt.h> + /* Assembly helpers, see i386/framebased.asm */ extern void __cdecl _SEHCleanHandlerEnvironment(void); -extern void __cdecl _SEHRegisterFrame(_SEHRegistration_t *); -extern void __cdecl _SEHUnregisterFrame(const _SEHRegistration_t *); -extern void __cdecl _SEHUnwind(_SEHPortableFrame_t *); +extern struct __SEHRegistration * __cdecl _SEHRegisterFrame(_SEHRegistration_t *); +extern void __cdecl _SEHUnregisterFrame(void); +extern void __cdecl _SEHGlobalUnwind(_SEHPortableFrame_t *); +extern _SEHRegistration_t * __cdecl _SEHCurrentRegistration(void); /* Borland C++ uses a different decoration (i.e. none) for stdcall functions */ extern void __stdcall RtlUnwind(void *, void *, void *, void *); void const * _SEHRtlUnwind = RtlUnwind; -__declspec(noreturn) void __cdecl _SEHCallHandler(_SEHPortableFrame_t * frame) +void __stdcall _SEHLocalUnwind +( + _SEHPortableFrame_t * frame, + _SEHPortableTryLevel_t * dsttrylevel +) { - frame->SPF_Handling = 1; - _SEHUnwind(frame); - frame->SPF_Handlers->SH_Handler(frame); + _SEHPortableTryLevel_t * trylevel; + + for + ( + trylevel = frame->SPF_TopTryLevel; + trylevel != dsttrylevel; + trylevel = trylevel->SPT_Next + ) + { + _SEHFinally_t pfnFinally; + + /* ASSERT(trylevel); */ + + pfnFinally = trylevel->SPT_Handlers->SH_Finally; + + if(pfnFinally) + pfnFinally(frame); + } } +__declspec(noreturn) void __cdecl _SEHCallHandler +( + _SEHPortableFrame_t * frame, + _SEHPortableTryLevel_t * trylevel +) +{ + DbgPrint("_SEHCallHandler: REG %p\n", _SEHCurrentRegistration()); + _SEHGlobalUnwind(frame); + DbgPrint("_SEHCallHandler: REG %p\n", _SEHCurrentRegistration()); + _SEHLocalUnwind(frame, trylevel); + DbgPrint("_SEHCallHandler: REG %p\n", _SEHCurrentRegistration()); + frame->SPF_Handler(trylevel); +} + int __cdecl _SEHFrameHandler ( struct _EXCEPTION_RECORD * ExceptionRecord, @@ -62,73 +98,143 @@ /* Unwinding */ if(ExceptionRecord->ExceptionFlags & (4 | 2)) - { - if(frame->SPF_Handlers->SH_Finally && !frame->SPF_Handling) - frame->SPF_Handlers->SH_Finally(frame); - } + _SEHLocalUnwind(frame, NULL); /* Handling */ else { int ret; + _SEHPortableTryLevel_t * trylevel; if(ExceptionRecord->ExceptionCode) frame->SPF_Code = ExceptionRecord->ExceptionCode; else - frame->SPF_Code = 0xC0000001; + frame->SPF_Code = 0xC0000001; - switch((UINT_PTR)frame->SPF_Handlers->SH_Filter) + for + ( + trylevel = frame->SPF_TopTryLevel; + trylevel != NULL; + trylevel = trylevel->SPT_Next + ) { - case (UINT_PTR)_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER): - case (UINT_PTR)_SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH): - case (UINT_PTR)_SEH_STATIC_FILTER(_SEH_CONTINUE_EXECUTION): - { - ret = (int)((UINT_PTR)frame->SPF_Handlers->SH_Filter) - 2; - break; - } + _SEHFilter_t pfnFilter = trylevel->SPT_Handlers->SH_Filter; - default: + switch((UINT_PTR)pfnFilter) { - if(frame->SPF_Handlers->SH_Filter) + case (UINT_PTR)_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER): + case (UINT_PTR)_SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH): + case (UINT_PTR)_SEH_STATIC_FILTER(_SEH_CONTINUE_EXECUTION): { - EXCEPTION_POINTERS ep; - - ep.ExceptionRecord = ExceptionRecord; - ep.ContextRecord = ContextRecord; - - ret = frame->SPF_Handlers->SH_Filter(&ep, frame); + ret = (int)((UINT_PTR)pfnFilter) - 2; + break; } - else - ret = _SEH_CONTINUE_SEARCH; - break; + default: + { + if(trylevel->SPT_Handlers->SH_Filter) + { + EXCEPTION_POINTERS ep; + + ep.ExceptionRecord = ExceptionRecord; + ep.ContextRecord = ContextRecord; + + ret = pfnFilter(&ep, frame); + } + else + ret = _SEH_CONTINUE_SEARCH; + + break; + } } + + /* _SEH_CONTINUE_EXECUTION */ + if(ret < 0) + return ExceptionContinueExecution; + /* _SEH_EXECUTE_HANDLER */ + else if(ret > 0) + _SEHCallHandler(frame, trylevel); + /* _SEH_CONTINUE_SEARCH */ + else + continue; } - /* _SEH_CONTINUE_EXECUTION */ - if(ret < 0) - return ExceptionContinueExecution; - /* _SEH_EXECUTE_HANDLER */ - else if(ret > 0) - _SEHCallHandler(frame); - /* _SEH_CONTINUE_SEARCH */ - else - /* fall through */; + /* FALLTHROUGH */ } return ExceptionContinueSearch; } -void __stdcall _SEHEnter(_SEHPortableFrame_t * frame) +void __stdcall _SEHEnterFrame_s +( + _SEHPortableFrame_t * frame, + _SEHPortableTryLevel_t * trylevel +) { + _SEHEnterFrame_f(frame, trylevel); +} + +void __stdcall _SEHEnterTry_s(_SEHPortableTryLevel_t * trylevel) +{ + _SEHEnterTry_f(trylevel); +} + +void __stdcall _SEHLeave_s(void) +{ + _SEHLeave_f(); +} + +void _SEH_FASTCALL _SEHEnterFrame_f +( + _SEHPortableFrame_t * frame, + _SEHPortableTryLevel_t * trylevel +) +{ + /* ASSERT(frame); */ + /* ASSERT(trylevel); */ frame->SPF_Registration.SER_Handler = _SEHFrameHandler; frame->SPF_Code = 0; - frame->SPF_Handling = 0; + frame->SPF_TopTryLevel = trylevel; + trylevel->SPT_Next = NULL; _SEHRegisterFrame(&frame->SPF_Registration); } -void __stdcall _SEHLeave(_SEHPortableFrame_t * frame) +void _SEH_FASTCALL _SEHEnterTry_f(_SEHPortableTryLevel_t * trylevel) { - _SEHUnregisterFrame(&frame->SPF_Registration); + _SEHPortableFrame_t * frame; + + frame = _SEH_CONTAINING_RECORD + ( + _SEHCurrentRegistration(), + _SEHPortableFrame_t, + SPF_Registration + ); + + trylevel->SPT_Next = frame->SPF_TopTryLevel; + frame->SPF_TopTryLevel = trylevel; } +void _SEH_FASTCALL _SEHLeave_f(void) +{ + _SEHPortableFrame_t * frame; + _SEHPortableTryLevel_t * trylevel; + + frame = _SEH_CONTAINING_RECORD + ( + _SEHCurrentRegistration(), + _SEHPortableFrame_t, + SPF_Registration + ); + + /* ASSERT(frame); */ + + trylevel = frame->SPF_TopTryLevel; + + /* ASSERT(trylevel); */ + + if(trylevel->SPT_Next) + frame->SPF_TopTryLevel = trylevel->SPT_Next; + else + _SEHUnregisterFrame(); +} + /* EOF */ _____ Modified: trunk/reactos/lib/pseh/i386/framebased.asm --- trunk/reactos/lib/pseh/i386/framebased.asm 2005-05-06 21:18:20 UTC (rev 15062) +++ trunk/reactos/lib/pseh/i386/framebased.asm 2005-05-06 22:25:30 UTC (rev 15063) @@ -1,4 +1,4 @@ -; Copyright (c) 2004 KJK::Hyperion +; Copyright (c) 2004/2005 KJK::Hyperion ; Permission is hereby granted, free of charge, to any person obtaining a copy ; of this software and associated documentation files (the "Software"), to deal @@ -25,6 +25,11 @@ cld ret +global __SEHCurrentRegistration +__SEHCurrentRegistration: + mov eax, [fs:0] + ret + global __SEHRegisterFrame __SEHRegisterFrame: mov ecx, [esp+4] @@ -35,33 +40,32 @@ global __SEHUnregisterFrame __SEHUnregisterFrame: - mov ecx, [esp+4] - mov ecx, [ecx] + mov ecx, [fs:0] + mov ecx, [ecx+0] mov [fs:0], ecx ret -global __SEHUnwind -__SEHUnwind: +global __SEHGlobalUnwind +__SEHGlobalUnwind: extern __SEHRtlUnwind - mov ecx, [esp+4] - ; RtlUnwind clobbers all the "don't clobber" registers, so we save them + push ebx + mov ebx, [esp+8] push esi push edi - push ebx - xor eax, eax - push eax ; ReturnValue - push eax ; ExceptionRecord - push eax ; TargetIp - push ecx ; TargetFrame [truncated at 1000 lines; 682 more skipped]

19 years, 4 months

[fireball] 15062: Patch by tinus: Resolves issue of keyboard detection when e.g. booting ReactOS under VMWare with no keyboard grabbed.

by fireball＠svn.reactos.com

Patch by tinus: Resolves issue of keyboard detection when e.g. booting ReactOS under VMWare with no keyboard grabbed. Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c _____ Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c --- trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-05-06 20:45:30 UTC (rev 15061) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-05-06 21:18:20 UTC (rev 15062) @@ -551,6 +551,26 @@ return Irp->IoStatus.Status; } +/* This is all pretty confusing. There's more than one way to + * disable/enable the keyboard. You can send KBD_ENABLE to the + * keyboard, and it will start scanning keys. Sending KBD_DISABLE + * will disable the key scanning but also reset the parameters to + * defaults. + * + * You can also send 0xAE to the controller for enabling the + * keyboard clock line and 0xAD for disabling it. Then it'll + * automatically get turned on at the next command. The last + * way is by modifying the bit that drives the clock line in the + * 'command byte' of the controller. This is almost, but not quite, + * the same as the AE/AD thing. The difference can be used to detect + * some really old broken keyboard controllers which I hope won't be + * necessary. + * + * Anyway, disabling the keyboard helps the detection and it also + * clears the keyboard buffer and sets defaults which is what we + * want. + */ + BOOLEAN STDCALL I8042KeyboardEnable(PDEVICE_EXTENSION DevExt) { DPRINT("Enabling keyboard\n"); @@ -564,6 +584,19 @@ return TRUE; } +BOOLEAN STDCALL I8042KeyboardDefaultsAndDisable(PDEVICE_EXTENSION DevExt) +{ + DPRINT("Disabling keyboard\n"); + if (STATUS_SUCCESS != I8042SynchWritePort(DevExt, + 0, + KBD_DISABLE, + TRUE)) { + DPRINT("Can't disable keyboard\n"); + return FALSE; + } + return TRUE; +} + BOOLEAN STDCALL I8042KeyboardEnableInterrupt(PDEVICE_EXTENSION DevExt) { UCHAR Value; @@ -606,12 +639,14 @@ DPRINT("Detecting keyboard\n"); + I8042KeyboardDefaultsAndDisable(DevExt); + do { Status = I8042SynchWritePort(DevExt, 0, KBD_GET_ID, TRUE); } while (STATUS_TIMEOUT == Status && RetryCount--); if (Status != STATUS_SUCCESS) { - DPRINT("Can't write GET_ID (%x)\n", Status); + DPRINT1("Can't write GET_ID (%x)\n", Status); return FALSE; }

19 years, 4 months

[greatlrd] 15061: <tinus_> "Forgotten file from commit 14982"

by greatlrd＠svn.reactos.com

<tinus_> "Forgotten file from commit 14982" Modified: trunk/reactos/drivers/input/i8042prt/registry.c _____ Modified: trunk/reactos/drivers/input/i8042prt/registry.c --- trunk/reactos/drivers/input/i8042prt/registry.c 2005-05-06 20:12:37 UTC (rev 15060) +++ trunk/reactos/drivers/input/i8042prt/registry.c 2005-05-06 20:45:30 UTC (rev 15061) @@ -8,25 +8,25 @@ * Jason Filby (jasonfilby(a)yahoo.com) * Tinus */ - + /* INCLUDES ****************************************************************/ - + #include <ddk/ntddk.h> #include <string.h> #include <ntos/keyboard.h> #include <ntos/minmax.h> #include <rosrtl/string.h> - + #include <ddk/ntddkbd.h> #include <ddk/ntdd8042.h> - + #define NDEBUG #include <debug.h> - + #include "i8042prt.h" - + /* FUNCTIONS *****************************************************************/ - + /* * Read the registry keys associated with this device. The RegistryPath * var is a hack. This should be more like what microsoft does, but I @@ -34,15 +34,15 @@ */ VOID STDCALL I8042ReadRegistry(PDRIVER_OBJECT DriverObject, PDEVICE_EXTENSION DevExt) - + { - RTL_QUERY_REGISTRY_TABLE Parameters[18]; + RTL_QUERY_REGISTRY_TABLE Parameters[19]; UNICODE_STRING ParametersPath; - + PWSTR RegistryPath = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\i8042Prt\\Pa rameters"; - + NTSTATUS Status; - + DWORD DefaultHeadless = 0; DWORD DefaultCrashScroll = 0; DWORD DefaultCrashSysRq = 0; @@ -61,82 +61,82 @@ DWORD DefaultSampleRate = 60; DWORD DefaultNumberOfButtons = 2; DWORD DefaultEnableWheelDetection = 1; - + RtlInitUnicodeString(&ParametersPath, NULL); ParametersPath.MaximumLength = (wcslen(RegistryPath) * sizeof(WCHAR)) + sizeof(UNICODE_NULL); - + ParametersPath.Buffer = ExAllocatePoolWithTag(PagedPool, ParametersPath.MaximumLength, TAG_I8042); - + if (!ParametersPath.Buffer) { DPRINT1("No buffer space for reading registry\n"); return; } - + RtlZeroMemory(ParametersPath.Buffer, ParametersPath.MaximumLength); RtlAppendUnicodeToString(&ParametersPath, RegistryPath); - + RtlZeroMemory(Parameters, sizeof(Parameters)); - + Parameters[0].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[0].Name = L"Headless"; Parameters[0].EntryContext = &DevExt->Settings.Headless; Parameters[0].DefaultType = REG_DWORD; Parameters[0].DefaultData = &DefaultHeadless; Parameters[0].DefaultLength = sizeof(ULONG); - + Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[1].Name = L"CrashOnCtrlScroll"; Parameters[1].EntryContext = &DevExt->Settings.CrashScroll; Parameters[1].DefaultType = REG_DWORD; Parameters[1].DefaultData = &DefaultCrashScroll; Parameters[1].DefaultLength = sizeof(ULONG); - + Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[2].Name = L"BreakOnSysRq"; Parameters[2].EntryContext = &DevExt->Settings.CrashSysRq; Parameters[2].DefaultType = REG_DWORD; Parameters[2].DefaultData = &DefaultCrashSysRq; Parameters[2].DefaultLength = sizeof(ULONG); - + Parameters[3].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[3].Name = L"ReportResetErrors"; Parameters[3].EntryContext = &DevExt->Settings.ReportResetErrors; Parameters[3].DefaultType = REG_DWORD; Parameters[3].DefaultData = &DefaultReportResetErrors; Parameters[3].DefaultLength = sizeof(ULONG); - + Parameters[4].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[4].Name = L"PollStatusIterations"; Parameters[4].EntryContext = &DevExt->Settings.PollStatusIterations; Parameters[4].DefaultType = REG_DWORD; Parameters[4].DefaultData = &DefaultPollStatusIterations; Parameters[4].DefaultLength = sizeof(ULONG); - + Parameters[5].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[5].Name = L"ResendIterations"; Parameters[5].EntryContext = &DevExt->Settings.ResendIterations; Parameters[5].DefaultType = REG_DWORD; Parameters[5].DefaultData = &DefaultResendIterations; Parameters[5].DefaultLength = sizeof(ULONG); - + Parameters[6].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[6].Name = L"PollingIterations"; Parameters[6].EntryContext = &DevExt->Settings.PollingIterations; Parameters[6].DefaultType = REG_DWORD; Parameters[6].DefaultData = &DefaultPollingIterations; Parameters[6].DefaultLength = sizeof(ULONG); - + Parameters[7].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[7].Name = L"PollingIterationsMaximum"; Parameters[7].EntryContext = &DevExt->Settings.PollingIterationsMaximum; Parameters[7].DefaultType = REG_DWORD; Parameters[7].DefaultData = &DefaultPollingIterationsMaximum; Parameters[7].DefaultLength = sizeof(ULONG); - + Parameters[8].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[8].Name = L"KeyboardDataQueueSize"; Parameters[8].EntryContext = @@ -144,21 +144,21 @@ Parameters[8].DefaultType = REG_DWORD; Parameters[8].DefaultData = &DefaultKeyboardDataQueueSize; Parameters[8].DefaultLength = sizeof(ULONG); - + Parameters[9].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[9].Name = L"OverrideKeyboardType"; Parameters[9].EntryContext = &DevExt->Settings.OverrideKeyboardType; Parameters[9].DefaultType = REG_DWORD; Parameters[9].DefaultData = &DefaultOverrideKeyboardType; Parameters[9].DefaultLength = sizeof(ULONG); - + Parameters[10].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[10].Name = L"OverrideKeyboardSubtype"; Parameters[10].EntryContext = &DevExt->Settings.OverrideKeyboardSubtype; Parameters[10].DefaultType = REG_DWORD; Parameters[10].DefaultData = &DefaultOverrideKeyboardSubtype; Parameters[10].DefaultLength = sizeof(ULONG); - + Parameters[11].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[11].Name = L"MouseDataQueueSize"; Parameters[11].EntryContext = @@ -166,56 +166,56 @@ Parameters[11].DefaultType = REG_DWORD; Parameters[11].DefaultData = &DefaultMouseDataQueueSize; Parameters[11].DefaultLength = sizeof(ULONG); - + Parameters[12].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[12].Name = L"MouseResendStallTime"; Parameters[12].EntryContext = &DevExt->Settings.MouseResendStallTime; Parameters[12].DefaultType = REG_DWORD; Parameters[12].DefaultData = &DefaultMouseResendStallTime; Parameters[12].DefaultLength = sizeof(ULONG); - + Parameters[13].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[13].Name = L"MouseSynchIn100ns"; Parameters[13].EntryContext = &DevExt->Settings.MouseSynchIn100ns; Parameters[13].DefaultType = REG_DWORD; Parameters[13].DefaultData = &DefaultMouseSynchIn100ns; Parameters[13].DefaultLength = sizeof(ULONG); - + Parameters[14].Flags = RTL_QUERY_REGISTRY_DIRECT; Parameters[14].Name = L"MouseResolution"; Parameters[14].EntryContext = &DevExt->Settings.MouseResolution; Parameters[14].DefaultType = REG_DWORD; Parameters[14].DefaultData = &DefaultMouseResolution; Parameters[14].DefaultLength = sizeof(ULONG); - - Parameters[14].Flags = RTL_QUERY_REGISTRY_DIRECT; - Parameters[14].Name = L"SampleRate"; - Parameters[14].EntryContext = &DevExt->MouseAttributes.SampleRate; - Parameters[14].DefaultType = REG_DWORD; - Parameters[14].DefaultData = &DefaultSampleRate; - Parameters[14].DefaultLength = sizeof(ULONG); - + Parameters[15].Flags = RTL_QUERY_REGISTRY_DIRECT; - Parameters[15].Name = L"NumberOfButtons"; - Parameters[15].EntryContext = &DevExt->Settings.NumberOfButtons; + Parameters[15].Name = L"SampleRate"; + Parameters[15].EntryContext = &DevExt->MouseAttributes.SampleRate; Parameters[15].DefaultType = REG_DWORD; - Parameters[15].DefaultData = &DefaultNumberOfButtons; + Parameters[15].DefaultData = &DefaultSampleRate; Parameters[15].DefaultLength = sizeof(ULONG); - + Parameters[16].Flags = RTL_QUERY_REGISTRY_DIRECT; - Parameters[16].Name = L"EnableWheelDetection"; - Parameters[16].EntryContext = &DevExt->Settings.EnableWheelDetection; + Parameters[16].Name = L"NumberOfButtons"; + Parameters[16].EntryContext = &DevExt->Settings.NumberOfButtons; Parameters[16].DefaultType = REG_DWORD; - Parameters[16].DefaultData = &DefaultEnableWheelDetection; + Parameters[16].DefaultData = &DefaultNumberOfButtons; Parameters[16].DefaultLength = sizeof(ULONG); - + + Parameters[17].Flags = RTL_QUERY_REGISTRY_DIRECT; + Parameters[17].Name = L"EnableWheelDetection"; + Parameters[17].EntryContext = &DevExt->Settings.EnableWheelDetection; + Parameters[17].DefaultType = REG_DWORD; + Parameters[17].DefaultData = &DefaultEnableWheelDetection; + Parameters[17].DefaultLength = sizeof(ULONG); + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL, ParametersPath.Buffer, Parameters, NULL, NULL); - + if (Status != STATUS_SUCCESS) { DPRINT1 ("Can't read registry: %x\n", Status); /* Actually, the defaults are not set when the function @@ -229,9 +229,12 @@ Current++; } DPRINT1 ("Manually set defaults\n"); - + } ExFreePoolWithTag(ParametersPath.Buffer, TAG_I8042); + + if (DevExt->Settings.MouseResolution > 3) + DevExt->Settings.MouseResolution = 3; + DPRINT("Done reading registry\n"); } -

19 years, 4 months

[greatlrd] 15060: HKLM, "SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters", "SampleRate", 0x00010001, 0x00000060

by greatlrd＠svn.reactos.com

HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","SampleRate ",0x00010001,0x00000060 60 are the dec value but it have not be convort to hex that is 0x3c legmet value are, e.g., 10, 20, 40, 60, 80, 100, 200.' in dec in hex 0x0a, 0x14, 0x28, 0x3c, 0x50, 0x64, 0xc8 Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-05-06 19:42:39 UTC (rev 15059) +++ trunk/reactos/bootdata/hivesys.inf 2005-05-06 20:12:37 UTC (rev 15060) @@ -581,7 +581,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Start",0x00010001,0x0 0000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Type",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","SampleRat e",0x00010001,0x00000060 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","SampleRat e",0x00010001,0x0000003c HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","BreakOnSys Rq",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","MouseResol ution",0x00010001,0x00000003

19 years, 4 months

← Newer
1
...
62
63
64
65
66
67
68
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005