Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[mbosma] 23058: Merge changes from PS rewrite.
by mbosma＠svn.reactos.org 14 Jul '06

14 Jul '06

Author: mbosma Date: Fri Jul 14 14:10:39 2006 New Revision: 23058 URL: http://svn.reactos.org/svn/reactos?rev=23058&view=rev Log: Merge changes from PS rewrite. Modified: branches/cache_manager_rewrite/mm/mm.c branches/cache_manager_rewrite/mm/process.c Modified: branches/cache_manager_rewrite/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mm.c?r… ============================================================================== --- branches/cache_manager_rewrite/mm/mm.c (original) +++ branches/cache_manager_rewrite/mm/mm.c Fri Jul 14 14:10:39 2006 @@ -22,65 +22,11 @@ PVOID MmHighestUserAddress = NULL; PBOOLEAN Mm64BitPhysicalAddress = FALSE; PVOID MmSystemRangeStart = NULL; +ULONG MmReadClusterSize; MM_STATS MmStats; /* FUNCTIONS ****************************************************************/ - - -NTSTATUS -NTAPI -MmReleaseMmInfo(PEPROCESS Process) -{ - PVOID Address; - PMEMORY_AREA MemoryArea; - - DPRINT("MmReleaseMmInfo(Process %x (%s))\n", Process, - Process->ImageFileName); - - MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - - while ((MemoryArea = ((PMADDRESS_SPACE)&Process->VadRoot)->MemoryAreaRoot) != NULL) - { - switch (MemoryArea->Type) - { - case MEMORY_AREA_SECTION_VIEW: - Address = (PVOID)MemoryArea->StartingAddress; - MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - MmUnmapViewOfSection((PEPROCESS)Process, Address); - MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - break; - - case MEMORY_AREA_VIRTUAL_MEMORY: - case MEMORY_AREA_PEB_OR_TEB: - MmFreeVirtualMemory(Process, MemoryArea); - break; - - case MEMORY_AREA_SHARED_DATA: - case MEMORY_AREA_NO_ACCESS: - MmFreeMemoryArea((PMADDRESS_SPACE)&Process->VadRoot, - MemoryArea, - NULL, - NULL); - break; - - case MEMORY_AREA_MDL_MAPPING: - KEBUGCHECK(PROCESS_HAS_LOCKED_PAGES); - break; - - default: - KEBUGCHECK(0); - } - } - - Mmi386ReleaseMmInfo(Process); - - MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - MmDestroyAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - - DPRINT("Finished MmReleaseMmInfo()\n"); - return(STATUS_SUCCESS); -} /* * @implemented Modified: branches/cache_manager_rewrite/mm/process.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/proces… ============================================================================== --- branches/cache_manager_rewrite/mm/process.c (original) +++ branches/cache_manager_rewrite/mm/process.c Fri Jul 14 14:10:39 2006 @@ -22,6 +22,33 @@ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) /* FUNCTIONS *****************************************************************/ + +LCID +NTAPI +MmGetSessionLocaleId(VOID) +{ + PEPROCESS Process; + PAGED_CODE(); + + /* Get the current process */ + Process = PsGetCurrentProcess(); + + /* Check if it's the Session Leader */ + if (Process->Vm.Flags.SessionLeader) + { + /* Make sure it has a valid Session */ + if (Process->Session) + { + /* Get the Locale ID */ +#if ROS_HAS_SESSIONS + return ((PMM_SESSION_SPACE)Process->Session)->LocaleId; +#endif + } + } + + /* Not a session leader, return the default */ + return PsDefaultThreadLocaleId; +} PVOID STDCALL @@ -489,6 +516,9 @@ goto exit; } + /* The process now has an address space */ + Process->HasAddressSpace = TRUE; + /* Check if there's a Section Object */ if (Section) { @@ -559,3 +589,64 @@ /* Return status to caller */ return Status; } + +VOID +NTAPI +MmCleanProcessAddressSpace(IN PEPROCESS Process) +{ + /* FIXME: Add part of MmDeleteProcessAddressSpace here */ +} + +NTSTATUS +NTAPI +MmDeleteProcessAddressSpace(PEPROCESS Process) +{ + PVOID Address; + PMEMORY_AREA MemoryArea; + + DPRINT("MmDeleteProcessAddressSpace(Process %x (%s))\n", Process, + Process->ImageFileName); + + MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); + + while ((MemoryArea = ((PMADDRESS_SPACE)&Process->VadRoot)->MemoryAreaRoot) != NULL) + { + switch (MemoryArea->Type) + { + case MEMORY_AREA_SECTION_VIEW: + Address = (PVOID)MemoryArea->StartingAddress; + MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); + MmUnmapViewOfSection(Process, Address); + MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); + break; + + case MEMORY_AREA_VIRTUAL_MEMORY: + case MEMORY_AREA_PEB_OR_TEB: + MmFreeVirtualMemory(Process, MemoryArea); + break; + + case MEMORY_AREA_SHARED_DATA: + case MEMORY_AREA_NO_ACCESS: + MmFreeMemoryArea((PMADDRESS_SPACE)&Process->VadRoot, + MemoryArea, + NULL, + NULL); + break; + + case MEMORY_AREA_MDL_MAPPING: + KEBUGCHECK(PROCESS_HAS_LOCKED_PAGES); + break; + + default: + KEBUGCHECK(0); + } + } + + Mmi386ReleaseMmInfo(Process); + + MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); + MmDestroyAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); + + DPRINT("Finished MmReleaseMmInfo()\n"); + return(STATUS_SUCCESS); +}

1 0

[ion] 23057: - Fix a serious bug in Kernel Queues. A condition existed where an inserted kernel queue with a timeout would crash the system once the thread waiting on it had its wait aborted or completed. - Thanks a lot to Thomas for his brutal test application which allowed me to discover this bug and the bugs addressed in the previous commits (related to the wait list and thread scheduler list corruption).
by ion＠svn.reactos.org 14 Jul '06

14 Jul '06

Author: ion Date: Fri Jul 14 06:26:44 2006 New Revision: 23057 URL: http://svn.reactos.org/svn/reactos?rev=23057&view=rev Log: - Fix a serious bug in Kernel Queues. A condition existed where an inserted kernel queue with a timeout would crash the system once the thread waiting on it had its wait aborted or completed. - Thanks a lot to Thomas for his brutal test application which allowed me to discover this bug and the bugs addressed in the previous commits (related to the wait list and thread scheduler list corruption). Modified: trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Fri Jul 14 06:26:44 2006 @@ -764,7 +764,7 @@ /* Initialize the Suspend Semaphore */ KeInitializeSemaphore(&Thread->SuspendSemaphore, 0, 128); - /* FIXME OPTIMIZATION OF DOOM. DO NOT ENABLE FIXME */ + /* Setup the timer */ Timer = &Thread->Timer; KeInitializeTimer(Timer); TimerWaitBlock = &Thread->WaitBlock[TIMER_WAIT_BLOCK]; Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c (original) +++ trunk/reactos/ntoskrnl/ke/queue.c Fri Jul 14 06:26:44 2006 @@ -390,6 +390,10 @@ &WaitBlock->WaitListEntry; Timer->Header.WaitListHead.Blink = &WaitBlock->WaitListEntry; + WaitBlock->WaitListEntry.Flink = + &Timer->Header.WaitListHead; + WaitBlock->WaitListEntry.Blink = + &Timer->Header.WaitListHead; /* Create Timer */ KiInsertTimer(Timer, *Timeout); @@ -427,8 +431,8 @@ /* Check if we had a timeout */ if (Timeout) { - /* FIXME: Fixup interval */ - DPRINT1("FIXME!!!\n"); + DPRINT1("If you see this message, contact Alex ASAP\n"); + KEBUGCHECK(0); } } Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Fri Jul 14 06:26:44 2006 @@ -360,7 +360,9 @@ return WaitStatus; } - /* FIXME: Fixup interval */ + /* Check if we had a timeout */ + DPRINT1("If you see this message, contact Alex ASAP\n"); + KEBUGCHECK(0); } /* Acquire again the lock */ @@ -533,7 +535,8 @@ /* Check if we had a timeout */ if (Timeout) { - /* FIXME: Fixup interval */ + DPRINT1("If you see this message, contact Alex ASAP\n"); + KEBUGCHECK(0); } } @@ -813,7 +816,8 @@ /* Check if we had a timeout */ if (Timeout) { - /* FIXME: Fixup interval */ + DPRINT1("If you see this message, contact Alex ASAP\n"); + KEBUGCHECK(0); } /* Acquire again the lock */

1 0

[ion] 23056: - Add KiCheckThreadStackSwap and KiAddThreadToWaitList macros - Initialize PRCBs' Wait Lists - Fix a ghastly implementation fault where the the queue code was correctly removing the thread from its wait list, but where this wait list was actually connected to the _SCHEDULER_ and ended up removing a thread behind its back, causing bizarre issues and w3seek's ASSERT(State == Ready) bug. Fixed this by using the macros above and PRCB Wait List and properly inserting a waiting thread int
by ion＠svn.reactos.org 14 Jul '06

14 Jul '06

Author: ion Date: Fri Jul 14 05:03:27 2006 New Revision: 23056 URL: http://svn.reactos.org/svn/reactos?rev=23056&view=rev Log: - Add KiCheckThreadStackSwap and KiAddThreadToWaitList macros - Initialize PRCBs' Wait Lists - Fix a ghastly implementation fault where the the queue code was correctly removing the thread from its wait list, but where this wait list was actually connected to the _SCHEDULER_ and ended up removing a thread behind its back, causing bizarre issues and w3seek's ASSERT(State == Ready) bug. Fixed this by using the macros above and PRCB Wait List and properly inserting a waiting thread into that list, and then removing it when unblocking it or removing a queue. Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Fri Jul 14 05:03:27 2006 @@ -156,6 +156,40 @@ } // +// Determines wether a thread should be added to the wait list +// +#define KiCheckThreadStackSwap(WaitMode, Thread, Swappable) \ +{ \ + /* Check the required conditions */ \ + if ((WaitMode != KernelMode) && \ + (Thread->EnableStackSwap) && \ + (Thread->Priority >= (LOW_REALTIME_PRIORITY + 9))) \ + { \ + /* We are go for swap */ \ + Swappable = TRUE; \ + } \ + else \ + { \ + /* Don't swap the thread */ \ + Swappable = FALSE; \ + } \ +} + +// +// Adds a thread to the wait list +// +#define KiAddThreadToWaitList(Thread, Swappable) \ +{ \ + /* Make sure it's swappable */ \ + if (Swappable) \ + { \ + /* Insert it into the PRCB's List */ \ + InsertTailList(&KeGetCurrentPrcb()->WaitListHead, \ + &Thread->WaitListEntry); \ + } \ +} + +// // Rules for checking alertability: // - For Alertable waits ONLY: // * We don't wait and return STATUS_ALERTED if the thread is alerted Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Fri Jul 14 05:03:27 2006 @@ -252,6 +252,7 @@ KiCheckFPU(); KeInitDpc(Pcr->Prcb); + InitializeListHead(&Pcr->PrcbData.WaitListHead); if (Pcr->PrcbData.FeatureBits & X86_FEATURE_SYSCALL) { @@ -332,6 +333,7 @@ KPCR->NtTib.ExceptionList = (PVOID)-1; KeInitDpc(KPCR->Prcb); + InitializeListHead(&KPCR->PrcbData.WaitListHead); KeInitExceptions (); KeInitInterrupts (); Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Fri Jul 14 05:03:27 2006 @@ -83,7 +83,7 @@ if (current->State != Ready) { - DPRINT1("%d/%d\n", &current, current->State); + DPRINT1("%p/%d\n", current, current->State); } ASSERT(current->State == Ready); Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c (original) +++ trunk/reactos/ntoskrnl/ke/queue.c Fri Jul 14 05:03:27 2006 @@ -102,7 +102,7 @@ /* Remove the queue from the thread's wait list */ Thread->WaitStatus = (NTSTATUS)Entry; - RemoveEntryList(&Thread->WaitListEntry); + if (Thread->WaitListEntry.Flink) RemoveEntryList(&Thread->WaitListEntry); Thread->WaitReason = 0; /* Increase the active threads and set the status*/ @@ -248,6 +248,7 @@ PKQUEUE PreviousQueue; PKWAIT_BLOCK WaitBlock; PKTIMER Timer; + BOOLEAN Swappable; ASSERT_QUEUE(Queue); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -354,6 +355,10 @@ WaitBlock->Thread = Thread; Thread->WaitStatus = STATUS_WAIT_0; + /* Check if we can swap the thread's stack */ + Thread->WaitListEntry.Flink = NULL; + KiCheckThreadStackSwap(WaitMode, Thread, Swappable); + /* We need to wait for the object... check for a timeout */ if (Timeout) { @@ -406,6 +411,7 @@ Thread->State = Waiting; /* Find a new thread to run */ + KiAddThreadToWaitList(Thread, Swappable); Status = KiSwapThread(); /* Reset the wait reason */ Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Fri Jul 14 05:03:27 2006 @@ -143,8 +143,8 @@ WaitBlock = WaitBlock->NextWaitBlock; } while (WaitBlock != Thread->WaitBlockList); - /* FIXME: Remove the thread from the wait list! */ - //RemoveEntryList(&Thread->WaitListEntry); + /* Remove the thread from the wait list! */ + if (Thread->WaitListEntry.Flink) RemoveEntryList(&Thread->WaitListEntry); /* Check if there's a Thread Timer */ Timer = &Thread->Timer; @@ -274,6 +274,7 @@ PKTIMER ThreadTimer; PKTHREAD CurrentThread = KeGetCurrentThread(); NTSTATUS WaitStatus = STATUS_SUCCESS; + BOOLEAN Swappable; /* Check if the lock is already held */ if (CurrentThread->WaitNext) @@ -305,6 +306,10 @@ { /* Check if we can do an alertable wait, if requested */ KiCheckAlertability(); + + /* Check if we can swap the thread's stack */ + CurrentThread->WaitListEntry.Flink = NULL; + KiCheckThreadStackSwap(WaitMode, CurrentThread, Swappable); /* Set status */ CurrentThread->WaitStatus = STATUS_WAIT_0; @@ -341,6 +346,7 @@ CurrentThread->State = Waiting; /* Find a new thread to run */ + KiAddThreadToWaitList(CurrentThread, Swappable); WaitStatus = KiSwapThread(); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -383,6 +389,7 @@ PKTIMER ThreadTimer; PKTHREAD CurrentThread = KeGetCurrentThread(); NTSTATUS WaitStatus = STATUS_SUCCESS; + BOOLEAN Swappable; /* Check if the lock is already held */ if (CurrentThread->WaitNext) @@ -461,6 +468,10 @@ /* Make sure we can satisfy the Alertable request */ KiCheckAlertability(); + /* Check if we can swap the thread's stack */ + CurrentThread->WaitListEntry.Flink = NULL; + KiCheckThreadStackSwap(WaitMode, CurrentThread, Swappable); + /* Enable the Timeout Timer if there was any specified */ if (Timeout) { @@ -512,6 +523,7 @@ CurrentThread->State = Waiting; /* Find a new thread to run */ + KiAddThreadToWaitList(CurrentThread, Swappable); WaitStatus = KiSwapThread(); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -564,6 +576,7 @@ ULONG AllObjectsSignaled; ULONG WaitIndex; NTSTATUS WaitStatus = STATUS_SUCCESS; + BOOLEAN Swappable; /* Set the Current Thread */ CurrentThread = KeGetCurrentThread(); @@ -727,6 +740,10 @@ /* Make sure we can satisfy the Alertable request */ KiCheckAlertability(); + /* Check if we can swap the thread's stack */ + CurrentThread->WaitListEntry.Flink = NULL; + KiCheckThreadStackSwap(WaitMode, CurrentThread, Swappable); + /* Enable the Timeout Timer if there was any specified */ if (Timeout) { @@ -786,6 +803,7 @@ CurrentThread->State = Waiting; /* Find a new thread to run */ + KiAddThreadToWaitList(CurrentThread, Swappable); WaitStatus = KiSwapThread(); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL);

1 0

[ion] 23055: - Fix utterly messed up unblocking/readying thread logic. - KiUnblockThread becomes KiReadyThread and doesn't perform priority modifications anymore. Also removed a large block of code that was #if 0ed out. - KiAbortWaitThread now does priority modifications (and better then before), then calls KiReadyThread. - Inserting a queue now *READIES A THREAD ONLY* instead of removing all its waits!
by ion＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: ion Date: Fri Jul 14 02:52:18 2006 New Revision: 23055 URL: http://svn.reactos.org/svn/reactos?rev=23055&view=rev Log: - Fix utterly messed up unblocking/readying thread logic. - KiUnblockThread becomes KiReadyThread and doesn't perform priority modifications anymore. Also removed a large block of code that was #if 0ed out. - KiAbortWaitThread now does priority modifications (and better then before), then calls KiReadyThread. - Inserting a queue now *READIES A THREAD ONLY* instead of removing all its waits! Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/gate.c trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/ntoskrnl/ps/idle.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Fri Jul 14 02:52:18 2006 @@ -133,14 +133,9 @@ VOID ); -/* Removes a thread out of a block state. */ -VOID -STDCALL -KiUnblockThread( - PKTHREAD Thread, - PNTSTATUS WaitStatus, - KPRIORITY Increment -); +VOID +NTAPI +KiReadyThread(IN PKTHREAD Thread); NTSTATUS STDCALL @@ -331,9 +326,9 @@ VOID FASTCALL KiAbortWaitThread( - PKTHREAD Thread, - NTSTATUS WaitStatus, - KPRIORITY Increment + IN PKTHREAD Thread, + IN NTSTATUS WaitStatus, + IN KPRIORITY Increment ); VOID Modified: trunk/reactos/ntoskrnl/ke/gate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gate.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gate.c (original) +++ trunk/reactos/ntoskrnl/ke/gate.c Fri Jul 14 02:52:18 2006 @@ -132,8 +132,8 @@ /* Increment the Queue's active threads */ if (WaitThread->Queue) WaitThread->Queue->CurrentCount++; - /* Reschedule the Thread */ - KiUnblockThread(WaitThread, &WaitStatus, EVENT_INCREMENT); + /* FIXME: This isn't really correct!!! */ + KiAbortWaitThread(WaitThread, WaitStatus, EVENT_INCREMENT); } quit: Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Fri Jul 14 02:52:18 2006 @@ -202,84 +202,12 @@ } VOID -STDCALL -KiUnblockThread(PKTHREAD Thread, - PNTSTATUS WaitStatus, - KPRIORITY Increment) -{ - if (Terminated == Thread->State) { - - DPRINT1("Can't unblock thread 0x%x because it's terminating\n", - Thread); - - } else if (Ready == Thread->State || - Running == Thread->State) { - - DPRINT1("Can't unblock thread 0x%x because it's %s\n", - Thread, (Thread->State == Ready ? "ready" : "running")); - - } else { - - LONG Processor; - KAFFINITY Affinity; - - /* FIXME: This propably isn't the right way to do it... */ - /* No it's not... i'll fix it later-- Alex */ - if (Thread->Priority < LOW_REALTIME_PRIORITY && - Thread->BasePriority < LOW_REALTIME_PRIORITY - 2) { - - if (!Thread->PriorityDecrement && !Thread->DisableBoost) { - - Thread->Priority = Thread->BasePriority + Increment; - Thread->PriorityDecrement = Increment; - } - - /* Also decrease quantum */ - Thread->Quantum--; - - } else { - - Thread->Quantum = Thread->QuantumReset; - } - - if (WaitStatus != NULL) { - - Thread->WaitStatus = *WaitStatus; - } - - Thread->State = Ready; - KiInsertIntoThreadList(Thread->Priority, Thread); - Processor = KeGetCurrentProcessorNumber(); - Affinity = Thread->Affinity; - - if (!(IdleProcessorMask & (1 << Processor) & Affinity) && - (IdleProcessorMask & ~(1 << Processor) & Affinity)) { - - LONG i; - - for (i = 0; i < KeNumberProcessors - 1; i++) { - - Processor++; - - if (Processor >= KeNumberProcessors) { - - Processor = 0; - } - - if (IdleProcessorMask & (1 << Processor) & Affinity) { -#if 0 - /* FIXME: - * Reschedule the threads on an other processor - */ - KeReleaseDispatcherDatabaseLockFromDpcLevel(); - KiRequestReschedule(Processor); - KeAcquireDispatcherDatabaseLockAtDpcLevel(); -#endif - break; - } - } - } - } +NTAPI +KiReadyThread(IN PKTHREAD Thread) +{ + /* Makes a thread ready */ + Thread->State = Ready; + KiInsertIntoThreadList(Thread->Priority, Thread); } VOID Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c (original) +++ trunk/reactos/ntoskrnl/ke/queue.c Fri Jul 14 02:52:18 2006 @@ -117,7 +117,7 @@ } /* Reschedule the Thread */ - KiUnblockThread(Thread, NULL, 0); + KiReadyThread(Thread); } else { Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Fri Jul 14 02:52:18 2006 @@ -127,6 +127,7 @@ { PKWAIT_BLOCK WaitBlock; PKTIMER Timer; + LONG NewPriority; /* Update wait status */ Thread->WaitStatus |= WaitStatus; @@ -158,8 +159,66 @@ /* Increment the Queue's active threads */ if (Thread->Queue) Thread->Queue->CurrentCount++; + /* Check if this is a non-RT thread */ + if (Thread->Priority < LOW_REALTIME_PRIORITY) + { + /* Check if boosting is enabled and we can boost */ + if (!(Thread->DisableBoost) && !(Thread->PriorityDecrement)) + { + /* We can boost, so calculate the new priority */ + NewPriority = Thread->BasePriority + Increment; + if (NewPriority > Thread->Priority) + { + /* Make sure the new priority wouldn't push the thread to RT */ + if (NewPriority >= LOW_REALTIME_PRIORITY) + { + /* Set it just before the RT zone */ + Thread->Priority = LOW_REALTIME_PRIORITY - 1; + } + else + { + /* Otherwise, set our calculated priority */ + Thread->Priority = NewPriority; + } + } + } + + /* Check if this is a high-priority thread */ + if (Thread->BasePriority >= 14) + { + /* It is, simply reset the quantum */ + Thread->Quantum = Thread->QuantumReset; + } + else + { + /* Otherwise, decrease quantum */ + Thread->Quantum--; + if (Thread->Quantum <= 0) + { + /* We've went below 0, reset it */ + Thread->Quantum = Thread->QuantumReset; + + /* Apply per-quantum priority decrement */ + Thread->Priority -= (Thread->PriorityDecrement + 1); + if (Thread->Priority < Thread->BasePriority) + { + /* We've went too low, reset it */ + Thread->Priority = Thread->BasePriority; + } + + /* Delete per-quantum decrement */ + Thread->PriorityDecrement = 0; + } + } + } + else + { + /* For real time threads, just reset the quantum */ + Thread->Quantum = Thread->QuantumReset; + } + /* Reschedule the Thread */ - KiUnblockThread(Thread, NULL, Increment); + KiReadyThread(Thread); } VOID Modified: trunk/reactos/ntoskrnl/ps/idle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/idle.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ps/idle.c (original) +++ trunk/reactos/ntoskrnl/ps/idle.c Fri Jul 14 02:52:18 2006 @@ -110,7 +110,7 @@ FALSE); oldIrql = KeAcquireDispatcherDatabaseLock (); - KiUnblockThread(&IdleThread->Tcb, NULL, 0); + KiReadyThread(&IdleThread->Tcb); KeReleaseDispatcherDatabaseLock(oldIrql); KeGetCurrentPrcb()->IdleThread = &IdleThread->Tcb; Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Fri Jul 14 02:52:18 2006 @@ -353,7 +353,7 @@ /* Dispatch thread */ OldIrql = KeAcquireDispatcherDatabaseLock (); - KiUnblockThread(&Thread->Tcb, NULL, 0); + KiReadyThread(&Thread->Tcb); KeReleaseDispatcherDatabaseLock(OldIrql); /* Return */

1 0

[greatlrd] 23054: Activate screensaver for bootcd rember fullpath should be c:\reactos\system32\matrix.scr but we use matrix.scr as key path for getting this working on livecd. But the desk.cpl apps should save full path to it. (and it does it in windows and reactos before ros cm broken it did in ros).
by greatlrd＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: greatlrd Date: Fri Jul 14 02:42:40 2006 New Revision: 23054 URL: http://svn.reactos.org/svn/reactos?rev=23054&view=rev Log: Activate screensaver for bootcd rember fullpath should be c:\reactos\system32\matrix.scr but we use matrix.scr as key path for getting this working on livecd. But the desk.cpl apps should save full path to it. (and it does it in windows and reactos before ros cm broken it did in ros). Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Fri Jul 14 02:42:40 2006 @@ -10,6 +10,7 @@ HKCU,"Control Panel\Desktop","DragFullWindows",0x00000002,"0" HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,"0" HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" +HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"matrix.scr" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" HKCU,"Control Panel\International",,0x00000012

1 0

[greatlrd] 23053: last fix for getting screensaver working on livecd it is rugh hack
by greatlrd＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: greatlrd Date: Fri Jul 14 02:38:30 2006 New Revision: 23053 URL: http://svn.reactos.org/svn/reactos?rev=23053&view=rev Log: last fix for getting screensaver working on livecd it is rugh hack Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Fri Jul 14 02:38:30 2006 @@ -3379,7 +3379,21 @@ } else { - DPRINT1("CsrStartScreenSaver : failed 0x%08X\n", result); + GetSystemDirectoryW(szCmdline,MAX_PATH); + wprintf(szCmdline, L"%s\\%s /s",szCmdline,szBuffer); + DPRINT1("CsrStartScreenSaver : OK %S, Name %S\n", szCmdline, szBuffer); + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + else + { + DPRINT1("CsrStartScreenSaver : failed 0x%08X\n", result); + } } RegCloseKey(hKey); }

1 0

[hpoussin] 23052: In case of error, free the input data buffer only if we just allocated it.
by hpoussin＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: hpoussin Date: Fri Jul 14 02:20:54 2006 New Revision: 23052 URL: http://svn.reactos.org/svn/reactos?rev=23052&view=rev Log: In case of error, free the input data buffer only if we just allocated it. Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Fri Jul 14 02:20:54 2006 @@ -126,7 +126,7 @@ PLIST_ENTRY Head = &((PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ListHead; if (Head->Flink != Head) { - /* We have at least one keyboard */ + /* We have at least one device */ PPORT_DEVICE_EXTENSION DevExt = CONTAINING_RECORD(Head->Flink, PORT_DEVICE_EXTENSION, ListEntry); IoGetCurrentIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoSkipCurrentIrpStackLocation(Irp); @@ -553,6 +553,9 @@ CONNECT_DATA ConnectData; NTSTATUS Status; + DPRINT("Connecting PortDO %p [%wZ] to ClassDO %p\n", + PortDO, &PortDO->DriverObject->DriverName, ClassDO); + KeInitializeEvent(&Event, NotificationEvent, FALSE); ConnectData.ClassDeviceObject = ClassDO; @@ -588,6 +591,18 @@ } return IoStatus.Status; +} + +/* Send IOCTL_INTERNAL_*_DISCONNECT to port */ +static NTSTATUS +DisconnectPortDriver( + IN PDEVICE_OBJECT PortDO) +{ + DPRINT("Disconnecting PortDO %p [%wZ]\n", + PortDO, &PortDO->DriverObject->DriverName); + + DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); + return STATUS_NOT_IMPLEMENTED; } static NTSTATUS NTAPI @@ -686,16 +701,17 @@ cleanup: if (!(Fdo->Flags & DO_DEVICE_INITIALIZING)) - DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); + DisconnectPortDriver(Fdo); if (DeviceExtension) { if (DeviceExtension->LowerDevice) IoDetachDevice(DeviceExtension->LowerDevice); - if (DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) + if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) { PCLASS_DEVICE_EXTENSION ClassDeviceExtension; ClassDeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceExtension->ClassDO->DeviceExtension; ExFreePool(ClassDeviceExtension->PortData); + IoDeleteDevice(DeviceExtension->ClassDO); } } if (Fdo) Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Fri Jul 14 02:20:54 2006 @@ -123,7 +123,7 @@ PLIST_ENTRY Head = &((PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ListHead; if (Head->Flink != Head) { - /* We have at least one mouse */ + /* We have at least one device */ PPORT_DEVICE_EXTENSION DevExt = CONTAINING_RECORD(Head->Flink, PORT_DEVICE_EXTENSION, ListEntry); IoGetCurrentIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoSkipCurrentIrpStackLocation(Irp); @@ -529,6 +529,9 @@ CONNECT_DATA ConnectData; NTSTATUS Status; + DPRINT("Connecting PortDO %p [%wZ] to ClassDO %p\n", + PortDO, &PortDO->DriverObject->DriverName, ClassDO); + KeInitializeEvent(&Event, NotificationEvent, FALSE); ConnectData.ClassDeviceObject = ClassDO; @@ -564,6 +567,18 @@ } return IoStatus.Status; +} + +/* Send IOCTL_INTERNAL_*_DISCONNECT to port */ +static NTSTATUS +DisconnectPortDriver( + IN PDEVICE_OBJECT PortDO) +{ + DPRINT("Disconnecting PortDO %p [%wZ]\n", + PortDO, &PortDO->DriverObject->DriverName); + + DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); + return STATUS_NOT_IMPLEMENTED; } static NTSTATUS NTAPI @@ -662,16 +677,17 @@ cleanup: if (!(Fdo->Flags & DO_DEVICE_INITIALIZING)) - DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); + DisconnectPortDriver(Fdo); if (DeviceExtension) { if (DeviceExtension->LowerDevice) IoDetachDevice(DeviceExtension->LowerDevice); - if (DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) + if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) { PCLASS_DEVICE_EXTENSION ClassDeviceExtension; ClassDeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceExtension->ClassDO->DeviceExtension; ExFreePool(ClassDeviceExtension->PortData); + IoDeleteDevice(DeviceExtension->ClassDO); } } if (Fdo)

1 0

[ion] 23051: - More cleanup of wait.c - Set the right wait status in KiAbortWaitThread. - Don't ignore priority boost (increments) when aborting waits. - When satisfying a mutant, insert if into the the head of the back-link, not the forward-link.
by ion＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: ion Date: Fri Jul 14 02:19:57 2006 New Revision: 23051 URL: http://svn.reactos.org/svn/reactos?rev=23051&view=rev Log: - More cleanup of wait.c - Set the right wait status in KiAbortWaitThread. - Don't ignore priority boost (increments) when aborting waits. - When satisfying a mutant, insert if into the the head of the back-link, not the forward-link. Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Fri Jul 14 02:19:57 2006 @@ -87,7 +87,7 @@ } \ \ /* Insert it into the Mutant List */ \ - InsertHeadList(&Thread->MutantListHead, \ + InsertHeadList(Thread->MutantListHead.Blink, \ &(Object)->MutantListEntry); \ } \ } \ @@ -132,7 +132,7 @@ } \ \ /* Insert it into the Mutant List */ \ - InsertHeadList(&Thread->MutantListHead, \ + InsertHeadList(Thread->MutantListHead.Blink, \ &(Object)->MutantListEntry); \ } \ } Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Fri Jul 14 02:19:57 2006 @@ -209,13 +209,13 @@ { if (Terminated == Thread->State) { - DPRINT("Can't unblock thread 0x%x because it's terminating\n", + DPRINT1("Can't unblock thread 0x%x because it's terminating\n", Thread); } else if (Ready == Thread->State || Running == Thread->State) { - DPRINT("Can't unblock thread 0x%x because it's %s\n", + DPRINT1("Can't unblock thread 0x%x because it's %s\n", Thread, (Thread->State == Ready ? "ready" : "running")); } else { Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Fri Jul 14 02:19:57 2006 @@ -38,14 +38,13 @@ /* Move to the next block */ WaitBlock = WaitBlock->NextWaitBlock; - } - while (WaitBlock != FirstBlock); + } while (WaitBlock != FirstBlock); } VOID FASTCALL -KiWaitTest(PVOID ObjectPointer, - KPRIORITY Increment) +KiWaitTest(IN PVOID ObjectPointer, + IN KPRIORITY Increment) { PLIST_ENTRY WaitEntry; PLIST_ENTRY WaitList; @@ -55,10 +54,10 @@ PKMUTANT FirstObject = ObjectPointer, Object; /* Loop the Wait Entries */ - DPRINT("KiWaitTest for Object: %x\n", FirstObject); WaitList = &FirstObject->Header.WaitListHead; WaitEntry = WaitList->Flink; - while ((FirstObject->Header.SignalState > 0) && (WaitEntry != WaitList)) + while ((FirstObject->Header.SignalState > 0) && + (WaitEntry != WaitList)) { /* Get the current wait block */ CurrentWaitBlock = CONTAINING_RECORD(WaitEntry, @@ -70,25 +69,23 @@ if (CurrentWaitBlock->WaitType == WaitAny) { /* Easy case, satisfy only this wait */ - DPRINT("Satisfiying a Wait any\n"); WaitEntry = WaitEntry->Blink; KiSatisfyObjectWait(FirstObject, WaitThread); } else { /* Everything must be satisfied */ - DPRINT("Checking for a Wait All\n"); NextWaitBlock = CurrentWaitBlock->NextWaitBlock; /* Loop first to make sure they are valid */ while (NextWaitBlock != CurrentWaitBlock) { - /* Check if the object is signaled */ - Object = NextWaitBlock->Object; - DPRINT("Checking: %p %d\n", - Object, Object->Header.SignalState); + /* Make sure this isn't a timeout block */ if (NextWaitBlock->WaitKey != STATUS_TIMEOUT) { + /* Get the object */ + Object = NextWaitBlock->Object; + /* Check if this is a mutant */ if ((Object->Header.Type == MutantObject) && (Object->Header.SignalState <= 0) && @@ -108,69 +105,61 @@ } /* All the objects are signaled, we can satisfy */ - DPRINT("Satisfiying a Wait All\n"); WaitEntry = WaitEntry->Blink; KiWaitSatisfyAll(CurrentWaitBlock); } /* All waits satisfied, unwait the thread */ - DPRINT("Unwaiting the Thread\n"); KiAbortWaitThread(WaitThread, CurrentWaitBlock->WaitKey, Increment); SkipUnwait: /* Next entry */ WaitEntry = WaitEntry->Flink; } - - DPRINT("Done\n"); } /* Must be called with the dispatcher lock held */ VOID FASTCALL -KiAbortWaitThread(PKTHREAD Thread, - NTSTATUS WaitStatus, - KPRIORITY Increment) +KiAbortWaitThread(IN PKTHREAD Thread, + IN NTSTATUS WaitStatus, + IN KPRIORITY Increment) { PKWAIT_BLOCK WaitBlock; - - /* If we are blocked, we must be waiting on something also */ - DPRINT("KiAbortWaitThread: %x, Status: %x, %x \n", - Thread, WaitStatus, Thread->WaitBlockList); + PKTIMER Timer; + + /* Update wait status */ + Thread->WaitStatus |= WaitStatus; /* Remove the Wait Blocks from the list */ - DPRINT("Removing waits\n"); WaitBlock = Thread->WaitBlockList; do { /* Remove it */ - DPRINT("Removing Waitblock: %x, %x\n", - WaitBlock, WaitBlock->NextWaitBlock); RemoveEntryList(&WaitBlock->WaitListEntry); /* Go to the next one */ WaitBlock = WaitBlock->NextWaitBlock; } while (WaitBlock != Thread->WaitBlockList); + /* FIXME: Remove the thread from the wait list! */ + //RemoveEntryList(&Thread->WaitListEntry); + /* Check if there's a Thread Timer */ - if (Thread->Timer.Header.Inserted) - { - /* Cancel the Thread Timer with the no-lock fastpath */ - DPRINT("Removing the Thread's Timer\n"); - Thread->Timer.Header.Inserted = FALSE; - RemoveEntryList(&Thread->Timer.TimerListEntry); + Timer = &Thread->Timer; + if (Timer->Header.Inserted) + { + /* Remove the timer */ + Timer->Header.Inserted = FALSE; + RemoveEntryList(&Timer->TimerListEntry); + //KiRemoveTimer(Timer); } /* Increment the Queue's active threads */ - if (Thread->Queue) - { - DPRINT("Incrementing Queue's active threads\n"); - Thread->Queue->CurrentCount++; - } + if (Thread->Queue) Thread->Queue->CurrentCount++; /* Reschedule the Thread */ - DPRINT("Unblocking the Thread\n"); - KiUnblockThread(Thread, &WaitStatus, 0); + KiUnblockThread(Thread, NULL, Increment); } VOID @@ -190,19 +179,21 @@ VOID FASTCALL -KiExitDispatcher(KIRQL OldIrql) +KiExitDispatcher(IN KIRQL OldIrql) { - /* If it's the idle thread, dispatch */ + /* Check if it's the idle thread */ if (!(KeIsExecutingDpc()) && (OldIrql < DISPATCH_LEVEL) && (KeGetCurrentThread()) && (KeGetCurrentThread() == KeGetCurrentPrcb()->IdleThread)) { + /* Dispatch a new thread */ KiDispatchThreadNoLock(Ready); } else { - KeReleaseDispatcherDatabaseLockFromDpcLevel(); + /* Otherwise just release the lock */ + KeReleaseDispatcherDatabaseLockFromDpcLevel(); } /* Lower irql back */

1 0

[ion] 23050: - Cleanup + formatting fixes for wait.c - Move some inlined functions from ke.h to ke_x.h - Add checks for special apc disabled (guarded regions) in wait code.
by ion＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: ion Date: Fri Jul 14 01:48:45 2006 New Revision: 23050 URL: http://svn.reactos.org/svn/reactos?rev=23050&view=rev Log: - Cleanup + formatting fixes for wait.c - Move some inlined functions from ke.h to ke_x.h - Add checks for special apc disabled (guarded regions) in wait code. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Fri Jul 14 01:48:45 2006 @@ -79,99 +79,6 @@ InitializeListHead(&((Header)->WaitListHead)); \ } -/* The following macro satisfies the wait of any dispatcher object */ -#define KiSatisfyObjectWait(Object, Thread) \ -{ \ - /* Special case for Mutants */ \ - if ((Object)->Header.Type == MutantObject) \ - { \ - /* Decrease the Signal State */ \ - (Object)->Header.SignalState--; \ - \ - /* Check if it's now non-signaled */ \ - if (!(Object)->Header.SignalState) \ - { \ - /* Set the Owner Thread */ \ - (Object)->OwnerThread = Thread; \ - \ - /* Disable APCs if needed */ \ - Thread->KernelApcDisable -= (Object)->ApcDisable; \ - \ - /* Check if it's abandoned */ \ - if ((Object)->Abandoned) \ - { \ - /* Unabandon it */ \ - (Object)->Abandoned = FALSE; \ - \ - /* Return Status */ \ - Thread->WaitStatus = STATUS_ABANDONED; \ - } \ - \ - /* Insert it into the Mutant List */ \ - InsertHeadList(&Thread->MutantListHead, \ - &(Object)->MutantListEntry); \ - } \ - } \ - else if (((Object)->Header.Type & TIMER_OR_EVENT_TYPE) == \ - EventSynchronizationObject) \ - { \ - /* Synchronization Timers and Events just get un-signaled */ \ - (Object)->Header.SignalState = 0; \ - } \ - else if ((Object)->Header.Type == SemaphoreObject) \ - { \ - /* These ones can have multiple states, so we only decrease it */ \ - (Object)->Header.SignalState--; \ - } \ -} - -/* The following macro satisfies the wait of a mutant dispatcher object */ -#define KiSatisfyMutantWait(Object, Thread) \ -{ \ - /* Decrease the Signal State */ \ - (Object)->Header.SignalState--; \ - \ - /* Check if it's now non-signaled */ \ - if (!(Object)->Header.SignalState) \ - { \ - /* Set the Owner Thread */ \ - (Object)->OwnerThread = Thread; \ - \ - /* Disable APCs if needed */ \ - Thread->KernelApcDisable -= (Object)->ApcDisable; \ - \ - /* Check if it's abandoned */ \ - if ((Object)->Abandoned) \ - { \ - /* Unabandon it */ \ - (Object)->Abandoned = FALSE; \ - \ - /* Return Status */ \ - Thread->WaitStatus = STATUS_ABANDONED; \ - } \ - \ - /* Insert it into the Mutant List */ \ - InsertHeadList(&Thread->MutantListHead, \ - &(Object)->MutantListEntry); \ - } \ -} - -/* The following macro satisfies the wait of any nonmutant dispatcher object */ -#define KiSatisfyNonMutantWait(Object, Thread) \ -{ \ - if (((Object)->Header.Type & TIMER_OR_EVENT_TYPE) == \ - EventSynchronizationObject) \ - { \ - /* Synchronization Timers and Events just get un-signaled */ \ - (Object)->Header.SignalState = 0; \ - } \ - else if ((Object)->Header.Type == SemaphoreObject) \ - { \ - /* These ones can have multiple states, so we only decrease it */ \ - (Object)->Header.SignalState--; \ - } \ -} - extern KSPIN_LOCK DispatcherDatabaseLock; #define KeEnterCriticalRegion() \ Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Fri Jul 14 01:48:45 2006 @@ -7,7 +7,7 @@ */ // -// Guarded Region Routines +// Enters a Critical Region // #define KeEnterGuardedRegion() \ { \ @@ -23,6 +23,9 @@ Thread->SpecialApcDisable--; \ } +// +// Leaves a Critical Region +// #define KeLeaveGuardedRegion() \ { \ PKTHREAD Thread = KeGetCurrentThread(); \ @@ -54,6 +57,142 @@ // // -// TODO: Wait Routines +// Satisfies the wait of any dispatcher object // +#define KiSatisfyObjectWait(Object, Thread) \ +{ \ + /* Special case for Mutants */ \ + if ((Object)->Header.Type == MutantObject) \ + { \ + /* Decrease the Signal State */ \ + (Object)->Header.SignalState--; \ + \ + /* Check if it's now non-signaled */ \ + if (!(Object)->Header.SignalState) \ + { \ + /* Set the Owner Thread */ \ + (Object)->OwnerThread = Thread; \ + \ + /* Disable APCs if needed */ \ + Thread->KernelApcDisable -= (Object)->ApcDisable; \ + \ + /* Check if it's abandoned */ \ + if ((Object)->Abandoned) \ + { \ + /* Unabandon it */ \ + (Object)->Abandoned = FALSE; \ + \ + /* Return Status */ \ + Thread->WaitStatus = STATUS_ABANDONED; \ + } \ + \ + /* Insert it into the Mutant List */ \ + InsertHeadList(&Thread->MutantListHead, \ + &(Object)->MutantListEntry); \ + } \ + } \ + else if (((Object)->Header.Type & TIMER_OR_EVENT_TYPE) == \ + EventSynchronizationObject) \ + { \ + /* Synchronization Timers and Events just get un-signaled */ \ + (Object)->Header.SignalState = 0; \ + } \ + else if ((Object)->Header.Type == SemaphoreObject) \ + { \ + /* These ones can have multiple states, so we only decrease it */ \ + (Object)->Header.SignalState--; \ + } \ +} +// +// Satisfies the wait of a mutant dispatcher object +// +#define KiSatisfyMutantWait(Object, Thread) \ +{ \ + /* Decrease the Signal State */ \ + (Object)->Header.SignalState--; \ + \ + /* Check if it's now non-signaled */ \ + if (!(Object)->Header.SignalState) \ + { \ + /* Set the Owner Thread */ \ + (Object)->OwnerThread = Thread; \ + \ + /* Disable APCs if needed */ \ + Thread->KernelApcDisable -= (Object)->ApcDisable; \ + \ + /* Check if it's abandoned */ \ + if ((Object)->Abandoned) \ + { \ + /* Unabandon it */ \ + (Object)->Abandoned = FALSE; \ + \ + /* Return Status */ \ + Thread->WaitStatus = STATUS_ABANDONED; \ + } \ + \ + /* Insert it into the Mutant List */ \ + InsertHeadList(&Thread->MutantListHead, \ + &(Object)->MutantListEntry); \ + } \ +} + +// +// Satisfies the wait of any nonmutant dispatcher object +// +#define KiSatisfyNonMutantWait(Object, Thread) \ +{ \ + if (((Object)->Header.Type & TIMER_OR_EVENT_TYPE) == \ + EventSynchronizationObject) \ + { \ + /* Synchronization Timers and Events just get un-signaled */ \ + (Object)->Header.SignalState = 0; \ + } \ + else if ((Object)->Header.Type == SemaphoreObject) \ + { \ + /* These ones can have multiple states, so we only decrease it */ \ + (Object)->Header.SignalState--; \ + } \ +} + +// +// Rules for checking alertability: +// - For Alertable waits ONLY: +// * We don't wait and return STATUS_ALERTED if the thread is alerted +// in EITHER the specified wait mode OR in Kernel Mode. +// - For BOTH Alertable AND Non-Alertable waits: +// * We don't want and return STATUS_USER_APC if the User Mode APC list +// is not empty AND the wait mode is User Mode. +// +#define KiCheckAlertability() \ +{ \ + if (Alertable) \ + { \ + if (CurrentThread->Alerted[(int)WaitMode]) \ + { \ + CurrentThread->Alerted[(int)WaitMode] = FALSE; \ + WaitStatus = STATUS_ALERTED; \ + break; \ + } \ + else if ((WaitMode != KernelMode) && \ + (!IsListEmpty(&CurrentThread-> \ + ApcState.ApcListHead[UserMode]))) \ + { \ + CurrentThread->ApcState.UserApcPending = TRUE; \ + WaitStatus = STATUS_USER_APC; \ + break; \ + } \ + else if (CurrentThread->Alerted[KernelMode]) \ + { \ + CurrentThread->Alerted[KernelMode] = FALSE; \ + WaitStatus = STATUS_ALERTED; \ + break; \ + } \ + } \ + else if ((WaitMode != KernelMode) && \ + (CurrentThread->ApcState.UserApcPending)) \ + { \ + WaitStatus = STATUS_USER_APC; \ + break; \ + } \ +} Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Fri Jul 14 01:48:45 2006 @@ -1,16 +1,15 @@ /* - * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ke/wait.c * PURPOSE: Manages waiting for Dispatcher Objects - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Gunnar Dalsnes */ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> - #define NDEBUG #include <internal/debug.h> @@ -19,47 +18,6 @@ KSPIN_LOCK DispatcherDatabaseLock; /* PRIVATE FUNCTIONS *********************************************************/ - -/* - * Rules for checking alertability: - * - For Alertable waits ONLY: - * * We don't wait and return STATUS_ALERTED if the thread is alerted - * in EITHER the specified wait mode OR in Kernel Mode. - * - For BOTH Alertable AND Non-Alertable waits: - * * We don't want and return STATUS_USER_APC if the User Mode APC list - * is not empty AND the wait mode is User Mode. - */ -#define KiCheckAlertability() \ - if (Alertable) \ - { \ - if (CurrentThread->Alerted[(int)WaitMode]) \ - { \ - CurrentThread->Alerted[(int)WaitMode] = FALSE; \ - WaitStatus = STATUS_ALERTED; \ - break; \ - } \ - else if ((WaitMode != KernelMode) && \ - (!IsListEmpty(&CurrentThread->ApcState.ApcListHead[UserMode])))\ - { \ - CurrentThread->ApcState.UserApcPending = TRUE; \ - WaitStatus = STATUS_USER_APC; \ - break; \ - } \ - else if (CurrentThread->Alerted[KernelMode]) \ - { \ - CurrentThread->Alerted[KernelMode] = FALSE; \ - WaitStatus = STATUS_ALERTED; \ - break; \ - } \ - } \ - else if ((WaitMode != KernelMode) && \ - (CurrentThread->ApcState.UserApcPending)) \ - { \ - WaitStatus = STATUS_USER_APC; \ - break; \ - } \ - -/* PUBLIC FUNCTIONS **********************************************************/ VOID FASTCALL @@ -82,607 +40,6 @@ WaitBlock = WaitBlock->NextWaitBlock; } while (WaitBlock != FirstBlock); -} - -/* - * @implemented - * - * FUNCTION: Puts the current thread into an alertable or nonalertable - * wait state for a given internal - * ARGUMENTS: - * WaitMode = Processor mode in which the caller is waiting - * Altertable = Specifies if the wait is alertable - * Interval = Specifies the interval to wait - * RETURNS: Status - */ -NTSTATUS -STDCALL -KeDelayExecutionThread(KPROCESSOR_MODE WaitMode, - BOOLEAN Alertable, - PLARGE_INTEGER Interval) -{ - PKWAIT_BLOCK TimerWaitBlock; - PKTIMER ThreadTimer; - PKTHREAD CurrentThread = KeGetCurrentThread(); - NTSTATUS WaitStatus = STATUS_SUCCESS; - DPRINT("Entering KeDelayExecutionThread\n"); - - /* Check if the lock is already held */ - if (CurrentThread->WaitNext) - { - /* Lock is held, disable Wait Next */ - DPRINT("Lock is held\n"); - CurrentThread->WaitNext = FALSE; - } - else - { - /* Lock not held, acquire it */ - DPRINT("Lock is not held, acquiring\n"); - CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); - } - - /* Use built-in Wait block */ - TimerWaitBlock = &CurrentThread->WaitBlock[TIMER_WAIT_BLOCK]; - - /* Start Wait Loop */ - do - { - /* Check if a kernel APC is pending and we were below APC_LEVEL */ - if ((CurrentThread->ApcState.KernelApcPending) && - (CurrentThread->WaitIrql < APC_LEVEL)) - { - /* Unlock the dispatcher */ - KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - goto SkipWait; - } - - /* Check if we can do an alertable wait, if requested */ - KiCheckAlertability(); - - /* Set status */ - CurrentThread->WaitStatus = STATUS_WAIT_0; - - /* Set Timer */ - ThreadTimer = &CurrentThread->Timer; - - /* Setup the Wait Block */ - CurrentThread->WaitBlockList = TimerWaitBlock; - TimerWaitBlock->NextWaitBlock = TimerWaitBlock; - - /* Link the timer to this Wait Block */ - ThreadTimer->Header.WaitListHead.Flink = &TimerWaitBlock->WaitListEntry; - ThreadTimer->Header.WaitListHead.Blink = &TimerWaitBlock->WaitListEntry; - - /* Insert the Timer into the Timer Lists and enable it */ - if (!KiInsertTimer(ThreadTimer, *Interval)) - { - /* FIXME: The timer already expired, we should find a new ready thread */ - WaitStatus = STATUS_SUCCESS; - break; - } - - /* Handle Kernel Queues */ - if (CurrentThread->Queue) - { - DPRINT("Waking Queue\n"); - KiWakeQueue(CurrentThread->Queue); - } - - /* Setup the wait information */ - CurrentThread->Alertable = Alertable; - CurrentThread->WaitMode = WaitMode; - CurrentThread->WaitReason = DelayExecution; - CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; - CurrentThread->State = Waiting; - - /* Find a new thread to run */ - DPRINT("Swapping threads\n"); - WaitStatus = KiSwapThread(); - - /* Check if we were executing an APC or if we timed out */ - if (WaitStatus != STATUS_KERNEL_APC) - { - /* This is a good thing */ - if (WaitStatus == STATUS_TIMEOUT) WaitStatus = STATUS_SUCCESS; - - /* Return Status */ - return WaitStatus; - } - - /* FIXME: Fixup interval */ - - /* Acquire again the lock */ -SkipWait: - DPRINT("Looping again\n"); - CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); - } - while (TRUE); - - /* Release the Lock, we are done */ - DPRINT("Returning from KeDelayExecutionThread(), %x. Status: %d\n", - KeGetCurrentThread(), Status); - KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - return WaitStatus; -} - -/* - * @implemented - * - * FUNCTION: Puts the current thread into a wait state until the - * given dispatcher object is set to signalled - * ARGUMENTS: - * Object = Object to wait on - * WaitReason = Reason for the wait (debugging aid) - * WaitMode = Can be KernelMode or UserMode, if UserMode then - * user-mode APCs can be delivered and the thread's - * stack can be paged out - * Altertable = Specifies if the wait is a alertable - * Timeout = Optional timeout value - * RETURNS: Status - */ -NTSTATUS -STDCALL -KeWaitForSingleObject(PVOID Object, - KWAIT_REASON WaitReason, - KPROCESSOR_MODE WaitMode, - BOOLEAN Alertable, - PLARGE_INTEGER Timeout) -{ - PKMUTANT CurrentObject; - PKWAIT_BLOCK WaitBlock; - PKWAIT_BLOCK TimerWaitBlock; - PKTIMER ThreadTimer; - PKTHREAD CurrentThread = KeGetCurrentThread(); - NTSTATUS WaitStatus = STATUS_SUCCESS; - DPRINT("Entering KeWaitForSingleObject\n"); - - /* Check if the lock is already held */ - if (CurrentThread->WaitNext) - { - /* Lock is held, disable Wait Next */ - DPRINT("Lock is held\n"); - CurrentThread->WaitNext = FALSE; - } - else - { - /* Lock not held, acquire it */ - DPRINT("Lock is not held, acquiring\n"); - CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); - } - - /* Start the actual Loop */ - do - { - /* Check if a kernel APC is pending and we were below APC_LEVEL */ - if ((CurrentThread->ApcState.KernelApcPending) && - (CurrentThread->WaitIrql < APC_LEVEL)) - { - /* Unlock the dispatcher */ - KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - goto SkipWait; - } - - /* Set default status */ - CurrentThread->WaitStatus = STATUS_WAIT_0; - - /* Append wait block to the KTHREAD wait block list */ - CurrentThread->WaitBlockList = WaitBlock = &CurrentThread->WaitBlock[0]; - - /* Get the Current Object */ - CurrentObject = (PKMUTANT)Object; - - /* Check if it's a mutant */ - if (CurrentObject->Header.Type == MutantObject) - { - /* Check its signal state or if we own it */ - if ((CurrentObject->Header.SignalState > 0) || - (CurrentThread == CurrentObject->OwnerThread)) - { - /* Just unwait this guy and exit */ - if (CurrentObject->Header.SignalState != (LONG)MINLONG) - { - /* It has a normal signal state, so unwait it and return */ - KiSatisfyMutantWait(CurrentObject, CurrentThread); - WaitStatus = CurrentThread->WaitStatus; - goto DontWait; - } - else - { - /* According to wasm.ru, we must raise this exception (tested and true) */ - KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); - } - } - } - else if (CurrentObject->Header.SignalState > 0) - { - /* Another satisfied object */ - KiSatisfyNonMutantWait(CurrentObject, CurrentThread); - WaitStatus = STATUS_WAIT_0; - goto DontWait; - } - - /* Set up the Wait Block */ - WaitBlock->Object = CurrentObject; - WaitBlock->Thread = CurrentThread; - WaitBlock->WaitKey = (USHORT)(STATUS_SUCCESS); - WaitBlock->WaitType = WaitAny; - WaitBlock->NextWaitBlock = WaitBlock; - - /* Make sure we can satisfy the Alertable request */ - KiCheckAlertability(); - - /* Enable the Timeout Timer if there was any specified */ - if (Timeout) - { - /* Fail if the timeout interval is actually 0 */ - if (!Timeout->QuadPart) - { - /* Return a timeout */ - WaitStatus = STATUS_TIMEOUT; - goto DontWait; - } - - /* Point to Timer Wait Block and Thread Timer */ - TimerWaitBlock = &CurrentThread->WaitBlock[TIMER_WAIT_BLOCK]; - ThreadTimer = &CurrentThread->Timer; - - /* Connect the Timer Wait Block */ - WaitBlock->NextWaitBlock = TimerWaitBlock; - - /* Set up the Timer Wait Block */ - TimerWaitBlock->NextWaitBlock = WaitBlock; - - /* Link the timer to this Wait Block */ - ThreadTimer->Header.WaitListHead.Flink = &TimerWaitBlock->WaitListEntry; - ThreadTimer->Header.WaitListHead.Blink = &TimerWaitBlock->WaitListEntry; - - /* Insert the Timer into the Timer Lists and enable it */ - if (!KiInsertTimer(ThreadTimer, *Timeout)) - { - /* Return a timeout if we couldn't insert the timer */ - WaitStatus = STATUS_TIMEOUT; - goto DontWait; - } - } - - /* Link the Object to this Wait Block */ - InsertTailList(&CurrentObject->Header.WaitListHead, - &WaitBlock->WaitListEntry); - - /* Handle Kernel Queues */ - if (CurrentThread->Queue) - { - DPRINT("Waking Queue\n"); - KiWakeQueue(CurrentThread->Queue); - } - - /* Setup the wait information */ - CurrentThread->Alertable = Alertable; - CurrentThread->WaitMode = WaitMode; - CurrentThread->WaitReason = WaitReason; - CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; - CurrentThread->State = Waiting; - - /* Find a new thread to run */ - DPRINT("Swapping threads\n"); - WaitStatus = KiSwapThread(); - - /* Check if we were executing an APC */ - if (WaitStatus != STATUS_KERNEL_APC) - { - /* Return Status */ - return WaitStatus; - } - - /* Check if we had a timeout */ - if (Timeout) - { - /* FIXME: Fixup interval */ - } - - /* Acquire again the lock */ -SkipWait: - DPRINT("Looping again\n"); - CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); - } - while (TRUE); - - /* Release the Lock, we are done */ - DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n", - KeGetCurrentThread(), WaitStatus); - KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - return WaitStatus; - -DontWait: - /* Adjust the Quantum */ - KiAdjustQuantumThread(CurrentThread); - - /* Release & Return */ - DPRINT("Quick-return from KeWaitForMultipleObjects(), %x. Status: %d\n.", - KeGetCurrentThread(), WaitStatus); - KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - return WaitStatus; -} - -/* - * @implemented - */ -NTSTATUS -STDCALL -KeWaitForMultipleObjects(ULONG Count, - PVOID Object[], - WAIT_TYPE WaitType, - KWAIT_REASON WaitReason, - KPROCESSOR_MODE WaitMode, - BOOLEAN Alertable, - PLARGE_INTEGER Timeout, - PKWAIT_BLOCK WaitBlockArray) -{ - PKMUTANT CurrentObject; - PKWAIT_BLOCK WaitBlock; - PKWAIT_BLOCK TimerWaitBlock; - PKTIMER ThreadTimer; - PKTHREAD CurrentThread = KeGetCurrentThread(); - ULONG AllObjectsSignaled; - ULONG WaitIndex; - NTSTATUS WaitStatus = STATUS_SUCCESS; - DPRINT("Entering KeWaitForMultipleObjects(Count %lu Object[] %p) " - "PsGetCurrentThread() %x, Timeout %x\n", - Count, Object, PsGetCurrentThread(), Timeout); - - /* Set the Current Thread */ - CurrentThread = KeGetCurrentThread(); - - /* Check if the lock is already held */ - if (CurrentThread->WaitNext) - { - /* Lock is held, disable Wait Next */ - DPRINT("Lock is held\n"); - CurrentThread->WaitNext = FALSE; - } - else - { - /* Lock not held, acquire it */ - DPRINT("Lock is not held, acquiring\n"); - CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); - } - - /* Make sure the Wait Count is valid for the Thread and Maximum Wait Objects */ - if (!WaitBlockArray) - { - /* Check in regards to the Thread Object Limit */ - if (Count > THREAD_WAIT_OBJECTS) KEBUGCHECK(MAXIMUM_WAIT_OBJECTS_EXCEEDED); - - /* Use the Thread's Wait Block */ - WaitBlockArray = &CurrentThread->WaitBlock[0]; - } - else - { - /* Using our own Block Array. Check in regards to System Object Limit */ - if (Count > MAXIMUM_WAIT_OBJECTS) KEBUGCHECK(MAXIMUM_WAIT_OBJECTS_EXCEEDED); - } - - /* Start the actual Loop */ - do - { - /* Check if a kernel APC is pending and we were below APC_LEVEL */ - if ((CurrentThread->ApcState.KernelApcPending) && - (CurrentThread->WaitIrql < APC_LEVEL)) - { - /* Unlock the dispatcher */ - KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - goto SkipWait; - } - - /* Append wait block to the KTHREAD wait block list */ - CurrentThread->WaitBlockList = WaitBlock = WaitBlockArray; - - /* Set default wait status */ - CurrentThread->WaitStatus = STATUS_WAIT_0; - - /* Check if the wait is (already) satisfied */ - AllObjectsSignaled = TRUE; - - /* First, we'll try to satisfy the wait directly */ - for (WaitIndex = 0; WaitIndex < Count; WaitIndex++) - { - /* Get the Current Object */ - CurrentObject = (PKMUTANT)Object[WaitIndex]; - - /* Check the type of wait */ - if (WaitType == WaitAny) - { - /* Check if the Object is a mutant */ - if (CurrentObject->Header.Type == MutantObject) - { - /* Check if it's signaled */ - if ((CurrentObject->Header.SignalState > 0) || - (CurrentThread == CurrentObject->OwnerThread)) - { - /* This is a Wait Any, so just unwait this and exit */ - if (CurrentObject->Header.SignalState != (LONG)MINLONG) - { - /* Normal signal state, so unwait it and return */ - KiSatisfyMutantWait(CurrentObject, CurrentThread); - WaitStatus = CurrentThread->WaitStatus | WaitIndex; - goto DontWait; - } - else - { - /* According to wasm.ru, we must raise this exception (tested and true) */ - KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); - } - } - } - else if (CurrentObject->Header.SignalState > 0) - { - /* Another signaled object, unwait and return */ - KiSatisfyNonMutantWait(CurrentObject, CurrentThread); - WaitStatus = WaitIndex; - goto DontWait; - } - } - else - { - /* Check if we're dealing with a mutant again */ - if (CurrentObject->Header.Type == MutantObject) - { - /* Check if it has an invalid count */ - if ((CurrentThread == CurrentObject->OwnerThread) && - (CurrentObject->Header.SignalState == MINLONG)) - { - /* Raise an exception */ - KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); - } - else if ((CurrentObject->Header.SignalState <= 0) && - (CurrentThread != CurrentObject->OwnerThread)) - { - /* We don't own it, can't satisfy the wait */ - AllObjectsSignaled = FALSE; - } - } - else if (CurrentObject->Header.SignalState <= 0) - { - /* Not signaled, can't satisfy */ - AllObjectsSignaled = FALSE; - } - } - - /* Set up a Wait Block for this Object */ - WaitBlock->Object = CurrentObject; - WaitBlock->Thread = CurrentThread; - WaitBlock->WaitKey = (USHORT)WaitIndex; - WaitBlock->WaitType = (USHORT)WaitType; - WaitBlock->NextWaitBlock = WaitBlock + 1; - - /* Move to the next Wait Block */ - WaitBlock = WaitBlock->NextWaitBlock; - } - - /* Return to the Root Wait Block */ - WaitBlock--; - WaitBlock->NextWaitBlock = WaitBlockArray; - - /* Check if this is a Wait All and all the objects are signaled */ - if ((WaitType == WaitAll) && (AllObjectsSignaled)) - { - /* Return to the Root Wait Block */ - WaitBlock = CurrentThread->WaitBlockList; - - /* Satisfy their Waits and return to the caller */ - KiWaitSatisfyAll(WaitBlock); - WaitStatus = CurrentThread->WaitStatus; - goto DontWait; - } - - /* Make sure we can satisfy the Alertable request */ - KiCheckAlertability(); - - /* Enable the Timeout Timer if there was any specified */ - if (Timeout) - { - /* Make sure the timeout interval isn't actually 0 */ - if (!Timeout->QuadPart) - { - /* Return a timeout */ - WaitStatus = STATUS_TIMEOUT; - goto DontWait; - } - - /* Point to Timer Wait Block and Thread Timer */ - TimerWaitBlock = &CurrentThread->WaitBlock[TIMER_WAIT_BLOCK]; - ThreadTimer = &CurrentThread->Timer; - - /* Connect the Timer Wait Block */ - WaitBlock->NextWaitBlock = TimerWaitBlock; - - /* Set up the Timer Wait Block */ - TimerWaitBlock->NextWaitBlock = WaitBlockArray; - - /* Initialize the list head */ - InitializeListHead(&ThreadTimer->Header.WaitListHead); - - /* Insert the Timer into the Timer Lists and enable it */ - if (!KiInsertTimer(ThreadTimer, *Timeout)) - { - /* Return a timeout if we couldn't insert the timer */ - WaitStatus = STATUS_TIMEOUT; - goto DontWait; - } - } - - /* Insert into Object's Wait List*/ - WaitBlock = CurrentThread->WaitBlockList; - do - { - /* Get the Current Object */ - CurrentObject = WaitBlock->Object; - - /* Link the Object to this Wait Block */ - InsertTailList(&CurrentObject->Header.WaitListHead, - &WaitBlock->WaitListEntry); - - /* Move to the next Wait Block */ - WaitBlock = WaitBlock->NextWaitBlock; - } - while (WaitBlock != WaitBlockArray); - - /* Handle Kernel Queues */ - if (CurrentThread->Queue) - { - DPRINT("Waking Queue\n"); - KiWakeQueue(CurrentThread->Queue); - } - - /* Setup the wait information */ - CurrentThread->Alertable = Alertable; - CurrentThread->WaitMode = WaitMode; - CurrentThread->WaitReason = WaitReason; - CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; - CurrentThread->State = Waiting; - - /* Find a new thread to run */ - DPRINT("Swapping threads\n"); - WaitStatus = KiSwapThread(); - - /* Check if we were executing an APC */ - DPRINT("Thread is back\n"); - if (WaitStatus != STATUS_KERNEL_APC) - { - /* Return Status */ - return WaitStatus; - } - - /* Check if we had a timeout */ - if (Timeout) - { - /* FIXME: Fixup interval */ - } - - /* Acquire again the lock */ -SkipWait: - DPRINT("Looping again\n"); - CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); - } - while (TRUE); - - /* Release the Lock, we are done */ - DPRINT("Returning, %x. Status: %d\n", KeGetCurrentThread(), WaitStatus); - KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - return WaitStatus; - -DontWait: - /* Adjust the Quantum */ - KiAdjustQuantumThread(CurrentThread); - - /* Release & Return */ - DPRINT("Returning, %x. Status: %d\n. We did not wait.", - KeGetCurrentThread(), WaitStatus); - KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - return WaitStatus; } VOID @@ -852,4 +209,561 @@ KeLowerIrql(OldIrql); } +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +KeDelayExecutionThread(IN KPROCESSOR_MODE WaitMode, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Interval OPTIONAL) +{ + PKWAIT_BLOCK TimerWaitBlock; + PKTIMER ThreadTimer; + PKTHREAD CurrentThread = KeGetCurrentThread(); + NTSTATUS WaitStatus = STATUS_SUCCESS; + + /* Check if the lock is already held */ + if (CurrentThread->WaitNext) + { + /* Lock is held, disable Wait Next */ + CurrentThread->WaitNext = FALSE; + } + else + { + /* Lock not held, acquire it */ + CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); + } + + /* Use built-in Wait block */ + TimerWaitBlock = &CurrentThread->WaitBlock[TIMER_WAIT_BLOCK]; + + /* Start Wait Loop */ + do + { + /* Check if a kernel APC is pending and we're below APC_LEVEL */ + if ((CurrentThread->ApcState.KernelApcPending) && + !(CurrentThread->SpecialApcDisable) && + (CurrentThread->WaitIrql < APC_LEVEL)) + { + /* Unlock the dispatcher */ + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + } + else + { + /* Check if we can do an alertable wait, if requested */ + KiCheckAlertability(); + + /* Set status */ + CurrentThread->WaitStatus = STATUS_WAIT_0; + + /* Set Timer */ + ThreadTimer = &CurrentThread->Timer; + + /* Setup the Wait Block */ + CurrentThread->WaitBlockList = TimerWaitBlock; + TimerWaitBlock->NextWaitBlock = TimerWaitBlock; + + /* Link the timer to this Wait Block */ + ThreadTimer->Header.WaitListHead.Flink = + &TimerWaitBlock->WaitListEntry; + ThreadTimer->Header.WaitListHead.Blink = + &TimerWaitBlock->WaitListEntry; + + /* Insert the Timer into the Timer Lists and enable it */ + if (!KiInsertTimer(ThreadTimer, *Interval)) + { + /* FIXME: We should find a new ready thread */ + WaitStatus = STATUS_SUCCESS; + break; + } + + /* Handle Kernel Queues */ + if (CurrentThread->Queue) KiWakeQueue(CurrentThread->Queue); + + /* Setup the wait information */ + CurrentThread->Alertable = Alertable; + CurrentThread->WaitMode = WaitMode; + CurrentThread->WaitReason = DelayExecution; + CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; + CurrentThread->State = Waiting; + + /* Find a new thread to run */ + WaitStatus = KiSwapThread(); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + + /* Check if we were executing an APC or if we timed out */ + if (WaitStatus != STATUS_KERNEL_APC) + { + /* This is a good thing */ + if (WaitStatus == STATUS_TIMEOUT) WaitStatus = STATUS_SUCCESS; + + /* Return Status */ + return WaitStatus; + } + + /* FIXME: Fixup interval */ + } + + /* Acquire again the lock */ + CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); + } while (TRUE); + + /* Release the Lock, we are done */ + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + return WaitStatus; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +KeWaitForSingleObject(PVOID Object, + KWAIT_REASON WaitReason, + KPROCESSOR_MODE WaitMode, + BOOLEAN Alertable, + PLARGE_INTEGER Timeout) +{ + PKMUTANT CurrentObject; + PKWAIT_BLOCK WaitBlock; + PKWAIT_BLOCK TimerWaitBlock; + PKTIMER ThreadTimer; + PKTHREAD CurrentThread = KeGetCurrentThread(); + NTSTATUS WaitStatus = STATUS_SUCCESS; + + /* Check if the lock is already held */ + if (CurrentThread->WaitNext) + { + /* Lock is held, disable Wait Next */ + CurrentThread->WaitNext = FALSE; + } + else + { + /* Lock not held, acquire it */ + CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); + } + + /* Start the actual Loop */ + do + { + /* Check if a kernel APC is pending and we're below APC_LEVEL */ + if ((CurrentThread->ApcState.KernelApcPending) && + !(CurrentThread->SpecialApcDisable) && + (CurrentThread->WaitIrql < APC_LEVEL)) + { + /* Unlock the dispatcher */ + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + } + else + { + /* Set default status */ + CurrentThread->WaitStatus = STATUS_WAIT_0; + + /* Append wait block to the KTHREAD wait block list */ + WaitBlock = &CurrentThread->WaitBlock[0]; + CurrentThread->WaitBlockList = WaitBlock; + + /* Get the Current Object */ + CurrentObject = (PKMUTANT)Object; + + /* Check if it's a mutant */ + if (CurrentObject->Header.Type == MutantObject) + { + /* Check its signal state or if we own it */ + if ((CurrentObject->Header.SignalState > 0) || + (CurrentThread == CurrentObject->OwnerThread)) + { + /* Just unwait this guy and exit */ + if (CurrentObject->Header.SignalState != (LONG)MINLONG) + { + /* It has a normal signal state. Unwait and return */ + KiSatisfyMutantWait(CurrentObject, CurrentThread); + WaitStatus = CurrentThread->WaitStatus; + goto DontWait; + } + else + { + /* Raise an exception (see wasm.ru) */ + KeReleaseDispatcherDatabaseLock(CurrentThread-> + WaitIrql); + ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); + } + } + } + else if (CurrentObject->Header.SignalState > 0) + { + /* Another satisfied object */ + KiSatisfyNonMutantWait(CurrentObject, CurrentThread); + WaitStatus = STATUS_WAIT_0; + goto DontWait; + } + + /* Set up the Wait Block */ + WaitBlock->Object = CurrentObject; + WaitBlock->Thread = CurrentThread; + WaitBlock->WaitKey = (USHORT)(STATUS_SUCCESS); + WaitBlock->WaitType = WaitAny; + WaitBlock->NextWaitBlock = WaitBlock; + + /* Make sure we can satisfy the Alertable request */ + KiCheckAlertability(); + + /* Enable the Timeout Timer if there was any specified */ + if (Timeout) + { + /* Fail if the timeout interval is actually 0 */ + if (!Timeout->QuadPart) + { + /* Return a timeout */ + WaitStatus = STATUS_TIMEOUT; + goto DontWait; + } + + /* Point to Timer Wait Block and Thread Timer */ + TimerWaitBlock = &CurrentThread->WaitBlock[TIMER_WAIT_BLOCK]; + ThreadTimer = &CurrentThread->Timer; + + /* Connect the Timer Wait Block */ + WaitBlock->NextWaitBlock = TimerWaitBlock; + + /* Set up the Timer Wait Block */ + TimerWaitBlock->NextWaitBlock = WaitBlock; + + /* Link the timer to this Wait Block */ + ThreadTimer->Header.WaitListHead.Flink = + &TimerWaitBlock->WaitListEntry; + ThreadTimer->Header.WaitListHead.Blink = + &TimerWaitBlock->WaitListEntry; + + /* Insert the Timer into the Timer Lists and enable it */ + if (!KiInsertTimer(ThreadTimer, *Timeout)) + { + /* Return a timeout if we couldn't insert the timer */ + WaitStatus = STATUS_TIMEOUT; + goto DontWait; + } + } + + /* Link the Object to this Wait Block */ + InsertTailList(&CurrentObject->Header.WaitListHead, + &WaitBlock->WaitListEntry); + + /* Handle Kernel Queues */ + if (CurrentThread->Queue) KiWakeQueue(CurrentThread->Queue); + + /* Setup the wait information */ + CurrentThread->Alertable = Alertable; + CurrentThread->WaitMode = WaitMode; + CurrentThread->WaitReason = WaitReason; + CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; + CurrentThread->State = Waiting; + + /* Find a new thread to run */ + WaitStatus = KiSwapThread(); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + + /* Check if we were executing an APC */ + if (WaitStatus != STATUS_KERNEL_APC) return WaitStatus; + + /* Check if we had a timeout */ + if (Timeout) + { + /* FIXME: Fixup interval */ + } + } + + /* Acquire again the lock */ + CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); + } while (TRUE); + + /* Release the Lock, we are done */ + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + return WaitStatus; + +DontWait: + /* Adjust the Quantum */ + KiAdjustQuantumThread(CurrentThread); + + /* Release & Return */ + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + return WaitStatus; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +KeWaitForMultipleObjects(IN ULONG Count, + IN PVOID Object[], + IN WAIT_TYPE WaitType, + IN KWAIT_REASON WaitReason, + IN KPROCESSOR_MODE WaitMode, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER Timeout OPTIONAL, + OUT PKWAIT_BLOCK WaitBlockArray OPTIONAL) +{ + PKMUTANT CurrentObject; + PKWAIT_BLOCK WaitBlock; + PKWAIT_BLOCK TimerWaitBlock; + PKTIMER ThreadTimer; + PKTHREAD CurrentThread = KeGetCurrentThread(); + ULONG AllObjectsSignaled; + ULONG WaitIndex; + NTSTATUS WaitStatus = STATUS_SUCCESS; + + /* Set the Current Thread */ + CurrentThread = KeGetCurrentThread(); + + /* Check if the lock is already held */ + if (CurrentThread->WaitNext) + { + /* Lock is held, disable Wait Next */ + CurrentThread->WaitNext = FALSE; + } + else + { + /* Lock not held, acquire it */ + CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); + } + + /* Make sure the Wait Count is valid */ + if (!WaitBlockArray) + { + /* Check in regards to the Thread Object Limit */ + if (Count > THREAD_WAIT_OBJECTS) + { + /* Bugcheck */ + KEBUGCHECK(MAXIMUM_WAIT_OBJECTS_EXCEEDED); + } + + /* Use the Thread's Wait Block */ + WaitBlockArray = &CurrentThread->WaitBlock[0]; + } + else + { + /* Using our own Block Array, so check with the System Object Limit */ + if (Count > MAXIMUM_WAIT_OBJECTS) + { + /* Bugcheck */ + KEBUGCHECK(MAXIMUM_WAIT_OBJECTS_EXCEEDED); + } + } + + /* Start the actual Loop */ + do + { + /* Check if a kernel APC is pending and we're below APC_LEVEL */ + if ((CurrentThread->ApcState.KernelApcPending) && + !(CurrentThread->SpecialApcDisable) && + (CurrentThread->WaitIrql < APC_LEVEL)) + { + /* Unlock the dispatcher */ + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + } + else + { + /* Append wait block to the KTHREAD wait block list */ + CurrentThread->WaitBlockList = WaitBlock = WaitBlockArray; + + /* Set default wait status */ + CurrentThread->WaitStatus = STATUS_WAIT_0; + + /* Check if the wait is (already) satisfied */ + AllObjectsSignaled = TRUE; + + /* First, we'll try to satisfy the wait directly */ + for (WaitIndex = 0; WaitIndex < Count; WaitIndex++) + { + /* Get the Current Object */ + CurrentObject = (PKMUTANT)Object[WaitIndex]; + + /* Check the type of wait */ + if (WaitType == WaitAny) + { + /* Check if the Object is a mutant */ + if (CurrentObject->Header.Type == MutantObject) + { + /* Check if it's signaled */ + if ((CurrentObject->Header.SignalState > 0) || + (CurrentThread == CurrentObject->OwnerThread)) + { + /* This is a Wait Any, so unwait this and exit */ + if (CurrentObject->Header.SignalState != + (LONG)MINLONG) + { + /* Normal signal state, unwait it and return */ + KiSatisfyMutantWait(CurrentObject, + CurrentThread); + WaitStatus = CurrentThread->WaitStatus | + WaitIndex; + goto DontWait; + } + else + { + /* Raise an exception (see wasm.ru) */ + KeReleaseDispatcherDatabaseLock(CurrentThread-> + WaitIrql); + ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); + } + } + } + else if (CurrentObject->Header.SignalState > 0) + { + /* Another signaled object, unwait and return */ + KiSatisfyNonMutantWait(CurrentObject, CurrentThread); + WaitStatus = WaitIndex; + goto DontWait; + } + } + else + { + /* Check if we're dealing with a mutant again */ + if (CurrentObject->Header.Type == MutantObject) + { + /* Check if it has an invalid count */ + if ((CurrentThread == CurrentObject->OwnerThread) && + (CurrentObject->Header.SignalState == MINLONG)) + { + /* Raise an exception */ + KeReleaseDispatcherDatabaseLock(CurrentThread-> + WaitIrql); + ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); + } + else if ((CurrentObject->Header.SignalState <= 0) && + (CurrentThread != CurrentObject->OwnerThread)) + { + /* We don't own it, can't satisfy the wait */ + AllObjectsSignaled = FALSE; + } + } + else if (CurrentObject->Header.SignalState <= 0) + { + /* Not signaled, can't satisfy */ + AllObjectsSignaled = FALSE; + } + } + + /* Set up a Wait Block for this Object */ + WaitBlock->Object = CurrentObject; + WaitBlock->Thread = CurrentThread; + WaitBlock->WaitKey = (USHORT)WaitIndex; + WaitBlock->WaitType = (USHORT)WaitType; + WaitBlock->NextWaitBlock = WaitBlock + 1; + + /* Move to the next Wait Block */ + WaitBlock = WaitBlock->NextWaitBlock; + } + + /* Return to the Root Wait Block */ + WaitBlock--; + WaitBlock->NextWaitBlock = WaitBlockArray; + + /* Check if this is a Wait All and all the objects are signaled */ + if ((WaitType == WaitAll) && (AllObjectsSignaled)) + { + /* Return to the Root Wait Block */ + WaitBlock = CurrentThread->WaitBlockList; + + /* Satisfy their Waits and return to the caller */ + KiWaitSatisfyAll(WaitBlock); + WaitStatus = CurrentThread->WaitStatus; + goto DontWait; + } + + /* Make sure we can satisfy the Alertable request */ + KiCheckAlertability(); + + /* Enable the Timeout Timer if there was any specified */ + if (Timeout) + { + /* Make sure the timeout interval isn't actually 0 */ + if (!Timeout->QuadPart) + { + /* Return a timeout */ + WaitStatus = STATUS_TIMEOUT; + goto DontWait; + } + + /* Point to Timer Wait Block and Thread Timer */ + TimerWaitBlock = &CurrentThread->WaitBlock[TIMER_WAIT_BLOCK]; + ThreadTimer = &CurrentThread->Timer; + + /* Connect the Timer Wait Block */ + WaitBlock->NextWaitBlock = TimerWaitBlock; + + /* Set up the Timer Wait Block */ + TimerWaitBlock->NextWaitBlock = WaitBlockArray; + + /* Initialize the list head */ + InitializeListHead(&ThreadTimer->Header.WaitListHead); + + /* Insert the Timer into the Timer Lists and enable it */ + if (!KiInsertTimer(ThreadTimer, *Timeout)) + { + /* Return a timeout if we couldn't insert the timer */ + WaitStatus = STATUS_TIMEOUT; + goto DontWait; + } + } + + /* Insert into Object's Wait List*/ + WaitBlock = CurrentThread->WaitBlockList; + do + { + /* Get the Current Object */ + CurrentObject = WaitBlock->Object; + + /* Link the Object to this Wait Block */ + InsertTailList(&CurrentObject->Header.WaitListHead, + &WaitBlock->WaitListEntry); + + /* Move to the next Wait Block */ + WaitBlock = WaitBlock->NextWaitBlock; + } while (WaitBlock != WaitBlockArray); + + /* Handle Kernel Queues */ + if (CurrentThread->Queue) KiWakeQueue(CurrentThread->Queue); + + /* Setup the wait information */ + CurrentThread->Alertable = Alertable; + CurrentThread->WaitMode = WaitMode; + CurrentThread->WaitReason = WaitReason; + CurrentThread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; + CurrentThread->State = Waiting; + + /* Find a new thread to run */ + WaitStatus = KiSwapThread(); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + + /* Check if we were executing an APC */ + if (WaitStatus != STATUS_KERNEL_APC) return WaitStatus; + + /* Check if we had a timeout */ + if (Timeout) + { + /* FIXME: Fixup interval */ + } + + /* Acquire again the lock */ + CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); + } + } while (TRUE); + + /* Release the Lock, we are done */ + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + return WaitStatus; + +DontWait: + /* Adjust the Quantum */ + KiAdjustQuantumThread(CurrentThread); + + /* Release & Return */ + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + return WaitStatus; +} + /* EOF */

1 0

[ekohl] 23049: Implement CM_Free_Log_Conf[_Ex] and add PNP_FreeLogConf stub.
by ekohl＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: ekohl Date: Fri Jul 14 01:28:01 2006 New Revision: 23049 URL: http://svn.reactos.org/svn/reactos?rev=23049&view=rev Log: Implement CM_Free_Log_Conf[_Ex] and add PNP_FreeLogConf stub. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/wine/cfgmgr32.h Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Fri Jul 14 01:28:01 2006 @@ -1250,16 +1250,35 @@ PNP_AddEmptyLogConf(handle_t BindingHandle, wchar_t *DeviceInstance, ULONG ulPriority, - ULONG *ulLogConfTag, + ULONG *pulLogConfTag, ULONG ulFlags) { CONFIGRET ret = CR_SUCCESS; DPRINT1("PNP_AddEmptyLogConf() called\n"); - *ulLogConfTag = 0; /* FIXME */ + *pulLogConfTag = 0; /* FIXME */ DPRINT1("PNP_AddEmptyLogConf() done (returns %lx)\n", ret); + + return ret; +} + + +/* Function 43 */ +CONFIGRET +PNP_FreeLogConf(handle_t BindingHandle, + wchar_t *DeviceInstance, + ULONG ulType, + ULONG ulLogConfTag, + ULONG ulFlags) +{ + CONFIGRET ret = CR_SUCCESS; + + DPRINT1("PNP_FreeLogConf() called\n"); + + + DPRINT1("PNP_FreeLogConf() done (returns %lx)\n", ret); return ret; } Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Fri Jul 14 01:28:01 2006 @@ -68,9 +68,9 @@ CM_Enumerate_Enumerators_ExW=SETUPAPI.CM_Enumerate_Enumerators_ExW ;CM_Find_Range ;CM_First_Range -;CM_Free_Log_Conf -;CM_Free_Log_Conf_Ex -CM_Free_Log_Conf_Handle(a)4=SETUPAPI.CM_Free_Log_Conf_Handle +CM_Free_Log_Conf=SETUPAPI.CM_Free_Log_Conf +CM_Free_Log_Conf_Ex=SETUPAPI.CM_Free_Log_Conf_Ex +CM_Free_Log_Conf_Handle=SETUPAPI.CM_Free_Log_Conf_Handle ;CM_Free_Range_List ;CM_Free_Res_Des ;CM_Free_Res_Des_Ex Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Fri Jul 14 01:28:01 2006 @@ -915,6 +915,65 @@ *pulLength, pulLength, ulFlags); +} + + +/*********************************************************************** + * CM_Free_Log_Conf [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Free_Log_Conf( + LOG_CONF lcLogConfToBeFreed, ULONG ulFlags) +{ + TRACE("%lx %lx\n", lcLogConfToBeFreed, ulFlags); + return CM_Free_Log_Conf_Ex(lcLogConfToBeFreed, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Free_Log_Conf_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Free_Log_Conf_Ex( + LOG_CONF lcLogConfToBeFreed, ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpDevInst; + PLOG_CONF_INFO pLogConfInfo; + + TRACE("%lx %lx %lx\n", lcLogConfToBeFreed, ulFlags, hMachine); + + if (!IsUserAdmin()) + return CR_ACCESS_DENIED; + + pLogConfInfo = (PLOG_CONF_INFO)lcLogConfToBeFreed; + if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + return CR_INVALID_LOG_CONF; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + return PNP_FreeLogConf(BindingHandle, lpDevInst, pLogConfInfo->ulFlags, + pLogConfInfo->ulTag, 0); } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Fri Jul 14 01:28:01 2006 @@ -46,8 +46,8 @@ @ stdcall CM_Enumerate_Enumerators_ExW(long wstr ptr long long) @ stub CM_Find_Range @ stub CM_First_Range -@ stub CM_Free_Log_Conf -@ stub CM_Free_Log_Conf_Ex +@ stdcall CM_Free_Log_Conf(ptr long) +@ stdcall CM_Free_Log_Conf_Ex(ptr long ptr) @ stdcall CM_Free_Log_Conf_Handle(ptr) @ stub CM_Free_Range_List @ stub CM_Free_Res_Des Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl (original) +++ trunk/reactos/include/reactos/idl/pnp.idl Fri Jul 14 01:28:01 2006 @@ -202,8 +202,15 @@ CONFIGRET PNP_AddEmptyLogConf(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, [in] ULONG ulPriority, - [out] ULONG *ulLogConfTag, + [out] ULONG *pulLogConfTag, [in] ULONG ulFlags); + + /* Function 43 */ + CONFIGRET PNP_FreeLogConf(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] ULONG ulType, + [in] ULONG ulLogConfTag, + [in] ULONG ulFlags); /* Function 58 */ CONFIGRET PNP_RunDetection(handle_t BindingHandle, Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/cfgmg… ============================================================================== --- trunk/reactos/include/reactos/wine/cfgmgr32.h (original) +++ trunk/reactos/include/reactos/wine/cfgmgr32.h Fri Jul 14 01:28:01 2006 @@ -250,6 +250,8 @@ CONFIGRET WINAPI CM_Enumerate_Enumerators_ExA( ULONG, PCHAR, PULONG, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Enumerate_Enumerators_ExW( ULONG, PWCHAR, PULONG, ULONG, HMACHINE ); #define CM_Enumerate_Enumerators_Ex WINELIB_NAME_AW(CM_Enumerate_Enumerators_Ex) +CONFIGRET WINAPI CM_Free_Log_Conf( LOG_CONF, ULONG ); +CONFIGRET WINAPI CM_Free_Log_Conf_Ex( LOG_CONF, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Free_Log_Conf_Handle( LOG_CONF ); CONFIGRET WINAPI CM_Get_Child( PDEVINST, DEVINST, ULONG ); CONFIGRET WINAPI CM_Get_Child_Ex( PDEVINST, DEVINST, ULONG, HMACHINE );

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006