Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 17236: Return failure if native function failed. one more test passes
by ion＠svn.reactos.com 09 Aug '05

09 Aug '05

Return failure if native function failed. one more test passes Modified: trunk/reactos/lib/kernel32/thread/thread.c _____ Modified: trunk/reactos/lib/kernel32/thread/thread.c --- trunk/reactos/lib/kernel32/thread/thread.c 2005-08-09 08:50:57 UTC (rev 17235) +++ trunk/reactos/lib/kernel32/thread/thread.c 2005-08-09 08:54:56 UTC (rev 17236) @@ -530,7 +530,10 @@ &AffinityMask, sizeof(KAFFINITY)); if (!NT_SUCCESS(Status)) + { SetLastErrorByStatus(Status); + ThreadBasic.AffinityMask = 0; + } return(ThreadBasic.AffinityMask); }

1 0

[ion] 17235: - Last patch was incomplete, apologies. SVN @ 5AM = bad idea.
by ion＠svn.reactos.com 09 Aug '05

09 Aug '05

- Last patch was incomplete, apologies. SVN @ 5AM = bad idea. - Do not report that ROS is running on 0 active processors, that's a bad idea. - Actually check the affinity mask set by NtSetInformationThread - Fix the check in KeSetAffinityThread - Give a valid affinity to the system thread (corresponding to the active cpu affinity set). This removes all bugchecks from the kernel32 thread winetest. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/query.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-08-09 08:02:05 UTC (rev 17234) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-08-09 08:50:57 UTC (rev 17235) @@ -228,6 +228,12 @@ VOID STDCALL +KiSetPriorityThread(PKTHREAD Thread, + KPRIORITY Priority, + PBOOLEAN Released); + +VOID +STDCALL KeStackAttachProcess ( IN struct _KPROCESS* Process, OUT PKAPC_STATE ApcState _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-08-09 08:02:05 UTC (rev 17234) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-08-09 08:50:57 UTC (rev 17235) @@ -1299,7 +1299,12 @@ DPRINT("KeSetAffinityThread(Thread %x, Affinity %x)\n", Thread, Affinity); - ASSERT(Affinity & ((1 << KeNumberProcessors) - 1)); + /* Verify correct affinity */ + if ((Affinity & Thread->ApcStatePointer[0]->Process->Affinity) != + Affinity || !Affinity) + { + KEBUGCHECK(INVALID_AFFINITY_SET); + } OldIrql = KeAcquireDispatcherDatabaseLock(); _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-08-09 08:02:05 UTC (rev 17234) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-08-09 08:50:57 UTC (rev 17235) @@ -25,7 +25,7 @@ EXPORTED ULONG NtBuildNumber = KERNEL_VERSION_BUILD; EXPORTED ULONG NtGlobalFlag = 0; EXPORTED CHAR KeNumberProcessors; -EXPORTED KAFFINITY KeActiveProcessors; +EXPORTED KAFFINITY KeActiveProcessors = 1; EXPORTED LOADER_PARAMETER_BLOCK KeLoaderBlock; EXPORTED ULONG KeDcacheFlushCount = 0; EXPORTED ULONG KeIcacheFlushCount = 0; _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2005-08-09 08:02:05 UTC (rev 17234) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2005-08-09 08:50:57 UTC (rev 17235) @@ -213,7 +213,7 @@ /* System threads may run on any processor. */ RtlZeroMemory(PsInitialSystemProcess, sizeof(EPROCESS)); - PsInitialSystemProcess->Pcb.Affinity = 0xFFFFFFFF; + PsInitialSystemProcess->Pcb.Affinity = KeActiveProcessors; PsInitialSystemProcess->Pcb.IopmOffset = 0xffff; PsInitialSystemProcess->Pcb.BasePriority = PROCESS_PRIO_NORMAL; PsInitialSystemProcess->Pcb.QuantumReset = 6; _____ Modified: trunk/reactos/ntoskrnl/ps/query.c --- trunk/reactos/ntoskrnl/ps/query.c 2005-08-09 08:02:05 UTC (rev 17234) +++ trunk/reactos/ntoskrnl/ps/query.c 2005-08-09 08:50:57 UTC (rev 17235) @@ -1194,6 +1194,8 @@ SetInformationData[ThreadInformationClass].Size); } + /* FIXME: This is REALLY wrong. Some types don't need THREAD_SET_INFORMATION */ + /* FIXME: We should also check for certain things before doing the reference */ Status = ObReferenceObjectByHandle (ThreadHandle, THREAD_SET_INFORMATION, PsThreadType, @@ -1218,7 +1220,19 @@ break; case ThreadAffinityMask: - Status = KeSetAffinityThread(&Thread->Tcb, u.Affinity); + + /* Check if this is valid */ + DPRINT1("%lx, %lx\n", Thread->ThreadsProcess->Pcb.Affinity, u.Affinity); + if ((Thread->ThreadsProcess->Pcb.Affinity & u.Affinity) != + u.Affinity) + { + DPRINT1("Wrong affinity given\n"); + Status = STATUS_INVALID_PARAMETER; + } + else + { + Status = KeSetAffinityThread(&Thread->Tcb, u.Affinity); + } break; case ThreadImpersonationToken:

1 0

[ion] 17234: Fix priority formulas, account for saturation, do proper km_um conversions for out of bounds or saturation priorirites, create an internal priority change function to be called if the lock is already held (however it's not efficient yet since ros dispatches instead of schedules, and so the lock is sometimes released, but i did write a small hack to account for that)... this fixes more wine tests
by ion＠svn.reactos.com 09 Aug '05

09 Aug '05

Fix priority formulas, account for saturation, do proper km_um conversions for out of bounds or saturation priorirites, create an internal priority change function to be called if the lock is already held (however it's not efficient yet since ros dispatches instead of schedules, and so the lock is sometimes released, but i did write a small hack to account for that)... this fixes more wine tests Modified: trunk/reactos/lib/kernel32/thread/thread.c Modified: trunk/reactos/ntoskrnl/ke/dpc.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c _____ Modified: trunk/reactos/lib/kernel32/thread/thread.c --- trunk/reactos/lib/kernel32/thread/thread.c 2005-08-09 07:42:00 UTC (rev 17233) +++ trunk/reactos/lib/kernel32/thread/thread.c 2005-08-09 08:02:05 UTC (rev 17234) @@ -15,6 +15,9 @@ #define NDEBUG #include "../include/debug.h" +/* FIXME: NDK */ +#define HIGH_PRIORITY 31 + /* FUNCTIONS *****************************************************************/ _SEH_FILTER(BaseThreadExceptionFilter) { @@ -536,52 +539,77 @@ /* * @implemented */ -BOOL STDCALL +BOOL +STDCALL SetThreadPriority(HANDLE hThread, - int nPriority) + int nPriority) { - ULONG Prio = nPriority; - NTSTATUS Status; + ULONG Prio = nPriority; + NTSTATUS Status; - Status = NtSetInformationThread(hThread, - ThreadBasePriority, - &Prio, - sizeof(ULONG)); + /* Check if values forcing saturation should be used */ + if (Prio == THREAD_PRIORITY_TIME_CRITICAL) + { + Prio = (HIGH_PRIORITY + 1) / 2; + } + else if (Prio == THREAD_PRIORITY_IDLE) + { + Prio = -((HIGH_PRIORITY + 1) / 2); + } - if (!NT_SUCCESS(Status)) + /* Set the Base Priority */ + Status = NtSetInformationThread(hThread, + ThreadBasePriority, + &Prio, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) { - SetLastErrorByStatus(Status); - return(FALSE); + /* Failure */ + SetLastErrorByStatus(Status); + return FALSE; } - return(TRUE); + /* Return */ + return TRUE; } - /* * @implemented */ -int STDCALL +int +STDCALL GetThreadPriority(HANDLE hThread) { - THREAD_BASIC_INFORMATION ThreadBasic; - NTSTATUS Status; + THREAD_BASIC_INFORMATION ThreadBasic; + NTSTATUS Status; - Status = NtQueryInformationThread(hThread, - ThreadBasicInformation, - &ThreadBasic, - sizeof(THREAD_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status)) + /* Query the Base Priority Increment */ + Status = NtQueryInformationThread(hThread, + ThreadBasicInformation, + &ThreadBasic, + sizeof(THREAD_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) { - SetLastErrorByStatus(Status); - return(THREAD_PRIORITY_ERROR_RETURN); + /* Failure */ + SetLastErrorByStatus(Status); + return THREAD_PRIORITY_ERROR_RETURN; } - return(ThreadBasic.BasePriority); + /* Do some conversions for out of boundary values */ + if (ThreadBasic.BasePriority > THREAD_BASE_PRIORITY_MAX) + { + ThreadBasic.BasePriority = THREAD_PRIORITY_TIME_CRITICAL; + } + else if (ThreadBasic.BasePriority < THREAD_BASE_PRIORITY_MIN) + { + ThreadBasic.BasePriority = THREAD_PRIORITY_IDLE; + } + + /* Return the final result */ + return ThreadBasic.BasePriority; } - /* * @implemented */ _____ Modified: trunk/reactos/ntoskrnl/ke/dpc.c --- trunk/reactos/ntoskrnl/ke/dpc.c 2005-08-09 07:42:00 UTC (rev 17233) +++ trunk/reactos/ntoskrnl/ke/dpc.c 2005-08-09 08:02:05 UTC (rev 17234) @@ -465,7 +465,8 @@ if (OldPriority != NewPriority) { /* Set new Priority */ - CurrentThread->Priority = NewPriority; + BOOLEAN Dummy; /* <- This is a hack anyways... */ + KiSetPriorityThread(CurrentThread, NewPriority, &Dummy); } else { _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-08-09 07:42:00 UTC (rev 17233) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-08-09 08:02:05 UTC (rev 17234) @@ -348,8 +348,9 @@ if (Priority != Thread->Priority) { /* - * HACK HACK This isn't nice, but it's the only way with our - * current codebase + * FIXME: This should be a call to KiSetPriorityThread but + * due to the current ""scheduler"" in ROS, it can't be done + * cleanly since it actualyl dispatches threads instead. */ Thread->Priority = Priority; } @@ -1054,121 +1055,231 @@ return BasePriorityIncrement; } -/* - * @implemented - */ -LONG STDCALL -KeSetBasePriorityThread (PKTHREAD Thread, - LONG Increment) -/* - * Sets thread's base priority relative to the process' base priority - * Should only be passed in THREAD_PRIORITY_ constants in pstypes.h - */ +VOID +STDCALL +KiSetPriorityThread(PKTHREAD Thread, + KPRIORITY Priority, + PBOOLEAN Released) { - KPRIORITY Priority; - if (Increment < -2) - { - Increment = -2; - } - else if (Increment > 2) - { - Increment = 2; - } - Priority = ((PETHREAD)Thread)->ThreadsProcess->Pcb.BasePriority + Increment; - if (Priority < LOW_PRIORITY) - { - Priority = LOW_PRIORITY; - } - else if (Priority >= MAXIMUM_PRIORITY) - { - Thread->BasePriority = HIGH_PRIORITY; - } - KeSetPriorityThread(Thread, Priority); - return 1; + KPRIORITY OldPriority = Thread->Priority; + ULONG Mask; + int i; + PKPCR Pcr; + DPRINT("Changing prio to : %lx\n", Priority); + + /* Check if priority changed */ + if (OldPriority != Priority) + { + /* Set it */ + Thread->Priority = Priority; + + /* Choose action based on thread's state */ + if (Thread->State == Ready) + { + /* Remove it from the current queue */ + KiRemoveFromThreadList(Thread); + + /* Re-insert it at its current priority */ + KiInsertIntoThreadList(Priority, Thread); + + /* Check if the old priority was lower */ + if (KeGetCurrentThread()->Priority < Priority) + { + /* Dispatch it immediately */ + KiDispatchThreadNoLock(Ready); + *Released = TRUE; + return; + } + } + else if (Thread->State == Running) + { + /* Check if the new priority is lower */ + if (Priority < OldPriority) + { + /* Check for threads with a higher priority */ + Mask = ~((1 << (Priority + 1)) - 1); + if (PriorityListMask & Mask) + { + /* Found a thread, is it us? */ + if (Thread == KeGetCurrentThread()) + { + /* Dispatch us */ + KiDispatchThreadNoLock(Ready); + *Released = TRUE; + return; + } + else + { + /* Loop every CPU */ + for (i = 0; i < KeNumberProcessors; i++) + { + /* Get the PCR for this CPU */ + Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); + + /* Reschedule if the new one is already on a CPU */ + if (Pcr->Prcb->CurrentThread == Thread) + { + KeReleaseDispatcherDatabaseLockFromDpcLevel(); + KiRequestReschedule(i); + *Released = TRUE; + return; + } + } + } + } + } + } + } + + /* Return to caller */ + return; } /* + * Sets thread's base priority relative to the process' base priority + * Should only be passed in THREAD_PRIORITY_ constants in pstypes.h + * * @implemented */ -KPRIORITY +LONG STDCALL -KeSetPriorityThread(PKTHREAD Thread, - KPRIORITY Priority) +KeSetBasePriorityThread (PKTHREAD Thread, + LONG Increment) { - KPRIORITY OldPriority; KIRQL OldIrql; - PKTHREAD CurrentThread; - ULONG Mask; - int i; - PKPCR Pcr; + PKPROCESS Process; + KPRIORITY Priority; + KPRIORITY CurrentBasePriority; + KPRIORITY BasePriority; + BOOLEAN Released = FALSE; + LONG CurrentIncrement; + + /* Lock the Dispatcher Database */ + OldIrql = KeAcquireDispatcherDatabaseLock(); - if (Priority < LOW_PRIORITY || Priority >= MAXIMUM_PRIORITY) { + /* Get the process and calculate current BP and BPI */ + Process = Thread->ApcStatePointer[0]->Process; + CurrentBasePriority = Thread->BasePriority; + CurrentIncrement = CurrentBasePriority - Process->BasePriority; - KEBUGCHECK(0); + /* Change to use the SI if Saturation was used */ + if (Thread->Saturation) CurrentIncrement = (HIGH_PRIORITY + 1) / 2 * + Thread->Saturation; + + /* Now check if saturation is being used for the new value */ + if (abs(Increment) >= ((HIGH_PRIORITY + 1) / 2)) + { + /* Check if we need positive or negative saturation */ + Thread->Saturation = (Increment > 0) ? 1 : -1; } - OldIrql = KeAcquireDispatcherDatabaseLock(); + /* Normalize the Base Priority */ + BasePriority = Process->BasePriority + Increment; + if (Process->BasePriority >= LOW_REALTIME_PRIORITY) + { + /* Check if it's too low */ + if (BasePriority < LOW_REALTIME_PRIORITY) + BasePriority = LOW_REALTIME_PRIORITY; - OldPriority = Thread->Priority; + /* Check if it's too high */ + if (BasePriority > HIGH_PRIORITY) BasePriority = HIGH_PRIORITY; - if (OldPriority != Priority) { + /* We are at RTP, so use the raw BP */ + Priority = BasePriority; + } + else + { + /* Check if it's entering RTP */ + if (BasePriority >= LOW_REALTIME_PRIORITY) + BasePriority = LOW_REALTIME_PRIORITY - 1; - CurrentThread = KeGetCurrentThread(); + /* Check if it's too low */ + if (BasePriority <= LOW_PRIORITY) + BasePriority = 1; - if (Thread->State == Ready) { + /* If Saturation is used, then use the raw BP */ + if (Thread->Saturation) + { + Priority = BasePriority; + } + else + { + /* Calculate the new priority */ + Priority = Thread->Priority + (BasePriority - CurrentBasePriority)- + Thread->PriorityDecrement; - KiRemoveFromThreadList(Thread); - Thread->BasePriority = Thread->Priority = (CHAR)Priority; - KiInsertIntoThreadList(Priority, Thread); + /* Make sure it won't enter RTP ranges */ + if (Priority >= LOW_REALTIME_PRIORITY) + Priority = LOW_REALTIME_PRIORITY - 1; + } + } - if (CurrentThread->Priority < Priority) { + /* Finally set the new base priority */ + Thread->BasePriority = BasePriority; - KiDispatchThreadNoLock(Ready); - KeLowerIrql(OldIrql); - return (OldPriority); - } + /* Reset the decrements */ + Thread->DecrementCount = 0; + Thread->PriorityDecrement = 0; - } else if (Thread->State == Running) { + /* If the priority will change, reset quantum and change it for real */ + if (Priority != Thread->Priority) + { + Thread->Quantum = Thread->QuantumReset; + KiSetPriorityThread(Thread, Priority, &Released); + } - Thread->BasePriority = Thread->Priority = (CHAR)Priority; + /* Release Lock if needed */ + if (!Released) + { + KeReleaseDispatcherDatabaseLock(OldIrql); + } + else + { + KeLowerIrql(OldIrql); + } - if (Priority < OldPriority) { + /* Return the Old Increment */ + return CurrentIncrement; +} - /* Check for threads with a higher priority */ - Mask = ~((1 << (Priority + 1)) - 1); - if (PriorityListMask & Mask) { +/* + * @implemented + */ +KPRIORITY +STDCALL +KeSetPriorityThread(PKTHREAD Thread, + KPRIORITY Priority) +{ + KPRIORITY OldPriority; + BOOLEAN Released = FALSE; + KIRQL OldIrql; - if (Thread == CurrentThread) { + /* Lock the Dispatcher Database */ + OldIrql = KeAcquireDispatcherDatabaseLock(); - KiDispatchThreadNoLock(Ready); - KeLowerIrql(OldIrql); - return (OldPriority); + /* Save the old Priority */ + OldPriority = Thread->Priority; - } else { + /* Reset the Quantum and Decrements */ + Thread->Quantum = Thread->QuantumReset; + Thread->DecrementCount = 0; + Thread->PriorityDecrement = 0; - for (i = 0; i < KeNumberProcessors; i++) { + /* Set the new Priority */ + KiSetPriorityThread(Thread, Priority, &Released); - Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); - - if (Pcr->Prcb->CurrentThread == Thread) { - - KeReleaseDispatcherDatabaseLockFromDpcLevel(); - KiRequestReschedule(i); - KeLowerIrql(OldIrql); - return (OldPriority); - } - } - } - } - } - } else { - - Thread->BasePriority = Thread->Priority = (CHAR)Priority; - } + /* Release Lock if needed */ + if (!Released) + { + KeReleaseDispatcherDatabaseLock(OldIrql); } + else + { + KeLowerIrql(OldIrql); + } - KeReleaseDispatcherDatabaseLock(OldIrql); - return(OldPriority); + /* Return Old Priority */ + return OldPriority; } /*

1 0

[greatlrd] 17233: Thx Royce3 for notice's a typo error CreateData to CanCreateData in a if statement. But it is not the bug we are looking for.
by greatlrd＠svn.reactos.com 09 Aug '05

09 Aug '05

Thx Royce3 for notice's a typo error CreateData to CanCreateData in a if statement. But it is not the bug we are looking for. Modified: trunk/reactos/lib/ddraw/main/surface.c _____ Modified: trunk/reactos/lib/ddraw/main/surface.c --- trunk/reactos/lib/ddraw/main/surface.c 2005-08-09 06:28:23 UTC (rev 17232) +++ trunk/reactos/lib/ddraw/main/surface.c 2005-08-09 07:42:00 UTC (rev 17233) @@ -72,7 +72,7 @@ if (This->owner->DriverCallbacks.DdMain.CanCreateSurface (&CanCreateData) == DDHAL_DRIVER_NOTHANDLED) return DDERR_INVALIDPARAMS; - if(CreateData.ddRVal != DD_OK) + if(CanCreateData.ddRVal != DD_OK) return CanCreateData.ddRVal;

1 0

[ion] 17232: It is generally considered a bad idea to dereference an object after the reference failed..... this fixes another wine test and avoids a bugcheck
by ion＠svn.reactos.com 09 Aug '05

09 Aug '05

It is generally considered a bad idea to dereference an object after the reference failed..... this fixes another wine test and avoids a bugcheck Modified: trunk/reactos/ntoskrnl/ps/query.c _____ Modified: trunk/reactos/ntoskrnl/ps/query.c --- trunk/reactos/ntoskrnl/ps/query.c 2005-08-09 06:23:16 UTC (rev 17231) +++ trunk/reactos/ntoskrnl/ps/query.c 2005-08-09 06:28:23 UTC (rev 17232) @@ -1233,9 +1233,9 @@ /* Shoult never occure if the data table is correct */ KEBUGCHECK(0); } + ObDereferenceObject (Thread); } - ObDereferenceObject (Thread); - + return Status; }

1 0

[ion] 17231: - Implement KeQueryBasePriorityThread to return the actual Base Priority Increment (or Saturation Increment) to NtQueryInformationThread. The value win32 works with is actually (usually) the difference between process and thread Base Priorities.
by ion＠svn.reactos.com 09 Aug '05

09 Aug '05

- Implement KeQueryBasePriorityThread to return the actual Base Priority Increment (or Saturation Increment) to NtQueryInformationThread. The value win32 works with is actually (usually) the difference between process and thread Base Priorities. This fixes another WINE test. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ps/query.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-08-09 05:54:57 UTC (rev 17230) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-08-09 06:23:16 UTC (rev 17231) @@ -222,6 +222,10 @@ NTSTATUS KeReleaseThread(PKTHREAD Thread); +LONG +STDCALL +KeQueryBasePriorityThread(IN PKTHREAD Thread); + VOID STDCALL KeStackAttachProcess ( _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-08-09 05:54:57 UTC (rev 17230) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-08-09 06:23:16 UTC (rev 17231) @@ -1026,6 +1026,34 @@ } } +LONG +STDCALL +KeQueryBasePriorityThread(IN PKTHREAD Thread) +{ + LONG BasePriorityIncrement; + KIRQL OldIrql; + PKPROCESS Process; + + /* Lock the Dispatcher Database */ + OldIrql = KeAcquireDispatcherDatabaseLock(); + + /* Get the Process */ + Process = Thread->ApcStatePointer[0]->Process; + + /* Calculate the BPI */ + BasePriorityIncrement = Thread->BasePriority - Process->BasePriority; + + /* If saturation occured, return the SI instead */ + if (Thread->Saturation) BasePriorityIncrement = (HIGH_PRIORITY + 1) / 2 * + Thread->Saturation; + + /* Release Lock */ + KeReleaseDispatcherDatabaseLock(OldIrql); + + /* Return Increment */ + return BasePriorityIncrement; +} + /* * @implemented */ _____ Modified: trunk/reactos/ntoskrnl/ps/query.c --- trunk/reactos/ntoskrnl/ps/query.c 2005-08-09 05:54:57 UTC (rev 17230) +++ trunk/reactos/ntoskrnl/ps/query.c 2005-08-09 06:23:16 UTC (rev 17231) @@ -1329,7 +1329,7 @@ u.TBI.ClientId = Thread->Cid; u.TBI.AffinityMask = Thread->Tcb.Affinity; u.TBI.Priority = Thread->Tcb.Priority; - u.TBI.BasePriority = Thread->Tcb.BasePriority; + u.TBI.BasePriority = KeQueryBasePriorityThread(&Thread->Tcb); break; case ThreadTimes:

1 0

[ion] 17230: - Fix NtSuspendThread: correct PreviousMode check, return error if thread is terminating, handle KeSuspendThread's possible exception, only attempt to return previous suspend count if asked to.
by ion＠svn.reactos.com 09 Aug '05

09 Aug '05

- Fix NtSuspendThread: correct PreviousMode check, return error if thread is terminating, handle KeSuspendThread's possible exception, only attempt to return previous suspend count if asked to. - Make KeSuspendThread return an exception if the thread has been suspended beyond the limit. This fixes another wine test. Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ps/suspend.c _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-08-09 04:59:19 UTC (rev 17229) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-08-09 05:54:57 UTC (rev 17230) @@ -14,10 +14,8 @@ #define NDEBUG #include <internal/debug.h> -#ifndef MUTANT_INCREMENT -#define MUTANT_INCREMENT 1 -#endif - +/* FIXME: NDK */ +#define MAXIMUM_SUSPEND_COUNT 0x7F #define THREAD_ALERT_INCREMENT 2 extern EX_WORK_QUEUE ExWorkerQueue[MaximumWorkQueue]; @@ -599,6 +597,14 @@ /* Save the Old Count */ PreviousCount = Thread->SuspendCount; + /* Handle the maximum */ + if (PreviousCount == MAXIMUM_SUSPEND_COUNT) + { + /* Raise an exception */ + KeReleaseDispatcherDatabaseLock(OldIrql); + ExRaiseStatus(STATUS_SUSPEND_COUNT_EXCEEDED); + } + /* Increment it */ Thread->SuspendCount++; _____ Modified: trunk/reactos/ntoskrnl/ps/suspend.c --- trunk/reactos/ntoskrnl/ps/suspend.c 2005-08-09 04:59:19 UTC (rev 17229) +++ trunk/reactos/ntoskrnl/ps/suspend.c 2005-08-09 05:54:57 UTC (rev 17230) @@ -115,25 +115,22 @@ { PETHREAD Thread; ULONG Prev; - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - PreviousMode = ExGetPreviousMode(); - /* Check buffer validity */ - if(PreviousSuspendCount && PreviousMode == UserMode) { - - _SEH_TRY { - + if(PreviousSuspendCount && PreviousMode != KernelMode) + { + _SEH_TRY + { ProbeForWrite(PreviousSuspendCount, sizeof(ULONG), sizeof(ULONG)); - } _SEH_HANDLE { - + } + _SEH_HANDLE + { Status = _SEH_GetExceptionCode(); - } _SEH_END; if(!NT_SUCCESS(Status)) return Status; @@ -146,30 +143,34 @@ PreviousMode, (PVOID*)&Thread, NULL); - if (!NT_SUCCESS(Status)) { + if (!NT_SUCCESS(Status)) return Status; - return Status; - } + /* Guard with SEH because KeSuspendThread can raise an exception */ + _SEH_TRY + { + /* Make sure the thread isn't terminating */ + if ((Thread != PsGetCurrentThread()) && (Thread->Terminated)) + { + ObDereferenceObject(Thread); + return STATUS_THREAD_IS_TERMINATING; + } - /* Call the Kernel Function */ - Prev = KeSuspendThread(&Thread->Tcb); + /* Call the Kernel function */ + Prev = KeSuspendThread(&Thread->Tcb); - /* Return it */ - if(PreviousSuspendCount) { + /* Return the Previous Count */ + if (PreviousSuspendCount) *PreviousSuspendCount = Prev; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); - _SEH_TRY { + /* Don't fail if we merely couldn't write the handle back */ + if (Status != STATUS_SUSPEND_COUNT_EXCEEDED) Status = STATUS_SUCCESS; + } _SEH_END; - *PreviousSuspendCount = Prev; - - } _SEH_HANDLE { - - Status = _SEH_GetExceptionCode(); - - } _SEH_END; - } - - /* Dereference and Return */ - ObDereferenceObject((PVOID)Thread); + /* Return */ + ObDereferenceObject(Thread); return Status; }

1 0

[ion] 17229: Sigh... yet another misuse of Object Attributes. Developer Note: Object Attributes are used to pass OBJ_ flags. Not Access Flags.
by ion＠svn.reactos.com 09 Aug '05

09 Aug '05

Sigh... yet another misuse of Object Attributes. Developer Note: Object Attributes are used to pass OBJ_ flags. Not Access Flags. Modified: trunk/reactos/subsys/smss/init.c _____ Modified: trunk/reactos/subsys/smss/init.c --- trunk/reactos/subsys/smss/init.c 2005-08-09 04:56:29 UTC (rev 17228) +++ trunk/reactos/subsys/smss/init.c 2005-08-09 04:59:19 UTC (rev 17229) @@ -42,8 +42,8 @@ RtlInitUnicodeString (& EventName, L"\\ReactOSInitDone"); InitializeObjectAttributes(&ObjectAttributes, & EventName, - EVENT_ALL_ACCESS, 0, + 0, NULL); Status = NtOpenEvent(&ReactOSInitEvent, EVENT_ALL_ACCESS,

1 0

[ion] 17228: remove another invalid ObjectAttribute
by ion＠svn.reactos.com 09 Aug '05

09 Aug '05

remove another invalid ObjectAttribute Modified: trunk/reactos/subsys/smss/debug.c _____ Modified: trunk/reactos/subsys/smss/debug.c --- trunk/reactos/subsys/smss/debug.c 2005-08-09 04:43:54 UTC (rev 17227) +++ trunk/reactos/subsys/smss/debug.c 2005-08-09 04:56:29 UTC (rev 17228) @@ -92,7 +92,7 @@ RtlInitUnicodeString (& PortName, wcPortName); InitializeObjectAttributes (& ObjectAttributes, & PortName, - PORT_ALL_ACCESS, + 0, NULL, NULL); Status = NtCreatePort (hPort,

1 0

[ion] 17227: - Fix a large amount of bugs in ObpAllocateObjectAttributes & Name
by ion＠svn.reactos.com 09 Aug '05

09 Aug '05

- Fix a large amount of bugs in ObpAllocateObjectAttributes & Name Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-08-09 04:03:14 UTC (rev 17226) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-08-09 04:43:54 UTC (rev 17227) @@ -549,13 +549,15 @@ } /* Block the Thread */ - DPRINT("Blocking the Thread: %d, %d, %d, %x\n", Alertable, WaitMode, WaitReason, KeGetCurrentThread()); + DPRINT("Blocking the Thread: %d, %d, %d, %x\n", Alertable, WaitMode, + WaitReason, KeGetCurrentThread()); KiBlockThread(&Status, Alertable, WaitMode, (UCHAR)WaitReason); /* Check if we were executing an APC */ + DPRINT("Thread is back\n"); if (Status != STATUS_KERNEL_APC) { /* Return Status */ @@ -568,7 +570,7 @@ } while (TRUE); /* Release the Lock, we are done */ - DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n", KeGetCurrentThread(), Status); + DPRINT("Returning, %x. Status: %d\n", KeGetCurrentThread(), Status); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); return Status; @@ -577,7 +579,8 @@ KiAdjustQuantumThread(CurrentThread); /* Release & Return */ - DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n. We did not wait.", KeGetCurrentThread(), Status); + DPRINT("Returning, %x. Status: %d\n. We did not wait.", + KeGetCurrentThread(), Status); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); return Status; } _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-08-09 04:03:14 UTC (rev 17226) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-08-09 04:43:54 UTC (rev 17227) @@ -65,30 +65,26 @@ PVOID Object = NULL; UNICODE_STRING RemainingPath; UNICODE_STRING ObjectName; - OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_CREATE_INFORMATION ObjectCreateInfo; NTSTATUS Status; PAGED_CODE(); - InitializeObjectAttributes(&ObjectAttributes, - ObjectPath, - Attributes | OBJ_OPENIF, - NULL, - NULL); - - /* Capture all the info */ - DPRINT("Capturing Create Info\n"); - Status = ObpCaptureObjectAttributes(&ObjectAttributes, - AccessMode, - ObjectType, - &ObjectCreateInfo, - &ObjectName); + /* Capture the name */ + DPRINT("Capturing Name\n"); + Status = ObpCaptureObjectName(&ObjectName, ObjectPath, AccessMode); if (!NT_SUCCESS(Status)) { - DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); + DPRINT("ObpCaptureObjectName() failed (Status %lx)\n", Status); return Status; } + + /* + * Create a fake ObjectCreateInfo structure. Note that my upcoming + * ObFindObject refactoring will remove the need for this hack. + */ + ObjectCreateInfo.RootDirectory = NULL; + ObjectCreateInfo.Attributes = Attributes; Status = ObFindObject(&ObjectCreateInfo, &ObjectName, @@ -96,7 +92,6 @@ &RemainingPath, ObjectType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-08-09 04:03:14 UTC (rev 17226) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-08-09 04:43:54 UTC (rev 17227) @@ -17,6 +17,7 @@ #define UNICODE_PATH_SEP L'\\' #define UNICODE_NO_PATH L"..." +#define OB_NAME_TAG TAG('O','b','N','m') typedef struct _RETENTION_CHECK_PARAMS { @@ -33,78 +34,85 @@ IN KPROCESSOR_MODE AccessMode) { NTSTATUS Status = STATUS_SUCCESS; + ULONG StringLength; + PWCHAR StringBuffer; UNICODE_STRING LocalName = {}; /* <= GCC 4.0 + Optimizer */ - /* First Probe the String */ - DPRINT("ObpCaptureObjectName: %wZ\n", ObjectName); - if (AccessMode != KernelMode) + /* Initialize the Input String */ + RtlInitUnicodeString(CapturedName, NULL); + + /* Protect everything */ + _SEH_TRY { - DPRINT("Probing Struct\n"); - _SEH_TRY + /* First Probe the String */ + DPRINT("ObpCaptureObjectName: %wZ\n", ObjectName); + if (AccessMode != KernelMode) { - /* FIXME: Explorer or win32 broken I think */ - #if 0 ProbeForRead(ObjectName, sizeof(UNICODE_STRING), sizeof(USHORT)); - #endif LocalName = *ObjectName; + + ProbeForRead(LocalName.Buffer, + LocalName.Length, + sizeof(WCHAR)); } - _SEH_HANDLE + else { - Status = _SEH_GetExceptionCode(); + /* No probing needed */ + LocalName = *ObjectName; } - _SEH_END; - - if (NT_SUCCESS(Status)) + + /* Make sure there really is a string */ + DPRINT("Probing OK\n"); + if ((StringLength = LocalName.Length)) { - DPRINT("Probing OK\n"); - _SEH_TRY + /* Check that the size is a valid WCHAR multiple */ + if ((StringLength & (sizeof(WCHAR) - 1)) || + /* Check that the NULL-termination below will work */ + (StringLength == (MAXUSHORT - sizeof(WCHAR) + 1))) { - #if 0 - DPRINT("Probing buffer\n"); - ProbeForRead(LocalName.Buffer, - LocalName.Length, - sizeof(USHORT)); - #endif + /* PS: Please keep the checks above expanded for clarity */ + DPRINT1("Invalid String Length\n"); + Status = STATUS_OBJECT_NAME_INVALID; } - _SEH_HANDLE + else { - Status = _SEH_GetExceptionCode(); + /* Allocate a non-paged buffer for this string */ + DPRINT("Capturing String\n"); + CapturedName->Length = StringLength; + CapturedName->MaximumLength = StringLength + sizeof(WCHAR); + if ((StringBuffer = ExAllocatePoolWithTag(NonPagedPool, + StringLength + sizeof(WCHAR), + OB_NAME_TAG))) + { + /* Copy the string and null-terminate it */ + RtlMoveMemory(StringBuffer, LocalName.Buffer, StringLength); + StringBuffer[StringLength / sizeof(WCHAR)] = UNICODE_NULL; + CapturedName->Buffer = StringBuffer; + DPRINT("String Captured: %wZ\n", CapturedName); + } + else + { + /* Fail */ + DPRINT1("Out of Memory!\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + } } - _SEH_END; } - - /* Fail if anything up to here died */ - if (!NT_SUCCESS(Status)) - { - DPRINT1("Probing failed\n"); - return Status; - } } - else + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - LocalName = *ObjectName; + Status = _SEH_GetExceptionCode(); + + /* Remember to free the buffer in case of failure */ + DPRINT1("Failed\n"); + if (StringBuffer) ExFreePool(StringBuffer); } + _SEH_END; - /* Make sure there really is a string */ - DPRINT("Probing OK\n"); - if (LocalName.Length) - { - /* Allocate a non-paged buffer for this string */ - DPRINT("Capturing String\n"); - CapturedName->Length = LocalName.Length; - CapturedName->MaximumLength = LocalName.Length + sizeof(WCHAR); - CapturedName->Buffer = ExAllocatePoolWithTag(NonPagedPool, - CapturedName->MaximumLength, - TAG('O','b','N','m')); - - /* Copy the string and null-terminate it */ - RtlMoveMemory(CapturedName->Buffer, LocalName.Buffer, LocalName.Length); - CapturedName->Buffer[LocalName.Length / sizeof(WCHAR)] = UNICODE_NULL; - DPRINT("String Captured: %p, %wZ\n", CapturedName, CapturedName); - } - + /* Return */ + DPRINT("Returning: %lx\n", Status); return Status; } @@ -125,115 +133,102 @@ DPRINT("ObpCaptureObjectAttributes\n"); RtlZeroMemory(ObjectCreateInfo, sizeof(OBJECT_CREATE_INFORMATION)); - /* Check if we got Oba */ - if (ObjectAttributes) + /* SEH everything here for protection */ + _SEH_TRY { - if (AccessMode != KernelMode) + /* Check if we got Oba */ + if (ObjectAttributes) { - DPRINT("Probing OBA\n"); - _SEH_TRY + if (AccessMode != KernelMode) { - /* FIXME: SMSS SENDS BULLSHIT. */ - #if 0 + DPRINT("Probing OBA\n"); ProbeForRead(ObjectAttributes, - sizeof(ObjectAttributes), + sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); - #endif } - _SEH_HANDLE + + /* Validate the Size and Attributes */ + DPRINT("Validating OBA\n"); + if ((ObjectAttributes->Length != sizeof(OBJECT_ATTRIBUTES)) || + (ObjectAttributes->Attributes & ~OBJ_VALID_ATTRIBUTES)) { - Status = _SEH_GetExceptionCode(); + Status = STATUS_INVALID_PARAMETER; + DPRINT1("Invalid Size: %lx or Attributes: %lx\n", + ObjectAttributes->Length, ObjectAttributes->Attributes); + goto Quickie; } - _SEH_END; - } - /* Validate the Size */ - DPRINT("Validating OBA\n"); - if (ObjectAttributes->Length != sizeof(OBJECT_ATTRIBUTES)) - { - Status = STATUS_INVALID_PARAMETER; - } - - /* Fail if SEH or Size Validation failed */ - if(!NT_SUCCESS(Status)) - { - DPRINT1("ObpCaptureObjectAttributes failed to probe object attributes\n"); - goto fail; - } + /* Set some Create Info */ + DPRINT("Creating OBCI\n"); + ObjectCreateInfo->RootDirectory = ObjectAttributes->RootDirectory; + ObjectCreateInfo->Attributes = ObjectAttributes->Attributes; + LocalObjectName = ObjectAttributes->ObjectName; + SecurityDescriptor = ObjectAttributes->SecurityDescriptor; + SecurityQos = ObjectAttributes->SecurityQualityOfService; - /* Set some Create Info */ - DPRINT("Creating OBCI\n"); - ObjectCreateInfo->RootDirectory = ObjectAttributes->RootDirectory; - ObjectCreateInfo->Attributes = ObjectAttributes->Attributes; - LocalObjectName = ObjectAttributes->ObjectName; - SecurityDescriptor = ObjectAttributes->SecurityDescriptor; - SecurityQos = ObjectAttributes->SecurityQualityOfService; - - /* Validate the SD */ - if (SecurityDescriptor) - { - DPRINT("Probing SD: %x\n", SecurityDescriptor); - Status = SeCaptureSecurityDescriptor(SecurityDescriptor, - AccessMode, - NonPagedPool, - TRUE, - &ObjectCreateInfo->SecurityDescriptor); - if(!NT_SUCCESS(Status)) + /* Validate the SD */ + if (SecurityDescriptor) { - DPRINT1("Unable to capture the security descriptor!!!\n"); - ObjectCreateInfo->SecurityDescriptor = NULL; - goto fail; - } + DPRINT("Probing SD: %x\n", SecurityDescriptor); + Status = SeCaptureSecurityDescriptor(SecurityDescriptor, + AccessMode, + NonPagedPool, + TRUE, + &ObjectCreateInfo->SecurityDescriptor); + if(!NT_SUCCESS(Status)) + { + DPRINT1("Unable to capture the security descriptor!!!\n"); + ObjectCreateInfo->SecurityDescriptor = NULL; + goto Quickie; + } - DPRINT("Probe done\n"); - ObjectCreateInfo->SecurityDescriptorCharge = 0; /* FIXME */ - ObjectCreateInfo->ProbeMode = AccessMode; - } + DPRINT("Probe done\n"); + ObjectCreateInfo->SecurityDescriptorCharge = 2048; /* FIXME */ + ObjectCreateInfo->ProbeMode = AccessMode; + } - /* Validate the QoS */ - if (SecurityQos) - { - if (AccessMode != KernelMode) + /* Validate the QoS */ + if (SecurityQos) { - DPRINT("Probing QoS\n"); - _SEH_TRY + if (AccessMode != KernelMode) { + DPRINT("Probing QoS\n"); ProbeForRead(SecurityQos, sizeof(SECURITY_QUALITY_OF_SERVICE), sizeof(ULONG)); } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - if(!NT_SUCCESS(Status)) - { - DPRINT1("Unable to capture QoS!!!\n"); - goto fail; - } - ObjectCreateInfo->SecurityQualityOfService = *SecurityQos; - ObjectCreateInfo->SecurityQos = &ObjectCreateInfo->SecurityQualityOfService; + /* Save Info */ + ObjectCreateInfo->SecurityQualityOfService = *SecurityQos; + ObjectCreateInfo->SecurityQos = &ObjectCreateInfo->SecurityQualityOfService; + } } + else + { + LocalObjectName = NULL; + } } - - /* Clear Local Object Name */ - DPRINT("Clearing name\n"); - RtlZeroMemory(ObjectName, sizeof(UNICODE_STRING)); - + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + Status = _SEH_GetExceptionCode(); + DPRINT1("Failed\n"); + goto Quickie; + } + _SEH_END; + /* Now check if the Object Attributes had an Object Name */ if (LocalObjectName) { - DPRINT("Name Buffer: %x\n", LocalObjectName->Buffer); + DPRINT("Name Buffer: %wZ\n", LocalObjectName); Status = ObpCaptureObjectName(ObjectName, LocalObjectName, AccessMode); } else { + /* Clear the string */ + RtlInitUnicodeString(ObjectName, NULL); + /* He can't have specified a Root Directory */ if (ObjectCreateInfo->RootDirectory) { @@ -242,14 +237,14 @@ } } -fail: +Quickie: if (!NT_SUCCESS(Status)) { DPRINT1("Failed to capture, cleaning up\n"); ObpReleaseCapturedAttributes(ObjectCreateInfo); } - DPRINT("Return to caller\n"); + DPRINT("Return to caller %x\n", Status); return Status; } @@ -795,7 +790,7 @@ /* Capture all the info */ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, - AccessMode, + ObjectAttributesAccessMode, Type, ObjectCreateInfo, &ObjectName);

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