Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 37134: - Enable building ntkrnlmp - SMP kernel now compiles. It doesn't boot and it won't run as we lack ACPI, SMT, a (proper) MP HAL, IPI and more. - Dedicated to Aleksey, Alex and KJK <3 <3 <3
by sginsberg＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: sginsberg Date: Sat Nov 1 13:21:39 2008 New Revision: 37134 URL: http://svn.reactos.org/svn/reactos?rev=37134&view=rev Log: - Enable building ntkrnlmp - SMP kernel now compiles. It doesn't boot and it won't run as we lack ACPI, SMT, a (proper) MP HAL, IPI and more. - Dedicated to Aleksey, Alex and KJK <3 <3 <3 Modified: trunk/reactos/ReactOS-generic.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Sat Nov 1 13:21:39 2008 @@ -110,7 +110,7 @@ </directory> <directory name="ntoskrnl"> <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> -  + <xi:include href="ntoskrnl/ntkrnlmp.rbuild" /> </directory> <directory name="subsystems"> <xi:include href="subsystems/subsystems.rbuild" />

1 0

[sginsberg] 37133: - Implement the MP case for KiTimerExpiration and KiTimerListExpire
by sginsberg＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: sginsberg Date: Sat Nov 1 13:16:17 2008 New Revision: 37133 URL: http://svn.reactos.org/svn/reactos?rev=37133&view=rev Log: - Implement the MP case for KiTimerExpiration and KiTimerListExpire Modified: trunk/reactos/ntoskrnl/ke/dpc.c Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=3713… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] Sat Nov 1 13:16:17 2008 @@ -92,6 +92,9 @@ ULONG Period; DPC_QUEUE_ENTRY DpcEntry[MAX_TIMER_DPCS]; PKSPIN_LOCK_QUEUE LockQueue; +#ifdef CONFIG_SMP + PKPRCB Prcb = KeGetCurrentPrcb(); +#endif /* Disable interrupts */ _disable(); @@ -182,19 +185,38 @@ } /* Check if we have a DPC */ -#ifndef CONFIG_SMP if (TimerDpc) { - /* Setup the DPC Entry */ - DpcEntry[DpcCalls].Dpc = TimerDpc; - DpcEntry[DpcCalls].Routine = TimerDpc->DeferredRoutine; - DpcEntry[DpcCalls].Context = TimerDpc->DeferredContext; - DpcCalls++; - ASSERT(DpcCalls < MAX_TIMER_DPCS); +#ifdef CONFIG_SMP + /* + * If the DPC is targeted to another processor, + * then insert it into that processor's DPC queue + * instead of delivering it now. + * If the DPC is a threaded DPC, and the current CPU + * has threaded DPCs enabled (KiExecuteDpc is actively parsing DPCs), + * then also insert it into the DPC queue for threaded delivery, + * instead of doing it here. + */ + if (((TimerDpc->Number >= MAXIMUM_PROCESSORS) && + ((TimerDpc->Number - MAXIMUM_PROCESSORS) != Prcb->Number)) || + ((TimerDpc->Type == ThreadedDpcObject) && (Prcb->ThreadDpcEnable))) + { + /* Queue it */ + KeInsertQueueDpc(TimerDpc, + UlongToPtr(SystemTime.LowPart), + UlongToPtr(SystemTime.HighPart)); + } + else +#endif + { + /* Setup the DPC Entry */ + DpcEntry[DpcCalls].Dpc = TimerDpc; + DpcEntry[DpcCalls].Routine = TimerDpc->DeferredRoutine; + DpcEntry[DpcCalls].Context = TimerDpc->DeferredContext; + DpcCalls++; + ASSERT(DpcCalls < MAX_TIMER_DPCS); + } } -#else -#error MP Case: Need to check the DPC target CPU so see if we can piggyback -#endif /* Check if we're done processing */ if (!(ActiveTimers) || !(Timers)) @@ -311,7 +333,10 @@ PKDPC TimerDpc; ULONG Period; DPC_QUEUE_ENTRY DpcEntry[MAX_TIMER_DPCS]; - +#ifdef CONFIG_SMP + PKPRCB Prcb = KeGetCurrentPrcb(); +#endif + /* Query system */ KeQuerySystemTime((PLARGE_INTEGER)&SystemTime); @@ -357,21 +382,40 @@ Interval.QuadPart = Int32x32To64(Period, -10000); while (!KiInsertTreeTimer(Timer, Interval)); } - + /* Check if we have a DPC */ -#ifndef CONFIG_SMP if (TimerDpc) { - /* Setup the DPC Entry */ - DpcEntry[DpcCalls].Dpc = TimerDpc; - DpcEntry[DpcCalls].Routine = TimerDpc->DeferredRoutine; - DpcEntry[DpcCalls].Context = TimerDpc->DeferredContext; - DpcCalls++; - ASSERT(DpcCalls < MAX_TIMER_DPCS); - } -#else -#error MP Case: Need to check the DPC target CPU so see if we can piggyback +#ifdef CONFIG_SMP + /* + * If the DPC is targeted to another processor, + * then insert it into that processor's DPC queue + * instead of delivering it now. + * If the DPC is a threaded DPC, and the current CPU + * has threaded DPCs enabled (KiExecuteDpc is actively parsing DPCs), + * then also insert it into the DPC queue for threaded delivery, + * instead of doing it here. + */ + if (((TimerDpc->Number >= MAXIMUM_PROCESSORS) && + ((TimerDpc->Number - MAXIMUM_PROCESSORS) != Prcb->Number)) || + ((TimerDpc->Type == ThreadedDpcObject) && (Prcb->ThreadDpcEnable))) + { + /* Queue it */ + KeInsertQueueDpc(TimerDpc, + UlongToPtr(SystemTime.LowPart), + UlongToPtr(SystemTime.HighPart)); + } + else #endif + { + /* Setup the DPC Entry */ + DpcEntry[DpcCalls].Dpc = TimerDpc; + DpcEntry[DpcCalls].Routine = TimerDpc->DeferredRoutine; + DpcEntry[DpcCalls].Context = TimerDpc->DeferredContext; + DpcCalls++; + ASSERT(DpcCalls < MAX_TIMER_DPCS); + } + } } /* Check if we still have DPC entries */

1 0

[fireball] 37132: - Refactor timer code to share more macros (see http://www.dcl.hpi.uni-potsdam.de/research/WRK/?p=32). - Implement expiring timers when the user changes the system time. Previously these timers would never expire if the time was set past their expiration points. - Fix a bug in KiInsertTreeTimer where, if a timer expired while we inserted it, we kept its Inserted state to TRUE. - Fix a bug where, when changing the system time, the modifications were not done in the correct order
by fireball＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: fireball Date: Sat Nov 1 10:33:05 2008 New Revision: 37132 URL: http://svn.reactos.org/svn/reactos?rev=37132&view=rev Log: - Refactor timer code to share more macros (see http://www.dcl.hpi.uni-potsdam.de/research/WRK/?p=32). - Implement expiring timers when the user changes the system time. Previously these timers would never expire if the time was set past their expiration points. - Fix a bug in KiInsertTreeTimer where, if a timer expired while we inserted it, we kept its Inserted state to TRUE. - Fix a bug where, when changing the system time, the modifications were not done in the correct order, possibly resulting in a race condition happening if someone else was checking the time simultaneously. - Tested with winetest kernel32 timer. - Thanks to Alex and Stefan. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/timerobj.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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Nov 1 10:33:05 2008 @@ -286,6 +286,13 @@ IN ULONG Hand ); +VOID +FASTCALL +KiTimerListExpire( + IN PLIST_ENTRY ExpiredListHead, + IN KIRQL OldIrql +); + BOOLEAN FASTCALL KiInsertTreeTimer( 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Sat Nov 1 10:33:05 2008 @@ -1100,6 +1100,37 @@ } // +// Called from KiCompleteTimer, KiInsertTreeTimer, KeSetSystemTime +// to remove timer entries +// See Windows HPI blog for more information. +VOID +FORCEINLINE +KiRemoveEntryTimer(IN PKTIMER Timer) +{ + ULONG Hand; + PKTIMER_TABLE_ENTRY TableEntry; + + /* Remove the timer from the timer list and check if it's empty */ + Hand = Timer->Header.Hand; + if (RemoveEntryList(&Timer->TimerListEntry)) + { + /* Get the respective timer table entry */ + TableEntry = &KiTimerTableListHead[Hand]; + if (&TableEntry->Entry == TableEntry->Entry.Flink) + { + /* Set the entry to an infinite absolute time */ + TableEntry->Time.HighPart = 0xFFFFFFFF; + } + } + + /* Clear the list entries on dbg builds so we can tell the timer is gone */ +#if DBG + Timer->TimerListEntry.Flink = NULL; + Timer->TimerListEntry.Blink = NULL; +#endif +} + +// // Called by Wait and Queue code to insert a timer for dispatching. // Also called by KeSetTimerEx to insert a timer from the caller. // @@ -1125,6 +1156,57 @@ /* Do nothing, just release the lock */ KiReleaseTimerLock(LockQueue); } +} + +// +// Called by KeSetTimerEx and KiInsertTreeTimer to calculate Due Time +// See the Windows HPI Blog for more information +// +BOOLEAN +FORCEINLINE +KiComputeDueTime(IN PKTIMER Timer, + IN LARGE_INTEGER DueTime, + OUT PULONG Hand) +{ + LARGE_INTEGER InterruptTime, SystemTime, DifferenceTime; + + /* Convert to relative time if needed */ + Timer->Header.Absolute = FALSE; + if (DueTime.HighPart >= 0) + { + /* Get System Time */ + KeQuerySystemTime(&SystemTime); + + /* Do the conversion */ + DifferenceTime.QuadPart = SystemTime.QuadPart - DueTime.QuadPart; + + /* Make sure it hasn't already expired */ + Timer->Header.Absolute = TRUE; + if (DifferenceTime.HighPart >= 0) + { + /* Cancel everything */ + Timer->Header.SignalState = TRUE; + Timer->Header.Hand = 0; + Timer->DueTime.QuadPart = 0; + *Hand = 0; + return FALSE; + } + + /* Set the time as Absolute */ + DueTime = DifferenceTime; + } + + /* Get the Interrupt Time */ + InterruptTime.QuadPart = KeQueryInterruptTime(); + + /* Recalculate due time */ + Timer->DueTime.QuadPart = InterruptTime.QuadPart - DueTime.QuadPart; + + /* Get the handle */ + *Hand = KiComputeTimerTableIndex(Timer->DueTime.QuadPart); + Timer->Header.Hand = (UCHAR)*Hand; + Timer->Header.Inserted = TRUE; + return TRUE; } // Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/clock.c [iso-8859-1] Sat Nov 1 10:33:05 2008 @@ -40,7 +40,6 @@ PKSPIN_LOCK_QUEUE LockQueue; LIST_ENTRY TempList, TempList2; ULONG Hand, i; - PKTIMER_TABLE_ENTRY TimerEntry; /* Sanity checks */ ASSERT((NewTime->HighPart & 0xF0000000) == 0); @@ -57,10 +56,10 @@ /* Query the system time now */ KeQuerySystemTime(OldTime); - /* Set the new system time */ + /* Set the new system time (ordering of these operations is critical) */ + SharedUserData->SystemTime.High2Time = NewTime->HighPart; SharedUserData->SystemTime.LowPart = NewTime->LowPart; SharedUserData->SystemTime.High1Time = NewTime->HighPart; - SharedUserData->SystemTime.High2Time = NewTime->HighPart; /* Check if this was for the HAL and set the RTC time */ if (HalTime) ExCmosClockIsSane = HalSetRealTimeClock(&TimeFields); @@ -98,16 +97,7 @@ if (Timer->Header.Absolute) { /* Remove it from the timer list */ - if (RemoveEntryList(&Timer->TimerListEntry)) - { - /* Get the entry and check if it's empty */ - TimerEntry = &KiTimerTableListHead[Timer->Header.Hand]; - if (IsListEmpty(&TimerEntry->Entry)) - { - /* Clear the time then */ - TimerEntry->Time.HighPart = 0xFFFFFFFF; - } - } + KiRemoveEntryTimer(Timer); /* Insert it into our temporary list */ InsertTailList(&TempList, &Timer->TimerListEntry); @@ -138,16 +128,7 @@ if (KiInsertTimerTable(Timer, Hand)) { /* Remove it from the timer list */ - if (RemoveEntryList(&Timer->TimerListEntry)) - { - /* Get the entry and check if it's empty */ - TimerEntry = &KiTimerTableListHead[Timer->Header.Hand]; - if (IsListEmpty(&TimerEntry->Entry)) - { - /* Clear the time then */ - TimerEntry->Time.HighPart = 0xFFFFFFFF; - } - } + KiRemoveEntryTimer(Timer); /* Insert it into our temporary list */ InsertTailList(&TempList2, &Timer->TimerListEntry); @@ -157,8 +138,8 @@ KiReleaseTimerLock(LockQueue); } - /* FIXME: Process expired timers! */ - KiReleaseDispatcherLock(OldIrql); + /* Process expired timers. This releases the dispatcher lock. */ + KiTimerListExpire(&TempList2, OldIrql); /* Revert affinity */ KeRevertToUserAffinityThread(); Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=3713… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] Sat Nov 1 10:33:05 2008 @@ -86,7 +86,6 @@ LONG Limit, Index, i; ULONG Timers, ActiveTimers, DpcCalls; PLIST_ENTRY ListHead, NextEntry; - PKTIMER_TABLE_ENTRY TimerEntry; KIRQL OldIrql; PKTIMER Timer; PKDPC TimerDpc; @@ -147,16 +146,7 @@ { /* It's expired, remove it */ ActiveTimers--; - if (RemoveEntryList(&Timer->TimerListEntry)) - { - /* Get the entry and check if it's empty */ - TimerEntry = &KiTimerTableListHead[Timer->Header.Hand]; - if (IsListEmpty(&TimerEntry->Entry)) - { - /* Clear the time then */ - TimerEntry->Time.HighPart = 0xFFFFFFFF; - } - } + KiRemoveEntryTimer(Timer); /* Make it non-inserted, unlock it, and signal it */ Timer->Header.Inserted = FALSE; @@ -192,6 +182,7 @@ } /* Check if we have a DPC */ +#ifndef CONFIG_SMP if (TimerDpc) { /* Setup the DPC Entry */ @@ -199,7 +190,11 @@ DpcEntry[DpcCalls].Routine = TimerDpc->DeferredRoutine; DpcEntry[DpcCalls].Context = TimerDpc->DeferredContext; DpcCalls++; + ASSERT(DpcCalls < MAX_TIMER_DPCS); } +#else +#error MP Case: Need to check the DPC target CPU so see if we can piggyback +#endif /* Check if we're done processing */ if (!(ActiveTimers) || !(Timers)) @@ -295,6 +290,108 @@ /* Lower IRQL if we need to */ if (OldIrql != DISPATCH_LEVEL) KeLowerIrql(OldIrql); + } + else + { + /* Unlock the dispatcher */ + KiReleaseDispatcherLock(OldIrql); + } +} + +VOID +FASTCALL +KiTimerListExpire(IN PLIST_ENTRY ExpiredListHead, + IN KIRQL OldIrql) +{ + ULARGE_INTEGER SystemTime; + LARGE_INTEGER Interval; + LONG i; + ULONG DpcCalls = 0; + PKTIMER Timer; + PKDPC TimerDpc; + ULONG Period; + DPC_QUEUE_ENTRY DpcEntry[MAX_TIMER_DPCS]; + + /* Query system */ + KeQuerySystemTime((PLARGE_INTEGER)&SystemTime); + + /* Loop expired list */ + while (ExpiredListHead->Flink != ExpiredListHead) + { + /* Get the current timer */ + Timer = CONTAINING_RECORD(ExpiredListHead->Flink, KTIMER, TimerListEntry); + + /* Remove it */ + RemoveEntryList(&Timer->TimerListEntry); + + /* Not inserted */ + Timer->Header.Inserted = FALSE; + + /* Signal it */ + Timer->Header.SignalState = 1; + + /* Get the DPC and period */ + TimerDpc = Timer->Dpc; + Period = Timer->Period; + + /* Check if there's any waiters */ + if (!IsListEmpty(&Timer->Header.WaitListHead)) + { + /* Check the type of event */ + if (Timer->Header.Type == TimerNotificationObject) + { + /* Unwait the thread */ + KxUnwaitThread(&Timer->Header, IO_NO_INCREMENT); + } + else + { + /* Otherwise unwait the thread and signal the timer */ + KxUnwaitThreadForEvent((PKEVENT)Timer, IO_NO_INCREMENT); + } + } + + /* Check if we have a period */ + if (Period) + { + /* Calculate the interval and insert the timer */ + Interval.QuadPart = Int32x32To64(Period, -10000); + while (!KiInsertTreeTimer(Timer, Interval)); + } + + /* Check if we have a DPC */ +#ifndef CONFIG_SMP + if (TimerDpc) + { + /* Setup the DPC Entry */ + DpcEntry[DpcCalls].Dpc = TimerDpc; + DpcEntry[DpcCalls].Routine = TimerDpc->DeferredRoutine; + DpcEntry[DpcCalls].Context = TimerDpc->DeferredContext; + DpcCalls++; + ASSERT(DpcCalls < MAX_TIMER_DPCS); + } +#else +#error MP Case: Need to check the DPC target CPU so see if we can piggyback +#endif + } + + /* Check if we still have DPC entries */ + if (DpcCalls) + { + /* Release the dispatcher while doing DPCs */ + KiReleaseDispatcherLock(DISPATCH_LEVEL); + + /* Start looping all DPC Entries */ + for (i = 0; DpcCalls; DpcCalls--, i++) + { + /* Call the DPC */ + DpcEntry[i].Routine(DpcEntry[i].Dpc, + DpcEntry[i].Context, + UlongToPtr(SystemTime.LowPart), + UlongToPtr(SystemTime.HighPart)); + } + + /* Lower IRQL */ + KeLowerIrql(OldIrql); } else { Modified: trunk/reactos/ntoskrnl/ke/timerobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timerobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/timerobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/timerobj.c [iso-8859-1] Sat Nov 1 10:33:05 2008 @@ -29,71 +29,29 @@ BOOLEAN Inserted = FALSE; ULONG Hand = 0; PKSPIN_LOCK_QUEUE LockQueue; - LONGLONG DueTime; - LARGE_INTEGER InterruptTime, SystemTime, DifferenceTime; - PKTIMER_TABLE_ENTRY TimerEntry; - DPRINT("KiInsertTreeTimer(): Timer %p, Interval: %I64d\n", Timer, Interval.QuadPart); - /* Convert to relative time if needed */ - Timer->Header.Absolute = FALSE; - if (Interval.HighPart >= 0) - { - /* Get System Time */ - KeQuerySystemTime(&SystemTime); - - /* Do the conversion */ - DifferenceTime.QuadPart = SystemTime.QuadPart - Interval.QuadPart; - - /* Make sure it hasn't already expired */ - Timer->Header.Absolute = TRUE; - if (DifferenceTime.HighPart >= 0) + /* Setup the timer's due time */ + if (KiComputeDueTime(Timer, Interval, &Hand)) + { + /* Acquire the lock */ + LockQueue = KiAcquireTimerLock(Hand); + + /* Insert the timer */ + if (KiInsertTimerTable(Timer, Hand)) { - /* Cancel everything */ - Timer->Header.SignalState = TRUE; - Timer->Header.Hand = 0; - Timer->DueTime.QuadPart = 0; - return FALSE; + /* It was already there, remove it */ + KiRemoveEntryTimer(Timer); + Timer->Header.Inserted = FALSE; } - - /* Set the time as Absolute */ - Interval = DifferenceTime; - } - - /* Get the Interrupt Time */ - InterruptTime.QuadPart = KeQueryInterruptTime(); - - /* Recalculate due time */ - DueTime = InterruptTime.QuadPart - Interval.QuadPart; - Timer->DueTime.QuadPart = DueTime; - - /* Get the handle */ - Hand = KiComputeTimerTableIndex(DueTime); - Timer->Header.Hand = (UCHAR)Hand; - Timer->Header.Inserted = TRUE; - - /* Acquire the lock */ - LockQueue = KiAcquireTimerLock(Hand); - - /* Insert the timer */ - if (KiInsertTimerTable(Timer, Hand)) - { - /* It was already there, remove it */ - if (RemoveEntryList(&Timer->TimerListEntry)) + else { - /* Get the entry and check if it's empty */ - TimerEntry = &KiTimerTableListHead[Hand]; - if (IsListEmpty(&TimerEntry->Entry)) - { - /* Clear the time then */ - TimerEntry->Time.HighPart = 0xFFFFFFFF; - } + /* Otherwise, we're now inserted */ + Inserted = TRUE; } - } - else - { - /* Otherwise, we're now inserted */ - Inserted = TRUE; + + /* Release the lock */ + KiReleaseTimerLock(LockQueue); } /* Release the lock and return insert status */ @@ -110,7 +68,6 @@ BOOLEAN Expired = FALSE; PLIST_ENTRY ListHead, NextEntry; PKTIMER CurrentTimer; - DPRINT("KiInsertTimerTable(): Timer %p, Hand: %d\n", Timer, Hand); /* Check if the period is zero */ @@ -160,7 +117,6 @@ PKDPC Dpc = Timer->Dpc; ULONG Period = Timer->Period; LARGE_INTEGER Interval, SystemTime; - DPRINT("KiSignalTimer(): Timer %p\n", Timer); /* Set default values */ @@ -212,22 +168,11 @@ IN PKSPIN_LOCK_QUEUE LockQueue) { LIST_ENTRY ListHead; - PKTIMER_TABLE_ENTRY TimerEntry; BOOLEAN RequestInterrupt = FALSE; - DPRINT("KiCompleteTimer(): Timer %p, LockQueue: %p\n", Timer, LockQueue); /* Remove it from the timer list */ - if (RemoveEntryList(&Timer->TimerListEntry)) - { - /* Get the entry and check if it's empty */ - TimerEntry = &KiTimerTableListHead[Timer->Header.Hand]; - if (IsListEmpty(&TimerEntry->Entry)) - { - /* Clear the time then */ - TimerEntry->Time.HighPart = 0xFFFFFFFF; - } - } + KiRemoveEntryTimer(Timer); /* Link the timer list to our stack */ ListHead.Flink = &Timer->TimerListEntry; @@ -264,7 +209,6 @@ BOOLEAN Inserted; ASSERT_TIMER(Timer); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); - DPRINT("KeCancelTimer(): Timer %p\n", Timer); /* Lock the Database and Raise IRQL */ @@ -301,7 +245,8 @@ IN TIMER_TYPE Type) { DPRINT("KeInitializeTimerEx(): Timer %p, Type %s\n", - Timer, (Type == NotificationTimer) ? "NotificationTimer" : "SynchronizationTimer"); + Timer, (Type == NotificationTimer) ? + "NotificationTimer" : "SynchronizationTimer"); /* Initialize the Dispatch Header */ KeInitializeDispatcherHeader(&Timer->Header, @@ -352,13 +297,11 @@ KIRQL OldIrql; BOOLEAN Inserted; ULONG Hand = 0; - LARGE_INTEGER InterruptTime, SystemTime, DifferenceTime; BOOLEAN RequestInterrupt = FALSE; ASSERT_TIMER(Timer); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); - DPRINT("KeSetTimerEx(): Timer %p, DueTime %I64d, Period %d, Dpc %p\n", - Timer, DueTime.QuadPart, Period, Dpc); + Timer, DueTime.QuadPart, Period, Dpc); /* Lock the Database and Raise IRQL */ OldIrql = KiAcquireDispatcherLock(); @@ -370,59 +313,24 @@ /* Set Default Timer Data */ Timer->Dpc = Dpc; Timer->Period = Period; - - /* Convert to relative time if needed */ - Timer->Header.Absolute = FALSE; - if (DueTime.HighPart >= 0) - { - /* Get System Time */ - KeQuerySystemTime(&SystemTime); - - /* Do the conversion */ - DifferenceTime.QuadPart = SystemTime.QuadPart - DueTime.QuadPart; - - /* Make sure it hasn't already expired */ - Timer->Header.Absolute = TRUE; - if (DifferenceTime.HighPart >= 0) - { - /* Cancel everything */ - Timer->Header.SignalState = TRUE; - Timer->Header.Hand = 0; - Timer->DueTime.QuadPart = 0; - - /* Signal the timer */ - RequestInterrupt = KiSignalTimer(Timer); - - /* Release the dispatcher lock */ - KiReleaseDispatcherLockFromDpcLevel(); - - /* Check if we need to do an interrupt */ - if (RequestInterrupt) HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - - /* Exit the dispatcher and return the old state */ - KiExitDispatcher(OldIrql); - return Inserted; - } - - /* Set the time as Absolute */ - DueTime = DifferenceTime; - } - - /* Get the Interrupt Time */ - InterruptTime.QuadPart = KeQueryInterruptTime(); - - /* Recalculate due time */ - Timer->DueTime.QuadPart = InterruptTime.QuadPart - DueTime.QuadPart; - - /* Get the handle */ - Hand = KiComputeTimerTableIndex(Timer->DueTime.QuadPart); - Timer->Header.Hand = (UCHAR)Hand; - Timer->Header.Inserted = TRUE; - - /* Insert the timer */ - Timer->Header.SignalState = FALSE; - KxInsertTimer(Timer, Hand); - + if (!KiComputeDueTime(Timer, DueTime, &Hand)) + { + /* Signal the timer */ + RequestInterrupt = KiSignalTimer(Timer); + + /* Release the dispatcher lock */ + KiReleaseDispatcherLockFromDpcLevel(); + + /* Check if we need to do an interrupt */ + if (RequestInterrupt) HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + } + else + { + /* Insert the timer */ + Timer->Header.SignalState = FALSE; + KxInsertTimer(Timer, Hand); + } + /* Exit the dispatcher */ KiExitDispatcher(OldIrql);

1 0

[cgutman] 37131: - Fix a cast
by cgutman＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: cgutman Date: Sat Nov 1 09:38:44 2008 New Revision: 37131 URL: http://svn.reactos.org/svn/reactos?rev=37131&view=rev Log: - Fix a cast Modified: trunk/reactos/drivers/storage/floppy/readwrite.c Modified: trunk/reactos/drivers/storage/floppy/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] Sat Nov 1 09:38:44 2008 @@ -705,7 +705,7 @@ IoMapTransfer(DriveInfo->ControllerInfo->AdapterObject, Irp->MdlAddress, DriveInfo->ControllerInfo->MapRegisterBase, - (PUCHAR)((ULONG_PTR)MmGetMdlVirtualAddress(Irp->MdlAddress) + TransferByteOffset), + (PVOID)((ULONG_PTR)MmGetMdlVirtualAddress(Irp->MdlAddress) + TransferByteOffset), &CurrentTransferBytes, WriteToDevice); /*

1 0

[jimtabor] 37130: - Update NtUserInitialize and show where it belongs.
by jimtabor＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: jimtabor Date: Sat Nov 1 09:31:54 2008 New Revision: 37130 URL: http://svn.reactos.org/svn/reactos?rev=37130&view=rev Log: - Update NtUserInitialize and show where it belongs. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Nov 1 09:31:54 2008 @@ -1724,12 +1724,12 @@ HWND hWndClient, HWND hWndServer); -DWORD +NTSTATUS NTAPI NtUserInitialize( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); + DWORD dwWinVersion, + HANDLE hPowerRequestEvent, + HANDLE hMediaRequestEvent); NTSTATUS NTAPI Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sat Nov 1 09:31:54 2008 @@ -586,8 +586,11 @@ PCSRSS_EXPORTED_FUNCS Exports, HANDLE CsrssApiHeap) { + NTSTATUS Status; CsrExports = *Exports; Win32CsrApiHeap = CsrssApiHeap; + + Status = NtUserInitialize(0 ,NULL, NULL); PrivateCsrssManualGuiCheck(0); CsrInitConsoleSupport(); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] Sat Nov 1 09:31:54 2008 @@ -22,6 +22,11 @@ #include "tuiconsole.h" #include <win32csr.h> +/* Public Win32K Headers */ +#include <win32k/ntusrtyp.h> +#include <win32k/ntuser.h> +#include <win32k/callback.h> + #include <tchar.h> #include <wchar.h> #include <cpl.h> Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Sat Nov 1 09:31:54 2008 @@ -13,6 +13,7 @@ <library>user32</library> <library>gdi32</library> <library>advapi32</library> + <library>win32ksys</library> <library>psapi</library> <library>msvcrt</library> <library>psapi</library> Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sat Nov 1 09:31:54 2008 @@ -805,15 +805,15 @@ return 0; } -DWORD +NTSTATUS NTAPI NtUserInitialize( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - UNIMPLEMENTED; - return 0; + DWORD dwWinVersion, + HANDLE hPowerRequestEvent, + HANDLE hMediaRequestEvent) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; } DWORD

1 0

[pschweitzer] 37129: - Implemented FsRtlInitializeBaseMcb, FsRtlInitializeLargeMcb, FsRtlInitializeLargeMcbs - FsRtlInitSystem now calls FsRtlInitializeLargeMcbs - Moved INT_NOTIIFY_SYNC to fsrtl.h
by pschweitzer＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: pschweitzer Date: Sat Nov 1 07:25:07 2008 New Revision: 37129 URL: http://svn.reactos.org/svn/reactos?rev=37129&view=rev Log: - Implemented FsRtlInitializeBaseMcb, FsRtlInitializeLargeMcb, FsRtlInitializeLargeMcbs - FsRtlInitSystem now calls FsRtlInitializeLargeMcbs - Moved INT_NOTIIFY_SYNC to fsrtl.h Modified: branches/pierre-fsd/ntoskrnl/fsrtl/fsrtlpc.c branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c branches/pierre-fsd/ntoskrnl/fsrtl/notify.c branches/pierre-fsd/ntoskrnl/include/internal/fsrtl.h Modified: branches/pierre-fsd/ntoskrnl/fsrtl/fsrtlpc.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/fsrtl… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/fsrtlpc.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/fsrtlpc.c [iso-8859-1] Sat Nov 1 07:25:07 2008 @@ -168,6 +168,8 @@ IFS_POOL_TAG, 0); + FsRtlInitializeLargeMcbs(); + /* Allocate the Resource Buffer */ FsRtlPagingIoResources = FsRtlAllocatePoolWithTag(NonPagedPool, FSRTL_MAX_RESOURCES * Modified: branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/large… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Sat Nov 1 07:25:07 2008 @@ -13,6 +13,11 @@ #define NDEBUG #include <debug.h> +/* GLOBALS *******************************************************************/ + +PAGED_LOOKASIDE_LIST FsRtlFirstMappingLookasideList; +PAGED_LOOKASIDE_LIST FsRtlFastMutexLookasideList; + /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -94,25 +99,66 @@ } /* - * @unimplemented + * @implemented */ VOID NTAPI FsRtlInitializeBaseMcb(IN PBASE_MCB Mcb, IN POOL_TYPE PoolType) { - KEBUGCHECK(0); -} - -/* - * @unimplemented + Mcb->PairCount = 0; + + if (PoolType == PagedPool) + { + Mcb->Mapping = ExAllocateFromPagedLookasideList(&FsRtlFirstMappingLookasideList); + } + else + { + Mcb->Mapping = FsRtlAllocatePoolWithTag(PoolType, sizeof(INT_MAPPING) * MAXIMUM_PAIR_COUNT, TAG('F', 'S', 'B', 'C')); + } + + Mcb->PoolType = PoolType; + Mcb->MaximumPairCount = MAXIMUM_PAIR_COUNT; +} + +/* + * @implemented */ VOID NTAPI FsRtlInitializeLargeMcb(IN PLARGE_MCB Mcb, IN POOL_TYPE PoolType) { - KEBUGCHECK(0); + Mcb->FastMutex = ExAllocateFromPagedLookasideList(&FsRtlFastMutexLookasideList); + ExInitializeFastMutex(Mcb->FastMutex); + + FsRtlInitializeBaseMcb(&(Mcb->BaseMcb), PoolType); +} + +/* + * @implemented + */ +VOID +NTAPI +FsRtlInitializeLargeMcbs(VOID) +{ + /* Initialize the list for the MCB */ + ExInitializePagedLookasideList(&FsRtlFirstMappingLookasideList, + NULL, + NULL, + POOL_RAISE_IF_ALLOCATION_FAILURE, + sizeof(INT_MAPPING) * MAXIMUM_PAIR_COUNT, + IFS_POOL_TAG, + 0); /* FIXME: Should be 4 */ + + /* Initialize the list for the fast mutex */ + ExInitializePagedLookasideList(&FsRtlFastMutexLookasideList, + NULL, + NULL, + POOL_RAISE_IF_ALLOCATION_FAILURE, + sizeof(FAST_MUTEX), + IFS_POOL_TAG, + 0); /* FIXME: Should be 32 */ } /* Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/notif… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] Sat Nov 1 07:25:07 2008 @@ -11,13 +11,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -typedef struct _INT_NOTIFY_SYNC -{ - FAST_MUTEX FastMutex; - ULONG_PTR OwningThread; - ULONG OwnerCount; -} INT_NOTIFY_SYNC, * PINT_NOTIFY_SYNC; /* PUBLIC FUNCTIONS **********************************************************/ Modified: branches/pierre-fsd/ntoskrnl/include/internal/fsrtl.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/include/int… ============================================================================== --- branches/pierre-fsd/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] Sat Nov 1 07:25:07 2008 @@ -45,8 +45,38 @@ #define FSRTL_MAX_RESOURCES 16 // +// Number of maximum pair count per MCB +// +#define MAXIMUM_PAIR_COUNT 15 + +// +// Internal structure for NOTIFY_SYNC +// +typedef struct _INT_NOTIFY_SYNC +{ + FAST_MUTEX FastMutex; + ULONG_PTR OwningThread; + ULONG OwnerCount; +} INT_NOTIFY_SYNC, * PINT_NOTIFY_SYNC; + +// +// Internal structure for MCB Mapping pointer +// +typedef struct _INT_MAPPING +{ + VBN Vbn; + LBN Lbn; +} INT_MAPPING, *PINT_MAPPING; + +// // Initialization Routines // +VOID +NTAPI +FsRtlInitializeLargeMcbs( + VOID +); + BOOLEAN NTAPI FsRtlInitSystem(

1 0

[jimtabor] 37128: - Update NtGdiGetGlyphOutline and NtGdiGetGlyphIndicesW.
by jimtabor＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: jimtabor Date: Sat Nov 1 07:08:07 2008 New Revision: 37128 URL: http://svn.reactos.org/svn/reactos?rev=37128&view=rev Log: - Update NtGdiGetGlyphOutline and NtGdiGetGlyphIndicesW. Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Sat Nov 1 07:08:07 2008 @@ -149,22 +149,75 @@ IN LPMAT2 pmat2, IN BOOL bIgnoreRotation) { - ULONG Ret; + ULONG Ret = GDI_ERROR; PDC dc; + PVOID pvBuf = NULL; + GLYPHMETRICS gm; + NTSTATUS Status = STATUS_SUCCESS; + dc = DC_LockDc(hdc); if (!dc) { SetLastWin32Error(ERROR_INVALID_HANDLE); return GDI_ERROR; } + + if (UnsafeBuf && cjBuf) + { + pvBuf = ExAllocatePoolWithTag(PagedPool, cjBuf, TAG_GDITEXT); + if (!pvBuf) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + goto Exit; + } + } + Ret = ftGdiGetGlyphOutline( dc, wch, iFormat, - pgm, + pgm ? &gm : NULL, cjBuf, - UnsafeBuf, + pvBuf, pmat2, bIgnoreRotation); + + if (pvBuf) + { + _SEH_TRY + { + ProbeForWrite(UnsafeBuf, cjBuf, 1); + RtlCopyMemory(UnsafeBuf, pvBuf, cjBuf); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + ExFreePoolWithTag(pvBuf, TAG_GDITEXT); + } + + if (pgm) + { + _SEH_TRY + { + ProbeForWrite(pgm, sizeof(GLYPHMETRICS), 1); + RtlCopyMemory(pgm, &gm, sizeof(GLYPHMETRICS)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + } + + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Ret = GDI_ERROR; + } + +Exit: DC_UnlockDc(dc); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sat Nov 1 07:08:07 2008 @@ -2377,7 +2377,7 @@ OUTLINETEXTMETRICW *potm; INT i; FT_Face face; - WCHAR DefChar = 0; + WCHAR DefChar = 0xffff; PWSTR Buffer = NULL; ULONG Size; @@ -2444,8 +2444,17 @@ for (i = 0; i < cwc; i++) { - Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]); - if (Buffer[i] == 0) Buffer[i] = DefChar; + Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]); + if (Buffer[i] == 0) + { + if (DefChar == 0xffff && FT_IS_SFNT(face)) + { + TT_OS2 *pOS2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); + Buffer[i] = (pOS2->usDefaultChar ? FT_Get_Char_Index(face, pOS2->usDefaultChar) : 0); + } + else + Buffer[i] = DefChar; + } } IntUnLockFreeType; @@ -2518,7 +2527,7 @@ UINT iFormat, LPGLYPHMETRICS pgm, ULONG cjBuf, - OPTIONAL PVOID UnsafeBuf, + PVOID pvBuf, LPMAT2 pmat2, BOOL bIgnoreRotation) { @@ -2527,7 +2536,6 @@ PTEXTOBJ TextObj; PFONTGDI FontGDI; HFONT hFont = 0; - NTSTATUS Status; GLYPHMETRICS gm; ULONG Size; FT_Face ft_face; @@ -2545,13 +2553,12 @@ LONG aveWidth; INT adv, lsb, bbx; /* These three hold to widths of the unrotated chars */ OUTLINETEXTMETRICW *potm; - PVOID pvBuf = NULL; int n = 0; FT_CharMap found = 0, charmap; XFORM xForm; DPRINT("%d, %08x, %p, %08lx, %p, %p\n", wch, iFormat, pgm, - cjBuf, UnsafeBuf, pmat2); + cjBuf, pvBuf, pmat2); Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; @@ -2561,7 +2568,7 @@ hFont = Dc_Attr->hlfntNew; TextObj = TEXTOBJ_LockText(hFont); -// DC_UnlockDc(dc); + if (!TextObj) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -2590,8 +2597,6 @@ { DPRINT("WARNING: No charmap selected!\n"); DPRINT("This font face has %d charmaps\n", ft_face->num_charmaps); - - for (n = 0; n < ft_face->num_charmaps; n++) { @@ -2643,7 +2648,7 @@ { DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); IntUnLockFreeType; - if (potm) ExFreePool(potm); + if (potm) ExFreePoolWithTag(potm, TAG_GDITEXT); return GDI_ERROR; } IntUnLockFreeType; @@ -2721,7 +2726,7 @@ needsTransform = TRUE; } - if (potm) ExFreePool(potm); /* It looks like we are finished with potm ATM.*/ + if (potm) ExFreePoolWithTag(potm, TAG_GDITEXT); /* It looks like we are finished with potm ATM.*/ if (!needsTransform) { @@ -2784,16 +2789,7 @@ IntUnLockFreeType; - if (pgm) - { - Status = MmCopyToCaller(pgm, &gm, sizeof(GLYPHMETRICS)); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return GDI_ERROR; - } - DPRINT("Copied GLYPHMETRICS to User!\n"); - } + if (pgm) RtlCopyMemory(pgm, &gm, sizeof(GLYPHMETRICS)); if (iFormat == GGO_METRICS) { @@ -2806,18 +2802,6 @@ DPRINT1("loaded a bitmap\n"); return GDI_ERROR; } - - if (UnsafeBuf && cjBuf) - { - pvBuf = ExAllocatePoolWithTag(PagedPool, cjBuf, TAG_GDITEXT); - if (pvBuf == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return GDI_ERROR; - } - RtlZeroMemory(pvBuf, cjBuf); - } - switch(iFormat) { @@ -2866,7 +2850,6 @@ default: DPRINT1("loaded glyph format %x\n", ft_face->glyph->format); - if(pvBuf) ExFreePool(pvBuf); return GDI_ERROR; } break; @@ -2885,34 +2868,60 @@ if(!pvBuf || !cjBuf) break; - ft_bitmap.width = width; - ft_bitmap.rows = height; - ft_bitmap.pitch = pitch; - ft_bitmap.pixel_mode = ft_pixel_mode_grays; - ft_bitmap.buffer = pvBuf; - - IntLockFreeType; - if(needsTransform) + switch(ft_face->glyph->format) { - FT_Outline_Transform(&ft_face->glyph->outline, &transMat); + case ft_glyph_format_bitmap: + { + BYTE *src = ft_face->glyph->bitmap.buffer, *dst = pvBuf; + INT h = ft_face->glyph->bitmap.rows; + INT x; + while(h--) + { + for(x = 0; x < pitch; x++) + { + if(x < ft_face->glyph->bitmap.width) + dst[x] = (src[x / 8] & (1 << ( (7 - (x % 8))))) ? 0xff : 0; + else + dst[x] = 0; + } + src += ft_face->glyph->bitmap.pitch; + dst += pitch; + } + return needed; + } + case ft_glyph_format_outline: + { + ft_bitmap.width = width; + ft_bitmap.rows = height; + ft_bitmap.pitch = pitch; + ft_bitmap.pixel_mode = ft_pixel_mode_grays; + ft_bitmap.buffer = pvBuf; + + IntLockFreeType; + if (needsTransform) + { + FT_Outline_Transform(&ft_face->glyph->outline, &transMat); + } + FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); + RtlZeroMemory(ft_bitmap.buffer, cjBuf); + FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); + IntUnLockFreeType; + + if (iFormat == GGO_GRAY2_BITMAP) + mult = 4; + else if (iFormat == GGO_GRAY4_BITMAP) + mult = 16; + else if (iFormat == GGO_GRAY8_BITMAP) + mult = 64; + else + { + return GDI_ERROR; + } + } + default: + DPRINT1("loaded glyph format %x\n", ft_face->glyph->format); + return GDI_ERROR; } - FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); - RtlZeroMemory(ft_bitmap.buffer, cjBuf); - FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap); - IntUnLockFreeType; - - if(iFormat == GGO_GRAY2_BITMAP) - mult = 4; - else if(iFormat == GGO_GRAY4_BITMAP) - mult = 16; - else if(iFormat == GGO_GRAY8_BITMAP) - mult = 64; - else - { - ASSERT(0); - break; - } - start = pvBuf; for(row = 0; row < height; row++) { @@ -3132,24 +3141,10 @@ default: DPRINT1("Unsupported format %d\n", iFormat); - if(pvBuf) ExFreePool(pvBuf); return GDI_ERROR; } - if (pvBuf) - { - Status = MmCopyToCaller(UnsafeBuf, pvBuf, cjBuf); - if (! NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - ExFreePool(pvBuf); - return GDI_ERROR; - } - DPRINT("NtGdiGetGlyphOutline K -> U worked!\n"); - ExFreePool(pvBuf); - } - - DPRINT("NtGdiGetGlyphOutline END and needed %d\n", needed); + DPRINT("ftGdiGetGlyphOutline END and needed %d\n", needed); return needed; }

1 0

[sginsberg] 37127: - Implement most of SMP KeFlushEntireTb (currently unused though) - Update KiTbFlushTimeStamp on both UP and MP after flushing
by sginsberg＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: sginsberg Date: Sat Nov 1 07:01:58 2008 New Revision: 37127 URL: http://svn.reactos.org/svn/reactos?rev=37127&view=rev Log: - Implement most of SMP KeFlushEntireTb (currently unused though) - Update KiTbFlushTimeStamp on both UP and MP after flushing Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sat Nov 1 07:01:58 2008 @@ -994,6 +994,20 @@ return KeLargestCacheLine; } +VOID +NTAPI +KiFlushTargetEntireTb(IN PKIPI_CONTEXT PacketContext, + IN PVOID Ignored1, + IN PVOID Ignored2, + IN PVOID Ignored3) +{ + /* Signal this packet as done */ + KiIpiSignalPacketDone(PacketContext); + + /* Flush the TB for the Current CPU */ + KeFlushCurrentTb(); +} + /* * @implemented */ @@ -1003,19 +1017,50 @@ IN BOOLEAN AllProcessors) { KIRQL OldIrql; +#ifdef CONFIG_SMP + KAFFINITY TargetAffinity; + PKPRCB Prcb = KeGetCurrentPrcb(); +#endif /* Raise the IRQL for the TB Flush */ OldIrql = KeRaiseIrqlToSynchLevel(); #ifdef CONFIG_SMP - /* FIXME: Support IPI Flush */ -#error Not yet implemented! + /* FIXME: Use KiTbFlushTimeStamp to synchronize TB flush */ + + /* Get the current processor affinity, and exclude ourselves */ + TargetAffinity = KeActiveProcessors; + TargetAffinity &= ~KeGetCurrentPrcb()->SetMember; + + /* Make sure this is MP */ + if (TargetAffinity) + { + /* Send an IPI TB flush to the other processors */ + KiIpiSendPacket(TargetAffinity, + KiFlushTargetEntireTb, + NULL, + 0, + NULL); + } #endif - /* Flush the TB for the Current CPU */ + /* Flush the TB for the Current CPU, and update the flush stamp */ KeFlushCurrentTb(); - /* Return to Original IRQL */ +#ifdef CONFIG_SMP + /* If this is MP, wait for the other processors to finish */ + if (TargetAffinity) + { + /* Sanity check */ + ASSERT(Prcb == (volatile PKPRCB)KeGetCurrentPrcb()); + + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); + } +#endif + + /* Update the flush stamp and return to original IRQL */ + InterlockedExchangeAdd(&KiTbFlushTimeStamp, 1); KeLowerIrql(OldIrql); }

1 0

[sginsberg] 37126: - Disable old and unused IPI code, add new NT compatible stubs - KiIpiSendRequest should be a fastcall named KiIpiSend, fix this and fix callers - Implement most of SMP KeIpiGenericCall. Also use KiReverseStallIpiLock instead of an uninitialized "KiIpiLock" - Fix KiIpiServiceRoutine -- 2nd argument should be PKEXCEPTION_FRAME
by sginsberg＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: sginsberg Date: Sat Nov 1 06:44:04 2008 New Revision: 37126 URL: http://svn.reactos.org/svn/reactos?rev=37126&view=rev Log: - Disable old and unused IPI code, add new NT compatible stubs - KiIpiSendRequest should be a fastcall named KiIpiSend, fix this and fix callers - Implement most of SMP KeIpiGenericCall. Also use KiReverseStallIpiLock instead of an uninitialized "KiIpiLock" - Fix KiIpiServiceRoutine -- 2nd argument should be PKEXCEPTION_FRAME Modified: trunk/reactos/include/ndk/kefuncs.h trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/ipi.c trunk/reactos/ntoskrnl/ke/thrdschd.c Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -205,7 +205,7 @@ NTAPI KiIpiServiceRoutine( IN PKTRAP_FRAME TrapFrame, - IN PVOID ExceptionFrame + IN PKEXCEPTION_FRAME ExceptionFrame ); // Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -190,7 +190,7 @@ KeInitializeDpc(Dpc, KiHaltProcessorDpcRoutine, (PVOID)Dpc); KeSetTargetProcessorDpc(Dpc, i); KeInsertQueueDpc(Dpc, NULL, NULL); - KiIpiSendRequest(1 << i, IPI_DPC); + KiIpiSend(1 << i, IPI_DPC); } } KeLowerIrql(OldIrql); 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -327,10 +327,33 @@ /* ipi.c ********************************************************************/ VOID -NTAPI -KiIpiSendRequest( +FASTCALL +KiIpiSend( KAFFINITY TargetSet, ULONG IpiRequest +); + +VOID +NTAPI +KiIpiSendPacket( + IN KAFFINITY TargetProcessors, + IN PKIPI_WORKER WorkerFunction, + IN PKIPI_BROADCAST_WORKER BroadcastFunction, + IN ULONG_PTR Context, + IN PULONG Count +); + +VOID +FASTCALL +KiIpiSignalPacketDone( + IN PKIPI_CONTEXT PacketContext +); + +VOID +FASTCALL +KiIpiSignalPacketDoneAndStall( + IN PKIPI_CONTEXT PacketContext, + IN volatile PULONG ReverseStall ); /* next file ***************************************************************/ 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -594,7 +594,7 @@ if ((NewThread) && !(KeGetPcr()->Number == Cpu)) { /* Send an IPI to request delivery */ - KiIpiSendRequest(AFFINITY_MASK(Cpu), IPI_DPC); + KiIpiSend(AFFINITY_MASK(Cpu), IPI_DPC); } } @@ -751,7 +751,7 @@ if (KeGetPcr()->Number != Processor) { /* Send an IPI to request delivery */ - KiIpiSendRequest(AFFINITY_MASK(Processor), IPI_APC); + KiIpiSend(AFFINITY_MASK(Processor), IPI_APC); } else { Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=3712… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -1130,7 +1130,7 @@ if (i != (LONG)KeGetCurrentProcessorNumber()) { /* Send the IPI and give them one second to catch up */ - KiIpiSendRequest(1 << i, IPI_FREEZE); + KiIpiSend(1 << i, IPI_FREEZE); KeStallExecutionProcessor(1000000); } } Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=3712… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -683,7 +683,7 @@ if (Prcb != CurrentPrcb) { /* It was, request and IPI */ - KiIpiSendRequest(AFFINITY_MASK(Cpu), IPI_DPC); + KiIpiSend(AFFINITY_MASK(Cpu), IPI_DPC); } else { Modified: trunk/reactos/ntoskrnl/ke/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ipi.c?rev=3712… ============================================================================== --- trunk/reactos/ntoskrnl/ke/ipi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/ipi.c [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -14,10 +14,60 @@ /* GLOBALS *******************************************************************/ -KSPIN_LOCK KiIpiLock; +extern KSPIN_LOCK KiReverseStallIpiLock; /* PRIVATE FUNCTIONS *********************************************************/ +VOID +NTAPI +KiIpiGenericCallTarget(IN PKIPI_CONTEXT PacketContext, + IN PVOID BroadcastFunction, + IN PVOID Argument, + IN PVOID Count) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +VOID +FASTCALL +KiIpiSend(IN KAFFINITY TargetProcessors, + IN ULONG IpiRequest) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +VOID +NTAPI +KiIpiSendPacket(IN KAFFINITY TargetProcessors, + IN PKIPI_WORKER WorkerFunction, + IN PKIPI_BROADCAST_WORKER BroadcastFunction, + IN ULONG_PTR Context, + IN PULONG Count) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +VOID +FASTCALL +KiIpiSignalPacketDone(IN PKIPI_CONTEXT PacketContext) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +VOID +FASTCALL +KiIpiSignalPacketDoneAndStall(IN PKIPI_CONTEXT PacketContext, + IN volatile PULONG ReverseStall) +{ + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); +} + +#if 0 VOID NTAPI KiIpiSendRequest(IN KAFFINITY TargetSet, @@ -86,6 +136,7 @@ } #endif } +#endif /* PUBLIC FUNCTIONS **********************************************************/ @@ -95,7 +146,7 @@ BOOLEAN NTAPI KiIpiServiceRoutine(IN PKTRAP_FRAME TrapFrame, - IN PVOID ExceptionFrame) + IN PKEXCEPTION_FRAME ExceptionFrame) { #ifdef CONFIG_SMP PKPRCB Prcb; @@ -141,32 +192,73 @@ KeIpiGenericCall(IN PKIPI_BROADCAST_WORKER Function, IN ULONG_PTR Argument) { -#ifdef CONFIG_SMP -#error Not yet implemented! -#else ULONG_PTR Status; KIRQL OldIrql, OldIrql2; +#ifdef CONFIG_SMP + KAFFINITY Affinity; + ULONG Count; + PKPRCB Prcb = KeGetCurrentPrcb(); +#endif /* Raise to DPC level if required */ OldIrql = KeGetCurrentIrql(); if (OldIrql < DISPATCH_LEVEL) KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); +#ifdef CONFIG_SMP + /* Get current processor count and affinity */ + Count = KeNumberProcessors; + Affinity = KeActiveProcessors; + + /* Exclude ourselves */ + Affinity &= ~KeGetCurrentPrcb()->SetMember; +#endif + /* Acquire the IPI lock */ - KefAcquireSpinLockAtDpcLevel(&KiIpiLock); + KeAcquireSpinLockAtDpcLevel(&KiReverseStallIpiLock); + +#ifdef CONFIG_SMP + /* Make sure this is MP */ + if (Affinity) + { + /* Send an IPI */ + KiIpiSendPacket(Affinity, + KiIpiGenericCallTarget, + Function, + Argument, + &Count); + + /* Spin until the other processors are ready */ + while ((volatile ULONG)Count != 1) YieldProcessor(); + } +#endif /* Raise to IPI level */ KeRaiseIrql(IPI_LEVEL, &OldIrql2); +#ifdef CONFIG_SMP + /* Let the other processors know it is time */ + Count = 0; +#endif + /* Call the function */ Status = Function(Argument); +#ifdef CONFIG_SMP + /* If this is MP, wait for the other processors to finish */ + if (Affinity) + { + /* Sanity check */ + ASSERT(Prcb == (volatile PKPRCB)KeGetCurrentPrcb()); + + /* FIXME: TODO */ + ASSERTMSG("Not yet implemented\n", FALSE); + } +#endif + /* Release the lock */ - KefReleaseSpinLockFromDpcLevel(&KiIpiLock); + KeReleaseSpinLockFromDpcLevel(&KiReverseStallIpiLock); /* Lower IRQL back */ KeLowerIrql(OldIrql); return Status; -#endif -} - -/* EOF */ +} Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Sat Nov 1 06:44:04 2008 @@ -253,7 +253,7 @@ if (KeGetCurrentProcessorNumber() != Thread->NextProcessor) { /* We are, send an IPI */ - KiIpiSendRequest(AFFINITY_MASK(Thread->NextProcessor), IPI_DPC); + KiIpiSend(AFFINITY_MASK(Thread->NextProcessor), IPI_DPC); } return; } @@ -612,7 +612,7 @@ if (KeGetCurrentProcessorNumber() != Processor) { /* We are, send an IPI */ - KiIpiSendRequest(AFFINITY_MASK(Processor), IPI_DPC); + KiIpiSend(AFFINITY_MASK(Processor), IPI_DPC); } } }

1 0

[cgutman] 37125: - Make sure ThunkTable is not NULL before attempting to free it - It gets set to NULL when the thunk is successfully added - I have no idea how this ever worked without this fix
by cgutman＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: cgutman Date: Fri Oct 31 20:00:08 2008 New Revision: 37125 URL: http://svn.reactos.org/svn/reactos?rev=37125&view=rev Log: - Make sure ThunkTable is not NULL before attempting to free it - It gets set to NULL when the thunk is successfully added - I have no idea how this ever worked without this fix Modified: trunk/reactos/ntoskrnl/mm/verifier.c Modified: trunk/reactos/ntoskrnl/mm/verifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/verifier.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/verifier.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/verifier.c [iso-8859-1] Fri Oct 31 20:00:08 2008 @@ -146,7 +146,7 @@ KeLeaveCriticalRegion(); /* Free the table if we failed and return status */ - ExFreePool(ThunkTable); + if (ThunkTable) ExFreePool(ThunkTable); return Status; }

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