Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 18117: - Fix several flaws in APC logic.
by ion＠svn.reactos.com 27 Sep '05

27 Sep '05

- Fix several flaws in APC logic. - Properly support Special APC Disabling. - Allow Guarded Mutex and Guarded Regions to function properly. - Optimize some code and add some additional checks. - Fix several bugs in KeFreezeAllThreads Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-09-27 01:48:49 UTC (rev 18116) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-09-27 01:57:27 UTC (rev 18117) @@ -55,7 +55,8 @@ PKTHREAD _Thread = KeGetCurrentThread(); \ if((_Thread) && (++_Thread->KernelApcDisable == 0)) \ { \ - if (!IsListEmpty(&_Thread->ApcState.ApcListHead[KernelMode])) \ + if (!IsListEmpty(&_Thread->ApcState.ApcListHead[KernelMode]) && \ + (_Thread->SpecialApcDisable == 0)) \ { \ KiKernelApcDeliveryCheck(); \ } \ _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-09-27 01:48:49 UTC (rev 18116) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-09-27 01:57:27 UTC (rev 18117) @@ -123,7 +123,8 @@ if((Thread) && (++Thread->KernelApcDisable == 0)) { /* Check if we need to request an APC Delivery */ - if (!IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) + if ((!IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) && + (Thread->SpecialApcDisable == 0)) { /* Check for the right environment */ KiKernelApcDeliveryCheck(); @@ -225,6 +226,32 @@ } } +static +__inline +VOID +KiRequestApcInterrupt(IN PKTHREAD Thread) +{ +#ifdef CONFIG_SMP + PKPRCB Prcb, CurrentPrcb; + LONG i; + + CurrentPrcb = KeGetCurrentPrcb(); + for (i = 0; i < KeNumberProcessors; i++) + { + Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; + if (Prcb->CurrentThread == Thread) + { + ASSERT (CurrentPrcb != Prcb); + KiIpiSendRequest(Prcb->SetMember, IPI_APC); + break; + } + } + ASSERT (i < KeNumberProcessors); +#else + HalRequestSoftwareInterrupt(APC_LEVEL); +#endif +} + /*++ * KiInsertQueueApc * @@ -238,8 +265,7 @@ * PriorityBoost - Priority Boost to apply to the Thread. * * Returns: - * If the APC is already inserted or APC queueing is disabled, FALSE. - * Otherwise, TRUE. + * None * * Remarks: * The APC will execute at APC_LEVEL for the KernelRoutine registered, and @@ -248,122 +274,175 @@ * Callers of this routine must have locked the dipatcher database. * *--*/ -BOOLEAN -STDCALL +VOID +FASTCALL KiInsertQueueApc(PKAPC Apc, KPRIORITY PriorityBoost) { PKTHREAD Thread = Apc->Thread; + PKAPC_STATE ApcState; + KPROCESSOR_MODE ApcMode; + PLIST_ENTRY ListHead, NextEntry; + PKAPC QueuedApc; + NTSTATUS Status; + /* Acquire the lock (only needed on MP) */ KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); - /* Don't do anything if the APC is already inserted */ - if (Apc->Inserted) { - - KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); - return FALSE; + /* Little undocumented feature: Special Apc State Index */ + if (Apc->ApcStateIndex == 3) + { + /* This tells us to use the thread's */ + Apc->ApcStateIndex = Thread->ApcStateIndex; } + /* Get the APC State for this Index, and the mode too */ + ApcState = Thread->ApcStatePointer[(int)Apc->ApcStateIndex]; + ApcMode = Apc->ApcMode; + /* Three scenarios: - 1) Kernel APC with Normal Routine or User APC = Put it at the end of the List - 2) User APC which is PsExitSpecialApc = Put it at the front of the List - 3) Kernel APC without Normal Routine = Put it at the end of the No-Normal Routine Kernel APC list - */ - if ((Apc->ApcMode != KernelMode) && (Apc->KernelRoutine == (PKKERNEL_ROUTINE)PsExitSpecialApc)) { + * 1) Kernel APC with Normal Routine or User APC = Put it at the end of the List + * 2) User APC which is PsExitSpecialApc = Put it at the front of the List + * 3) Kernel APC without Normal Routine = Put it at the end of the No-Normal Routine Kernel APC list + */ + if (Apc->NormalRoutine) + { + /* Normal APC; is it the Thread Termination APC? */ + if ((ApcMode != KernelMode) && (Apc->KernelRoutine == PsExitSpecialApc)) + { + /* Set User APC pending to true */ + Thread->ApcState.UserApcPending = TRUE; - DPRINT("Inserting the Thread Exit APC for '%.16s' into the Queue\n", ((PETHREAD)Thread)->ThreadsProcess->ImageFileName); - Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->UserApcPending = TRUE; - InsertHeadList(&Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcLis tHead[(int)Apc->ApcMode], - &Apc->ApcListEntry); + /* Insert it at the top of the list */ + InsertHeadList(&ApcState->ApcListHead[ApcMode], &Apc->ApcListEntry); - } else if (Apc->NormalRoutine == NULL) { + /* Display debug message */ + DPRINT1("Inserted the Thread Exit APC for '%.16s' into the Queue\n", + ((PETHREAD)Thread)->ThreadsProcess->ImageFileName); + } + else + { + /* Regular user or kernel Normal APC */ + InsertTailList(&ApcState->ApcListHead[ApcMode], &Apc->ApcListEntry); - DPRINT("Inserting Special APC %x for '%.16s' into the Queue\n", Apc, ((PETHREAD)Thread)->ThreadsProcess->ImageFileName); - - /* insert special apc before normal apcs (if any) but after the last special apc (fifo) */ - InsertAscendingListFIFO( - &Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcListHead[(int)Apc- >ApcMode], - Apc, - KAPC, - ApcListEntry, - NormalRoutine /* sort field */ - ); - - } else { - - DPRINT("Inserting Normal APC %x for '%.16s' into the %x Queue\n", Apc, ((PETHREAD)Thread)->ThreadsProcess->ImageFileName, Apc->ApcMode); - InsertTailList(&Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcLis tHead[(int)Apc->ApcMode], - &Apc->ApcListEntry); + /* Display debug message */ + DPRINT("Inserted Normal APC for '%.16s' into the Queue\n", + ((PETHREAD)Thread)->ThreadsProcess->ImageFileName); + } } + else + { + /* Special APC, find the first Normal APC in the list */ + ListHead = &ApcState->ApcListHead[ApcMode]; + NextEntry = ListHead->Flink; + while(NextEntry != ListHead) + { + /* Get the APC */ + QueuedApc = CONTAINING_RECORD(NextEntry, KAPC, ApcListEntry); - /* Confirm Insertion */ - Apc->Inserted = TRUE; + /* Is this a Normal APC? If so, break */ + if (QueuedApc->NormalRoutine) break; - KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); + /* Move to the next APC in the Queue */ + NextEntry = NextEntry->Flink; + } - /* - * Three possibilites here again: - * 1) Kernel APC, The thread is Running: Request an Interrupt - * 2) Kernel APC, The Thread is Waiting at PASSIVE_LEVEL and APCs are enabled and not in progress: Unwait the Thread - * 3) User APC, Unwait the Thread if it is alertable - */ - if (Apc->ApcMode == KernelMode) { + /* Move to the APC before this one (ie: the last Special APC) */ + NextEntry = NextEntry->Blink; - /* Set Kernel APC pending */ - Thread->ApcState.KernelApcPending = TRUE; + /* Insert us here */ + InsertHeadList(NextEntry, &Apc->ApcListEntry); + DPRINT("Inserted Special APC for '%.16s' into the Queue\n", + ((PETHREAD)Thread)->ThreadsProcess->ImageFileName); + } - /* Check the Thread State */ - if (Thread->State == Running) { + /* Now check if the Apc State Indexes match */ + if (Thread->ApcStateIndex == Apc->ApcStateIndex) + { + /* Check that if the thread matches */ + if (Thread == KeGetCurrentThread()) + { + /* Check if this is kernel mode */ + if (ApcMode == KernelMode) + { + /* All valid, a Kernel APC is pending now */ + Thread->ApcState.KernelApcPending = TRUE; -#ifdef CONFIG_SMP - PKPRCB Prcb, CurrentPrcb; - LONG i; -#endif - - DPRINT ("Requesting APC Interrupt for Running Thread \n"); - -#ifdef CONFIG_SMP - CurrentPrcb = KeGetCurrentPrcb(); - if (CurrentPrcb->CurrentThread == Thread) + /* Check if Special APCs are disabled */ + if (Thread->SpecialApcDisable == 0) + { + /* They're not, so request the interrupt */ + HalRequestSoftwareInterrupt(APC_LEVEL); + } + } + } + else + { + /* Check if this is a non-kernel mode APC */ + if (ApcMode != KernelMode) { - HalRequestSoftwareInterrupt(APC_LEVEL); + /* Not a Kernel-Mode APC. Are we waiting in user-mode? */ + if ((Thread->State == Waiting) && (Thread->WaitMode == UserMode)) + { + /* The thread is waiting. Are we alertable, or is an APC pending */ + if ((Thread->Alertable) || (Thread->ApcState.UserApcPending)) + { + /* Set user-mode APC pending */ + Thread->ApcState.UserApcPending = TRUE; + Status = STATUS_USER_APC; + goto Unwait; + } + } } else { - for (i = 0; i < KeNumberProcessors; i++) - { - Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; - if (Prcb->CurrentThread == Thread) - { - ASSERT (CurrentPrcb != Prcb); - KiIpiSendRequest(Prcb->SetMember, IPI_APC); - break; - } - } - ASSERT (i < KeNumberProcessors); - } -#else - HalRequestSoftwareInterrupt(APC_LEVEL); -#endif + /* Kernel-mode APC, set us pending */ + Thread->ApcState.KernelApcPending = TRUE; - } else if ((Thread->State == Waiting) && (Thread->WaitIrql == PASSIVE_LEVEL) && - ((Apc->NormalRoutine == NULL) || - ((!Thread->KernelApcDisable) && (!Thread->ApcState.KernelApcInProgress)))) { + /* Are we currently running? */ + if (Thread->State == Running) + { + /* The thread is running, so send an APC request */ + KiRequestApcInterrupt(Thread); + } + else + { + /* + * If the thread is Waiting at PASSIVE_LEVEL AND + * Special APCs are not disabled AND + * He is a Normal APC AND + * Kernel APCs are not disabled AND + * Kernel APC is not pending OR + * He is a Special APC THEN + * Unwait thread with STATUS_KERNEL_APC + */ + if ((Thread->State == Waiting) && + (Thread->WaitIrql == PASSIVE_LEVEL) && + (!Thread->SpecialApcDisable) && + ((!Apc->NormalRoutine) || + ((!Thread->KernelApcDisable) && + (!Thread->ApcState.KernelApcInProgress)))) + { + /* We'll unwait with this status */ + Status = STATUS_KERNEL_APC; - DPRINT("Waking up Thread for Kernel-Mode APC Delivery \n"); - KiAbortWaitThread(Thread, STATUS_KERNEL_APC, PriorityBoost); + /* Wake up the thread */ +Unwait: + DPRINT("Waking up Thread for %lx Delivery \n", Status); + KiAbortWaitThread(Thread, Status, PriorityBoost); + } + else + { + /* FIXME: Handle deferred ready sometime far far in the future */ + } + } + } } - - } else if ((Thread->State == Waiting) && - (Thread->WaitMode != KernelMode) && - (Thread->Alertable)) { - - DPRINT("Waking up Thread for User-Mode APC Delivery \n"); - Thread->ApcState.UserApcPending = TRUE; - KiAbortWaitThread(Thread, STATUS_USER_APC, PriorityBoost); } - return TRUE; + /* Return to caller */ + KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); + return; } /*++ @@ -399,11 +478,9 @@ PVOID SystemArgument1, PVOID SystemArgument2, KPRIORITY PriorityBoost) - { KIRQL OldIrql; PKTHREAD Thread; - BOOLEAN Inserted; ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); DPRINT("KeInsertQueueApc(Apc %x, SystemArgument1 %x, " @@ -416,25 +493,25 @@ /* Get the Thread specified in the APC */ Thread = Apc->Thread; - /* Make sure the thread allows APC Queues. - * The thread is not apc queueable, for instance, when it's (about to be) terminated. - */ - if (Thread->ApcQueueable == FALSE) { - DPRINT("Thread doesn't allow APC Queues\n"); + /* Make sure we can Queue APCs and that this one isn't already inserted */ + if ((Thread->ApcQueueable == FALSE) && (Apc->Inserted == TRUE)) + { + DPRINT("Can't queue the APC\n"); KeReleaseDispatcherDatabaseLock(OldIrql); return FALSE; } - /* Set the System Arguments */ + /* Set the System Arguments and set it as inserted */ Apc->SystemArgument1 = SystemArgument1; Apc->SystemArgument2 = SystemArgument2; + Apc->Inserted = TRUE; /* Call the Internal Function */ - Inserted = KiInsertQueueApc(Apc, PriorityBoost); + KiInsertQueueApc(Apc, PriorityBoost); /* Return Sucess if we are here */ KeReleaseDispatcherDatabaseLock(OldIrql); - return Inserted; + return TRUE; } /*++ @@ -464,23 +541,25 @@ { KIRQL OldIrql; PKAPC Apc; - PLIST_ENTRY FirstEntry = NULL; + PLIST_ENTRY FirstEntry, CurrentEntry; /* Lock the Dispatcher Database and APC Queue */ OldIrql = KeAcquireDispatcherDatabaseLock(); KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); - /* mark all apcs as not-inserted */ - LIST_FOR_EACH(Apc, &Thread->ApcState.ApcListHead[PreviousMode], KAPC, ApcListEntry) { - Apc->Inserted = FALSE; - } - - if (!IsListEmpty(&Thread->ApcState.ApcListHead[PreviousMode])) { + if (IsListEmpty(&Thread->ApcState.ApcListHead[PreviousMode])) { + FirstEntry = NULL; + } else { FirstEntry = Thread->ApcState.ApcListHead[PreviousMode].Flink; - /* unlink list head from the rest of the list */ RemoveEntryList(&Thread->ApcState.ApcListHead[PreviousMode]); + CurrentEntry = FirstEntry; + do { + Apc = CONTAINING_RECORD(CurrentEntry, KAPC, ApcListEntry); + Apc->Inserted = FALSE; + CurrentEntry = CurrentEntry->Flink; + } while (CurrentEntry != FirstEntry); } - + /* Release the locks */ KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); KeReleaseDispatcherDatabaseLock(OldIrql); @@ -516,46 +595,42 @@ { KIRQL OldIrql; PKTHREAD Thread = Apc->Thread; - + PKAPC_STATE ApcState; + BOOLEAN Inserted; ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); DPRINT("KeRemoveQueueApc called for APC: %x \n", Apc); + /* Acquire locks */ OldIrql = KeAcquireDispatcherDatabaseLock(); KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); /* Check if it's inserted */ - if (Apc->Inserted) { - + if ((Inserted = Apc->Inserted)) + { /* Remove it from the Queue*/ + Apc->Inserted = FALSE; + ApcState = Thread->ApcStatePointer[(int)Apc->ApcStateIndex]; RemoveEntryList(&Apc->ApcListEntry); - Apc->Inserted = FALSE; /* If the Queue is completely empty, then no more APCs are pending */ - if (IsListEmpty(&Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcListH ead[(int)Apc->ApcMode])) { - + if (IsListEmpty(&Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcListH ead[(int)Apc->ApcMode])) + { /* Set the correct State based on the Apc Mode */ - if (Apc->ApcMode == KernelMode) { - - Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->KernelApcPending = FALSE; - - } else { - - Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->UserApcPending = FALSE; + if (Apc->ApcMode == KernelMode) + { + ApcState->KernelApcPending = FALSE; } + else + { + ApcState->UserApcPending = FALSE; + } } - - } else { - - /* It's not inserted, fail */ - KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); - KeReleaseDispatcherDatabaseLock(OldIrql); - return(FALSE); } /* Restore IRQL and Return */ KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); KeReleaseDispatcherDatabaseLock(OldIrql); - return(TRUE); + return Inserted; } /*++ @@ -591,6 +666,8 @@ PKTRAP_FRAME TrapFrame) { PKTHREAD Thread = KeGetCurrentThread(); + PKPROCESS Process = KeGetCurrentProcess(); + PKTRAP_FRAME OldTrapFrame; PLIST_ENTRY ApcListEntry; PKAPC Apc; KIRQL OldIrql; @@ -599,17 +676,22 @@ PKNORMAL_ROUTINE NormalRoutine; PVOID SystemArgument1; PVOID SystemArgument2; - ASSERT_IRQL_EQUAL(APC_LEVEL); - /* Lock the APC Queue and Raise IRQL to Synch */ - KeAcquireSpinLock(&Thread->ApcQueueLock, &OldIrql); + /* Save the old trap frame */ + OldTrapFrame = Thread->TrapFrame; - /* Clear APC Pending */ + /* Clear Kernel APC Pending */ Thread->ApcState.KernelApcPending = FALSE; + /* Check if Special APCs are disabled */ + if (Thread->SpecialApcDisable != 0) goto Quickie; + /* Do the Kernel APCs first */ - while (!IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) { + while (!IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) + { + /* Lock the APC Queue and Raise IRQL to Synch */ + KeAcquireSpinLock(&Thread->ApcQueueLock, &OldIrql); /* Get the next Entry */ ApcListEntry = Thread->ApcState.ApcListHead[KernelMode].Flink; @@ -623,8 +705,8 @@ SystemArgument2 = Apc->SystemArgument2; /* Special APC */ - if (NormalRoutine == NULL) { - + if (!NormalRoutine) + { /* Remove the APC from the list */ RemoveEntryList(ApcListEntry); Apc->Inserted = FALSE; @@ -639,15 +721,13 @@ &NormalContext, &SystemArgument1, &SystemArgument2); - - /* Raise IRQL and Lock again */ - KeAcquireSpinLock(&Thread->ApcQueueLock, &OldIrql); - - } else { - - /* Normal Kernel APC */ - if (Thread->ApcState.KernelApcInProgress || Thread->KernelApcDisable) { - + } + else + { + /* Normal Kernel APC, make sur APCs aren't disabled or in progress*/ + if ((Thread->ApcState.KernelApcInProgress) || + (Thread->KernelApcDisable)) + { /* * DeliveryMode must be KernelMode in this case, since one may not * return to umode while being inside a critical section or while @@ -656,8 +736,9 @@ */ ASSERT(DeliveryMode == KernelMode); + /* Release lock and return */ KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); - return; + goto Quickie; } /* Dequeue the APC */ @@ -676,8 +757,8 @@ &SystemArgument2); /* If There still is a Normal Routine, then we need to call this at PASSIVE_LEVEL */ - if (NormalRoutine != NULL) { - + if (NormalRoutine) + { /* At Passive Level, this APC can be prempted by a Special APC */ Thread->ApcState.KernelApcInProgress = TRUE; KeLowerIrql(PASSIVE_LEVEL); @@ -688,21 +769,34 @@ KeRaiseIrql(APC_LEVEL, &OldIrql); } - /* Raise IRQL and Lock again */ - KeAcquireSpinLock(&Thread->ApcQueueLock, &OldIrql); + /* Set Kernel APC in progress to false and loop again */ Thread->ApcState.KernelApcInProgress = FALSE; } } /* Now we do the User APCs */ - if ((!IsListEmpty(&Thread->ApcState.ApcListHead[UserMode])) && - (DeliveryMode != KernelMode) && (Thread->ApcState.UserApcPending == TRUE)) { + if ((DeliveryMode == UserMode) && + (!IsListEmpty(&Thread->ApcState.ApcListHead[UserMode])) && + (Thread->ApcState.UserApcPending == TRUE)) + { + /* Lock the APC Queue and Raise IRQL to Synch */ + KeAcquireSpinLock(&Thread->ApcQueueLock, &OldIrql); /* It's not pending anymore */ Thread->ApcState.UserApcPending = FALSE; - /* Get the APC Object */ + /* Get the APC Entry */ ApcListEntry = Thread->ApcState.ApcListHead[UserMode].Flink; + + /* Is it empty now? */ + if (!ApcListEntry) + { + /* Release the lock and return */ + KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); + goto Quickie; + } + + /* Get the actual APC object */ Apc = CONTAINING_RECORD(ApcListEntry, KAPC, ApcListEntry); /* Save Parameters so that it's safe to free the Object in Kernel Routine*/ @@ -724,13 +818,13 @@ &SystemArgument1, &SystemArgument2); - if (NormalRoutine == NULL) { - + if (!NormalRoutine) + { /* Check if more User APCs are Pending */ KeTestAlertThread(UserMode); - - } else { - + } + else + { /* Set up the Trap Frame and prepare for Execution in NTDLL.DLL */ DPRINT("Delivering a User APC: %x\n", Apc); KiInitializeUserApc(Reserved, @@ -740,12 +834,23 @@ SystemArgument1, SystemArgument2); } + } - } else { +Quickie: + /* Make sure we're still in the same process */ + if (Process != Thread->ApcState.Process) + { + /* Erm, we got attached or something! BAD! */ + KEBUGCHECKEX(INVALID_PROCESS_ATTACH_ATTEMPT, + (ULONG_PTR)Process, + (ULONG_PTR)Thread->ApcState.Process, + Thread->ApcStateIndex, + KeGetCurrentPrcb()->DpcRoutineActive); + } - /* Go back to APC_LEVEL */ - KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); - } + /* Restore the trap frame */ + Thread->TrapFrame = OldTrapFrame; + return; } VOID @@ -865,7 +970,7 @@ KeAreApcsDisabled(VOID) { /* Return the Kernel APC State */ - return KeGetCurrentThread()->KernelApcDisable ? TRUE : FALSE; + return KeGetCurrentThread()->CombinedApcDisable ? TRUE : FALSE; } /*++ _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-09-27 01:48:49 UTC (rev 18116) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-09-27 01:57:27 UTC (rev 18117) @@ -527,8 +527,8 @@ return PreviousCount; } -BOOLEAN -STDCALL +VOID +FASTCALL KiInsertQueueApc(PKAPC Apc, KPRIORITY PriorityBoost); @@ -547,20 +547,42 @@ /* Acquire Lock */ OldIrql = KeAcquireDispatcherDatabaseLock(); + /* If someone is already trying to free us, try again */ + while (CurrentThread->FreezeCount) + { + /* Release and re-acquire the lock so the APC will go through */ + KeReleaseDispatcherDatabaseLock(OldIrql); + OldIrql = KeAcquireDispatcherDatabaseLock(); + } + + /* Enter a critical region */ + KeEnterCriticalRegion(); + /* Loop the Process's Threads */ LIST_FOR_EACH(Current, &Process->ThreadListHead, KTHREAD, ThreadListEntry) { /* Make sure it's not ours */ - if (Current == CurrentThread) continue; - - /* Make sure it wasn't already frozen, and that it's not suspended */ - if (!(++Current->FreezeCount) && !(Current->SuspendCount)) + if (Current != CurrentThread) { - /* Insert the APC */ - if (!KiInsertQueueApc(&Current->SuspendApc, IO_NO_INCREMENT)) + /* Should be bother inserting the APC? */ + if (Current->ApcQueueable) { - /* Unsignal the Semaphore, the APC already got inserted */ - Current->SuspendSemaphore.Header.SignalState--; + /* Make sure it wasn't already frozen, and that it's not suspended */ + if (!(++Current->FreezeCount) && !(Current->SuspendCount)) + { + /* Did we already insert it? */ + if (!Current->SuspendApc.Inserted) + { + /* Insert the APC */ + Current->SuspendApc.Inserted = TRUE; + KiInsertQueueApc(&Current->SuspendApc, IO_NO_INCREMENT); + } + else + { + /* Unsignal the Semaphore, the APC already got inserted */ + Current->SuspendSemaphore.Header.SignalState--; + } + } } } } @@ -589,20 +611,30 @@ { /* Raise an exception */ KeReleaseDispatcherDatabaseLock(OldIrql); - ExRaiseStatus(STATUS_SUSPEND_COUNT_EXCEEDED); + RtlRaiseStatus(STATUS_SUSPEND_COUNT_EXCEEDED); } - /* Increment it */ - Thread->SuspendCount++; + /* Should we bother to queue at all? */ + if (Thread->ApcQueueable) + { + /* Increment the suspend count */ + Thread->SuspendCount++; - /* Check if we should suspend it */ - if (!PreviousCount && !Thread->FreezeCount) { - - /* Insert the APC */ - if (!KiInsertQueueApc(&Thread->SuspendApc, IO_NO_INCREMENT)) { - - /* Unsignal the Semaphore, the APC already got inserted */ - Thread->SuspendSemaphore.Header.SignalState--; + /* Check if we should suspend it */ + if (!PreviousCount && !Thread->FreezeCount) + { + /* Is the APC already inserted? */ + if (!Thread->SuspendApc.Inserted) + { + /* Not inserted, insert it */ + Thread->SuspendApc.Inserted = TRUE; + KiInsertQueueApc(&Thread->SuspendApc, IO_NO_INCREMENT); + } + else + { + /* Unsignal the Semaphore, the APC already got inserted */ + Thread->SuspendSemaphore.Header.SignalState--; + } } }

1 0

[weiden] 18116: minor fixes
by weiden＠svn.reactos.com 27 Sep '05

27 Sep '05

minor fixes Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.c _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.c --- trunk/reactos/subsys/system/sndvol32/sndvol32.c 2005-09-27 01:02:15 UTC (rev 18115) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.c 2005-09-27 01:48:49 UTC (rev 18116) @@ -51,6 +51,8 @@ DWORD PlaybackID; DWORD RecordingID; UINT OtherLines; + + DWORD tmp; } PREFERENCES_CONTEXT, *PPREFERENCES_CONTEXT; typedef struct _PREFERENCES_FILL_DEVICES @@ -173,20 +175,34 @@ PVOID Context) { PPREFERENCES_CONTEXT PrefContext = (PPREFERENCES_CONTEXT)Context; + HWND hwndControls; LVITEM lvi; + UINT i; - lvi.mask = LVIF_TEXT | LVIF_PARAM; - lvi.iItem = 0; - lvi.iSubItem = 0; - lvi.pszText = Line->szName; - lvi.lParam = (LPARAM)Line->dwSource; - - SendMessage(GetDlgItem(PrefContext->hwndDlg, - IDC_CONTROLS), - LVM_INSERTITEM, - 0, - (LPARAM)&lvi); + if (Line->cControls != 0) + { + hwndControls = GetDlgItem(PrefContext->hwndDlg, + IDC_CONTROLS); + lvi.mask = LVIF_TEXT | LVIF_PARAM; + lvi.iItem = PrefContext->tmp++; + lvi.iSubItem = 0; + lvi.pszText = Line->szName; + lvi.lParam = (LPARAM)Line->dwSource; + + i = SendMessage(hwndControls, + LVM_INSERTITEM, + 0, + (LPARAM)&lvi); + if (i != (UINT)-1) + { + /* FIXME - read config from registry */ + ListView_SetCheckState(hwndControls, + i, + FALSE); + } + } + return TRUE; } @@ -263,6 +279,9 @@ } EnableWindow(GetDlgItem(Context->hwndDlg, IDC_LINE), + FALSE); + EnableWindow(GetDlgItem(Context->hwndDlg, + IDC_OTHER), Context->OtherLines != 0); CheckDlgButton(Context->hwndDlg, IDC_LINE, @@ -289,6 +308,7 @@ ListView_DeleteAllItems(GetDlgItem(Context->hwndDlg, IDC_CONTROLS)); + Context->tmp = 0; SndMixerEnumConnections(Context->Mixer, LineID, PrefDlgAddConnection, @@ -326,8 +346,27 @@ { if (HIWORD(wParam) == CBN_SELCHANGE) { - UpdatePrefDlgControls(Context, - (DWORD)-1); + DWORD LineID; + DWORD Index; + + Index = SendMessage(GetDlgItem(hwndDlg, + IDC_LINE), + CB_GETCURSEL, + 0, + 0); + if (Index != CB_ERR) + { + LineID = SendMessage(GetDlgItem(hwndDlg, + IDC_LINE), + CB_GETITEMDATA, + Index, + 0); + if (LineID != CB_ERR) + { + UpdatePrefDlgControls(Context, + LineID); + } + } } break; } @@ -336,6 +375,9 @@ { UpdatePrefDlgControls(Context, Context->PlaybackID); + EnableWindow(GetDlgItem(hwndDlg, + IDC_LINE), + FALSE); break; } @@ -343,6 +385,9 @@ { UpdatePrefDlgControls(Context, Context->RecordingID); + EnableWindow(GetDlgItem(hwndDlg, + IDC_LINE), + FALSE); break; } @@ -350,19 +395,23 @@ { INT LineCbIndex; DWORD LineID; + + EnableWindow(GetDlgItem(hwndDlg, + IDC_LINE), + TRUE); - LineCbIndex = SendMessage(GetDlgItem(Context->hwndDlg, - IDC_MIXERDEVICE), - CB_GETCURSEL, - 0, - 0); + LineCbIndex = SendDlgItemMessage(hwndDlg, + IDC_LINE, + CB_GETCURSEL, + 0, + 0); if (LineCbIndex != CB_ERR) { - LineID = SendMessage(GetDlgItem(Context->hwndDlg, - IDC_MIXERDEVICE), - CB_GETITEMDATA, - LineCbIndex, - 0); + LineID = SendDlgItemMessage(hwndDlg, + IDC_LINE, + CB_GETITEMDATA, + LineCbIndex, + 0); if (LineID != CB_ERR) { UpdatePrefDlgControls(Context,

1 0

[weiden] 18115: partly implemented the mixer selection dialog
by weiden＠svn.reactos.com 27 Sep '05

27 Sep '05

partly implemented the mixer selection dialog Modified: trunk/reactos/subsys/system/sndvol32/Cz.rc Modified: trunk/reactos/subsys/system/sndvol32/De.rc Modified: trunk/reactos/subsys/system/sndvol32/En.rc Modified: trunk/reactos/subsys/system/sndvol32/Fr.rc Modified: trunk/reactos/subsys/system/sndvol32/mixer.c Modified: trunk/reactos/subsys/system/sndvol32/resources.h Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.c Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.h Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.xml _____ Modified: trunk/reactos/subsys/system/sndvol32/Cz.rc --- trunk/reactos/subsys/system/sndvol32/Cz.rc 2005-09-27 00:46:19 UTC (rev 18114) +++ trunk/reactos/subsys/system/sndvol32/Cz.rc 2005-09-27 01:02:15 UTC (rev 18115) @@ -35,6 +35,8 @@ PUSHBUTTON "&Zßznam", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON PUSHBUTTON "&JinÚ:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8 + CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "ZruÜit", IDCANCEL, 168,226,50,14 _____ Modified: trunk/reactos/subsys/system/sndvol32/De.rc --- trunk/reactos/subsys/system/sndvol32/De.rc 2005-09-27 00:46:19 UTC (rev 18114) +++ trunk/reactos/subsys/system/sndvol32/De.rc 2005-09-27 01:02:15 UTC (rev 18115) @@ -35,6 +35,8 @@ PUSHBUTTON "&Aufnahme", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON PUSHBUTTON "A&ndere:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8 + CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Abbrechen", IDCANCEL, 168,226,50,14 _____ Modified: trunk/reactos/subsys/system/sndvol32/En.rc --- trunk/reactos/subsys/system/sndvol32/En.rc 2005-09-27 00:46:19 UTC (rev 18114) +++ trunk/reactos/subsys/system/sndvol32/En.rc 2005-09-27 01:02:15 UTC (rev 18115) @@ -35,6 +35,8 @@ PUSHBUTTON "&Recording", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON PUSHBUTTON "&Other:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8 + CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Cancel", IDCANCEL, 168,226,50,14 _____ Modified: trunk/reactos/subsys/system/sndvol32/Fr.rc --- trunk/reactos/subsys/system/sndvol32/Fr.rc 2005-09-27 00:46:19 UTC (rev 18114) +++ trunk/reactos/subsys/system/sndvol32/Fr.rc 2005-09-27 01:02:15 UTC (rev 18115) @@ -35,6 +35,8 @@ PUSHBUTTON "&Enregistrement", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON PUSHBUTTON "&Autre :", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8 + CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 PUSHBUTTON "OK", IDOK, 114,226,50,14 PUSHBUTTON "Annuler", IDCANCEL, 168,226,50,14 _____ Modified: trunk/reactos/subsys/system/sndvol32/mixer.c --- trunk/reactos/subsys/system/sndvol32/mixer.c 2005-09-27 00:46:19 UTC (rev 18114) +++ trunk/reactos/subsys/system/sndvol32/mixer.c 2005-09-27 01:02:15 UTC (rev 18115) @@ -117,11 +117,12 @@ if (LineInfo->cControls > 0) { *Controls = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, + 0, LineInfo->cControls * sizeof(MIXERCONTROL)); if (*Controls != NULL) { MIXERLINECONTROLS LineControls; + MMRESULT Result; UINT j; LineControls.cbStruct = sizeof(LineControls); @@ -130,18 +131,14 @@ LineControls.cbmxctrl = sizeof(MIXERCONTROL); LineControls.pamxctrl = (PVOID)(*Controls); - for (j = 0; j < LineInfo->cControls; j++) + Result = mixerGetLineControls((HMIXEROBJ)Mixer->hmx, + &LineControls, + MIXER_GETLINECONTROLSF_ALL); + if (Result == MMSYSERR_NOERROR) { - (*Controls)[j].cbStruct = sizeof(MIXERCONTROL); - } - - if (mixerGetLineControls((HMIXEROBJ)Mixer->hmx, - &LineControls, - MIXER_GETLINECONTROLSF_ALL) == MMSYSERR_NOERROR) - { - for (j = 0; j < LineInfo->cControls; j++) + for (j = 0; j < LineControls.cControls; j++) { - DPRINT("Line control: %ws", (*Controls)[j].szName); + DPRINT("Line control: %ws\n", (*Controls)[j].szName); } return TRUE; @@ -152,12 +149,12 @@ 0, *Controls); *Controls = NULL; - DPRINT("Failed to get line controls!\n"); + DPRINT("Failed to get line (ID: 0x%x) controls: %d\n", LineInfo->dwLineID, Result); } } else { - DPRINT("Failed to allocate memory for %d line controls!\n", LineInfo->cControls); + DPRINT("Failed to allocate memory for %d line (ID: 0x%x) controls!\n", LineInfo->dwLineID, LineInfo->cControls); } return FALSE; @@ -174,19 +171,23 @@ { UINT i; MIXERLINE LineInfo; + MMRESULT Result; BOOL Ret = TRUE; LineInfo.cbStruct = sizeof(LineInfo); - LineInfo.dwDestination = Line->Info.dwDestination; for (i = Line->Info.cConnections; i > 0; i--) { + LineInfo.dwDestination = Line->Info.dwDestination; LineInfo.dwSource = i - 1; - if (mixerGetLineInfo((HMIXEROBJ)Mixer->hmx, - &LineInfo, - MIXER_GETLINEINFOF_SOURCE) == MMSYSERR_NOERROR) + Result = mixerGetLineInfo((HMIXEROBJ)Mixer->hmx, + &LineInfo, + MIXER_GETLINEINFOF_SOURCE); + if (Result == MMSYSERR_NOERROR) { LPMIXERCONTROL Controls; PSND_MIXER_CONNECTION Con; + + DPRINT("++ Source: %ws\n", LineInfo.szName); if (!SndMixerQueryControls(Mixer, &LineInfo, @@ -216,7 +217,7 @@ } else { - DPRINT("Failed to get connection information!\n"); + DPRINT("Failed to get connection information: %d\n", Result); Ret = FALSE; break; } @@ -246,6 +247,8 @@ &Line->Info, MIXER_GETLINEINFOF_DESTINATION) == MMSYSERR_NOERROR) { + DPRINT("+ Destination: %ws (%d)\n", Line->Info.szName, Line->Info.dwComponentType); + if (!SndMixerQueryConnections(Mixer, Line)) { DPRINT("Failed to query mixer connections!\n"); @@ -445,3 +448,38 @@ return FALSE; } +BOOL +SndMixerEnumConnections(PSND_MIXER Mixer, + DWORD LineID, + PFNSNDMIXENUMCONNECTIONS EnumProc, + PVOID Context) +{ + if (Mixer->hmx) + { + PSND_MIXER_DESTINATION Line; + + for (Line = Mixer->Lines; Line != NULL; Line = Line->Next) + { + if (Line->Info.dwLineID == LineID) + { + PSND_MIXER_CONNECTION Connection; + + for (Connection = Line->Connections; Connection != NULL; Connection = Connection->Next) + { + if (!EnumProc(Mixer, + LineID, + &Connection->Info, + Context)) + { + return FALSE; + } + } + + return TRUE; + } + } + } + + return FALSE; +} + _____ Modified: trunk/reactos/subsys/system/sndvol32/resources.h --- trunk/reactos/subsys/system/sndvol32/resources.h 2005-09-27 00:46:19 UTC (rev 18114) +++ trunk/reactos/subsys/system/sndvol32/resources.h 2005-09-27 01:02:15 UTC (rev 18115) @@ -17,6 +17,8 @@ #define IDC_RECORDING 1003 #define IDC_OTHER 1004 #define IDC_LINE 1005 +#define IDC_LABELCONTROLS 1006 +#define IDC_CONTROLS 1007 #define IDS_SNDVOL32 100 #define IDS_NOMIXERDEVICES 101 _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.c --- trunk/reactos/subsys/system/sndvol32/sndvol32.c 2005-09-27 00:46:19 UTC (rev 18114) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.c 2005-09-27 01:02:15 UTC (rev 18115) @@ -31,6 +31,7 @@ ATOM MainWindowClass; HWND hMainWnd; HANDLE hAppHeap; +LPTSTR lpAppTitle; #define GetDialogData(hwndDlg, type) \ ( P##type )GetWindowLongPtr((hwndDlg), DWLP_USER) @@ -44,6 +45,12 @@ PMIXER_WINDOW MixerWindow; PSND_MIXER Mixer; HWND hwndDlg; + + UINT Selected; + DWORD SelectedLine; + DWORD PlaybackID; + DWORD RecordingID; + UINT OtherLines; } PREFERENCES_CONTEXT, *PPREFERENCES_CONTEXT; typedef struct _PREFERENCES_FILL_DEVICES @@ -86,6 +93,209 @@ return TRUE; } +static BOOL CALLBACK +PrefDlgAddLine(PSND_MIXER Mixer, + LPMIXERLINE Line, + PVOID Context) +{ + PPREFERENCES_CONTEXT PrefContext = (PPREFERENCES_CONTEXT)Context; + + switch (Line->dwComponentType) + { + case MIXERLINE_COMPONENTTYPE_DST_SPEAKERS: + if (PrefContext->PlaybackID == (DWORD)-1) + { + PrefContext->PlaybackID = Line->dwLineID; + + if (PrefContext->SelectedLine == (DWORD)-1) + { + PrefContext->SelectedLine = Line->dwLineID; + } + } + else + goto AddToOthersLines; + + break; + + case MIXERLINE_COMPONENTTYPE_DST_WAVEIN: + if (PrefContext->RecordingID == (DWORD)-1) + { + PrefContext->RecordingID = Line->dwLineID; + + if (PrefContext->SelectedLine == (DWORD)-1) + { + PrefContext->SelectedLine = Line->dwLineID; + } + } + else + goto AddToOthersLines; + + break; + + default: + { + LRESULT lres; + HWND hwndCbOthers; + + if (PrefContext->SelectedLine == (DWORD)-1) + { + PrefContext->SelectedLine = Line->dwLineID; + } + +AddToOthersLines: + hwndCbOthers = GetDlgItem(PrefContext->hwndDlg, + IDC_LINE); + + lres = SendMessage(hwndCbOthers, + CB_ADDSTRING, + 0, + (LPARAM)Line->szName); + if (lres != CB_ERR) + { + SendMessage(hwndCbOthers, + CB_SETITEMDATA, + (WPARAM)lres, + Line->dwLineID); + + PrefContext->OtherLines++; + } + break; + } + } + + return TRUE; +} + +static BOOL CALLBACK +PrefDlgAddConnection(PSND_MIXER Mixer, + DWORD LineID, + LPMIXERLINE Line, + PVOID Context) +{ + PPREFERENCES_CONTEXT PrefContext = (PPREFERENCES_CONTEXT)Context; + LVITEM lvi; + + lvi.mask = LVIF_TEXT | LVIF_PARAM; + lvi.iItem = 0; + lvi.iSubItem = 0; + lvi.pszText = Line->szName; + lvi.lParam = (LPARAM)Line->dwSource; + + SendMessage(GetDlgItem(PrefContext->hwndDlg, + IDC_CONTROLS), + LVM_INSERTITEM, + 0, + (LPARAM)&lvi); + + return TRUE; +} + +static VOID +UpdatePrefDlgControls(PPREFERENCES_CONTEXT Context, + DWORD LineID) +{ + UINT OldID, MixerID = 0; + INT DeviceCbIndex; + + /* select the mixer */ + DeviceCbIndex = SendMessage(GetDlgItem(Context->hwndDlg, + IDC_MIXERDEVICE), + CB_GETCURSEL, + 0, + 0); + if (DeviceCbIndex != CB_ERR) + { + MixerID = SendMessage(GetDlgItem(Context->hwndDlg, + IDC_MIXERDEVICE), + CB_GETITEMDATA, + DeviceCbIndex, + 0); + if (MixerID == CB_ERR) + { + MixerID = 0; + } + } + + OldID = Context->Selected; + if (MixerID != OldID && + SndMixerSelect(Context->Mixer, + MixerID)) + { + Context->Selected = SndMixerGetSelection(Context->Mixer); + + /* update the controls */ + Context->PlaybackID = (DWORD)-1; + Context->RecordingID = (DWORD)-1; + Context->OtherLines = 0; + Context->SelectedLine = (DWORD)-1; + + if (SndMixerEnumLines(Context->Mixer, + PrefDlgAddLine, + Context)) + { + UINT SelBox = 0; + + /* enable/disable controls and make default selection */ + EnableWindow(GetDlgItem(Context->hwndDlg, + IDC_PLAYBACK), + Context->PlaybackID != (DWORD)-1); + CheckDlgButton(Context->hwndDlg, + IDC_PLAYBACK, + (Context->PlaybackID != (DWORD)-1 && SelBox++ == 0) ? + BST_CHECKED : BST_UNCHECKED); + + EnableWindow(GetDlgItem(Context->hwndDlg, + IDC_RECORDING), + Context->RecordingID != (DWORD)-1); + CheckDlgButton(Context->hwndDlg, + IDC_RECORDING, + (Context->RecordingID != (DWORD)-1 && SelBox++ == 0) ? + BST_CHECKED : BST_UNCHECKED); + + if (Context->OtherLines != 0) + { + /* select the first item in the other lines combo box by default */ + SendMessage(GetDlgItem(Context->hwndDlg, + IDC_LINE), + CB_SETCURSEL, + 0, + 0); + } + EnableWindow(GetDlgItem(Context->hwndDlg, + IDC_LINE), + Context->OtherLines != 0); + CheckDlgButton(Context->hwndDlg, + IDC_LINE, + (Context->OtherLines != 0 && SelBox++ == 0) ? + BST_CHECKED : BST_UNCHECKED); + + /* disable the OK button if the device doesn't have any lines */ + EnableWindow(GetDlgItem(Context->hwndDlg, + IDOK), + Context->PlaybackID != (DWORD)-1 || + Context->RecordingID != (DWORD)-1 || + Context->OtherLines != 0); + + LineID = Context->SelectedLine; + } + } + + /* update the line sources list */ + if ((MixerID != OldID && Context->SelectedLine != (DWORD)-1) || + (Context->SelectedLine != LineID && LineID != (DWORD)-1)) + { + Context->SelectedLine = LineID; + + ListView_DeleteAllItems(GetDlgItem(Context->hwndDlg, + IDC_CONTROLS)); + + SndMixerEnumConnections(Context->Mixer, + LineID, + PrefDlgAddConnection, + Context); + } +} + static INT_PTR CALLBACK DlgPreferencesProc(HWND hwndDlg, UINT uMsg, @@ -98,8 +308,70 @@ { case WM_COMMAND: { + Context = GetDialogData(hwndDlg, + PREFERENCES_CONTEXT); switch (LOWORD(wParam)) { + case IDC_MIXERDEVICE: + { + if (HIWORD(wParam) == CBN_SELCHANGE) + { + UpdatePrefDlgControls(Context, + (DWORD)-1); + } + break; + } + + case IDC_LINE: + { + if (HIWORD(wParam) == CBN_SELCHANGE) + { + UpdatePrefDlgControls(Context, + (DWORD)-1); + } + break; + } + + case IDC_PLAYBACK: + { + UpdatePrefDlgControls(Context, + Context->PlaybackID); + break; + } + + case IDC_RECORDING: + { + UpdatePrefDlgControls(Context, + Context->RecordingID); + break; + } + + case IDC_OTHER: + { + INT LineCbIndex; + DWORD LineID; + + LineCbIndex = SendMessage(GetDlgItem(Context->hwndDlg, + IDC_MIXERDEVICE), + CB_GETCURSEL, + 0, + 0); + if (LineCbIndex != CB_ERR) + { + LineID = SendMessage(GetDlgItem(Context->hwndDlg, + IDC_MIXERDEVICE), + CB_GETITEMDATA, + LineCbIndex, + 0); + if (LineID != CB_ERR) + { + UpdatePrefDlgControls(Context, + LineID); + } + } + break; + } + case IDOK: case IDCANCEL: { @@ -126,6 +398,9 @@ case WM_INITDIALOG: { PREFERENCES_FILL_DEVICES FillDevContext; + LVCOLUMN lvc; + RECT rcClient; + HWND hwndControls; SetWindowLongPtr(hwndDlg, DWLP_USER, @@ -133,6 +408,7 @@ Context = (PPREFERENCES_CONTEXT)((LONG_PTR)lParam); Context->hwndDlg = hwndDlg; Context->Mixer = SndMixerCreate(hwndDlg); + Context->Selected = (UINT)-1; FillDevContext.PrefContext = Context; FillDevContext.hComboBox = GetDlgItem(hwndDlg, @@ -141,6 +417,26 @@ SndMixerEnumProducts(Context->Mixer, FillDeviceComboBox, &FillDevContext); + + /* initialize the list view control */ + hwndControls = GetDlgItem(hwndDlg, + IDC_CONTROLS); + ListView_SetExtendedListViewStyle(hwndControls, + LVS_EX_CHECKBOXES); + + GetClientRect(hwndControls, + &rcClient); + lvc.mask = LVCF_TEXT | LVCF_WIDTH; + lvc.pszText = TEXT(""); + lvc.cx = rcClient.right; + SendMessage(hwndControls, + LVM_INSERTCOLUMN, + 0, + (LPARAM)&lvc); + + /* update all controls */ + UpdatePrefDlgControls(Context, + (DWORD)-1); return TRUE; } @@ -222,6 +518,17 @@ PostQuitMessage(0); break; } + + case IDC_ABOUT: + { + HICON hAppIcon = (HICON)GetClassLongPtrW(hwnd, + GCLP_HICON); + ShellAbout(hwnd, + lpAppTitle, + NULL, + hAppIcon); + break; + } } break; } @@ -350,7 +657,6 @@ static HWND CreateApplicationWindow(VOID) { - LPTSTR lpAppTitle; HWND hWnd; PMIXER_WINDOW MixerWindow = HeapAlloc(hAppHeap, @@ -361,14 +667,6 @@ return NULL; } - /* load the application title */ - if (AllocAndLoadString(&lpAppTitle, - hAppInstance, - IDS_SNDVOL32) == 0) - { - lpAppTitle = NULL; - } - if (mixerGetNumDevs() > 0) { hWnd = CreateWindowEx(WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT, @@ -401,11 +699,6 @@ LocalFree(lpErrMessage); } - if (lpAppTitle != NULL) - { - LocalFree(lpAppTitle); - } - if (hWnd == NULL) { HeapFree(hAppHeap, @@ -426,6 +719,14 @@ hAppInstance = hInstance; hAppHeap = GetProcessHeap(); + + /* load the application title */ + if (AllocAndLoadString(&lpAppTitle, + hAppInstance, + IDS_SNDVOL32) == 0) + { + lpAppTitle = NULL; + } InitCommonControls(); @@ -454,6 +755,11 @@ DestroyWindow(hMainWnd); UnregisterApplicationClasses(); + + if (lpAppTitle != NULL) + { + LocalFree(lpAppTitle); + } return 0; } _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.h --- trunk/reactos/subsys/system/sndvol32/sndvol32.h 2005-09-27 00:46:19 UTC (rev 18114) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.h 2005-09-27 01:02:15 UTC (rev 18115) @@ -4,6 +4,7 @@ #include <windows.h> #include <mmsystem.h> #include <commctrl.h> +#include <shellapi.h> #include <stdio.h> #include <tchar.h> #include <string.h> @@ -63,6 +64,7 @@ } SND_MIXER, *PSND_MIXER; typedef BOOL (CALLBACK *PFNSNDMIXENUMLINES)(PSND_MIXER Mixer, LPMIXERLINE Line, PVOID Context); +typedef BOOL (CALLBACK *PFNSNDMIXENUMCONNECTIONS)(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Context); typedef BOOL (CALLBACK *PFNSNDMIXENUMPRODUCTS)(PSND_MIXER Mixer, UINT Id, LPCTSTR ProductName, PVOID Context); PSND_MIXER SndMixerCreate(HWND hWndNotification); @@ -73,7 +75,8 @@ INT SndMixerGetProductName(PSND_MIXER Mixer, LPTSTR lpBuffer, UINT uSize); BOOL SndMixerEnumProducts(PSND_MIXER Mixer, PFNSNDMIXENUMPRODUCTS EnumProc, PVOID Context); INT SndMixerGetDestinationCount(PSND_MIXER Mixer); -BOOL SndMixerEnumDestinationLines(PSND_MIXER Mixer, PFNSNDMIXENUMLINES EnumProc, PVOID Context); +BOOL SndMixerEnumLines(PSND_MIXER Mixer, PFNSNDMIXENUMLINES EnumProc, PVOID Context); +BOOL SndMixerEnumConnections(PSND_MIXER Mixer, DWORD LineID, PFNSNDMIXENUMCONNECTIONS EnumProc, PVOID Context); /* * MISC _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.xml --- trunk/reactos/subsys/system/sndvol32/sndvol32.xml 2005-09-27 00:46:19 UTC (rev 18114) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.xml 2005-09-27 01:02:15 UTC (rev 18115) @@ -4,7 +4,9 @@ <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="_WIN32_WINNT">0x6501</define> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> <library>ntdll</library> <library>user32</library> <library>gdi32</library>

1 0

[npwoods] 18114: Notepad enhancements
by npwoods＠svn.reactos.com 27 Sep '05

27 Sep '05

Notepad enhancements 1. Implemented "Goto line" 2. Partially implemented Replace (dialog comes up, need to have it actually do the replace ) Modified: trunk/reactos/subsys/system/notepad/En.rc Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/dialog.h Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/notepad/main.h Modified: trunk/reactos/subsys/system/notepad/notepad_res.h _____ Modified: trunk/reactos/subsys/system/notepad/En.rc --- trunk/reactos/subsys/system/notepad/En.rc 2005-09-26 22:57:48 UTC (rev 18113) +++ trunk/reactos/subsys/system/notepad/En.rc 2005-09-27 00:46:19 UTC (rev 18114) @@ -51,8 +51,10 @@ MENUITEM "&Font...", CMD_FONT } POPUP "&Search" { - MENUITEM "&Search\tCtrl+F", CMD_SEARCH - MENUITEM "&Search next\tF3", CMD_SEARCH_NEXT + MENUITEM "&Find...\tCtrl+F", CMD_SEARCH + MENUITEM "Find &next\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO } POPUP "&Help" { MENUITEM "&Contents", CMD_HELP_CONTENTS @@ -107,6 +109,18 @@ LTEXT "Endlines:",0x156,5,20,41,12 } +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOG 0,0,165,50 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Goto line" +{ +EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "Line number:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP +PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ @@ -138,6 +152,7 @@ STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ task. \nClose one or more applications to increase the amount of \nfree \ memory." +STRING_CANNOTFIND "Cannot find '%s'" STRING_ANSI, "ANSI" STRING_UNICODE, "Unicode" STRING_UNICODE_BE, "Unicode (big endian)" _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-09-26 22:57:48 UTC (rev 18113) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-09-27 00:46:19 UTC (rev 18114) @@ -21,11 +21,13 @@ */ #define UNICODE +#define _UNICODE #include <assert.h> #include <stdio.h> #include <windows.h> #include <commdlg.h> +#include <tchar.h> #include "main.h" #include "license.h" @@ -669,29 +671,115 @@ } } -VOID DIALOG_Search(VOID) +typedef HWND (STDCALL *FINDPROC)(LPFINDREPLACE lpfr); + +static VOID DIALOG_SearchDialog(FINDPROC pfnProc) { - ZeroMemory(&Globals.find, sizeof(Globals.find)); - Globals.find.lStructSize = sizeof(Globals.find); - Globals.find.hwndOwner = Globals.hMainWnd; - Globals.find.hInstance = Globals.hInstance; - Globals.find.lpstrFindWhat = Globals.szFindText; - Globals.find.wFindWhatLen = SIZEOF(Globals.szFindText); - Globals.find.Flags = FR_DOWN; + ZeroMemory(&Globals.find, sizeof(Globals.find)); + Globals.find.lStructSize = sizeof(Globals.find); + Globals.find.hwndOwner = Globals.hMainWnd; + Globals.find.hInstance = Globals.hInstance; + Globals.find.lpstrFindWhat = Globals.szFindText; + Globals.find.wFindWhatLen = SIZEOF(Globals.szFindText); + Globals.find.lpstrReplaceWith = Globals.szReplaceText; + Globals.find.wReplaceWithLen = SIZEOF(Globals.szReplaceText); + Globals.find.Flags = FR_DOWN; - /* We only need to create the modal FindReplace dialog which will */ - /* notify us of incoming events using hMainWnd Window Messages */ + /* We only need to create the modal FindReplace dialog which will */ + /* notify us of incoming events using hMainWnd Window Messages */ - Globals.hFindReplaceDlg = FindText(&Globals.find); - assert(Globals.hFindReplaceDlg !=0); + Globals.hFindReplaceDlg = pfnProc(&Globals.find); + assert(Globals.hFindReplaceDlg !=0); } +VOID DIALOG_Search(VOID) +{ + DIALOG_SearchDialog(FindText); +} + VOID DIALOG_SearchNext(VOID) { /* FIXME: Search Next */ DIALOG_Search(); } +VOID DIALOG_Replace(VOID) +{ + DIALOG_SearchDialog(ReplaceText); +} + +static INT_PTR CALLBACK DIALOG_GoTo_DialogProc(HWND hwndDialog, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + BOOL bResult = FALSE; + HWND hTextBox; + TCHAR szText[32]; + + switch(uMsg) { + case WM_INITDIALOG: + hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER); + _sntprintf(szText, sizeof(szText) / sizeof(szText[0]), _T("%d"), lParam); + SetWindowText(hTextBox, szText); + break; + case WM_COMMAND: + if (HIWORD(wParam) == BN_CLICKED) + { + if (LOWORD(wParam) == IDOK) + { + hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER); + GetWindowText(hTextBox, szText, sizeof(szText) / sizeof(szText[0])); + EndDialog(hwndDialog, _ttoi(szText)); + bResult = TRUE; + } + else if (LOWORD(wParam) == IDCANCEL) + { + EndDialog(hwndDialog, 0); + bResult = TRUE; + } + } + break; + } + + return bResult; +} + +VOID DIALOG_GoTo(VOID) +{ + INT_PTR nLine; + LPTSTR pszText; + int nLength, i; + DWORD dwStart, dwEnd; + + nLength = GetWindowTextLength(Globals.hEdit); + pszText = (LPTSTR) HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(*pszText)); + if (!pszText) + return; + + /* Retrieve current text */ + GetWindowText(Globals.hEdit, pszText, nLength + 1); + SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM) &dwStart, (LPARAM) &dwEnd); + + nLine = 1; + for (i = 0; pszText[i] && (i < dwStart); i++) + { + if (pszText[i] == '\n') + nLine++; + } + + nLine = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(DIALOG_GOTO), + Globals.hMainWnd, DIALOG_GoTo_DialogProc, nLine); + + if (nLine >= 1) + { + for (i = 0; pszText[i] && (nLine > 1) && (i < dwStart - 1); i++) + { + if (pszText[i] == '\n') + nLine--; + } + SendMessage(Globals.hEdit, EM_SETSEL, i, i); + } + HeapFree(GetProcessHeap(), 0, pszText); +} + VOID DIALOG_HelpContents(VOID) { WinHelp(Globals.hMainWnd, helpfileW, HELP_INDEX, 0); _____ Modified: trunk/reactos/subsys/system/notepad/dialog.h --- trunk/reactos/subsys/system/notepad/dialog.h 2005-09-26 22:57:48 UTC (rev 18113) +++ trunk/reactos/subsys/system/notepad/dialog.h 2005-09-27 00:46:19 UTC (rev 18114) @@ -38,6 +38,8 @@ VOID DIALOG_Search(VOID); VOID DIALOG_SearchNext(VOID); +VOID DIALOG_Replace(VOID); +VOID DIALOG_GoTo(VOID); VOID DIALOG_SelectFont(VOID); _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-09-26 22:57:48 UTC (rev 18113) +++ trunk/reactos/subsys/system/notepad/main.c 2005-09-27 00:46:19 UTC (rev 18114) @@ -78,6 +78,8 @@ case CMD_SEARCH: DIALOG_Search(); break; case CMD_SEARCH_NEXT: DIALOG_SearchNext(); break; + case CMD_REPLACE: DIALOG_Replace(); break; + case CMD_GOTO: DIALOG_GoTo(); break; case CMD_WRAP: DIALOG_EditWrap(); break; case CMD_FONT: DIALOG_SelectFont(); break; @@ -106,6 +108,7 @@ LPTSTR pszText = NULL; DWORD dwPosition, dwDummy; BOOL bMatches = FALSE; + TCHAR szResource[128], szText[128]; iTargetLength = _tcslen(pFindReplace->lpstrFindWhat); @@ -149,9 +152,18 @@ if (bMatches) { + /* Found target */ SendMessage(Globals.hEdit, EM_SETSEL, dwPosition, dwPosition + iTargetLength); SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0); } + else + { + /* Can't find target */ + LoadString(Globals.hInstance, STRING_CANNOTFIND, szResource, SIZEOF(szResource)); + _sntprintf(szText, SIZEOF(szText), szResource, pFindReplace->lpstrFindWhat); + LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource)); + MessageBox(Globals.hEdit, szText, szResource, MB_OK); + } if (pszText) HeapFree(GetProcessHeap(), 0, pszText); _____ Modified: trunk/reactos/subsys/system/notepad/main.h --- trunk/reactos/subsys/system/notepad/main.h 2005-09-26 22:57:48 UTC (rev 18113) +++ trunk/reactos/subsys/system/notepad/main.h 2005-09-27 00:46:19 UTC (rev 18114) @@ -49,6 +49,7 @@ LOGFONT lfFont; BOOL bWrapLongLines; WCHAR szFindText[MAX_PATH]; + WCHAR szReplaceText[MAX_PATH]; WCHAR szFileName[MAX_PATH]; WCHAR szFileTitle[MAX_PATH]; WCHAR szFilter[2 * MAX_STRING_LEN + 100]; _____ Modified: trunk/reactos/subsys/system/notepad/notepad_res.h --- trunk/reactos/subsys/system/notepad/notepad_res.h 2005-09-26 22:57:48 UTC (rev 18113) +++ trunk/reactos/subsys/system/notepad/notepad_res.h 2005-09-27 00:46:19 UTC (rev 18114) @@ -25,6 +25,8 @@ #define DIALOG_ENCODING 0x204 #define ID_ENCODING 0x205 #define ID_EOLN 0x206 +#define DIALOG_GOTO 0x207 +#define ID_LINENUMBER 0x208 /* Commands */ #define CMD_NEW 0x100 @@ -46,6 +48,8 @@ #define CMD_SEARCH 0x120 #define CMD_SEARCH_NEXT 0x121 +#define CMD_REPLACE 0x122 +#define CMD_GOTO 0x123 #define CMD_WRAP 0x119 #define CMD_FONT 0x140 @@ -79,12 +83,13 @@ #define STRING_NOTFOUND 0x17B #define STRING_OUT_OF_MEMORY 0x17C +#define STRING_CANNOTFIND 0x17D -#define STRING_ANSI 0x17D -#define STRING_UNICODE 0x17E -#define STRING_UNICODE_BE 0x17F -#define STRING_UTF8 0x180 +#define STRING_ANSI 0x17E +#define STRING_UNICODE 0x17F +#define STRING_UNICODE_BE 0x180 +#define STRING_UTF8 0x181 -#define STRING_CRLF 0x181 -#define STRING_LF 0x182 -#define STRING_CR 0x183 +#define STRING_CRLF 0x182 +#define STRING_LF 0x183 +#define STRING_CR 0x184

1 0

[gdalsnes] 18113: -reorder InsertXscendingOrder macro argument order and update uses
by gdalsnes＠svn.reactos.com 26 Sep '05

26 Sep '05

-reorder InsertXscendingOrder macro argument order and update uses -start to macrofy list enums in ntoskrnl using LIST_FOR_EACH macros -use IsListEmpty some places instead of manual coding -profile.c:KeStartProfile() zero correct buffer in (and not the NULL ptr;-) -improve LIST_FOR_EACH macros so that the iterator is set to NULL at end of enum -kthread.c:KiServiceCheck() set the shadowtable before calling the win32k proc/thread init funcs -apc.c:KiInsertQueueApc() insert special apcs in correct fifo order -apc.c:KeFlushQueueApc() simplify -timer.c:KiExpireTimers() calling RemoveEntryList on a possibly empty list is not ok Modified: trunk/reactos/include/reactos/helper.h Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/fs.c Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/io/pnpnotify.c Modified: trunk/reactos/ntoskrnl/io/pnproot.c Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/kqueue.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/profile.c Modified: trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/ntoskrnl/ke/timer.c Modified: trunk/reactos/subsys/system/usetup/partlist.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c _____ Modified: trunk/reactos/include/reactos/helper.h --- trunk/reactos/include/reactos/helper.h 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/include/reactos/helper.h 2005-09-26 22:57:48 UTC (rev 18113) @@ -18,17 +18,21 @@ #define EXPORTED __declspec(dllexport) #define IMPORTED __declspec(dllimport) -/* iterate through the list using a list entry */ +/* iterate through the list using a list entry. + * elem is set to NULL if the list is run thru without breaking out or if list is empty. + */ #define LIST_FOR_EACH(elem, list, type, field) \ for ((elem) = CONTAINING_RECORD((list)->Flink, type, field); \ - &(elem)->field != (list); \ + &(elem)->field != (list) || (elem = NULL); \ (elem) = CONTAINING_RECORD((elem)->field.Flink, type, field)) -/* iterate through the list using a list entry, with safety against removal */ +/* iterate through the list using a list entry, with safety against removal + * elem is set to NULL if the list is run thru without breaking out or if list is empty. + */ #define LIST_FOR_EACH_SAFE(cursor, cursor2, list, type, field) \ for ((cursor) = CONTAINING_RECORD((list)->Flink, type, field), \ (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field); \ - &(cursor)->field != (list); \ + &(cursor)->field != (list) || (cursor = NULL); \ (cursor) = (cursor2), \ (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field)) @@ -55,7 +59,7 @@ #define HOURS_TO_100NS(hours) (((LONGLONG)(hours)) * MINUTES_TO_100NS(60)) #define UNICODIZE1(x) L##x #define UNICODIZE(x) UNICODIZE1(x) -#define InsertAscendingListFIFO(ListHead, Type, ListEntryField, NewEntry, SortField)\ +#define InsertAscendingListFIFO(ListHead, NewEntry, Type, ListEntryField, SortField)\ {\ PLIST_ENTRY current;\ \ @@ -73,7 +77,7 @@ InsertTailList(current, &((NewEntry)->ListEntryField));\ } -#define InsertDescendingListFIFO(ListHead, Type, ListEntryField, NewEntry, SortField)\ +#define InsertDescendingListFIFO(ListHead, NewEntry, Type, ListEntryField, SortField)\ {\ PLIST_ENTRY current;\ \ @@ -91,7 +95,7 @@ InsertTailList(current, &((NewEntry)->ListEntryField));\ } -#define InsertAscendingList(ListHead, Type, ListEntryField, NewEntry, SortField)\ +#define InsertAscendingList(ListHead, NewEntry, Type, ListEntryField, SortField)\ {\ PLIST_ENTRY current;\ \ @@ -109,7 +113,7 @@ InsertTailList(current, &((NewEntry)->ListEntryField));\ } -#define InsertDescendingList(ListHead, Type, ListEntryField, NewEntry, SortField)\ +#define InsertDescendingList(ListHead, NewEntry, Type, ListEntryField, SortField)\ {\ PLIST_ENTRY current;\ \ _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/io/device.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -33,17 +33,13 @@ IoShutdownRegisteredDevices(VOID) { PSHUTDOWN_ENTRY ShutdownEntry; - PLIST_ENTRY Entry; IO_STATUS_BLOCK StatusBlock; PIRP Irp; KEVENT Event; NTSTATUS Status; - Entry = ShutdownListHead.Flink; - while (Entry != &ShutdownListHead) + LIST_FOR_EACH(ShutdownEntry, &ShutdownListHead, SHUTDOWN_ENTRY, ShutdownList) { - ShutdownEntry = CONTAINING_RECORD(Entry, SHUTDOWN_ENTRY, ShutdownList); - KeInitializeEvent (&Event, NotificationEvent, FALSE); @@ -66,8 +62,6 @@ FALSE, NULL); } - - Entry = Entry->Flink; } } @@ -1082,27 +1076,24 @@ STDCALL IoUnregisterShutdownNotification(PDEVICE_OBJECT DeviceObject) { - PSHUTDOWN_ENTRY ShutdownEntry; - PLIST_ENTRY Entry; + PSHUTDOWN_ENTRY ShutdownEntry, tmp; KIRQL oldlvl; - Entry = ShutdownListHead.Flink; - while (Entry != &ShutdownListHead) + LIST_FOR_EACH_SAFE(ShutdownEntry, tmp, &ShutdownListHead, SHUTDOWN_ENTRY, ShutdownList) { - ShutdownEntry = CONTAINING_RECORD(Entry, SHUTDOWN_ENTRY, ShutdownList); + if (ShutdownEntry->DeviceObject == DeviceObject) { DeviceObject->Flags &= ~DO_SHUTDOWN_REGISTERED; KeAcquireSpinLock(&ShutdownListLock,&oldlvl); - RemoveEntryList(Entry); + RemoveEntryList(&ShutdownEntry->ShutdownList); KeReleaseSpinLock(&ShutdownListLock,oldlvl); - ExFreePool(Entry); + ExFreePool(ShutdownEntry); return; } - Entry = Entry->Flink; } } _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -1118,44 +1118,32 @@ NTSTATUS INIT_FUNCTION IoDestroyDriverList(VOID) { - PLIST_ENTRY GroupEntry; - PLIST_ENTRY ServiceEntry; - PSERVICE_GROUP CurrentGroup; - PSERVICE CurrentService; + PSERVICE_GROUP CurrentGroup, tmp1; + PSERVICE CurrentService, tmp2; DPRINT("IoDestroyDriverList() called\n"); /* Destroy group list */ - GroupEntry = GroupListHead.Flink; - while (GroupEntry != &GroupListHead) + LIST_FOR_EACH_SAFE(CurrentGroup, tmp1, &GroupListHead, SERVICE_GROUP, GroupListEntry) { - CurrentGroup = CONTAINING_RECORD(GroupEntry, SERVICE_GROUP, GroupListEntry); - ExFreePool(CurrentGroup->GroupName.Buffer); - RemoveEntryList(GroupEntry); + RemoveEntryList(&CurrentGroup->GroupListEntry); if (CurrentGroup->TagArray) { ExFreePool(CurrentGroup->TagArray); } ExFreePool(CurrentGroup); - - GroupEntry = GroupListHead.Flink; } /* Destroy service list */ - ServiceEntry = ServiceListHead.Flink; - while (ServiceEntry != &ServiceListHead) + LIST_FOR_EACH_SAFE(CurrentService, tmp2, &ServiceListHead, SERVICE, ServiceListEntry) { - CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); - ExFreePool(CurrentService->ServiceName.Buffer); ExFreePool(CurrentService->RegistryPath.Buffer); ExFreePool(CurrentService->ServiceGroup.Buffer); ExFreePool(CurrentService->ImagePath.Buffer); - RemoveEntryList(ServiceEntry); + RemoveEntryList(&CurrentService->ServiceListEntry); ExFreePool(CurrentService); - - ServiceEntry = ServiceListHead.Flink; } DPRINT("IoDestroyDriverList() done\n"); @@ -1423,8 +1411,6 @@ VOID FASTCALL IopInitializeSystemDrivers(VOID) { - PLIST_ENTRY GroupEntry; - PLIST_ENTRY ServiceEntry; PSERVICE_GROUP CurrentGroup; PSERVICE CurrentService; NTSTATUS Status; @@ -1432,21 +1418,15 @@ DPRINT("IopInitializeSystemDrivers()\n"); - GroupEntry = GroupListHead.Flink; - while (GroupEntry != &GroupListHead) + LIST_FOR_EACH(CurrentGroup, &GroupListHead, SERVICE_GROUP, GroupListEntry) { - CurrentGroup = CONTAINING_RECORD(GroupEntry, SERVICE_GROUP, GroupListEntry); - DPRINT("Group: %wZ\n", &CurrentGroup->GroupName); /* Load all drivers with a valid tag */ for (i = 0; i < CurrentGroup->TagCount; i++) { - ServiceEntry = ServiceListHead.Flink; - while (ServiceEntry != &ServiceListHead) + LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) { - CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); - if ((RtlCompareUnicodeString(&CurrentGroup->GroupName, &CurrentService->ServiceGroup, TRUE) == 0) && (CurrentService->Start == 1 /*SERVICE_SYSTEM_START*/) && @@ -1455,15 +1435,12 @@ DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); Status = IopLoadDriver(CurrentService); } - ServiceEntry = ServiceEntry->Flink; } } /* Load all drivers without a tag or with an invalid tag */ - ServiceEntry = ServiceListHead.Flink; - while (ServiceEntry != &ServiceListHead) + LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) { - CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); if ((RtlCompareUnicodeString(&CurrentGroup->GroupName, &CurrentService->ServiceGroup, TRUE) == 0) && (CurrentService->Start == 1 /*SERVICE_SYSTEM_START*/)) @@ -1481,10 +1458,8 @@ Status = IopLoadDriver(CurrentService); } } - ServiceEntry = ServiceEntry->Flink; } - GroupEntry = GroupEntry->Flink; } DPRINT("IopInitializeSystemDrivers() done\n"); _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/io/file.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -1383,7 +1383,6 @@ NTSTATUS Status; PFILE_OBJECT FileObject; PETHREAD Thread; - PLIST_ENTRY IrpEntry; PIRP Irp; KIRQL OldIrql; BOOLEAN OurIrpsInList = FALSE; @@ -1408,11 +1407,9 @@ */ Thread = PsGetCurrentThread(); - for (IrpEntry = Thread->IrpList.Flink; - IrpEntry != &Thread->IrpList; - IrpEntry = IrpEntry->Flink) + + LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) { - Irp = CONTAINING_RECORD(IrpEntry, IRP, ThreadListEntry); if (Irp->Tail.Overlay.OriginalFileObject == FileObject) { IoCancelIrp(Irp); @@ -1440,11 +1437,8 @@ * forever. */ - for (IrpEntry = Thread->IrpList.Flink; - IrpEntry != &Thread->IrpList; - IrpEntry = IrpEntry->Flink) + LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) { - Irp = CONTAINING_RECORD(IrpEntry, IRP, ThreadListEntry); if (Irp->Tail.Overlay.OriginalFileObject == FileObject) { OurIrpsInList = TRUE; _____ Modified: trunk/reactos/ntoskrnl/io/fs.c --- trunk/reactos/ntoskrnl/io/fs.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/io/fs.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -72,7 +72,6 @@ VOID IoShutdownRegisteredFileSystems(VOID) { - PLIST_ENTRY current_entry; FILE_SYSTEM_OBJECT* current; PIRP Irp; KEVENT Event; @@ -87,11 +86,8 @@ NotificationEvent, FALSE); - current_entry = FileSystemListHead.Flink; - while (current_entry!=(&FileSystemListHead)) + LIST_FOR_EACH(current, &FileSystemListHead, FILE_SYSTEM_OBJECT,Entry) { - current = CONTAINING_RECORD(current_entry,FILE_SYSTEM_OBJECT,Entry); - /* send IRP_MJ_SHUTDOWN */ Irp = IoBuildSynchronousFsdRequest(IRP_MJ_SHUTDOWN, current->DeviceObject, @@ -110,8 +106,6 @@ FALSE, NULL); } - - current_entry = current_entry->Flink; } ExReleaseResourceLite(&FileSystemListLock); @@ -224,8 +218,7 @@ * RETURNS: Status */ { - PLIST_ENTRY current_entry; - FILE_SYSTEM_OBJECT* current; + PFILE_SYSTEM_OBJECT current; NTSTATUS Status; DEVICE_TYPE MatchingDeviceType; PDEVICE_OBJECT DevObject; @@ -262,13 +255,12 @@ KeEnterCriticalRegion(); ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - current_entry = FileSystemListHead.Flink; - while (current_entry!=(&FileSystemListHead)) + +restart: + LIST_FOR_EACH(current,&FileSystemListHead, FILE_SYSTEM_OBJECT, Entry) { - current = CONTAINING_RECORD(current_entry,FILE_SYSTEM_OBJECT,Entry); if (current->DeviceObject->DeviceType != MatchingDeviceType) { - current_entry = current_entry->Flink; continue; } /* If we are not allowed to mount this volume as a raw filesystem volume @@ -294,8 +286,7 @@ return(Status); } ExAcquireResourceSharedLite(&FileSystemListLock,TRUE); - current_entry = FileSystemListHead.Flink; - continue; + goto restart; case STATUS_SUCCESS: DeviceObject->Vpb->Flags = DeviceObject->Vpb->Flags | @@ -306,7 +297,8 @@ case STATUS_UNRECOGNIZED_VOLUME: default: - current_entry = current_entry->Flink; + /* do nothing */ + break; } } ExReleaseResourceLite(&FileSystemListLock); @@ -504,28 +496,26 @@ VOID STDCALL IoUnregisterFileSystem(IN PDEVICE_OBJECT DeviceObject) { - PLIST_ENTRY current_entry; PFILE_SYSTEM_OBJECT current; DPRINT("IoUnregisterFileSystem(DeviceObject 0x%p)\n", DeviceObject); KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); - current_entry = FileSystemListHead.Flink; - while (current_entry!=(&FileSystemListHead)) + + LIST_FOR_EACH(current,&FileSystemListHead, FILE_SYSTEM_OBJECT,Entry) { - current = CONTAINING_RECORD(current_entry,FILE_SYSTEM_OBJECT,Entry); if (current->DeviceObject == DeviceObject) { - RemoveEntryList(current_entry); + RemoveEntryList(&current->Entry); ExFreePoolWithTag(current, TAG_FILE_SYSTEM); ExReleaseResourceLite(&FileSystemListLock); KeLeaveCriticalRegion(); IopNotifyFileSystemChange(DeviceObject, FALSE); return; } - current_entry = current_entry->Flink; } + ExReleaseResourceLite(&FileSystemListLock); KeLeaveCriticalRegion(); } @@ -595,17 +585,11 @@ BOOLEAN DriverActive) { PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; - PLIST_ENTRY Entry; KeAcquireGuardedMutex(&FsChangeNotifyListLock); - Entry = FsChangeNotifyListHead.Flink; - while (Entry != &FsChangeNotifyListHead) + LIST_FOR_EACH(ChangeEntry, &FsChangeNotifyListHead,FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList) { - ChangeEntry = CONTAINING_RECORD(Entry, FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList); - (ChangeEntry->FSDNotificationProc)(DeviceObject, DriverActive); - - Entry = Entry->Flink; } KeReleaseGuardedMutex(&FsChangeNotifyListLock); } @@ -646,24 +630,20 @@ IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) { PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; - PLIST_ENTRY Entry; - Entry = FsChangeNotifyListHead.Flink; - while (Entry != &FsChangeNotifyListHead) + LIST_FOR_EACH(ChangeEntry, &FsChangeNotifyListHead, FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList) { - ChangeEntry = CONTAINING_RECORD(Entry, FS_CHANGE_NOTIFY_ENTRY, FsChangeNotifyList); if (ChangeEntry->DriverObject == DriverObject && ChangeEntry->FSDNotificationProc == FSDNotificationProc) { KeAcquireGuardedMutex(&FsChangeNotifyListLock); - RemoveEntryList(Entry); + RemoveEntryList(&ChangeEntry->FsChangeNotifyList); KeReleaseGuardedMutex(&FsChangeNotifyListLock); - ExFreePoolWithTag(Entry, TAG_FS_CHANGE_NOTIFY); + ExFreePoolWithTag(ChangeEntry, TAG_FS_CHANGE_NOTIFY); return; } - Entry = Entry->Flink; } } _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -962,7 +962,6 @@ STDCALL IoCancelThreadIo(PETHREAD Thread) { - PLIST_ENTRY IrpEntry; PIRP Irp; KIRQL OldIrql; ULONG Retries = 3000; @@ -972,13 +971,8 @@ OldIrql = KfRaiseIrql(APC_LEVEL); /* Start by cancelling all the IRPs in the current thread queue. */ - for (IrpEntry = Thread->IrpList.Flink; - IrpEntry != &Thread->IrpList; - IrpEntry = IrpEntry->Flink) + LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) { - /* Get the IRP */ - Irp = CONTAINING_RECORD(IrpEntry, IRP, ThreadListEntry); - /* Cancel it */ IoCancelIrp(Irp); } _____ Modified: trunk/reactos/ntoskrnl/io/pnpnotify.c --- trunk/reactos/ntoskrnl/io/pnpnotify.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/io/pnpnotify.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -184,7 +184,6 @@ IN PVOID EventCategoryData2) { PPNP_NOTIFY_ENTRY ChangeEntry; - PLIST_ENTRY Entry; PVOID NotificationStructure; BOOLEAN CallCurrentEntry; @@ -249,10 +248,8 @@ * list to find those that meet some criteria. */ - Entry = PnpNotifyListHead.Flink; - while (Entry != &PnpNotifyListHead) + LIST_FOR_EACH(ChangeEntry,&PnpNotifyListHead, PNP_NOTIFY_ENTRY, PnpNotifyList) { - ChangeEntry = CONTAINING_RECORD(Entry, PNP_NOTIFY_ENTRY, PnpNotifyList); CallCurrentEntry = FALSE; switch (EventCategory) @@ -294,7 +291,6 @@ ChangeEntry->Context); } - Entry = Entry->Flink; } KeReleaseGuardedMutex(&PnpNotifyListLock); ExFreePoolWithTag(NotificationStructure, TAG_PNP_NOTIFY); _____ Modified: trunk/reactos/ntoskrnl/io/pnproot.c --- trunk/reactos/ntoskrnl/io/pnproot.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/io/pnproot.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -766,7 +766,6 @@ PPNPROOT_PDO_DEVICE_EXTENSION PdoDeviceExtension; PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; PDEVICE_RELATIONS Relations; - PLIST_ENTRY CurrentEntry; PPNPROOT_DEVICE Device; NTSTATUS Status; ULONG Size; @@ -796,11 +795,8 @@ Relations->Count = DeviceExtension->DeviceListCount; i = 0; - CurrentEntry = DeviceExtension->DeviceListHead.Flink; - while (CurrentEntry != &DeviceExtension->DeviceListHead) + LIST_FOR_EACH(Device,&DeviceExtension->DeviceListHead,PNPROOT_DEVICE, ListEntry) { - Device = CONTAINING_RECORD(CurrentEntry, PNPROOT_DEVICE, ListEntry); - if (!Device->Pdo) { /* Create a physical device object for the @@ -894,8 +890,6 @@ Relations->Objects[i] = Device->Pdo; i++; - - CurrentEntry = CurrentEntry->Flink; } if (NT_SUCCESS(Status)) _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -254,8 +254,6 @@ KPRIORITY PriorityBoost) { PKTHREAD Thread = Apc->Thread; - PLIST_ENTRY ApcListEntry; - PKAPC QueuedApc; KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); @@ -282,18 +280,15 @@ DPRINT("Inserting Special APC %x for '%.16s' into the Queue\n", Apc, ((PETHREAD)Thread)->ThreadsProcess->ImageFileName); - for (ApcListEntry = Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcListHead[(int)Apc-> ApcMode].Flink; - ApcListEntry != &Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcListHead[(int)Apc- >ApcMode]; - ApcListEntry = ApcListEntry->Flink) { + /* insert special apc before normal apcs (if any) but after the last special apc (fifo) */ + InsertAscendingListFIFO( + &Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcListHead[(int)Apc- >ApcMode], + Apc, + KAPC, + ApcListEntry, + NormalRoutine /* sort field */ + ); - QueuedApc = CONTAINING_RECORD(ApcListEntry, KAPC, ApcListEntry); - if (Apc->NormalRoutine != NULL) break; - } - - /* We found the first "Normal" APC, so write right before it */ - ApcListEntry = ApcListEntry->Blink; - InsertHeadList(ApcListEntry, &Apc->ApcListEntry); - } else { DPRINT("Inserting Normal APC %x for '%.16s' into the %x Queue\n", Apc, ((PETHREAD)Thread)->ThreadsProcess->ImageFileName, Apc->ApcMode); @@ -469,25 +464,23 @@ { KIRQL OldIrql; PKAPC Apc; - PLIST_ENTRY FirstEntry, CurrentEntry; + PLIST_ENTRY FirstEntry = NULL; /* Lock the Dispatcher Database and APC Queue */ OldIrql = KeAcquireDispatcherDatabaseLock(); KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); - if (IsListEmpty(&Thread->ApcState.ApcListHead[PreviousMode])) { - FirstEntry = NULL; - } else { + /* mark all apcs as not-inserted */ + LIST_FOR_EACH(Apc, &Thread->ApcState.ApcListHead[PreviousMode], KAPC, ApcListEntry) { + Apc->Inserted = FALSE; + } + + if (!IsListEmpty(&Thread->ApcState.ApcListHead[PreviousMode])) { FirstEntry = Thread->ApcState.ApcListHead[PreviousMode].Flink; + /* unlink list head from the rest of the list */ RemoveEntryList(&Thread->ApcState.ApcListHead[PreviousMode]); - CurrentEntry = FirstEntry; - do { - Apc = CONTAINING_RECORD(CurrentEntry, KAPC, ApcListEntry); - Apc->Inserted = FALSE; - CurrentEntry = CurrentEntry->Flink; - } while (CurrentEntry != FirstEntry); } - + /* Release the locks */ KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); KeReleaseDispatcherDatabaseLock(OldIrql); _____ Modified: trunk/reactos/ntoskrnl/ke/bug.c --- trunk/reactos/ntoskrnl/ke/bug.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/ke/bug.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -252,7 +252,6 @@ { PKBUGCHECK_CALLBACK_RECORD CurrentRecord; PLIST_ENTRY ListHead; - PLIST_ENTRY NextEntry; /* FIXME: Check Checksum and add support for WithReason Callbacks */ @@ -261,14 +260,8 @@ if (ListHead->Flink && ListHead->Blink) { /* Loop the list */ - NextEntry = ListHead->Flink; - while (NextEntry != ListHead) { - - /* Get the Callback Record */ - CurrentRecord = CONTAINING_RECORD(NextEntry, - KBUGCHECK_CALLBACK_RECORD, - Entry); - + LIST_FOR_EACH(CurrentRecord, ListHead, KBUGCHECK_CALLBACK_RECORD, Entry) + { /* Make sure it's inserted */ if (CurrentRecord->State == BufferInserted) { @@ -278,9 +271,6 @@ CurrentRecord->Length); CurrentRecord->State = BufferFinished; } - - /* Move to next Entry */ - NextEntry = NextEntry->Flink; } } } @@ -297,7 +287,6 @@ KIRQL OldIrql; BOOLEAN GotExtendedCrashInfo = FALSE; PVOID Address = 0; - PLIST_ENTRY CurrentEntry; PLDR_DATA_TABLE_ENTRY CurrentModule = NULL; extern LIST_ENTRY ModuleListHead; #if 0 @@ -322,14 +311,8 @@ Address = (PVOID)Tf->Eip; /* Try to get information on the module */ - CurrentEntry = ModuleListHead.Flink; - while (CurrentEntry != &ModuleListHead) + LIST_FOR_EACH(CurrentModule, &ModuleListHead, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList) { - /* Get the current Section */ - CurrentModule = CONTAINING_RECORD(CurrentEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderModuleList); - /* Check if this is the right one */ if ((Address != NULL && (Address >= (PVOID)CurrentModule->DllBase && Address < (PVOID)((ULONG_PTR)CurrentModule->DllBase + CurrentModule->SizeOfImage)))) @@ -338,9 +321,6 @@ GotExtendedCrashInfo = TRUE; break; } - - /* Loop again */ - CurrentEntry = CurrentEntry->Flink; } } _____ Modified: trunk/reactos/ntoskrnl/ke/kqueue.c --- trunk/reactos/ntoskrnl/ke/kqueue.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/ke/kqueue.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -118,9 +118,9 @@ /* Insert new entry after the last entry with SortKey less or equal to passed-in SortKey */ InsertAscendingListFIFO(&DeviceQueue->DeviceListHead, + DeviceQueueEntry, KDEVICE_QUEUE_ENTRY, DeviceListEntry, - DeviceQueueEntry, SortKey); Inserted = TRUE; } @@ -204,35 +204,26 @@ } else { /* Find entry with SortKey greater than or equal to the passed-in SortKey */ - ListEntry = DeviceQueue->DeviceListHead.Flink; - while (ListEntry != &DeviceQueue->DeviceListHead) { - - /* Get Entry */ - ReturnEntry = CONTAINING_RECORD(ListEntry, - KDEVICE_QUEUE_ENTRY, - DeviceListEntry); - + LIST_FOR_EACH(ReturnEntry, &DeviceQueue->DeviceListHead, KDEVICE_QUEUE_ENTRY, DeviceListEntry) + { /* Check if keys match */ - if (ReturnEntry->SortKey >= SortKey) break; - - /* Move to next item */ - ListEntry = ListEntry->Flink; + if (ReturnEntry->SortKey >= SortKey) { + /* We found it, so just remove it */ + RemoveEntryList(&ReturnEntry->DeviceListEntry); + break; + } } /* Check if we found something */ - if (ListEntry == &DeviceQueue->DeviceListHead) { + if (!ReturnEntry) { /* Not found, return the first entry */ ListEntry = RemoveHeadList(&DeviceQueue->DeviceListHead); ReturnEntry = CONTAINING_RECORD(ListEntry, KDEVICE_QUEUE_ENTRY, DeviceListEntry); - } else { + } - /* We found it, so just remove it */ - RemoveEntryList(&ReturnEntry->DeviceListEntry); - } - /* Set it as non-inserted */ ReturnEntry->Inserted = FALSE; } _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -76,7 +76,6 @@ KiScanThreadList(KPRIORITY Priority, KAFFINITY Affinity) { - PLIST_ENTRY current_entry; PKTHREAD current; ULONG Mask; @@ -84,12 +83,8 @@ if (PriorityListMask & Mask) { - current_entry = PriorityListHead[Priority].Flink; + LIST_FOR_EACH(current, &PriorityListHead[Priority], KTHREAD, WaitListEntry) { - while (current_entry != &PriorityListHead[Priority]) { - - current = CONTAINING_RECORD(current_entry, KTHREAD, WaitListEntry); - if (current->State != Ready) { DPRINT1("%d/%d\n", &current, current->State); @@ -102,8 +97,6 @@ KiRemoveFromThreadList(current); return(current); } - - current_entry = current_entry->Flink; } } @@ -548,7 +541,6 @@ KeFreezeAllThreads(PKPROCESS Process) { KIRQL OldIrql; - PLIST_ENTRY CurrentEntry; PKTHREAD Current; PKTHREAD CurrentThread = KeGetCurrentThread(); @@ -556,12 +548,8 @@ OldIrql = KeAcquireDispatcherDatabaseLock(); /* Loop the Process's Threads */ - CurrentEntry = Process->ThreadListHead.Flink; - while (CurrentEntry != &Process->ThreadListHead) + LIST_FOR_EACH(Current, &Process->ThreadListHead, KTHREAD, ThreadListEntry) { - /* Get the Thread */ - Current = CONTAINING_RECORD(CurrentEntry, KTHREAD, ThreadListEntry); - /* Make sure it's not ours */ if (Current == CurrentThread) continue; @@ -575,8 +563,6 @@ Current->SuspendSemaphore.Header.SignalState--; } } - - CurrentEntry = CurrentEntry->Flink; } /* Release the lock */ @@ -1456,8 +1442,8 @@ if (Thread->ServiceTable != KeServiceDescriptorTableShadow) { /* We do. Initialize it and save the new table */ - PsInitWin32Thread((PETHREAD)Thread); Thread->ServiceTable = KeServiceDescriptorTableShadow; + PsInitWin32Thread((PETHREAD)Thread); } } _____ Modified: trunk/reactos/ntoskrnl/ke/profile.c --- trunk/reactos/ntoskrnl/ke/profile.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/ke/profile.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -53,17 +53,15 @@ { KIRQL OldIrql; PKPROFILE_SOURCE_OBJECT SourceBuffer; - PKPROFILE_SOURCE_OBJECT Source = NULL; PKPROFILE_SOURCE_OBJECT CurrentSource; BOOLEAN FreeBuffer = TRUE; PKPROCESS ProfileProcess; - PLIST_ENTRY ListEntry; /* Allocate a buffer first, before we raise IRQL */ SourceBuffer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KPROFILE_SOURCE_OBJECT), TAG('P', 'r', 'o', 'f')); - RtlZeroMemory(Source, sizeof(KPROFILE_SOURCE_OBJECT)); + RtlZeroMemory(SourceBuffer, sizeof(KPROFILE_SOURCE_OBJECT)); /* Raise to PROFILE_LEVEL */ KeRaiseIrql(PROFILE_LEVEL, &OldIrql); @@ -90,32 +88,23 @@ } /* Check if this type of profile (source) is already running */ - for (ListEntry = KiProfileSourceListHead.Flink; - ListEntry != &KiProfileSourceListHead; - ListEntry = ListEntry->Flink) { - - /* Get the Source Object */ - CurrentSource = CONTAINING_RECORD(ListEntry, - KPROFILE_SOURCE_OBJECT, - ListEntry); - + LIST_FOR_EACH(CurrentSource, &KiProfileSourceListHead, KPROFILE_SOURCE_OBJECT, ListEntry) + { /* Check if it's the same as the one being requested now */ if (CurrentSource->Source == Profile->Source) { - - Source = CurrentSource; break; } } /* See if the loop found something */ - if (!Source) { + if (!CurrentSource) { /* Nothing found, use our allocated buffer */ - Source = SourceBuffer; + CurrentSource = SourceBuffer; /* Set up the Source Object */ - Source->Source = Profile->Source; - InsertHeadList(&KiProfileSourceListHead, &Source->ListEntry); + CurrentSource->Source = Profile->Source; + InsertHeadList(&KiProfileSourceListHead, &CurrentSource->ListEntry); /* Don't free the pool later on */ FreeBuffer = FALSE; @@ -138,7 +127,6 @@ KeStopProfile(PKPROFILE Profile) { KIRQL OldIrql; - PLIST_ENTRY ListEntry; PKPROFILE_SOURCE_OBJECT CurrentSource = NULL; /* Raise to PROFILE_LEVEL and acquire spinlock */ @@ -153,18 +141,15 @@ Profile->Active = FALSE; /* Find the Source Object */ - for (ListEntry = KiProfileSourceListHead.Flink; - CurrentSource->Source != Profile->Source; - ListEntry = ListEntry->Flink) { - - /* Get the Source Object */ - CurrentSource = CONTAINING_RECORD(ListEntry, - KPROFILE_SOURCE_OBJECT, - ListEntry); + LIST_FOR_EACH(CurrentSource, &KiProfileSourceListHead, KPROFILE_SOURCE_OBJECT, ListEntry) + { + if (CurrentSource->Source == Profile->Source) { + /* Remove it */ + RemoveEntryList(&CurrentSource->ListEntry); + break; + } } - /* Remove it */ - RemoveEntryList(&CurrentSource->ListEntry); } /* Lower IRQL */ @@ -240,14 +225,10 @@ { PULONG BucketValue; PKPROFILE Profile; - PLIST_ENTRY NextEntry; /* Loop the List */ - for (NextEntry = ListHead->Flink; NextEntry != ListHead; NextEntry = NextEntry->Flink) { - - /* Get the Current Profile in the List */ - Profile = CONTAINING_RECORD(NextEntry, KPROFILE, ListEntry); - + LIST_FOR_EACH(Profile, ListHead, KPROFILE, ListEntry) + { /* Check if the source is good, and if it's within the range */ if ((Profile->Source != Source) || (TrapFrame->Eip < (ULONG_PTR)Profile->RegionStart) || _____ Modified: trunk/reactos/ntoskrnl/ke/queue.c --- trunk/reactos/ntoskrnl/ke/queue.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/ke/queue.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -182,17 +182,14 @@ /* Loop until the queue is processed */ while (TRUE) { - /* Get the Entry */ - ListEntry = Queue->EntryListHead.Flink; - /* Check if the counts are valid and if there is still a queued entry */ if ((Queue->CurrentCount < Queue->MaximumCount) && - (ListEntry != &Queue->EntryListHead)) { + !IsListEmpty(&Queue->EntryListHead)) { /* Remove the Entry and Save it */ DPRINT("Removing Queue Entry. CurrentCount: %d, Maximum Count: %d\n", Queue->CurrentCount, Queue->MaximumCount); - ListEntry = RemoveHeadList(&Queue->EntryListHead); + ListEntry = Queue->EntryListHead.Flink; /* Decrease the number of entries */ Queue->Header.SignalState--; @@ -328,7 +325,7 @@ KeRundownQueue(IN PKQUEUE Queue) { PLIST_ENTRY EnumEntry; - PLIST_ENTRY FirstEntry; + PLIST_ENTRY FirstEntry = NULL; PKTHREAD Thread; KIRQL OldIrql; @@ -337,19 +334,11 @@ /* Get the Dispatcher Lock */ OldIrql = KeAcquireDispatcherDatabaseLock(); - /* Get the First Empty Entry */ - FirstEntry = Queue->EntryListHead.Flink; - /* Make sure the list is not empty */ - if (FirstEntry == &Queue->EntryListHead) { - - /* It is, so don't return anything */ - FirstEntry = NULL; - - } else { - + if (!IsListEmpty(&Queue->EntryListHead)) + { /* Remove it */ - RemoveEntryList(&Queue->EntryListHead); + FirstEntry = RemoveHeadList(&Queue->EntryListHead); } /* Unlink threads and clear their Thread->Queue */ _____ Modified: trunk/reactos/ntoskrnl/ke/timer.c --- trunk/reactos/ntoskrnl/ke/timer.c 2005-09-26 22:06:31 UTC (rev 18112) +++ trunk/reactos/ntoskrnl/ke/timer.c 2005-09-26 22:57:48 UTC (rev 18113) @@ -217,7 +217,7 @@ PVOID SystemArgument1, PVOID SystemArgument2) [truncated at 1000 lines; 128 more skipped]

1 0

[weiden] 18112: don't use MIXERCONTROLA for unicode builds
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

don't use MIXERCONTROLA for unicode builds Modified: trunk/reactos/w32api/include/mmsystem.h _____ Modified: trunk/reactos/w32api/include/mmsystem.h --- trunk/reactos/w32api/include/mmsystem.h 2005-09-26 21:49:03 UTC (rev 18111) +++ trunk/reactos/w32api/include/mmsystem.h 2005-09-26 22:06:31 UTC (rev 18112) @@ -1851,7 +1851,7 @@ typedef AUXCAPSW AUXCAPS,*PAUXCAPS,*LPAUXCAPS; typedef MIXERCAPSW MIXERCAPS,*PMIXERCAPS,*LPMIXERCAPS; typedef MIXERLINEW MIXERLINE,*PMIXERLINE,*LPMIXERLINE; -typedef MIXERCONTROLA MIXERCONTROL,*PMIXERCONTROL,*LPMIXERCONTROL; +typedef MIXERCONTROLW MIXERCONTROL,*PMIXERCONTROL,*LPMIXERCONTROL; typedef MIXERLINECONTROLSW MIXERLINECONTROLS,*PMIXERLINECONTROLS,*LPMIXERLINECONTROLS; typedef MIXERCONTROLDETAILS_LISTTEXTW MIXERCONTROLDETAILS_LISTTEXT,*PMIXERCONTROLDETAILS_LISTTEXT,*LPMIXERCONT ROLDETAILS_LISTTEXT; typedef JOYCAPSW JOYCAPS,*PJOYCAPS,*LPJOYCAPS;

1 0

[ion] 18111: Fix calc.exe redraw problems on XP. Patch by Christoph_vW <Christoph@ApiViewer.de>
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

Fix calc.exe redraw problems on XP. Patch by Christoph_vW <Christoph(a)ApiViewer.de> Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-09-26 21:39:04 UTC (rev 18110) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-09-26 21:49:03 UTC (rev 18111) @@ -194,7 +194,7 @@ hWnd = CreateWindow( appname, appname, - WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX, + WS_CLIPSIBLINGS | (WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX), CW_USEDEFAULT, CW_USEDEFAULT, calc.sciMode ? CALC_STANDARD_WIDTH : CALC_SCIENTIFIC_WIDTH,

1 0

[ion] 18110: - Implement alldvrm and aulldvrm and export them from ntoskrnl. This fixes bug 467.
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

- Implement alldvrm and aulldvrm and export them from ntoskrnl. This fixes bug 467. Modified: trunk/reactos/lib/rtl/i386/math.S Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/lib/rtl/i386/math.S --- trunk/reactos/lib/rtl/i386/math.S 2005-09-26 20:52:20 UTC (rev 18109) +++ trunk/reactos/lib/rtl/i386/math.S 2005-09-26 21:39:04 UTC (rev 18110) @@ -5,7 +5,34 @@ * FILE: lib/rtl/i386/math.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) * Eric Kohl (ekohl(a)rz-online.de) - * REVISION HISTORY: 27/07/2005 Created + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ /* GLOBALS ****************************************************************/ @@ -19,6 +46,8 @@ .globl __aullrem .globl __allmul .globl __alldiv +.globl __aulldvrm +.globl __alldvrm /* FUNCTIONS ***************************************************************/ @@ -235,3 +264,368 @@ /* Remove stack frame and return*/ leave ret + +__alldvrm: + push edi + push esi + push ebp + +// Set up the local stack and save the index registers. When this is done +// the stack frame will look as follows (assuming that the expression a/b will +// generate a call to alldvrm(a, b)): +// +// ----------------- +// | | +// |---------------| +// | | +// |--divisor (b)--| +// | | +// |---------------| +// | | +// |--dividend (a)-| +// | | +// |---------------| +// | return addr** | +// |---------------| +// | EDI | +// |---------------| +// | ESI | +// |---------------| +// ESP---->| EBP | +// ----------------- +// + +#define DVNDLO [esp + 16] // stack address of dividend (a) +#define DVNDHI [esp + 20] // stack address of dividend (a) +#define DVSRLO [esp + 24] // stack address of divisor (b) +#define DVSRHI [esp + 28] // stack address of divisor (b) + +// Determine sign of the quotient (edi = 0 if result is positive, non-zero +// otherwise) and make operands positive. +// Sign of the remainder is kept in ebp. + + xor edi,edi // result sign assumed positive + xor ebp,ebp // result sign assumed positive + + mov eax,DVNDHI // hi word of a + or eax,eax // test to see if signed + jge short L1 // skip rest if a is already positive + inc edi // complement result sign flag + inc ebp // complement result sign flag + mov edx,DVNDLO // lo word of a + neg eax // make a positive + neg edx + sbb eax,0 + mov DVNDHI,eax // save positive value + mov DVNDLO,edx +L1: + mov eax,DVSRHI // hi word of b + or eax,eax // test to see if signed + jge short L2 // skip rest if b is already positive + inc edi // complement the result sign flag + mov edx,DVSRLO // lo word of a + neg eax // make b positive + neg edx + sbb eax,0 + mov DVSRHI,eax // save positive value + mov DVSRLO,edx +L2: + +// +// Now do the divide. First look to see if the divisor is less than 4194304K. +// If so, then we can use a simple algorithm with word divides, otherwise +// things get a little more complex. +// +// NOTE - eax currently contains the high order word of DVSR +// + + or eax,eax // check to see if divisor < 4194304K + jnz short L3 // nope, gotta do this the hard way + mov ecx,DVSRLO // load divisor + mov eax,DVNDHI // load high word of dividend + xor edx,edx + div ecx // eax <- high order bits of quotient + mov ebx,eax // save high bits of quotient + mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend + div ecx // eax <- low order bits of quotient + mov esi,eax // ebx:esi <- quotient +// +// Now we need to do a multiply so that we can compute the remainder. +// + mov eax,ebx // set up high word of quotient + mul dword ptr DVSRLO // HIWORD(QUOT) * DVSR + mov ecx,eax // save the result in ecx + mov eax,esi // set up low word of quotient + mul dword ptr DVSRLO // LOWORD(QUOT) * DVSR + add edx,ecx // EDX:EAX = QUOT * DVSR + jmp short L4 // complete remainder calculation + +// +// Here we do it the hard way. Remember, eax contains the high word of DVSR +// + +L3: + mov ebx,eax // ebx:ecx <- divisor + mov ecx,DVSRLO + mov edx,DVNDHI // edx:eax <- dividend + mov eax,DVNDLO +L5: + shr ebx,1 // shift divisor right one bit + rcr ecx,1 + shr edx,1 // shift dividend right one bit + rcr eax,1 + or ebx,ebx + jnz short L5 // loop until divisor < 4194304K + div ecx // now divide, ignore remainder + mov esi,eax // save quotient + +// +// We may be off by one, so to check, we will multiply the quotient +// by the divisor and check the result against the orignal dividend +// Note that we must also check for overflow, which can occur if the +// dividend is close to 2**64 and the quotient is off by 1. +// + + mul dword ptr DVSRHI // QUOT * DVSRHI + mov ecx,eax + mov eax,DVSRLO + mul esi // QUOT * DVSRLO + add edx,ecx // EDX:EAX = QUOT * DVSR + jc short L6 // carry means Quotient is off by 1 + +// +// do long compare here between original dividend and the result of the +// multiply in edx:eax. If original is larger or equal, we are ok, otherwise +// subtract one (1) from the quotient. +// + + cmp edx,DVNDHI // compare hi words of result and original + ja short L6 // if result > original, do subtract + jb short L7 // if result < original, we are ok + cmp eax,DVNDLO // hi words are equal, compare lo words + jbe short L7 // if less or equal we are ok, else subtract +L6: + dec esi // subtract 1 from quotient + sub eax,DVSRLO // subtract divisor from result + sbb edx,DVSRHI +L7: + xor ebx,ebx // ebx:esi <- quotient + +L4: +// +// Calculate remainder by subtracting the result from the original dividend. +// Since the result is already in a register, we will do the subtract in the +// opposite direction and negate the result if necessary. +// + + sub eax,DVNDLO // subtract dividend from result + sbb edx,DVNDHI + +// +// Now check the result sign flag to see if the result is supposed to be positive +// or negative. It is currently negated (because we subtracted in the 'wrong' +// direction), so if the sign flag is set we are done, otherwise we must negate +// the result to make it positive again. +// + + dec ebp // check result sign flag + jns short L9 // result is ok, set up the quotient + neg edx // otherwise, negate the result + neg eax + sbb edx,0 + +// +// Now we need to get the quotient into edx:eax and the remainder into ebx:ecx. +// +L9: + mov ecx,edx + mov edx,ebx + mov ebx,ecx + mov ecx,eax + mov eax,esi + +// +// Just the cleanup left to do. edx:eax contains the quotient. Set the sign +// according to the save value, cleanup the stack, and return. +// + + dec edi // check to see if result is negative + jnz short L8 // if EDI == 0, result should be negative + neg edx // otherwise, negate the result + neg eax + sbb edx,0 + +// +// Restore the saved registers and return. +// + +L8: + pop ebp + pop esi + pop edi + + ret 16 + +__aulldvrm: + +// ulldvrm - unsigned long divide and remainder +// +// Purpose: +// Does a unsigned long divide and remainder of the arguments. Arguments +// are not changed. +// +// Entry: +// Arguments are passed on the stack: +// 1st pushed: divisor (QWORD) +// 2nd pushed: dividend (QWORD) +// +// Exit: +// EDX:EAX contains the quotient (dividend/divisor) +// EBX:ECX contains the remainder (divided % divisor) +// NOTE: this routine removes the parameters from the stack. +// +// Uses: +// ECX +// + push esi + +// Set up the local stack and save the index registers. When this is done +// the stack frame will look as follows (assuming that the expression a/b will +// generate a call to aulldvrm(a, b)): +// +// ----------------- +// | | +// |---------------| +// | | +// |--divisor (b)--| +// | | +// |---------------| +// | | +// |--dividend (a)-| +// | | +// |---------------| +// | return addr** | +// |---------------| +// ESP---->| ESI | +// ----------------- +// + +#undef DVNDLO +#undef DVNDHI +#undef DVSRLO +#undef DVSRHI +#define DVNDLO [esp + 8] // stack address of dividend (a) +#define DVNDHI [esp + 8] // stack address of dividend (a) +#define DVSRLO [esp + 16] // stack address of divisor (b) +#define DVSRHI [esp + 20] // stack address of divisor (b) + +// +// Now do the divide. First look to see if the divisor is less than 4194304K. +// If so, then we can use a simple algorithm with word divides, otherwise +// things get a little more complex. +// + + mov eax,DVSRHI // check to see if divisor < 4194304K + or eax,eax + jnz short .L1 // nope, gotta do this the hard way + mov ecx,DVSRLO // load divisor + mov eax,DVNDHI // load high word of dividend + xor edx,edx + div ecx // get high order bits of quotient + mov ebx,eax // save high bits of quotient + mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend + div ecx // get low order bits of quotient + mov esi,eax // ebx:esi <- quotient + +// +// Now we need to do a multiply so that we can compute the remainder. +// + mov eax,ebx // set up high word of quotient + mul dword ptr DVSRLO // HIWORD(QUOT) * DVSR + mov ecx,eax // save the result in ecx + mov eax,esi // set up low word of quotient + mul dword ptr DVSRLO // LOWORD(QUOT) * DVSR + add edx,ecx // EDX:EAX = QUOT * DVSR + jmp short .L2 // complete remainder calculation + +// +// Here we do it the hard way. Remember, eax contains DVSRHI +// + +.L1: + mov ecx,eax // ecx:ebx <- divisor + mov ebx,DVSRLO + mov edx,DVNDHI // edx:eax <- dividend + mov eax,DVNDLO +.L3: + shr ecx,1 // shift divisor right one bit// hi bit <- 0 + rcr ebx,1 + shr edx,1 // shift dividend right one bit// hi bit <- 0 + rcr eax,1 + or ecx,ecx + jnz short .L3 // loop until divisor < 4194304K + div ebx // now divide, ignore remainder + mov esi,eax // save quotient + +// +// We may be off by one, so to check, we will multiply the quotient +// by the divisor and check the result against the orignal dividend +// Note that we must also check for overflow, which can occur if the +// dividend is close to 2**64 and the quotient is off by 1. +// + + mul dword ptr DVSRHI // QUOT * DVSRHI + mov ecx,eax + mov eax,DVSRLO + mul esi // QUOT * DVSRLO + add edx,ecx // EDX:EAX = QUOT * DVSR + jc short .L4 // carry means Quotient is off by 1 + +// +// do long compare here between original dividend and the result of the +// multiply in edx:eax. If original is larger or equal, we are ok, otherwise +// subtract one (1) from the quotient. +// + + cmp edx,DVNDHI // compare hi words of result and original + ja short .L4 // if result > original, do subtract + jb short .L5 // if result < original, we are ok + cmp eax,DVNDLO // hi words are equal, compare lo words + jbe short .L5 // if less or equal we are ok, else subtract +.L4: + dec esi // subtract 1 from quotient + sub eax,DVSRLO // subtract divisor from result + sbb edx,DVSRHI +.L5: + xor ebx,ebx // ebx:esi <- quotient + +.L2: +// +// Calculate remainder by subtracting the result from the original dividend. +// Since the result is already in a register, we will do the subtract in the +// opposite direction and negate the result. +// + + sub eax,DVNDLO // subtract dividend from result + sbb edx,DVNDHI + neg edx // otherwise, negate the result + neg eax + sbb edx,0 + +// +// Now we need to get the quotient into edx:eax and the remainder into ebx:ecx. +// + mov ecx,edx + mov edx,ebx + mov ebx,ecx + mov ecx,eax + mov eax,esi +// +// Just the cleanup left to do. edx:eax contains the quotient. +// Restore the saved registers and return. +// + + pop esi + + ret 16 + _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-09-26 20:52:20 UTC (rev 18109) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-09-26 21:39:04 UTC (rev 18110) @@ -1411,7 +1411,9 @@ _allrem _allshl _allshr +_alldvrm _aulldiv +_aulldvrm _aullrem _aullshr _except_handler2

1 0

[ion] 18109: Err, actually deliver APCs when returning from systemcalls... fixes bug 810
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

Err, actually deliver APCs when returning from systemcalls... fixes bug 810 Modified: trunk/reactos/ntoskrnl/ke/apc.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-09-26 20:44:43 UTC (rev 18108) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-09-26 20:52:20 UTC (rev 18109) @@ -808,7 +808,7 @@ KeGetCurrentThread()->TrapFrame); /* Don't deliver APCs in V86 mode */ - if (TrapFrame->Eflags & 2) return; + if (TrapFrame->Eflags & X86_EFLAGS_VM) return; /* Save the full context */ Context.ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS;

1 0

[greatlrd] 18108: change from copyfileW to copyfileExW in MoveFileWithProgressW and add a error check for copyfileExW that was forgotten.
by greatlrd＠svn.reactos.com 26 Sep '05

26 Sep '05

change from copyfileW to copyfileExW in MoveFileWithProgressW and add a error check for copyfileExW that was forgotten. Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-26 20:29:08 UTC (rev 18107) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-26 20:44:43 UTC (rev 18108) @@ -633,9 +633,20 @@ size = wcslen(lpNewFileName); wcscpy((WCHAR *)&lpNewFileName2[size], (WCHAR *)&lpDeleteFile[size2]); - /* copy file */ - Result = CopyFileW(lpDeleteFile,lpNewFileName2, FALSE); + /* copy file */ + Result = CopyFileExW (lpDeleteFile, + lpNewFileName2, + lpProgressRoutine, + lpData, + NULL, + 0); + if (Result == FALSE) + { + DPRINT("MoveFileWithProgressW : Fails\n"); + break; + } + /* delete file */ DPRINT("MoveFileWithProgressW : Delete file : %S : %S\n",lpDeleteFile, lpNewFileName2);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs