Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[cwittich] 25606: replace _sleep with Sleep to fix the gcc 4.x build

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jan 24 00:48:31 2007 New Revision: 25606 URL: http://svn.reactos.org/svn/reactos?rev=25606&view=rev Log: replace _sleep with Sleep to fix the gcc 4.x build Modified: trunk/reactos/dll/cpl/intl_new/currency.c trunk/reactos/dll/cpl/intl_new/date.c trunk/reactos/dll/cpl/intl_new/nums.c trunk/reactos/dll/cpl/intl_new/time.c Modified: trunk/reactos/dll/cpl/intl_new/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/currency.… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/currency.c (original) +++ trunk/reactos/dll/cpl/intl_new/currency.c Wed Jan 24 00:48:31 2007 @@ -715,7 +715,7 @@ InitNegCurrencySumCB(hwndDlg); /* FIXME: */ - _sleep(15); + Sleep(15); UpdateCurrencyLocaleSamples(hwndDlg, LOCALE_USER_DEFAULT); } } Modified: trunk/reactos/dll/cpl/intl_new/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/date.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/date.c (original) +++ trunk/reactos/dll/cpl/intl_new/date.c Wed Jan 24 00:48:31 2007 @@ -596,7 +596,7 @@ if(!SetLongDateFormat(hwndDlg)) break; InitShortDateCB(hwndDlg); /* FIXME: */ - _sleep(15); + Sleep(15); UpdateDateLocaleSamples(hwndDlg, LOCALE_USER_DEFAULT); } } Modified: trunk/reactos/dll/cpl/intl_new/nums.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/nums.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/nums.c (original) +++ trunk/reactos/dll/cpl/intl_new/nums.c Wed Jan 24 00:48:31 2007 @@ -837,7 +837,7 @@ InitNegNumFmtCB(hwndDlg); /* FIXME: */ - _sleep(15); + Sleep(15); /* Update sum format samples */ UpdateNumSamples(hwndDlg, LOCALE_USER_DEFAULT); } Modified: trunk/reactos/dll/cpl/intl_new/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/time.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/time.c (original) +++ trunk/reactos/dll/cpl/intl_new/time.c Wed Jan 24 00:48:31 2007 @@ -523,7 +523,7 @@ /* FIXME: */ - _sleep(15); + Sleep(15); UpdateTimeLocaleSamples(hwndDlg, LOCALE_USER_DEFAULT); } }

17 years, 8 months

[ion] 25605: - Convert KxDelayThreadWait, KxSingleThreadWait, KxMultiThreadWait into macros. - Add KxQueueThreadWait macro based on previous ones. - Add KxSetTimerForThreadWait to initialize the timer during the macros above. Wait timer setup is now done in two phases, which will be required with the new timer code anyway. - Remove IRQL hack from idle loop when delivering DPCs. - Make the wait code use the new macros and make it scale better. - Add some missing definitions to asm.h

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 23 21:39:47 2007 New Revision: 25605 URL: http://svn.reactos.org/svn/reactos?rev=25605&view=rev Log: - Convert KxDelayThreadWait, KxSingleThreadWait, KxMultiThreadWait into macros. - Add KxQueueThreadWait macro based on previous ones. - Add KxSetTimerForThreadWait to initialize the timer during the macros above. Wait timer setup is now done in two phases, which will be required with the new timer code anyway. - Remove IRQL hack from idle loop when delivering DPCs. - Make the wait code use the new macros and make it scale better. - Add some missing definitions to asm.h Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2560… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Tue Jan 23 21:39:47 2007 @@ -19,6 +19,8 @@ #ifndef _ASM_H #define _ASM_H + +//#define NEW_SCHEDULER // // PCR Access @@ -138,6 +140,16 @@ #define EPROCESS_VDM_OBJECTS 0x144 // +// KTIMER_TABLE Offsets +// +#ifdef __ASM__ +#define KTIMER_TABLE_ENTRY 0x00 +#define KTIMER_TABLE_TIME 0x08 +#define TIMER_ENTRY_SIZE 0x10 +#define TIMER_TABLE_SIZE 0x200 +#endif + +// // KPRCB Offsets // #define KPRCB_DR0 0x2F8 @@ -146,6 +158,8 @@ #define KPRCB_DR3 0x304 #define KPRCB_DR6 0x308 #define KPRCB_DR7 0x20C +#define KPRCB_TIMER_HAND 0x964 +#define KPRCB_TIMER_REQUEST 0x968 // // KPCR Offsets 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 Tue Jan 23 21:39:47 2007 @@ -373,126 +373,220 @@ return STATUS_WAIT_0; } -FORCEINLINE -BOOLEAN -KxDelayThreadWait(IN PKTHREAD Thread, - IN BOOLEAN Alertable, - IN KPROCESSOR_MODE WaitMode) -{ - BOOLEAN Swappable; - PKWAIT_BLOCK TimerBlock = &Thread->WaitBlock[TIMER_WAIT_BLOCK]; - - /* Setup the Wait Block */ - Thread->WaitBlockList = TimerBlock; - TimerBlock->NextWaitBlock = TimerBlock; - - /* Link the timer to this Wait Block */ - Thread->Timer.Header.WaitListHead.Flink = &TimerBlock->WaitListEntry; - Thread->Timer.Header.WaitListHead.Blink = &TimerBlock->WaitListEntry; - - /* Clear wait status */ - Thread->WaitStatus = STATUS_WAIT_0; - - /* Setup wait fields */ - Thread->Alertable = Alertable; - Thread->WaitReason = DelayExecution; - Thread->WaitMode = WaitMode; - - /* Check if we can swap the thread's stack */ - Thread->WaitListEntry.Flink = NULL; - Swappable = KiCheckThreadStackSwap(Thread, WaitMode); - - /* Set the wait time */ - Thread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; - return Swappable; -} - -FORCEINLINE -BOOLEAN -KxMultiThreadWait(IN PKTHREAD Thread, - IN PKWAIT_BLOCK WaitBlock, - IN BOOLEAN Alertable, - IN KWAIT_REASON WaitReason, - IN KPROCESSOR_MODE WaitMode) -{ - BOOLEAN Swappable; - PKTIMER ThreadTimer = &Thread->Timer; - - /* Set default wait status */ - Thread->WaitStatus = STATUS_WAIT_0; - - /* Link wait block array to the thread */ - Thread->WaitBlockList = WaitBlock; - - /* Initialize the timer list */ - InitializeListHead(&ThreadTimer->Header.WaitListHead); - - /* Set wait settings */ - Thread->Alertable = Alertable; - Thread->WaitMode = WaitMode; - Thread->WaitReason = WaitReason; - - /* Check if we can swap the thread's stack */ - Thread->WaitListEntry.Flink = NULL; - Swappable = KiCheckThreadStackSwap(Thread, WaitMode); - - /* Set the wait time */ - Thread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; - return Swappable; -} - -FORCEINLINE -BOOLEAN -KxSingleThreadWait(IN PKTHREAD Thread, - IN PKWAIT_BLOCK WaitBlock, - IN PVOID Object, - IN PLARGE_INTEGER Timeout, - IN BOOLEAN Alertable, - IN KWAIT_REASON WaitReason, - IN KPROCESSOR_MODE WaitMode) -{ - BOOLEAN Swappable; - PKWAIT_BLOCK TimerBlock = &Thread->WaitBlock[TIMER_WAIT_BLOCK]; - - /* Setup the Wait Block */ - Thread->WaitBlockList = WaitBlock; - WaitBlock->WaitKey = STATUS_WAIT_0; - WaitBlock->Object = Object; - WaitBlock->WaitType = WaitAny; - - /* Clear wait status */ - Thread->WaitStatus = STATUS_WAIT_0; - - /* Check if we have a timer */ - if (Timeout) - { - /* Pointer to timer block */ - WaitBlock->NextWaitBlock = TimerBlock; - TimerBlock->NextWaitBlock = WaitBlock; - - /* Link the timer to this Wait Block */ - Thread->Timer.Header.WaitListHead.Flink = &TimerBlock->WaitListEntry; - Thread->Timer.Header.WaitListHead.Blink = &TimerBlock->WaitListEntry; - } - else - { - /* No timer block, just ourselves */ - WaitBlock->NextWaitBlock = WaitBlock; - } - - /* Setup wait fields */ - Thread->Alertable = Alertable; - Thread->WaitReason = WaitReason; - Thread->WaitMode = WaitMode; - - /* Check if we can swap the thread's stack */ - Thread->WaitListEntry.Flink = NULL; - Swappable = KiCheckThreadStackSwap(Thread, WaitMode); - - /* Set the wait time */ - Thread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; - return Swappable; -} +VOID +FORCEINLINE +KxSetTimerForThreadWait(IN PKTIMER Timer, + IN LARGE_INTEGER Interval) +{ + LARGE_INTEGER InterruptTime, SystemTime, TimeDifference; + + /* Check the timer's interval to see if it's absolute */ + Timer->Header.Absolute = FALSE; + if (!Timer->Period) Timer->Header.SignalState = FALSE; + if (Interval.HighPart >= 0) + { + /* Get the system time and calculate the relative time */ + KeQuerySystemTime(&SystemTime); + TimeDifference.QuadPart = SystemTime.QuadPart - Interval.QuadPart; + Timer->Header.Absolute = TRUE; + + /* Check if we've already expired */ + if (TimeDifference.HighPart >= 0) + { + /* Reset everything */ + Timer->DueTime.QuadPart = 0; + Timer->Header.SignalState = TRUE; + return; + } + else + { + /* Update the interval */ + Interval = TimeDifference; + } + } + + /* Calculate the due time */ + InterruptTime.QuadPart = KeQueryInterruptTime(); + Timer->DueTime.QuadPart = InterruptTime.QuadPart - Interval.QuadPart; +} + +#define KxDelayThreadWait() \ + \ + /* Setup the Wait Block */ \ + Thread->WaitBlockList = TimerBlock; \ + \ + /* Setup the timer */ \ + KxSetTimerForThreadWait(Timer, *Interval); \ + \ + /* Save the due time for the caller */ \ + DueTime.QuadPart = Timer->DueTime.QuadPart; \ + \ + /* Link the timer to this Wait Block */ \ + TimerBlock->NextWaitBlock = TimerBlock; \ + Timer->Header.WaitListHead.Flink = &TimerBlock->WaitListEntry; \ + Timer->Header.WaitListHead.Blink = &TimerBlock->WaitListEntry; \ + \ + /* Clear wait status */ \ + Thread->WaitStatus = STATUS_SUCCESS; \ + \ + /* Setup wait fields */ \ + Thread->Alertable = Alertable; \ + Thread->WaitReason = DelayExecution; \ + Thread->WaitMode = WaitMode; \ + \ + /* Check if we can swap the thread's stack */ \ + Thread->WaitListEntry.Flink = NULL; \ + Swappable = KiCheckThreadStackSwap(Thread, WaitMode); \ + \ + /* Set the wait time */ \ + Thread->WaitTime = KeTickCount.LowPart; + +#define KxMultiThreadWait() \ + /* Link wait block array to the thread */ \ + Thread->WaitBlockList = WaitBlockArray; \ + \ + /* Reset the index */ \ + Index = 0; \ + \ + /* Loop wait blocks */ \ + do \ + { \ + /* Fill out the wait block */ \ + WaitBlock = &WaitBlockArray[Index]; \ + WaitBlock->Object = Object[Index]; \ + WaitBlock->WaitKey = Index; \ + WaitBlock->WaitType = WaitType; \ + WaitBlock->Thread = Thread; \ + \ + /* Link to next block */ \ + WaitBlock->NextWaitBlock = &WaitBlockArray[Index + 1]; \ + Index++; \ + } while (Index < Count); \ + \ + /* Link the last block */ \ + WaitBlock->NextWaitBlock = WaitBlockArray; \ + \ + /* Set default wait status */ \ + Thread->WaitStatus = STATUS_WAIT_0; \ + \ + /* Check if we have a timer */ \ + if (Timeout) \ + { \ + /* Link to the block */ \ + TimerBlock->NextWaitBlock = WaitBlockArray; \ + \ + /* Setup the timer */ \ + KxSetTimerForThreadWait(Timer, *Timeout); \ + \ + /* Save the due time for the caller */ \ + DueTime.QuadPart = Timer->DueTime.QuadPart; \ + \ + /* Initialize the list */ \ + InitializeListHead(&Timer->Header.WaitListHead); \ + } \ + \ + /* Set wait settings */ \ + Thread->Alertable = Alertable; \ + Thread->WaitMode = WaitMode; \ + Thread->WaitReason = WaitReason; \ + \ + /* Check if we can swap the thread's stack */ \ + Thread->WaitListEntry.Flink = NULL; \ + Swappable = KiCheckThreadStackSwap(Thread, WaitMode); \ + \ + /* Set the wait time */ \ + Thread->WaitTime = KeTickCount.LowPart; + +#define KxSingleThreadWait() \ + /* Setup the Wait Block */ \ + Thread->WaitBlockList = WaitBlock; \ + WaitBlock->WaitKey = STATUS_SUCCESS; \ + WaitBlock->Object = Object; \ + WaitBlock->WaitType = WaitAny; \ + \ + /* Clear wait status */ \ + Thread->WaitStatus = STATUS_SUCCESS; \ + \ + /* Check if we have a timer */ \ + if (Timeout) \ + { \ + /* Setup the timer */ \ + KxSetTimerForThreadWait(Timer, *Timeout); \ + \ + /* Save the due time for the caller */ \ + DueTime.QuadPart = Timer->DueTime.QuadPart; \ + \ + /* Pointer to timer block */ \ + WaitBlock->NextWaitBlock = TimerBlock; \ + TimerBlock->NextWaitBlock = WaitBlock; \ + \ + /* Link the timer to this Wait Block */ \ + Timer->Header.WaitListHead.Flink = &TimerBlock->WaitListEntry; \ + Timer->Header.WaitListHead.Blink = &TimerBlock->WaitListEntry; \ + } \ + else \ + { \ + /* No timer block, just ourselves */ \ + WaitBlock->NextWaitBlock = WaitBlock; \ + } \ + \ + /* Set wait settings */ \ + Thread->Alertable = Alertable; \ + Thread->WaitMode = WaitMode; \ + Thread->WaitReason = WaitReason; \ + \ + /* Check if we can swap the thread's stack */ \ + Thread->WaitListEntry.Flink = NULL; \ + Swappable = KiCheckThreadStackSwap(Thread, WaitMode); \ + \ + /* Set the wait time */ \ + Thread->WaitTime = KeTickCount.LowPart; + +#define KxQueueThreadWait() \ + /* Setup the Wait Block */ \ + Thread->WaitBlockList = WaitBlock; \ + WaitBlock->WaitKey = STATUS_SUCCESS; \ + WaitBlock->Object = Queue; \ + WaitBlock->WaitType = WaitAny; \ + WaitBlock->Thread = Thread; \ + \ + /* Clear wait status */ \ + Thread->WaitStatus = STATUS_SUCCESS; \ + \ + /* Check if we have a timer */ \ + if (Timeout) \ + { \ + /* Setup the timer */ \ + KxSetTimerForThreadWait(Timer, *Timeout); \ + \ + /* Save the due time for the caller */ \ + DueTime.QuadPart = Timer->DueTime.QuadPart; \ + \ + /* Pointer to timer block */ \ + WaitBlock->NextWaitBlock = TimerBlock; \ + TimerBlock->NextWaitBlock = WaitBlock; \ + \ + /* Link the timer to this Wait Block */ \ + Timer->Header.WaitListHead.Flink = &TimerBlock->WaitListEntry; \ + Timer->Header.WaitListHead.Blink = &TimerBlock->WaitListEntry; \ + } \ + else \ + { \ + /* No timer block, just ourselves */ \ + WaitBlock->NextWaitBlock = WaitBlock; \ + } \ + \ + /* Set wait settings */ \ + Thread->Alertable = FALSE; \ + Thread->WaitMode = WaitMode; \ + Thread->WaitReason = WrQueue; \ + \ + /* Check if we can swap the thread's stack */ \ + Thread->WaitListEntry.Flink = NULL; \ + Swappable = KiCheckThreadStackSwap(Thread, WaitMode); \ + \ + /* Set the wait time */ \ + Thread->WaitTime = KeTickCount.LowPart; // // Unwaits a Thread @@ -772,6 +866,27 @@ /* We deliver instantly on UP */ UNREFERENCED_PARAMETER(NeedApc); UNREFERENCED_PARAMETER(Processor); +} + +FORCEINLINE +PKSPIN_LOCK_QUEUE +KiAcquireTimerLock(IN ULONG Hand) +{ + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + + /* Nothing to do on UP */ + UNREFERENCED_PARAMETER(Hand); + return NULL; +} + +FORCEINLINE +VOID +KiReleaseTimerLock(IN PKSPIN_LOCK_QUEUE LockQueue) +{ + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + + /* Nothing to do on UP */ + UNREFERENCED_PARAMETER(LockQueue); } #else @@ -1350,3 +1465,19 @@ /* Return the current mode */ return KeGetCurrentThread()->PreviousMode; } + +VOID +FORCEINLINE +KiInsertWaitTimer(IN PKTIMER Timer) +{ + /* Set default data */ + Timer->Header.Inserted = TRUE; + if (!Timer->Period) Timer->Header.SignalState = FALSE; + + /* Now insert it into the Timer List */ + InsertAscendingList(&KiTimerListHead, + Timer, + KTIMER, + TimerListEntry, + DueTime.QuadPart); +} Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Tue Jan 23 21:39:47 2007 @@ -677,18 +677,9 @@ #endif jz CheckSchedule - /* Raise to DISPATCH_LEVEL */ - mov ecx, DISPATCH_LEVEL - call @KfRaiseIrql@4 - mov edi, eax - /* Handle the above */ lea ecx, [ebx+KPCR_PRCB_DATA] call @KiRetireDpcList@4 - - /* Lower IRQL */ - mov ecx, edi - call @KfLowerIrql@4 CheckSchedule: #ifndef NEW_SCHEDULER Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c (original) +++ trunk/reactos/ntoskrnl/ke/queue.c Tue Jan 23 21:39:47 2007 @@ -244,13 +244,13 @@ PLIST_ENTRY QueueEntry; NTSTATUS Status; PKTHREAD Thread = KeGetCurrentThread(); - KIRQL OldIrql; PKQUEUE PreviousQueue; - PKWAIT_BLOCK WaitBlock; - PKTIMER Timer; + PKWAIT_BLOCK WaitBlock = &Thread->WaitBlock[0]; + PKWAIT_BLOCK TimerBlock = &Thread->WaitBlock[TIMER_WAIT_BLOCK]; + PKTIMER Timer = &Thread->Timer; BOOLEAN Swappable; PLARGE_INTEGER OriginalDueTime = Timeout; - LARGE_INTEGER DueTime, NewDueTime; + LARGE_INTEGER DueTime, NewDueTime, InterruptTime; ASSERT_QUEUE(Queue); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -259,12 +259,14 @@ { /* It is, so next time don't do expect this */ Thread->WaitNext = FALSE; + KxQueueThreadWait(); } else { - /* Lock the Dispatcher Database */ - OldIrql = KiAcquireDispatcherLock(); - Thread->WaitIrql = OldIrql; + /* Raise IRQL to synch, prepare the wait, then lock the database */ + Thread->WaitIrql = KeRaiseIrqlToSynchLevel(); + KxQueueThreadWait(); + KiAcquireDispatcherLockAtDpcLevel(); } /* @@ -314,7 +316,13 @@ /* Check if the entry is valid. If not, bugcheck */ if (!(QueueEntry->Flink) || !(QueueEntry->Blink)) { - KEBUGCHECK(INVALID_WORK_QUEUE_ITEM); + /* Invalid item */ + KeBugCheckEx(INVALID_WORK_QUEUE_ITEM, + (ULONG_PTR)QueueEntry, + (ULONG_PTR)Queue, + (ULONG_PTR)NULL, + (ULONG_PTR)((PWORK_QUEUE_ITEM)QueueEntry)-> + WorkerRoutine); } /* Remove the Entry */ @@ -326,16 +334,14 @@ } else { - /* Use the Thread's Wait Block, it's big enough */ - Thread->WaitBlockList = &Thread->WaitBlock[0]; - /* Check if a kernel APC is pending and we're below APC_LEVEL */ if ((Thread->ApcState.KernelApcPending) && !(Thread->SpecialApcDisable) && (Thread->WaitIrql < APC_LEVEL)) { /* Increment the count and unlock the dispatcher */ Queue->CurrentCount++; - KiReleaseDispatcherLock(Thread->WaitIrql); + KiReleaseDispatcherLockFromDpcLevel(); + KiExitDispatcher(Thread->WaitIrql); } else { @@ -349,94 +355,57 @@ break; } - /* Build the Wait Block */ - WaitBlock = &Thread->WaitBlock[0]; - WaitBlock->Object = (PVOID)Queue; - WaitBlock->WaitKey = STATUS_SUCCESS; - WaitBlock->WaitType = WaitAny; - WaitBlock->Thread = Thread; - Thread->WaitStatus = STATUS_WAIT_0; - - /* Check if we can swap the thread's stack */ - Thread->WaitListEntry.Flink = NULL; - Swappable = KiCheckThreadStackSwap(Thread, WaitMode); - - /* We need to wait for the object... check for a timeout */ + /* Enable the Timeout Timer if there was any specified */ if (Timeout) { - /* Check if it's zero */ - if (!Timeout->QuadPart) + /* Check if the timer expired */ + InterruptTime.QuadPart = KeQueryInterruptTime(); + if (InterruptTime.QuadPart >= Timer->DueTime.QuadPart) { - /* Don't wait. Return and increase pending threads */ + /* It did, so we don't need to wait */ QueueEntry = (PLIST_ENTRY)STATUS_TIMEOUT; Queue->CurrentCount++; break; } - /* - * Set up the Timer. We'll use the internal function so - * that we can hold on to the dispatcher lock. - */ - Timer = &Thread->Timer; - WaitBlock->NextWaitBlock = &Thread->WaitBlock[1]; - WaitBlock = &Thread->WaitBlock[1]; - - /* Set up the Timer Wait Block */ - WaitBlock->Object = (PVOID)Timer; - WaitBlock->Thread = Thread; - WaitBlock->WaitKey = STATUS_TIMEOUT; - WaitBlock->WaitType = WaitAny; - - /* Link the timer to this Wait Block */ - Timer->Header.WaitListHead.Flink = - &WaitBlock->WaitListEntry; - Timer->Header.WaitListHead.Blink = - &WaitBlock->WaitListEntry; - WaitBlock->WaitListEntry.Flink = - &Timer->Header.WaitListHead; - WaitBlock->WaitListEntry.Blink = - &Timer->Header.WaitListHead; - - /* Create Timer */ - if (!KiInsertTimer(Timer, *Timeout)) - { - /* FIXME */ - DPRINT1("If you see this message contact Alex ASAP\n"); - KEBUGCHECK(0); - } - - /* Set timer due time */ - DueTime.QuadPart = Timer->DueTime.QuadPart; + /* It didn't, so activate it */ + Timer->Header.Inserted = TRUE; } - /* Close the loop */ - WaitBlock->NextWaitBlock = &Thread->WaitBlock[0]; - - /* Insert the wait block into the Queues's wait list */ - WaitBlock = &Thread->WaitBlock[0]; + /* Insert the wait block in the list */ InsertTailList(&Queue->Header.WaitListHead, &WaitBlock->WaitListEntry); /* Setup the wait information */ - Thread->WaitMode = WaitMode; - Thread->WaitReason = WrQueue; - Thread->Alertable = FALSE; - Thread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; Thread->State = Waiting; - /* Find a new thread to run */ + /* Add the thread to the wait list */ KiAddThreadToWaitList(Thread, Swappable); + + /* Activate thread swap */ + ASSERT(Thread->WaitIrql <= DISPATCH_LEVEL); + KiSetThreadSwapBusy(Thread); + + /* Check if we have a timer */ + if (Timeout) + { + /* Insert it */ + KiInsertWaitTimer(Timer); + } + else + { + /* Otherwise, unlock the dispatcher */ + KiReleaseDispatcherLockFromDpcLevel(); + } + + /* Do the actual swap */ Status = KiSwapThread(Thread, KeGetCurrentPrcb()); /* Reset the wait reason */ Thread->WaitReason = 0; /* Check if we were executing an APC */ - if (Status != STATUS_KERNEL_APC) - { - /* Done Waiting */ - return (PLIST_ENTRY)Status; - } + if (Status != STATUS_KERNEL_APC) return (PLIST_ENTRY)Status; /* Check if we had a timeout */ if (Timeout) @@ -448,17 +417,17 @@ } } - /* Reacquire the lock */ - OldIrql = KiAcquireDispatcherLock(); - - /* Save the new IRQL and decrease number of waiting threads */ - Thread->WaitIrql = OldIrql; + /* Start another wait */ + Thread->WaitIrql = KeRaiseIrqlToSynchLevel(); + KxQueueThreadWait(); + KiAcquireDispatcherLockAtDpcLevel(); Queue->CurrentCount--; } } /* Unlock Database and return */ - KiReleaseDispatcherLock(Thread->WaitIrql); + KiReleaseDispatcherLockFromDpcLevel(); + KiExitDispatcher(Thread->WaitIrql); return QueueEntry; } Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=256… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Tue Jan 23 21:39:47 2007 @@ -15,6 +15,7 @@ /* PRIVATE FUNCTIONS *********************************************************/ +#if 0 VOID FASTCALL KiWaitSatisfyAll(PKWAIT_BLOCK FirstBlock) @@ -36,6 +37,7 @@ WaitBlock = WaitBlock->NextWaitBlock; } while (WaitBlock != FirstBlock); } +#endif VOID FASTCALL @@ -234,89 +236,122 @@ IN BOOLEAN Alertable, IN PLARGE_INTEGER Interval OPTIONAL) { - PKTIMER ThreadTimer; + PKTIMER Timer; + PKWAIT_BLOCK TimerBlock; PKTHREAD Thread = KeGetCurrentThread(); NTSTATUS WaitStatus; BOOLEAN Swappable; - PLARGE_INTEGER OriginalDueTime = Interval; - LARGE_INTEGER DueTime, NewDueTime; + PLARGE_INTEGER OriginalDueTime; + LARGE_INTEGER DueTime, NewDueTime, InterruptTime; + + /* If this is a user-mode wait of 0 seconds, yield execution */ + if (!(Interval->QuadPart) && (WaitMode != KernelMode)) + { + /* Make sure the wait isn't alertable or interrupting an APC */ + if (!(Alertable) && !(Thread->ApcState.UserApcPending)) + { + /* Yield execution */ + NtYieldExecution(); + } + } + + /* Setup the original time and timer/wait blocks */ + OriginalDueTime = Interval; + Timer = &Thread->Timer; + TimerBlock = &Thread->WaitBlock[TIMER_WAIT_BLOCK]; /* Check if the lock is already held */ - if (Thread->WaitNext) - { - /* Lock is held, disable Wait Next */ - Thread->WaitNext = FALSE; - Swappable = KxDelayThreadWait(Thread, Alertable, WaitMode); - } - else - { - /* Lock not held, acquire it */ + if (!Thread->WaitNext) goto WaitStart; + + /* Otherwise, we already have the lock, so initialize the wait */ + Thread->WaitNext = FALSE; + KxDelayThreadWait(); + + /* Start wait loop */ + for (;;) + { + /* Disable pre-emption */ + Thread->Preempted = FALSE; + + /* Check if a kernel APC is pending and we're below APC_LEVEL */ + if ((Thread->ApcState.KernelApcPending) && !(Thread->SpecialApcDisable) && + (Thread->WaitIrql < APC_LEVEL)) + { + /* Unlock the dispatcher */ + KiReleaseDispatcherLock(Thread->WaitIrql); + } + else + { + /* Check if we have to bail out due to an alerted state */ + WaitStatus = KiCheckAlertability(Thread, Alertable, WaitMode); + if (WaitStatus != STATUS_WAIT_0) break; + + /* Check if the timer expired */ + InterruptTime.QuadPart = KeQueryInterruptTime(); + if (InterruptTime.QuadPart >= Timer->DueTime.QuadPart) + { + /* It did, so we don't need to wait */ + goto NoWait; + } + + /* It didn't, so activate it */ + Timer->Header.Inserted = TRUE; + + /* Handle Kernel Queues */ + if (Thread->Queue) KiActivateWaiterQueue(Thread->Queue); + + /* Setup the wait information */ + Thread->State = Waiting; + + /* Add the thread to the wait list */ + KiAddThreadToWaitList(Thread, Swappable); + + /* Insert the timer and swap the thread */ + ASSERT(Thread->WaitIrql <= DISPATCH_LEVEL); + KiSetThreadSwapBusy(Thread); + KiInsertWaitTimer(Timer); + WaitStatus = KiSwapThread(Thread, KeGetCurrentPrcb()); + + /* Check if were swapped ok */ + if (WaitStatus != STATUS_KERNEL_APC) + { + /* This is a good thing */ + if (WaitStatus == STATUS_TIMEOUT) WaitStatus = STATUS_SUCCESS; + + /* Return Status */ + return WaitStatus; + } + + /* Recalculate due times */ + Interval = KiRecalculateDueTime(OriginalDueTime, + &DueTime, + &NewDueTime); + } + WaitStart: - Thread->WaitIrql = KiAcquireDispatcherLock(); - Swappable = KxDelayThreadWait(Thread, Alertable, WaitMode); - } - - /* Check if a kernel APC is pending and we're below APC_LEVEL */ - if ((Thread->ApcState.KernelApcPending) && !(Thread->SpecialApcDisable) && - (Thread->WaitIrql < APC_LEVEL)) - { - /* Unlock the dispatcher */ + /* Setup a new wait */ + Thread->WaitIrql = KeRaiseIrqlToSynchLevel(); + KxDelayThreadWait(); + KiAcquireDispatcherLockAtDpcLevel(); + } + + /* We're done! */ + KiReleaseDispatcherLock(Thread->WaitIrql); + return WaitStatus; + +NoWait: + /* There was nothing to wait for. Did we have a wait interval? */ + if (!Interval->QuadPart) + { + /* Unlock the dispatcher and do a yield */ KiReleaseDispatcherLock(Thread->WaitIrql); - goto WaitStart; - } - - /* Check if we have to bail out due to an alerted state */ - WaitStatus = KiCheckAlertability(Thread, Alertable, WaitMode); - if (WaitStatus != STATUS_WAIT_0) - { - /* Unlock the dispatcher and return */ - KiReleaseDispatcherLock(Thread->WaitIrql); - return WaitStatus; - } - - /* Set Timer */ - ThreadTimer = &Thread->Timer; - - /* Insert the Timer into the Timer Lists and enable it */ - if (!KiInsertTimer(ThreadTimer, *Interval)) - { - /* FIXME: We should find a new ready thread */ - KiReleaseDispatcherLock(Thread->WaitIrql); - return STATUS_WAIT_0; - } - - /* Save due time */ - DueTime.QuadPart = ThreadTimer->DueTime.QuadPart; - - /* Handle Kernel Queues */ - if (Thread->Queue) KiActivateWaiterQueue(Thread->Queue); - - /* Setup the wait information */ - Thread->State = Waiting; - - /* Add the thread to the wait list */ - KiAddThreadToWaitList(Thread, Swappable); - - /* Swap the thread */ - ASSERT(Thread->WaitIrql <= DISPATCH_LEVEL); - KiSetThreadSwapBusy(Thread); - WaitStatus = KiSwapThread(Thread, KeGetCurrentPrcb()); - - /* Check if we were executing an APC or if we timed out */ - if (WaitStatus == STATUS_KERNEL_APC) - { - /* Recalculate due times */ - Interval = KiRecalculateDueTime(OriginalDueTime, - &DueTime, - &NewDueTime); - goto WaitStart; - } - - /* This is a good thing */ - if (WaitStatus == STATUS_TIMEOUT) WaitStatus = STATUS_SUCCESS; - - /* Return Status */ - return WaitStatus; + return NtYieldExecution(); + } + + /* Unlock the dispatcher and adjust the quantum for a no-wait */ + KiReleaseDispatcherLockFromDpcLevel(); + KiAdjustQuantumThread(Thread); + return STATUS_SUCCESS; } /* @@ -330,157 +365,145 @@ IN BOOLEAN Alertable, IN PLARGE_INTEGER Timeout OPTIONAL) { - PKMUTANT CurrentObject; - PKWAIT_BLOCK WaitBlock; - PKTIMER ThreadTimer; PKTHREAD Thread = KeGetCurrentThread(); + PKMUTANT CurrentObject = (PKMUTANT)Object; + PKWAIT_BLOCK WaitBlock = &Thread->WaitBlock[0]; + PKWAIT_BLOCK TimerBlock = &Thread->WaitBlock[TIMER_WAIT_BLOCK]; + PKTIMER Timer = &Thread->Timer; NTSTATUS WaitStatus; BOOLEAN Swappable; - LARGE_INTEGER DueTime, NewDueTime; + LARGE_INTEGER DueTime, NewDueTime, InterruptTime; PLARGE_INTEGER OriginalDueTime = Timeout; - /* Get wait block */ - WaitBlock = &Thread->WaitBlock[0]; - /* Check if the lock is already held */ - if (Thread->WaitNext) - { - /* Lock is held, disable Wait Next */ - Thread->WaitNext = FALSE; - Swappable = KxSingleThreadWait(Thread, - WaitBlock, - Object, - Timeout, - Alertable, - WaitReason, - WaitMode); - } - else - { -StartWait: - /* Lock not held, acquire it */ - Thread->WaitIrql = KiAcquireDispatcherLock(); - Swappable = KxSingleThreadWait(Thread, - WaitBlock, - Object, - Timeout, - WaitReason, - WaitMode, - Alertable); - } - - /* Check if a kernel APC is pending and we're below APC_LEVEL */ - if ((Thread->ApcState.KernelApcPending) && !(Thread->SpecialApcDisable) && - (Thread->WaitIrql < APC_LEVEL)) - { - /* Unlock the dispatcher and wait again */ - KiReleaseDispatcherLock(Thread->WaitIrql); - goto StartWait; - } - - /* Get the Current Object */ - CurrentObject = (PKMUTANT)Object; - ASSERT(CurrentObject->Header.Type != QueueObject); - - /* 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) || - (Thread == 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, Thread); - WaitStatus = Thread->WaitStatus; + if (!Thread->WaitNext) goto WaitStart; + + /* Otherwise, we already have the lock, so initialize the wait */ + Thread->WaitNext = FALSE; + KxSingleThreadWait(); + + /* Start wait loop */ + for (;;) + { + /* Disable pre-emption */ + Thread->Preempted = FALSE; + + /* Check if a kernel APC is pending and we're below APC_LEVEL */ + if ((Thread->ApcState.KernelApcPending) && !(Thread->SpecialApcDisable) && + (Thread->WaitIrql < APC_LEVEL)) + { + /* Unlock the dispatcher */ + KiReleaseDispatcherLock(Thread->WaitIrql); + } + else + { + /* Sanity check */ + ASSERT(CurrentObject->Header.Type != QueueObject); + + /* 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) || + (Thread == 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, Thread); + WaitStatus = Thread->WaitStatus; + goto DontWait; + } + else + { + /* Raise an exception */ + KiReleaseDispatcherLock(Thread->WaitIrql); + ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); + } + } + } + else if (CurrentObject->Header.SignalState > 0) + { + /* Another satisfied object */ + KiSatisfyNonMutantWait(CurrentObject, Thread); + WaitStatus = STATUS_WAIT_0; goto DontWait; } + + /* Make sure we can satisfy the Alertable request */ + WaitStatus = KiCheckAlertability(Thread, Alertable, WaitMode); + if (WaitStatus != STATUS_WAIT_0) break; + + /* Enable the Timeout Timer if there was any specified */ + if (Timeout) + { + /* Check if the timer expired */ + InterruptTime.QuadPart = KeQueryInterruptTime(); + if (InterruptTime.QuadPart >= Timer->DueTime.QuadPart) + { + /* It did, so we don't need to wait */ + WaitStatus = STATUS_TIMEOUT; + goto DontWait; + } + + /* It didn't, so activate it */ + Timer->Header.Inserted = TRUE; + } + + /* Link the Object to this Wait Block */ + InsertTailList(&CurrentObject->Header.WaitListHead, + &WaitBlock->WaitListEntry); + + /* Handle Kernel Queues */ + if (Thread->Queue) KiActivateWaiterQueue(Thread->Queue); + + /* Setup the wait information */ + Thread->State = Waiting; + + /* Add the thread to the wait list */ + KiAddThreadToWaitList(Thread, Swappable); + + /* Activate thread swap */ + ASSERT(Thread->WaitIrql <= DISPATCH_LEVEL); + KiSetThreadSwapBusy(Thread); + + /* Check if we have a timer */ + if (Timeout) + { + /* Insert it */ + KiInsertWaitTimer(Timer); + } else { - /* Raise an exception */ - KiReleaseDispatcherLock(Thread->WaitIrql); - ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); - } - } - } - else if (CurrentObject->Header.SignalState > 0) - { - /* Another satisfied object */ - KiSatisfyNonMutantWait(CurrentObject, Thread); - WaitStatus = STATUS_WAIT_0; - goto DontWait; - } - - /* Make sure we can satisfy the Alertable request */ - WaitStatus = KiCheckAlertability(Thread, Alertable, WaitMode); - if (WaitStatus != STATUS_WAIT_0) - { - /* Unlock the dispatcher and return */ - KiReleaseDispatcherLock(Thread->WaitIrql); - return WaitStatus; - } - - /* 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; - } - - /* Insert the Timer into the Timer Lists and enable it */ - ThreadTimer = &Thread->Timer; - if (!KiInsertTimer(ThreadTimer, *Timeout)) - { - /* Return a timeout if we couldn't insert the timer */ - WaitStatus = STATUS_TIMEOUT; - goto DontWait; - } - - /* Set the current due time */ - DueTime.QuadPart = ThreadTimer->DueTime.QuadPart; - } - - /* Link the Object to this Wait Block */ - InsertTailList(&CurrentObject->Header.WaitListHead, - &WaitBlock->WaitListEntry); - - /* Handle Kernel Queues */ - if (Thread->Queue) KiActivateWaiterQueue(Thread->Queue); - - /* Setup the wait information */ - Thread->State = Waiting; - - /* Add the thread to the wait list */ - KiAddThreadToWaitList(Thread, Swappable); - - /* Swap the thread */ - ASSERT(Thread->WaitIrql <= DISPATCH_LEVEL); - KiSetThreadSwapBusy(Thread); - WaitStatus = KiSwapThread(Thread, KeGetCurrentPrcb()); - - /* Check if we were executing an APC */ - if (WaitStatus == STATUS_KERNEL_APC) - { - /* Check if we had a timeout */ - if (Timeout) - { - /* Recalculate due times */ - Timeout = KiRecalculateDueTime(OriginalDueTime, - &DueTime, - &NewDueTime); - } - - /* Wait again */ - goto StartWait; + /* Otherwise, unlock the dispatcher */ + KiReleaseDispatcherLockFromDpcLevel(); + } + + /* Do the actual swap */ + WaitStatus = KiSwapThread(Thread, KeGetCurrentPrcb()); + + /* Check if we were executing an APC */ + if (WaitStatus != STATUS_KERNEL_APC) return WaitStatus; + + /* Check if we had a timeout */ + if (Timeout) + { + /* Recalculate due times */ + Timeout = KiRecalculateDueTime(OriginalDueTime, + &DueTime, + &NewDueTime); + } + } +WaitStart: + /* Setup a new wait */ + Thread->WaitIrql = KeRaiseIrqlToSynchLevel(); + KxSingleThreadWait(); + KiAcquireDispatcherLockAtDpcLevel(); } /* Wait complete */ + KiReleaseDispatcherLock(Thread->WaitIrql); return WaitStatus; DontWait: @@ -508,15 +531,14 @@ { PKMUTANT CurrentObject; PKWAIT_BLOCK WaitBlock; - PKWAIT_BLOCK TimerWaitBlock; - PKTIMER ThreadTimer; PKTHREAD Thread = KeGetCurrentThread(); - ULONG AllObjectsSignaled; - ULONG WaitIndex; + PKWAIT_BLOCK TimerBlock = &Thread->WaitBlock[TIMER_WAIT_BLOCK]; + PKTIMER Timer = &Thread->Timer; NTSTATUS WaitStatus = STATUS_SUCCESS; BOOLEAN Swappable; PLARGE_INTEGER OriginalDueTime = Timeout; - LARGE_INTEGER DueTime, NewDueTime; + LARGE_INTEGER DueTime, NewDueTime, InterruptTime; + ULONG Index; /* Make sure the Wait Count is valid */ if (!WaitBlockArray) @@ -545,219 +567,220 @@ ASSERT(Count != 0); /* Check if the lock is already held */ - if (Thread->WaitNext) - { - /* Lock is held, disable Wait Next */ - Thread->WaitNext = FALSE; - } - else - { - /* Lock not held, acquire it */ -StartWait: - Thread->WaitIrql = KiAcquireDispatcherLock(); - } - - /* Prepare for the wait */ - Swappable = KxMultiThreadWait(Thread, - WaitBlockArray, - Alertable, - WaitReason, - WaitMode); - - /* Check if a kernel APC is pending and we're below APC_LEVEL */ - if ((Thread->ApcState.KernelApcPending) && !(Thread->SpecialApcDisable) && - (Thread->WaitIrql < APC_LEVEL)) - { - /* Unlock the dispatcher */ - KiReleaseDispatcherLock(Thread->WaitIrql); - goto StartWait; - } - - /* Append wait block to the KTHREAD wait block list */ - WaitBlock = WaitBlockArray; - - /* 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]; - ASSERT(CurrentObject->Header.Type != QueueObject); - - /* 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) || - (Thread == CurrentObject->OwnerThread)) + if (!Thread->WaitNext) goto WaitStart; + + /* Otherwise, we already have the lock, so initialize the wait */ + Thread->WaitNext = FALSE; + KxMultiThreadWait(); + + /* Start wait loop */ + for (;;) + { + /* Disable pre-emption */ + Thread->Preempted = FALSE; + + /* Check if a kernel APC is pending and we're below APC_LEVEL */ + if ((Thread->ApcState.KernelApcPending) && !(Thread->SpecialApcDisable) && + (Thread->WaitIrql < APC_LEVEL)) + { + /* Unlock the dispatcher */ + KiReleaseDispatcherLock(Thread->WaitIrql); + } + else + { + /* Check what kind of wait this is */ + Index = 0; + if (WaitType == WaitAny) + { + /* Loop blocks */ + do { - /* This is a Wait Any, so unwait this and exit */ - if (CurrentObject->Header.SignalState != - (LONG)MINLONG) + /* Get the Current Object */ + CurrentObject = (PKMUTANT)Object[Index]; + ASSERT(CurrentObject->Header.Type != QueueObject); + + /* Check if the Object is a mutant */ + if (CurrentObject->Header.Type == MutantObject) { - /* Normal signal state, unwait it and return */ - KiSatisfyMutantWait(CurrentObject, Thread); - WaitStatus = Thread->WaitStatus | WaitIndex; + /* Check if it's signaled */ + if ((CurrentObject->Header.SignalState > 0) || + (Thread == 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, Thread); + WaitStatus = Thread->WaitStatus | Index; + goto DontWait; + } + else + { + /* Raise an exception (see wasm.ru) */ + KiReleaseDispatcherLock(Thread->WaitIrql); + ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); + } + } + } + else if (CurrentObject->Header.SignalState > 0) + { + /* Another signaled object, unwait and return */ + KiSatisfyNonMutantWait(CurrentObject, Thread); + WaitStatus = Index; goto DontWait; } - else + + /* Go to the next block */ + Index++; + } while (Index < Count); + } + else + { + /* Loop blocks */ + do + { + /* Get the Current Object */ + CurrentObject = (PKMUTANT)Object[Index]; + ASSERT(CurrentObject->Header.Type != QueueObject); + + /* Check if we're dealing with a mutant again */ + if (CurrentObject->Header.Type == MutantObject) { - /* Raise an exception (see wasm.ru) */ - KiReleaseDispatcherLock(Thread->WaitIrql); - ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); + /* Check if it has an invalid count */ + if ((Thread == CurrentObject->OwnerThread) && + (CurrentObject->Header.SignalState == MINLONG)) + { + /* Raise an exception */ + KiReleaseDispatcherLock(Thread->WaitIrql); + ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); + } + else if ((CurrentObject->Header.SignalState <= 0) && + (Thread != CurrentObject->OwnerThread)) + { + /* We don't own it, can't satisfy the wait */ + break; + } } + else if (CurrentObject->Header.SignalState <= 0) + { + /* Not signaled, can't satisfy */ + break; + } + + /* Go to the next block */ + Index++; + } while (Index < Count); + + /* Check if we've went through all the objects */ + if (Index == Count) + { + /* Loop wait blocks */ + WaitBlock = WaitBlockArray; + do + { + /* Get the object and satisfy it */ + CurrentObject = (PKMUTANT)WaitBlock->Object; + KiSatisfyObjectWait(CurrentObject, Thread); + + /* Go to the next block */ + WaitBlock = WaitBlock->NextWaitBlock; + } while(WaitBlock != WaitBlockArray); + + /* Set the wait status and get out */ + WaitStatus = Thread->WaitStatus; + goto DontWait; } } - else if (CurrentObject->Header.SignalState > 0) - { - /* Another signaled object, unwait and return */ - KiSatisfyNonMutantWait(CurrentObject, Thread); - 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 ((Thread == CurrentObject->OwnerThread) && - (CurrentObject->Header.SignalState == MINLONG)) + + /* Make sure we can satisfy the Alertable request */ + WaitStatus = KiCheckAlertability(Thread, Alertable, WaitMode); + if (WaitStatus != STATUS_WAIT_0) break; + + /* Enable the Timeout Timer if there was any specified */ + if (Timeout) + { + /* Check if the timer expired */ + InterruptTime.QuadPart = KeQueryInterruptTime(); + if (InterruptTime.QuadPart >= Timer->DueTime.QuadPart) { - /* Raise an exception */ - KiReleaseDispatcherLock(Thread->WaitIrql); - ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); + /* It did, so we don't need to wait */ + WaitStatus = STATUS_TIMEOUT; + goto DontWait; } - else if ((CurrentObject->Header.SignalState <= 0) && - (Thread != 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 = &WaitBlockArray[WaitIndex]; - WaitBlock->Object = CurrentObject; - WaitBlock->Thread = Thread; - WaitBlock->WaitKey = (USHORT)WaitIndex; - WaitBlock->WaitType = (UCHAR)WaitType; - WaitBlock->NextWaitBlock = &WaitBlockArray[WaitIndex + 1]; - } - - /* Check if this is a Wait All and all the objects are signaled */ - if ((WaitType == WaitAll) && (AllObjectsSignaled)) - { - /* Return to the Root Wait Block */ - WaitBlock->NextWaitBlock = &WaitBlockArray[0]; - - /* Satisfy their Waits and return to the caller */ - KiWaitSatisfyAll(WaitBlock); - WaitStatus = Thread->WaitStatus; - goto DontWait; - } - - /* Make sure we can satisfy the Alertable request */ - WaitStatus = KiCheckAlertability(Thread, Alertable, WaitMode); - if (WaitStatus != STATUS_WAIT_0) - { - /* Unlock the dispatcher and return */ - KiReleaseDispatcherLock(Thread->WaitIrql); - return WaitStatus; - } - - /* 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; - } - - /* Link timer wait block */ - TimerWaitBlock = &Thread->WaitBlock[TIMER_WAIT_BLOCK]; - WaitBlock->NextWaitBlock = TimerWaitBlock; - - /* Use this the timer block for linking below */ - WaitBlock = TimerWaitBlock; - - /* Insert the Timer into the Timer Lists and enable it */ - ThreadTimer = &Thread->Timer; - if (!KiInsertTimer(ThreadTimer, *Timeout)) - { - /* Return a timeout if we couldn't insert the timer */ - WaitStatus = STATUS_TIMEOUT; - goto DontWait; - } - - /* Set the current due time */ - DueTime.QuadPart = ThreadTimer->DueTime.QuadPart; - } - - /* Link to the Root Wait Block */ - WaitBlock->NextWaitBlock = &WaitBlockArray[0]; - - /* Insert into Object's Wait List*/ - WaitBlock = &WaitBlockArray[0]; - 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 (Thread->Queue) KiActivateWaiterQueue(Thread->Queue); - - /* Setup the wait information */ - Thread->State = Waiting; - - /* Add the thread to the wait list */ - KiAddThreadToWaitList(Thread, Swappable); - - /* Swap the thread */ - ASSERT(Thread->WaitIrql <= DISPATCH_LEVEL); - KiSetThreadSwapBusy(Thread); - WaitStatus = KiSwapThread(Thread, KeGetCurrentPrcb()); - - /* Check if we were executing an APC */ - if (WaitStatus == STATUS_KERNEL_APC) - { - /* Check if we had a timeout */ - if (Timeout) - { - /* Recalculate due times */ - Timeout = KiRecalculateDueTime(OriginalDueTime, - &DueTime, - &NewDueTime); - } - - /* Wait again */ - goto StartWait; + + /* It didn't, so activate it */ + Timer->Header.Inserted = TRUE; + + /* Link the wait blocks */ + WaitBlock->NextWaitBlock = TimerBlock; + } + + /* Insert into Object's Wait List*/ + WaitBlock = WaitBlockArray; + 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 (Thread->Queue) KiActivateWaiterQueue(Thread->Queue); + + /* Setup the wait information */ + Thread->State = Waiting; + + /* Add the thread to the wait list */ + KiAddThreadToWaitList(Thread, Swappable); + + /* Activate thread swap */ + ASSERT(Thread->WaitIrql <= DISPATCH_LEVEL); + KiSetThreadSwapBusy(Thread); + + /* Check if we have a timer */ + if (Timeout) + { + /* Insert it */ + KiInsertWaitTimer(Timer); + } + else + { + /* Otherwise, unlock the dispatcher */ + KiReleaseDispatcherLockFromDpcLevel(); + } + + /* Swap the thread */ + WaitStatus = KiSwapThread(Thread, KeGetCurrentPrcb()); + + /* Check if we were executing an APC */ + if (WaitStatus != STATUS_KERNEL_APC) return WaitStatus; + + /* Check if we had a timeout */ + if (Timeout) + { + /* Recalculate due times */ + Timeout = KiRecalculateDueTime(OriginalDueTime, + &DueTime, + &NewDueTime); + } + } + +WaitStart: + /* Setup a new wait */ + Thread->WaitIrql = KeRaiseIrqlToSynchLevel(); + KxMultiThreadWait(); + KiAcquireDispatcherLockAtDpcLevel(); } /* We are done */ + KiReleaseDispatcherLock(Thread->WaitIrql); return WaitStatus; DontWait:

17 years, 8 months

[hyperion] 25604: Fixed: - _ReadWriteBarrier - _InterlockedCompareExchange8 - _InterlockedCompareExchange16 - _InterlockedCompareExchange - _InterlockedCompareExchange64 - _InterlockedCompareExchangePointer - _InterlockedExchange - _InterlockedExchangePointer - _InterlockedExchangeAdd - _interlockedbittestandset - _interlockedbittestandreset This commit dedicated to Alex (sup Alex!)

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Jan 23 21:26:51 2007 New Revision: 25604 URL: http://svn.reactos.org/svn/reactos?rev=25604&view=rev Log: Fixed: - _ReadWriteBarrier - _InterlockedCompareExchange8 - _InterlockedCompareExchange16 - _InterlockedCompareExchange - _InterlockedCompareExchange64 - _InterlockedCompareExchangePointer - _InterlockedExchange - _InterlockedExchangePointer - _InterlockedExchangeAdd - _interlockedbittestandset - _interlockedbittestandreset This commit dedicated to Alex (sup Alex!) Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Tue Jan 23 21:26:51 2007 @@ -91,7 +91,11 @@ #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 #define _ReadWriteBarrier() __sync_synchronize() #else -/* TODO: _ReadWriteBarrier() */ +static __inline__ __attribute__((always_inline)) _MemoryBarrier(void) +{ + __asm__ __volatile__("" : : : "memory"); +} +#define _ReadWriteBarrier() _MemoryBarrier() #endif #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 @@ -190,82 +194,66 @@ static __inline__ __attribute__((always_inline)) char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) { char retval = Comperand; - __asm__("lock; cmpxchgb %b[Exchange], %[Destination]" : "=a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange) : "memory"); + __asm__("lock; cmpxchgb %b[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); return retval; } static __inline__ __attribute__((always_inline)) short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) { short retval = Comperand; - __asm__("lock; cmpxchgw %w[Exchange], %[Destination]" : "=a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange): "memory"); + __asm__("lock; cmpxchgw %w[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); return retval; } static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) { long retval = Comperand; - __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : "=a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange): "memory"); + __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); return retval; } static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) { - unsigned long lo32Retval = (unsigned long)((Comperand >> 0) & 0xFFFFFFFF); - long hi32Retval = (unsigned long)((Comperand >> 32) & 0xFFFFFFFF); - - unsigned long lo32Exchange = (unsigned long)((Exchange >> 0) & 0xFFFFFFFF); - long hi32Exchange = (unsigned long)((Exchange >> 32) & 0xFFFFFFFF); + long long retval = Comperand; __asm__ ( "cmpxchg8b %[Destination]" : - "=a" (lo32Retval), "=d" (hi32Retval) : - [Destination] "rm" (Destination), "b" (lo32Exchange), "c" (hi32Exchange) : + [retval] "+A" (retval) : + [Destination] "m" (*Destination), + "b" ((unsigned long)((Exchange >> 0) & 0xFFFFFFFF)), + "c" ((unsigned long)((Exchange >> 32) & 0xFFFFFFFF)) : "memory" ); - { - union u_ - { - long long ll; - struct s_ - { - unsigned long lo32; - long hi32; - } - s; - } - u = { s : { lo32 : lo32Retval, hi32 : hi32Retval } }; - - return u.ll; - } + return retval; } static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) { - void * retval; - __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : "=a" (retval) : [Destination] "rm" (Destination), [Exchange] "r" (Exchange), "a" (Comperand) : "memory"); + void * retval = (void *)Comperand; + __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "=a" (retval) : "[retval]" (retval), [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); return retval; } static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * const Target, const long Value) { long retval = Value; - __asm__("lock; xchgl %[retval], %[Target]" : [retval] "=r" (retval) : [Target] "rm" (Target) : "memory"); + __asm__("xchgl %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; } static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) { void * retval = Value; - __asm__("lock; xchgl %[retval], %[Target]" : [retval] "=r" (retval) : [Target] "rm" (Target) : "memory"); + __asm__("xchgl %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; } static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) { long retval = Value; - __asm__("lock; xaddl %[retval], %[Addend]" : [retval] "=r" (retval) : [Addend] "rm" (Addend)); + __asm__("lock; xaddl %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); return retval; } @@ -449,17 +437,17 @@ return _InterlockedExchangeAdd(lpAddend, 1) + 1; } -static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandreset(volatile long * const a, const long b) +static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandreset(volatile long * a, const long b) { unsigned char retval; - __asm__("lock; btr %[b], %[a]; setc %b[retval]" : [retval] "=q" (retval) : [a] "rm" (a), [b] "Nr" (b)); - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandset(volatile long * const a, const long b) + __asm__("lock; btrl %[b], %[a]; setb %b[retval]" : [retval] "=r" (retval), [a] "=m" (a) : [b] "Ir" (b) : "memory"); + return retval; +} + +static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandset(volatile long * a, const long b) { unsigned char retval; - __asm__("lock; bts %[b], %[a]; setc %b[retval]" : [retval] "=q" (retval) : [a] "rm" (a), [b] "Nr" (b)); + __asm__("lock; btsl %[b], %[a]; setc %b[retval]" : [retval] "=r" (retval), [a] "=m" (a) : [b] "Ir" (b) : "memory"); return retval; }

17 years, 8 months

[fireball] 25603: Alexey Zavyalov: Add functionally Numbers, Currency, Time, Date tabs. Fix some bugs. See issue #1988 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jan 23 20:59:36 2007 New Revision: 25603 URL: http://svn.reactos.org/svn/reactos?rev=25603&view=rev Log: Alexey Zavyalov: Add functionally Numbers, Currency, Time, Date tabs. Fix some bugs. See issue #1988 for more details. Added: trunk/reactos/dll/cpl/intl_new/currency.c trunk/reactos/dll/cpl/intl_new/date.c trunk/reactos/dll/cpl/intl_new/langs.c trunk/reactos/dll/cpl/intl_new/nums.c trunk/reactos/dll/cpl/intl_new/setupreg.c trunk/reactos/dll/cpl/intl_new/time.c Modified: trunk/reactos/dll/cpl/intl_new/En.rc trunk/reactos/dll/cpl/intl_new/extra.c trunk/reactos/dll/cpl/intl_new/intl.c trunk/reactos/dll/cpl/intl_new/intl.h trunk/reactos/dll/cpl/intl_new/intl.rbuild trunk/reactos/dll/cpl/intl_new/locale.c trunk/reactos/dll/cpl/intl_new/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/intl_new/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/En.rc?rev… Added: trunk/reactos/dll/cpl/intl_new/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/currency.… Added: trunk/reactos/dll/cpl/intl_new/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/date.c?re… Modified: trunk/reactos/dll/cpl/intl_new/extra.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/extra.c?r… Modified: trunk/reactos/dll/cpl/intl_new/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.c?re… Modified: trunk/reactos/dll/cpl/intl_new/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.h?re… Modified: trunk/reactos/dll/cpl/intl_new/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.rbui… Added: trunk/reactos/dll/cpl/intl_new/langs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/langs.c?r… Modified: trunk/reactos/dll/cpl/intl_new/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/locale.c?… Added: trunk/reactos/dll/cpl/intl_new/nums.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/nums.c?re… Modified: trunk/reactos/dll/cpl/intl_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/resource.… Added: trunk/reactos/dll/cpl/intl_new/setupreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/setupreg.… Added: trunk/reactos/dll/cpl/intl_new/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/time.c?re…

17 years, 8 months

[ion] 25602: - Fix MSVC breakage caused by recent modifications of cctypes.h. - Remove structures from ntifs.h that shouldn't be there. - Add support for optimized detection of a DOS device path \?? or \??\ and implement it into ObpLookupObjectName. - Add support for proper re-parsing up to a maximum of 30 times to avoid reparse DOS attacks on the kernel. - Set WIN32_WINNT version to Windows 2003 SP1.

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 23 01:16:13 2007 New Revision: 25602 URL: http://svn.reactos.org/svn/reactos?rev=25602&view=rev Log: - Fix MSVC breakage caused by recent modifications of cctypes.h. - Remove structures from ntifs.h that shouldn't be there. - Add support for optimized detection of a DOS device path \?? or \??\ and implement it into ObpLookupObjectName. - Add support for proper re-parsing up to a maximum of 30 times to avoid reparse DOS attacks on the kernel. - Set WIN32_WINNT version to Windows 2003 SP1. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/cctypes.h trunk/reactos/ntoskrnl/ex/pushlock.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=25… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Tue Jan 23 01:16:13 2007 @@ -49,6 +49,9 @@ #ifndef NTSYSAPI #define NTSYSAPI #endif + +#define EX_PUSH_LOCK ULONG_PTR +#define PEX_PUSH_LOCK PULONG_PTR #include "csq.h" @@ -1402,35 +1405,6 @@ WCHAR Name[1]; } PATHNAME_BUFFER, *PPATHNAME_BUFFER; -#if (VER_PRODUCTBUILD >= 2600) - -typedef struct _PRIVATE_CACHE_MAP_FLAGS { - ULONG DontUse : 16; - ULONG ReadAheadActive : 1; - ULONG ReadAheadEnabled : 1; - ULONG Available : 14; -} PRIVATE_CACHE_MAP_FLAGS, *PPRIVATE_CACHE_MAP_FLAGS; - -typedef struct _PRIVATE_CACHE_MAP { - _ANONYMOUS_UNION union { - CSHORT NodeTypeCode; - PRIVATE_CACHE_MAP_FLAGS Flags; - ULONG UlongFlags; - } DUMMYUNIONNAME; - ULONG ReadAheadMask; - PFILE_OBJECT FileObject; - LARGE_INTEGER FileOffset1; - LARGE_INTEGER BeyondLastByte1; - LARGE_INTEGER FileOffset2; - LARGE_INTEGER BeyondLastByte2; - LARGE_INTEGER ReadAheadOffset[2]; - ULONG ReadAheadLength[2]; - KSPIN_LOCK ReadAheadSpinLock; - LIST_ENTRY PrivateLinks; -} PRIVATE_CACHE_MAP, *PPRIVATE_CACHE_MAP; - -#endif - typedef enum _RTL_GENERIC_COMPARE_RESULTS { GenericLessThan, @@ -1715,16 +1689,6 @@ USHORT NumEntries; } TUNNEL, *PTUNNEL; -typedef struct _VACB { - PVOID BaseAddress; - PSHARED_CACHE_MAP SharedCacheMap; - union { - LARGE_INTEGER FileOffset; - USHORT ActiveCount; - } Overlay; - LIST_ENTRY LruList; -} VACB, *PVACB; - typedef struct _VAD_HEADER { PVOID StartVPN; PVOID EndVPN; Modified: trunk/reactos/include/ndk/cctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cctypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cctypes.h (original) +++ trunk/reactos/include/ndk/cctypes.h Tue Jan 23 01:16:13 2007 @@ -35,54 +35,101 @@ extern ULONG NTSYSAPI CcFastReadNoWait; extern ULONG NTSYSAPI CcFastMdlReadNotPossible; +// +// Virtual Address Control BLock +// +typedef struct _VACB +{ + PVOID BaseAddress; + struct _SHARED_CACHE_MAP *SharedCacheMap; + union + { + LARGE_INTEGER FileOffset; + USHORT ActiveCount; + } Overlay; + LIST_ENTRY LruList; +} VACB, *PVACB; + +// +// Private Cache Map Structure and Flags +// +typedef struct _PRIVATE_CACHE_MAP_FLAGS +{ + ULONG DontUse:16; + ULONG ReadAheadActive:1; + ULONG ReadAheadEnabled:1; + ULONG Available:14; +} PRIVATE_CACHE_MAP_FLAGS; + +typedef struct _PRIVATE_CACHE_MAP +{ + union + { + CSHORT NodeTypeCode; + PRIVATE_CACHE_MAP_FLAGS Flags; + ULONG UlongFlags; + }; + ULONG ReadAheadMask; + PFILE_OBJECT FileObject; + LARGE_INTEGER FileOffset1; + LARGE_INTEGER BeyondLastByte1; + LARGE_INTEGER FileOffset2; + LARGE_INTEGER BeyondLastByte2; + LARGE_INTEGER ReadAheadOffset[2]; + ULONG ReadAheadLength[2]; + KSPIN_LOCK ReadAheadSpinLock; + LIST_ENTRY PrivateLinks; +} PRIVATE_CACHE_MAP, *PPRIVATE_CACHE_MAP; #ifdef _NTIFS_INCLUDED_ -typedef struct _SHARED_CACHE_MAP { - SHORT NodeTypeCode; - SHORT NodeByteSize; - ULONG OpenCount; - LARGE_INTEGER FileSize; - LIST_ENTRY BcbList; - LARGE_INTEGER SectionSize; - LARGE_INTEGER ValidDataLength; - LARGE_INTEGER ValidDataGoal; - PVACB InitialVacbs[4]; - PVACB Vacbs; - PFILE_OBJECT FileObject; - PVACB ActiveVacb; - PVOID NeedToZero; - ULONG ActivePage; - ULONG NeedToZeroPage; - ULONG ActiveVacbSpinLock; - ULONG VacbActiveCount; - ULONG DirtyPages; - LIST_ENTRY SharedCacheMapLinks; - ULONG Flags; - ULONG Status; - PMCB Mbcb; - PVOID Section; - PKEVENT CreateEvent; - PKEVENT WaitOnActiveCount; - ULONG PagesToWrite; - LONGLONG BeyondLastFlush; - PCACHE_MANAGER_CALLBACKS Callbacks; - PVOID LazyWriteContext; - PLIST_ENTRY PrivateList; - PVOID LogHandle; - PVOID FlushToLsnRoutine; - ULONG DirtyPageThreshold; - ULONG LazyWritePassCount; - PCACHE_UNINITIALIZE_EVENT UninitializeEvent; - PVACB NeedToZeroVacb; - ULONG BcbSpinLock; - PVOID Reserved; - KEVENT Event; - /* FIX ME: This should be PEX_PUSH_LOCK */ - PVOID VacbPushLock; - PPRIVATE_CACHE_MAP PrivateCacheMap; - } SHARED_CACHE_MAP; - +// +// Shared Cache Map +// +typedef struct _SHARED_CACHE_MAP +{ + SHORT NodeTypeCode; + SHORT NodeByteSize; + ULONG OpenCount; + LARGE_INTEGER FileSize; + LIST_ENTRY BcbList; + LARGE_INTEGER SectionSize; + LARGE_INTEGER ValidDataLength; + LARGE_INTEGER ValidDataGoal; + PVACB InitialVacbs[4]; + PVACB Vacbs; + PFILE_OBJECT FileObject; + PVACB ActiveVacb; + PVOID NeedToZero; + ULONG ActivePage; + ULONG NeedToZeroPage; + ULONG ActiveVacbSpinLock; + ULONG VacbActiveCount; + ULONG DirtyPages; + LIST_ENTRY SharedCacheMapLinks; + ULONG Flags; + ULONG Status; + PMCB Mbcb; + PVOID Section; + PKEVENT CreateEvent; + PKEVENT WaitOnActiveCount; + ULONG PagesToWrite; + LONGLONG BeyondLastFlush; + PCACHE_MANAGER_CALLBACKS Callbacks; + PVOID LazyWriteContext; + PLIST_ENTRY PrivateList; + PVOID LogHandle; + PVOID FlushToLsnRoutine; + ULONG DirtyPageThreshold; + ULONG LazyWritePassCount; + PCACHE_UNINITIALIZE_EVENT UninitializeEvent; + PVACB NeedToZeroVacb; + ULONG BcbSpinLock; + PVOID Reserved; + KEVENT Event; + PEX_PUSH_LOCK VacbPushLock; + PPRIVATE_CACHE_MAP PrivateCacheMap; +} SHARED_CACHE_MAP; #endif /* _NTIFS_INCLUDED_ */ #endif /* NTOS_MODE_USER */ Modified: trunk/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/pushlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/pushlock.c (original) +++ trunk/reactos/ntoskrnl/ex/pushlock.c Tue Jan 23 01:16:13 2007 @@ -362,7 +362,7 @@ VOID FASTCALL ExWaitForUnblockPushLock(IN PEX_PUSH_LOCK PushLock, - IN PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock) + IN PVOID WaitBlock) { /* Call the timed function with no timeout */ ExTimedWaitForUnblockPushLock(PushLock, WaitBlock, NULL); Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Tue Jan 23 01:16:13 2007 @@ -652,18 +652,24 @@ VOID FASTCALL -ExBlockPushLock(PEX_PUSH_LOCK PushLock, - PVOID WaitBlock); - -VOID -FASTCALL -ExfUnblockPushLock(PEX_PUSH_LOCK PushLock, - PVOID CurrentWaitBlock); - -VOID -FASTCALL -ExWaitForUnblockPushLock(IN PEX_PUSH_LOCK PushLock, - IN PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock); +ExBlockPushLock( + IN PEX_PUSH_LOCK PushLock, + IN PVOID WaitBlock +); + +VOID +FASTCALL +ExfUnblockPushLock( + IN PEX_PUSH_LOCK PushLock, + IN PVOID CurrentWaitBlock +); + +VOID +FASTCALL +ExWaitForUnblockPushLock( + IN PEX_PUSH_LOCK PushLock, + IN PVOID WaitBlock +); /*++ * @name ExInitializePushLock Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Tue Jan 23 01:16:13 2007 @@ -103,6 +103,15 @@ } OBP_FIND_HANDLE_DATA, *POBP_FIND_HANDLE_DATA; // +// Structure for quick-compare of a DOS Device path +// +typedef union +{ + WCHAR Name[sizeof(ULARGE_INTEGER) / sizeof(WCHAR)]; + ULARGE_INTEGER Alignment; +} ALIGNEDNAME; + +// // Private Temporary Buffer for Lookup Routines // #define TAG_OB_TEMP_STORAGE TAG('O', 'b', 'S', 't') @@ -502,6 +511,9 @@ extern volatile PVOID ObpReaperList; extern NPAGED_LOOKASIDE_LIST ObpNmLookasideList, ObpCiLookasideList; extern BOOLEAN IoCountOperations; +extern ALIGNEDNAME ObpDosDevicesShortNamePrefix; +extern ALIGNEDNAME ObpDosDevicesShortNameRoot; +extern UNICODE_STRING ObpDosDevicesShortName; // // Inlined Functions Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h Tue Jan 23 01:16:13 2007 @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ /* Always target Windows 2003 Service Pack 1 */ -#undef NTDDI_VERSION +#define _WIN32_WINNT _WIN32_WINNT_WS03 #define NTDDI_VERSION NTDDI_WS03SP1 #define NTKERNELAPI Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Tue Jan 23 01:16:13 2007 @@ -16,8 +16,18 @@ #include <debug.h> BOOLEAN ObpCaseInsensitive = TRUE; -POBJECT_DIRECTORY NameSpaceRoot = NULL; -POBJECT_DIRECTORY ObpTypeDirectoryObject = NULL; +POBJECT_DIRECTORY NameSpaceRoot; +POBJECT_DIRECTORY ObpTypeDirectoryObject; + +/* DOS Device Prefix \??\ and \?? */ +ALIGNEDNAME ObpDosDevicesShortNamePrefix = {{L'\\',L'?',L'?',L'\\'}}; +ALIGNEDNAME ObpDosDevicesShortNameRoot = {{L'\\',L'?',L'?',L'\0'}}; +UNICODE_STRING ObpDosDevicesShortName = +{ + sizeof(ObpDosDevicesShortNamePrefix), + sizeof(ObpDosDevicesShortNamePrefix), + (PWSTR)&ObpDosDevicesShortNamePrefix +}; /* PRIVATE FUNCTIONS *********************************************************/ @@ -256,22 +266,22 @@ NTSTATUS NTAPI -ObpLookupObjectName(IN HANDLE RootHandle, +ObpLookupObjectName(IN HANDLE RootHandle OPTIONAL, IN PUNICODE_STRING ObjectName, IN ULONG Attributes, IN POBJECT_TYPE ObjectType, IN KPROCESSOR_MODE AccessMode, IN OUT PVOID ParseContext, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, - IN PVOID InsertObject, - IN PACCESS_STATE AccessState, - IN POBP_LOOKUP_CONTEXT LookupContext, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + IN PVOID InsertObject OPTIONAL, + IN OUT PACCESS_STATE AccessState, + OUT POBP_LOOKUP_CONTEXT LookupContext, OUT PVOID *FoundObject) { PVOID Object; POBJECT_HEADER ObjectHeader; UNICODE_STRING ComponentName, RemainingName; - BOOLEAN InsideRoot = FALSE; + BOOLEAN Reparse = FALSE, SymLink = FALSE; PDEVICE_MAP DeviceMap = NULL; POBJECT_DIRECTORY Directory = NULL, ParentDirectory = NULL, RootDirectory; POBJECT_DIRECTORY ReferencedDirectory = NULL, ReferencedParentDirectory = NULL; @@ -281,6 +291,7 @@ KPROCESSOR_MODE AccessCheckMode; PWCHAR NewName; POBJECT_HEADER_NAME_INFO ObjectNameInfo; + ULONG MaxReparse = 30; PAGED_CODE(); OBTRACE(OB_NAMESPACE_DEBUG, "%s - Finding Object: %wZ. Expecting: %p\n", @@ -345,6 +356,9 @@ ObDereferenceObject(RootDirectory); return STATUS_INVALID_HANDLE; } + + /* Set default parse count */ + MaxReparse = 30; /* Now parse */ while (TRUE) @@ -397,7 +411,22 @@ /* Don't use this anymore, since we're starting at root */ RootHandle = NULL; - break; + goto ParseFromRoot; + } + else if (--MaxReparse) + { + /* Try reparsing again */ + continue; + } + else + { + /* Reparsed too many times */ + ObDereferenceObject(RootDirectory); + + /* Return the object and normalized status */ + *FoundObject = Object; + if (!Object) Status = STATUS_OBJECT_NAME_NOT_FOUND; + return Status; } } } @@ -465,373 +494,434 @@ return Status; } } - } - - /* Save the name */ -ReparseNewDir: - RemainingName = *ObjectName; + else + { +ParseFromRoot: + /* Check if we have a device map */ + if (DeviceMap) + { + /* Dereference it */ + ObfDereferenceDeviceMap(DeviceMap); + DeviceMap = NULL; + } + + /* Check if this is a possible DOS name */ + if (!((ULONG_PTR)(ObjectName->Buffer) & 7)) + { + /* + * This could be one. Does it match the prefix? + * Note that as an optimization, the match is done as 64-bit + * compare since the prefix is "\??\" which is exactly 8 bytes. + * + * In the second branch, we test for "\??" which is also valid. + * This time, we use a 32-bit compare followed by a Unicode + * character compare (16-bit), since the sum is 6 bytes. + */ + if ((ObjectName->Length >= ObpDosDevicesShortName.Length) && + (*(PULONGLONG)(ObjectName->Buffer) == + ObpDosDevicesShortNamePrefix.Alignment.QuadPart)) + { + /* FIXME! */ + } + else if ((ObjectName->Length == ObpDosDevicesShortName.Length - + sizeof(WCHAR)) && + (*(PULONG)(ObjectName->Buffer) == + ObpDosDevicesShortNameRoot.Alignment.LowPart) && + (*((PWCHAR)(ObjectName->Buffer) + 2) == + (WCHAR)(ObpDosDevicesShortNameRoot.Alignment.HighPart))) + { + /* FIXME! */ + } + } + } + } + + /* Check if we were reparsing a symbolic link */ + if (!SymLink) + { + /* Allow reparse */ + Reparse = TRUE; + MaxReparse = 30; + } /* Reparse */ - while (TRUE) - { - /* Check if we should use the Root Directory */ - if (!InsideRoot) - { - /* Yes, use the root directory and remember that */ - Directory = RootDirectory; - InsideRoot = TRUE; - } - - /* Check if the name starts with a path separator */ - if ((RemainingName.Length) && - (RemainingName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR)) - { - /* Skip the path separator */ - RemainingName.Buffer++; - RemainingName.Length -= sizeof(OBJ_NAME_PATH_SEPARATOR); - } - - /* Find the next Part Name */ - ComponentName = RemainingName; - while (RemainingName.Length) - { - /* Break if we found the \ ending */ - if (RemainingName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR) break; - - /* Move on */ - RemainingName.Buffer++; - RemainingName.Length -= sizeof(OBJ_NAME_PATH_SEPARATOR); - } - - /* Get its size and make sure it's valid */ - ComponentName.Length -= RemainingName.Length; - if (!ComponentName.Length) - { - /* Invalid size, fail */ - Status = STATUS_OBJECT_NAME_INVALID; - break; - } - - /* Check if this is a user-mode call that needs to traverse */ - if ((AccessCheckMode != KernelMode) && - !(AccessState->Flags & TOKEN_HAS_TRAVERSE_PRIVILEGE)) - { - /* We shouldn't have referenced a directory yet */ - ASSERT(ReferencedDirectory == NULL); - - /* Reference the directory */ - ObReferenceObject(Directory); - ReferencedDirectory = Directory; - - /* Check if we have a parent directory */ - if (ParentDirectory) - { - /* Check for traverse access */ - if (!ObpCheckTraverseAccess(ParentDirectory, - DIRECTORY_TRAVERSE, - AccessState, - FALSE, - AccessCheckMode, - &Status)) - { - /* We don't have it, fail */ - break; - } - } - } - - /* Check if we don't have a remaining name yet */ - if (!RemainingName.Length) - { - /* Check if we don't have a referenced directory yet */ - if (!ReferencedDirectory) - { - /* Reference it */ + while (Reparse) + { + /* Get the name */ + RemainingName = *ObjectName; + + /* Disable reparsing again */ + Reparse = FALSE; + + /* Start parse loop */ + while (TRUE) + { + /* Clear object */ + Object = NULL; + + /* Check if the name starts with a path separator */ + if ((RemainingName.Length) && + (RemainingName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR)) + { + /* Skip the path separator */ + RemainingName.Buffer++; + RemainingName.Length -= sizeof(OBJ_NAME_PATH_SEPARATOR); + } + + /* Find the next Part Name */ + ComponentName = RemainingName; + while (RemainingName.Length) + { + /* Break if we found the \ ending */ + if (RemainingName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR) break; + + /* Move on */ + RemainingName.Buffer++; + RemainingName.Length -= sizeof(OBJ_NAME_PATH_SEPARATOR); + } + + /* Get its size and make sure it's valid */ + ComponentName.Length -= RemainingName.Length; + if (!ComponentName.Length) + { + /* Invalid size, fail */ + Status = STATUS_OBJECT_NAME_INVALID; + break; + } + + /* Check if we're in the root */ + if (!Directory) Directory = RootDirectory; + + /* Check if this is a user-mode call that needs to traverse */ + if ((AccessCheckMode != KernelMode) && + !(AccessState->Flags & TOKEN_HAS_TRAVERSE_PRIVILEGE)) + { + /* We shouldn't have referenced a directory yet */ + ASSERT(ReferencedDirectory == NULL); + + /* Reference the directory */ ObReferenceObject(Directory); ReferencedDirectory = Directory; - } - - /* Check if we are inserting an object */ - if (InsertObject) - { - /* Lock the directory */ - ObpAcquireDirectoryLockExclusive(Directory, LookupContext); - } - } - - /* Do the lookup */ - Object = ObpLookupEntryDirectory(Directory, - &ComponentName, - Attributes, - InsertObject ? FALSE : TRUE, - LookupContext); - if (!Object) - { - /* We didn't find it... do we still have a path? */ - if (RemainingName.Length) - { - /* Then tell the caller the path wasn't found */ - Status = STATUS_OBJECT_PATH_NOT_FOUND; + + /* Check if we have a parent directory */ + if (ParentDirectory) + { + /* Check for traverse access */ + if (!ObpCheckTraverseAccess(ParentDirectory, + DIRECTORY_TRAVERSE, + AccessState, + FALSE, + AccessCheckMode, + &Status)) + { + /* We don't have it, fail */ + break; + } + } + } + + /* Check if we don't have a remaining name yet */ + if (!RemainingName.Length) + { + /* Check if we don't have a referenced directory yet */ + if (!ReferencedDirectory) + { + /* Reference it */ + ObReferenceObject(Directory); + ReferencedDirectory = Directory; + } + + /* Check if we are inserting an object */ + if (InsertObject) + { + /* Lock the directory */ + ObpAcquireDirectoryLockExclusive(Directory, LookupContext); + } + } + + /* Do the lookup */ + Object = ObpLookupEntryDirectory(Directory, + &ComponentName, + Attributes, + InsertObject ? FALSE : TRUE, + LookupContext); + if (!Object) + { + /* We didn't find it... do we still have a path? */ + if (RemainingName.Length) + { + /* Then tell the caller the path wasn't found */ + Status = STATUS_OBJECT_PATH_NOT_FOUND; + break; + } + else if (!InsertObject) + { + /* Otherwise, we have a path, but the name isn't valid */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + break; + } + + /* Check create access for the object */ + if (!ObCheckCreateObjectAccess(Directory, + ObjectType == ObDirectoryType ? + DIRECTORY_CREATE_SUBDIRECTORY : + DIRECTORY_CREATE_OBJECT, + AccessState, + &ComponentName, + FALSE, + AccessCheckMode, + &Status)) + { + /* We don't have create access, fail */ + break; + } + + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(InsertObject); + + /* FIXME: Check if this is a Section Object or Sym Link */ + /* FIXME: If it is, then check if this isn't session 0 */ + /* FIXME: If it isn't, check for SeCreateGlobalPrivilege */ + /* FIXME: If privilege isn't there, check for unsecure name */ + /* FIXME: If it isn't a known unsecure name, then fail */ + + /* Create Object Name */ + NewName = ExAllocatePoolWithTag(PagedPool, + ComponentName.Length, + OB_NAME_TAG); + if (!(NewName) || + !(ObpInsertEntryDirectory(Directory, + LookupContext, + ObjectHeader))) + { + /* Either couldn't allocate the name, or insert failed */ + if (NewName) ExFreePool(NewName); + + /* Fail due to memory reasons */ + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + /* Reference newly to be inserted object */ + ObReferenceObject(InsertObject); + + /* Get the name information */ + ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + + /* Reference the directory */ + ObReferenceObject(Directory); + + /* Copy the Name */ + RtlCopyMemory(NewName, + ComponentName.Buffer, + ComponentName.Length); + + /* Check if we had an old name */ + if (ObjectNameInfo->Name.Buffer) + { + /* Free it */ + ExFreePool(ObjectNameInfo->Name.Buffer); + } + + /* Write new one */ + ObjectNameInfo->Name.Buffer = NewName; + ObjectNameInfo->Name.Length = ComponentName.Length; + ObjectNameInfo->Name.MaximumLength = ComponentName.Length; + + /* Return Status and the Expected Object */ + Status = STATUS_SUCCESS; + Object = InsertObject; + + /* Get out of here */ break; } - else if (!InsertObject) - { - /* Otherwise, we have a path, but the name isn't valid */ - Status = STATUS_OBJECT_NAME_NOT_FOUND; - break; - } - - /* Check create access for the object */ - if (!ObCheckCreateObjectAccess(Directory, - ObjectType == ObDirectoryType ? - DIRECTORY_CREATE_SUBDIRECTORY : - DIRECTORY_CREATE_OBJECT, - AccessState, - &ComponentName, - FALSE, - AccessCheckMode, - &Status)) - { - /* We don't have create access, fail */ - break; - } - - /* Get the object header */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(InsertObject); - - /* FIXME: Check if this is a Section Object or Sym Link */ - /* FIXME: If it is, then check if this isn't session 0 */ - /* FIXME: If it isn't, check for SeCreateGlobalPrivilege */ - /* FIXME: If privilege isn't there, check for unsecure name */ - /* FIXME: If it isn't a known unsecure name, then fail */ - - /* Create Object Name */ - NewName = ExAllocatePoolWithTag(PagedPool, - ComponentName.Length, - OB_NAME_TAG); - if (!(NewName) || - !(ObpInsertEntryDirectory(Directory, - LookupContext, - ObjectHeader))) - { - /* Either couldn't allocate the name, or insert failed */ - if (NewName) ExFreePool(NewName); - - /* Fail due to memory reasons */ - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - /* Reference newly to be inserted object */ - ObReferenceObject(InsertObject); - - /* Get the name information */ - ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - - /* Reference the directory */ - ObReferenceObject(Directory); - - /* Copy the Name */ - RtlCopyMemory(NewName, - ComponentName.Buffer, - ComponentName.Length); - - /* Check if we had an old name */ - if (ObjectNameInfo->Name.Buffer) - { - /* Free it */ - ExFreePool(ObjectNameInfo->Name.Buffer); - } - - /* Write new one */ - ObjectNameInfo->Name.Buffer = NewName; - ObjectNameInfo->Name.Length = ComponentName.Length; - ObjectNameInfo->Name.MaximumLength = ComponentName.Length; - - /* Return Status and the Expected Object */ - Status = STATUS_SUCCESS; - Object = InsertObject; - - /* Get out of here */ - break; - } - -Reparse: - /* We found it, so now get its header */ - ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); - - /* - * Check for a parse Procedure, but don't bother to parse for an insert - * unless it's a Symbolic Link, in which case we MUST parse - */ - ParseRoutine = ObjectHeader->Type->TypeInfo.ParseProcedure; - if ((ParseRoutine) && - (!(InsertObject) || (ParseRoutine == ObpParseSymbolicLink))) - { - /* Use the Root Directory next time */ - InsideRoot = FALSE; - - /* Increment the pointer count */ - InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); - - /* Cleanup from the first lookup */ - ObpCleanupDirectoryLookup(LookupContext); - - /* Check if we have a referenced directory */ - if (ReferencedDirectory) - { - /* We do, dereference it */ - ObDereferenceObject(ReferencedDirectory); - ReferencedDirectory = NULL; - } - - /* Check if we have a referenced parent directory */ - if (ReferencedParentDirectory) - { - /* We do, dereference it */ - ObDereferenceObject(ReferencedParentDirectory); - ReferencedParentDirectory = NULL; - } - - /* Call the Parse Procedure */ - ObpCalloutStart(&CalloutIrql); - Status = ParseRoutine(Object, - ObjectType, - AccessState, - AccessCheckMode, - Attributes, - ObjectName, - &RemainingName, - ParseContext, - SecurityQos, - &Object); - ObpCalloutEnd(CalloutIrql, "Parse", ObjectHeader->Type, Object); - - /* Remove our extra reference */ - ObDereferenceObject(&ObjectHeader->Body); - - /* Check if we have to reparse */ - if ((Status == STATUS_REPARSE) || - (Status == STATUS_REPARSE_OBJECT)) - { - /* Start over from root if we got sent back there */ - if ((Status == STATUS_REPARSE_OBJECT) || - (ObjectName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR)) - { - /* Check if we got a root directory */ - if (RootHandle) + +ReparseObject: + /* We found it, so now get its header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + + /* + * Check for a parse Procedure, but don't bother to parse for an insert + * unless it's a Symbolic Link, in which case we MUST parse + */ + ParseRoutine = ObjectHeader->Type->TypeInfo.ParseProcedure; + if ((ParseRoutine) && + (!(InsertObject) || (ParseRoutine == ObpParseSymbolicLink))) + { + /* Use the Root Directory next time */ + Directory = NULL; + + /* Increment the pointer count */ + InterlockedExchangeAdd(&ObjectHeader->PointerCount, 1); + + /* Cleanup from the first lookup */ + ObpCleanupDirectoryLookup(LookupContext); + + /* Check if we have a referenced directory */ + if (ReferencedDirectory) + { + /* We do, dereference it */ + ObDereferenceObject(ReferencedDirectory); + ReferencedDirectory = NULL; + } + + /* Check if we have a referenced parent directory */ + if (ReferencedParentDirectory) + { + /* We do, dereference it */ + ObDereferenceObject(ReferencedParentDirectory); + ReferencedParentDirectory = NULL; + } + + /* Call the Parse Procedure */ + ObpCalloutStart(&CalloutIrql); + Status = ParseRoutine(Object, + ObjectType, + AccessState, + AccessCheckMode, + Attributes, + ObjectName, + &RemainingName, + ParseContext, + SecurityQos, + &Object); + ObpCalloutEnd(CalloutIrql, "Parse", ObjectHeader->Type, Object); + + /* Remove our extra reference */ + ObDereferenceObject(&ObjectHeader->Body); + + /* Check if we have to reparse */ + if ((Status == STATUS_REPARSE) || + (Status == STATUS_REPARSE_OBJECT)) + { + /* Reparse again */ + Reparse = TRUE; + + /* Start over from root if we got sent back there */ + if ((Status == STATUS_REPARSE_OBJECT) || + (ObjectName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR)) { - /* Stop using it, because we have a new directory now */ - ObDereferenceObject(RootDirectory); - RootHandle = NULL; - } - - /* Start at Root */ - ParentDirectory = NULL; - RootDirectory = NameSpaceRoot; - - /* Check for reparse status */ - if (Status == STATUS_REPARSE_OBJECT) - { - /* Did we actually get an object to which to reparse? */ - if (!Object) + /* Check if we got a root directory */ + if (RootHandle) { - /* We didn't, so set a failure status */ - Status = STATUS_OBJECT_NAME_NOT_FOUND; + /* Stop using it, because we have a new directory now */ + ObDereferenceObject(RootDirectory); + RootHandle = NULL; + } + + /* Start at Root */ + ParentDirectory = NULL; + RootDirectory = NameSpaceRoot; + + /* Check for reparse status */ + if (Status == STATUS_REPARSE_OBJECT) + { + /* Don't reparse again */ + Reparse = FALSE; + + /* Did we actually get an object to which to reparse? */ + if (!Object) + { + /* We didn't, so set a failure status */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + else + { + /* We did, so we're free to parse the new object */ + goto ReparseObject; + } } else { - /* We did, so we're free to parse the new object */ - InsideRoot = TRUE; - goto Reparse; + /* This is a symbolic link */ + SymLink = TRUE; + goto ParseFromRoot; } } - - /* Restart the search */ - goto ReparseNewDir; - } - else if (RootDirectory == NameSpaceRoot) - { - /* We got STATUS_REPARSE but are at the Root Directory */ + else if (RootDirectory == NameSpaceRoot) + { + /* We got STATUS_REPARSE but are at the Root Directory */ + Object = NULL; + Status = STATUS_OBJECT_NAME_NOT_FOUND; + Reparse = FALSE; + } + } + else if (!NT_SUCCESS(Status)) + { + /* Total failure */ Object = NULL; + } + else if (!Object) + { + /* We didn't reparse but we didn't find the Object Either */ Status = STATUS_OBJECT_NAME_NOT_FOUND; } - } - else if (!NT_SUCCESS(Status)) - { - /* Total failure */ - Object = NULL; - } - else if (!Object) - { - /* We didn't reparse but we didn't find the Object Either */ - Status = STATUS_OBJECT_NAME_NOT_FOUND; - } - - /* Break out of the loop */ - break; - } - else - { - /* No parse routine...do we still have a remaining name? */ - if (!RemainingName.Length) - { - /* Are we creating an object? */ - if (!InsertObject) - { - /* Check if this is a user-mode call that needs to traverse */ - if ((AccessCheckMode != KernelMode) && - !(AccessState->Flags & TOKEN_HAS_TRAVERSE_PRIVILEGE)) + + /* Break out of the loop */ + break; + } + else + { + /* No parse routine...do we still have a remaining name? */ + if (!RemainingName.Length) + { + /* Are we creating an object? */ + if (!InsertObject) { - /* Check if we can get it */ - if (!ObpCheckTraverseAccess(Directory, - DIRECTORY_TRAVERSE, - AccessState, - FALSE, - AccessCheckMode, - &Status)) + /* Check if this is a user-mode call that needs to traverse */ + if ((AccessCheckMode != KernelMode) && + !(AccessState->Flags & TOKEN_HAS_TRAVERSE_PRIVILEGE)) { - /* We don't have access, fail */ - Object = NULL; - break; + /* Check if we can get it */ + if (!ObpCheckTraverseAccess(Directory, + DIRECTORY_TRAVERSE, + AccessState, + FALSE, + AccessCheckMode, + &Status)) + { + /* We don't have access, fail */ + Object = NULL; + break; + } } + + /* Reference the Object */ + Status = ObReferenceObjectByPointer(Object, + 0, + ObjectType, + AccessMode); + if (!NT_SUCCESS(Status)) Object = NULL; } - /* Reference the Object */ - Status = ObReferenceObjectByPointer(Object, - 0, - ObjectType, - AccessMode); - if (!NT_SUCCESS(Status)) Object = NULL; - } - - /* And get out of the reparse loop */ - break; - } - else - { - /* We still have a name; check if this is a directory object */ - if (ObjectHeader->Type == ObDirectoryType) - { - /* Check if we have a referenced parent directory */ - if (ReferencedParentDirectory) + /* And get out of the reparse loop */ + break; + } + else + { + /* We still have a name; check if this is a directory object */ + if (ObjectHeader->Type == ObDirectoryType) { - /* Dereference it */ - ObDereferenceObject(ReferencedParentDirectory); + /* Check if we have a referenced parent directory */ + if (ReferencedParentDirectory) + { + /* Dereference it */ + ObDereferenceObject(ReferencedParentDirectory); + } + + /* Restart the lookup from this directory */ + ReferencedParentDirectory = ReferencedDirectory; + ParentDirectory = Directory; + Directory = Object; + ReferencedDirectory = NULL; } - - /* Restart the lookup from this directory */ - ReferencedParentDirectory = ReferencedDirectory; - ParentDirectory = Directory; - Directory = Object; - ReferencedDirectory = NULL; - } - else - { - /* We still have a name, but no parse routine for it */ - Status = STATUS_OBJECT_TYPE_MISMATCH; - Object = NULL; - break; + else + { + /* We still have a name, but no parse routine for it */ + Status = STATUS_OBJECT_TYPE_MISMATCH; + Object = NULL; + break; + } } } }

17 years, 8 months

[gedmurphy] 25601: - Fix the display of the radio buttons by using the Marlett font to draw the radio buttons instead of using Pie and Ellipse as Wine does. (ReactOS NtGdiPie and NtGdiEllipse need work anyway) - The font is a bit messy at the moment, so it would be appreciated if any font designers out there could fix it.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Jan 22 23:14:59 2007 New Revision: 25601 URL: http://svn.reactos.org/svn/reactos?rev=25601&view=rev Log: - Fix the display of the radio buttons by using the Marlett font to draw the radio buttons instead of using Pie and Ellipse as Wine does. (ReactOS NtGdiPie and NtGdiEllipse need work anyway) - The font is a bit messy at the moment, so it would be appreciated if any font designers out there could fix it. Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c Mon Jan 22 23:14:59 2007 @@ -717,123 +717,81 @@ return TRUE; } -/* Ported from WINE20020904 */ -/* Draw a radio/radioimage/radiomask button coming from DrawFrameControl() - * - * Does a pretty good job in emulating MS behavior. Some quirks are - * however there because MS uses a TrueType font (Marlett) to draw - * the buttons. - */ static BOOL UITOOLS95_DFC_ButtonRadio(HDC dc, LPRECT r, UINT uFlags) { - RECT myr; - int i; - int SmallDiam = UITOOLS_MakeSquareRect(r, &myr); - int BorderShrink = SmallDiam / 16; - HPEN hpsave; - HBRUSH hbsave; - int xc, yc; - - if(BorderShrink < 1) BorderShrink = 1; - - if((uFlags & 0xff) == DFCS_BUTTONRADIOIMAGE) - { - FillRect(dc, r, (HBRUSH)GetStockObject(BLACK_BRUSH)); - } - - xc = myr.left + SmallDiam - SmallDiam/2; - yc = myr.top + SmallDiam - SmallDiam/2; - - /* Define bounding box */ - i = 14*SmallDiam/16; - myr.left = xc - i+i/2; - myr.right = xc + i/2; - myr.top = yc - i+i/2; - myr.bottom = yc + i/2; + RECT rc; + LOGFONT lf; + HFONT hFont, hOldFont; + int SmallDiam, i; + + LPCTSTR OutRight = TEXT("j"); // Outer right + LPCTSTR OutLeft = TEXT("k"); // Outer left + LPCTSTR InRight = TEXT("l"); // inner left + LPCTSTR InLeft = TEXT("m"); // inner right + LPCTSTR Center = TEXT("n"); // center + + SmallDiam = UITOOLS_MakeSquareRect(r, &rc); + + ZeroMemory(&lf, sizeof(LOGFONT)); + lf.lfHeight = SmallDiam; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + lstrcpy(lf.lfFaceName, TEXT("Marlett")); + hFont = CreateFontIndirect(&lf); + hOldFont = SelectObject(dc, hFont); if((uFlags & 0xff) == DFCS_BUTTONRADIOMASK) { - hbsave = (HBRUSH)SelectObject(dc, GetStockObject(BLACK_BRUSH)); - Ellipse(dc, myr.left, myr.top, myr.right, myr.bottom); - SelectObject(dc, hbsave); + SetBkMode(dc, OPAQUE); + SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); + TextOut(dc, rc.left, rc.top, Center, 1); + SetBkMode(dc, TRANSPARENT); + SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); + TextOut(dc, rc.left, rc.top, OutRight, 1); + SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); + TextOut(dc, rc.left, rc.top, OutLeft, 1); } else { - if(uFlags & (DFCS_FLAT|DFCS_MONO)) - { - hpsave = (HPEN)SelectObject(dc, GetSysColorPen(COLOR_WINDOWFRAME)); - hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(COLOR_WINDOWFRAME)); - Ellipse(dc, myr.left, myr.top, myr.right, myr.bottom); - SelectObject(dc, hbsave); - SelectObject(dc, hpsave); + SetBkMode(dc, TRANSPARENT); + + /* Center section, white for active, grey for inactive */ + i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE; + SetTextColor(dc, GetSysColor(i)); + TextOut(dc, rc.left, rc.top, Center, 1); + + if(uFlags & (DFCS_FLAT | DFCS_MONO)) + { + SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); + TextOut(dc, rc.left, rc.top, OutRight, 1); + TextOut(dc, rc.left, rc.top, OutLeft, 1); + TextOut(dc, rc.left, rc.top, InRight, 1); + TextOut(dc, rc.left, rc.top, InLeft, 1); } else { - hpsave = (HPEN)SelectObject(dc, GetSysColorPen(COLOR_BTNHIGHLIGHT)); - hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(COLOR_BTNHIGHLIGHT)); - Pie(dc, myr.left, myr.top, myr.right+1, myr.bottom+1, myr.left-1, myr.bottom, myr.right+1, myr.top); - - SelectObject(dc, GetSysColorPen(COLOR_BTNSHADOW)); - SelectObject(dc, GetSysColorBrush(COLOR_BTNSHADOW)); - Pie(dc, myr.left, myr.top, myr.right+1, myr.bottom+1, myr.right+1, myr.top, myr.left-1, myr.bottom); - - myr.left += BorderShrink; - myr.right -= BorderShrink; - myr.top += BorderShrink; - myr.bottom -= BorderShrink; - - SelectObject(dc, GetSysColorPen(COLOR_3DLIGHT)); - SelectObject(dc, GetSysColorBrush(COLOR_3DLIGHT)); - Pie(dc, myr.left, myr.top, myr.right+1, myr.bottom+1, myr.left-1, myr.bottom, myr.right+1, myr.top); - - SelectObject(dc, GetSysColorPen(COLOR_3DDKSHADOW)); - SelectObject(dc, GetSysColorBrush(COLOR_3DDKSHADOW)); - Pie(dc, myr.left, myr.top, myr.right+1, myr.bottom+1, myr.right+1, myr.top, myr.left-1, myr.bottom); - SelectObject(dc, hbsave); - SelectObject(dc, hpsave); + SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW)); + TextOut(dc, rc.left, rc.top, OutRight, 1); + SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); + TextOut(dc, rc.left, rc.top, OutLeft, 1); + SetTextColor(dc, GetSysColor(COLOR_3DDKSHADOW)); + TextOut(dc, rc.left, rc.top, InRight, 1); + SetTextColor(dc, GetSysColor(COLOR_3DLIGHT)); + TextOut(dc, rc.left, rc.top, InLeft, 1); } - - i = 10*SmallDiam/16; - myr.left = xc - i+i/2; - myr.right = xc + i/2; - myr.top = yc - i+i/2; - myr.bottom = yc + i/2; - i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE; - hpsave = (HPEN)SelectObject(dc, GetSysColorPen(i)); - hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(i)); - Ellipse(dc, myr.left, myr.top, myr.right, myr.bottom); - SelectObject(dc, hbsave); - SelectObject(dc, hpsave); } if(uFlags & DFCS_CHECKED) { - i = 6*SmallDiam/16; - i = i < 1 ? 1 : i; - myr.left = xc - i+i/2; - myr.right = xc + i/2; - myr.top = yc - i+i/2; - myr.bottom = yc + i/2; - - i = uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_WINDOWTEXT; - hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(i)); - hpsave = (HPEN)SelectObject(dc, GetSysColorPen(i)); - Ellipse(dc, myr.left, myr.top, myr.right, myr.bottom); - SelectObject(dc, hpsave); - SelectObject(dc, hbsave); - } - - /* FIXME: M$ has a Polygon in the center at relative points: */ - /* 0.476, 0.476 (times SmallDiam, SmallDiam) */ - /* 0.476, 0.525 */ - /* 0.500, 0.500 */ - /* 0.500, 0.499 */ - /* when the button is unchecked. The reason for it is unknown. The */ - /* color is COLOR_BTNHIGHLIGHT, although the Polygon gets painted at */ - /* least 3 times (it looks like a clip-region when you see it happen). */ - /* I do not really see a reason why this should be implemented. If you */ - /* have a good reason, let me know. Maybe this is a quirk in the Marlett */ - /* font. */ + LPCTSTR Check = TEXT("i"); + + SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); + TextOut(dc, rc.left, rc.top, Check, 1); + } + + SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); + SelectObject(dc, hOldFont); return TRUE; }

17 years, 8 months

[gedmurphy] 25600: Don't substitute Marlett as TGMarlett is the file name, not the typeface name.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Jan 22 22:42:16 2007 New Revision: 25600 URL: http://svn.reactos.org/svn/reactos?rev=25600&view=rev Log: Don't substitute Marlett as TGMarlett is the file name, not the typeface name. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Mon Jan 22 22:42:16 2007 @@ -40,7 +40,6 @@ ; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"DejaVu Vera Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"DejaVu Vera Sans Mono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Marlett",0x00000000,"TGMarlett" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"DejaVu Vera Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"DejaVu Vera Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Vera Sans"

17 years, 8 months

[cwittich] 25599: named pipes support for linux builds

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 22 22:34:53 2007 New Revision: 25599 URL: http://svn.reactos.org/svn/reactos?rev=25599&view=rev Log: named pipes support for linux builds Modified: trunk/reactos/tools/sysreg/file_reader.cpp trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/namedpipe_reader.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/sysreg.mak Modified: trunk/reactos/tools/sysreg/file_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/file_reader.cpp (original) +++ trunk/reactos/tools/sysreg/file_reader.cpp Mon Jan 22 22:34:53 2007 @@ -133,9 +133,9 @@ TCHAR * offset = szBuffer; #endif total_length = 0; - while(ptr = _tcsstr(offset, _T("\x0D\x0A"))) + while((ptr = _tcsstr(offset, _T("\x0D\x0A"))) != NULL) { - int length = ((unsigned)ptr - (unsigned)offset); + long long length = ((long long)ptr - (long long)offset); length /= sizeof(TCHAR); offset[length] = _T('\0'); Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Mon Jan 22 22:34:53 2007 @@ -5,7 +5,7 @@ * FILE: tools/sysreg/namedpipe_reader.cpp * PURPOSE: pipe reader support * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at) - * Christoph von Wittich (Christoph(a)ApiViewer.de) + * Christoph von Wittich (Christoph_vW(a)ReactOS.org) */ #include "namedpipe_reader.h" @@ -20,7 +20,7 @@ using std::vector; //--------------------------------------------------------------------------------------- - NamedPipeReader::NamedPipeReader() : h_Pipe(NULL) + NamedPipeReader::NamedPipeReader() : h_Pipe(NULLVAL) { } @@ -35,15 +35,13 @@ bool NamedPipeReader::openPipe(string const & PipeCmd) { - if (h_Pipe != NULL) + if (h_Pipe != NULLVAL) { cerr << "NamedPipeReader::openPipe> pipe already open" << endl; return false; } -#ifdef __LINUX__ - -#else +#ifdef WIN32 h_Pipe = CreateFile(PipeCmd.c_str(), GENERIC_WRITE | GENERIC_READ, 0, @@ -55,6 +53,7 @@ if(INVALID_HANDLE_VALUE == h_Pipe) { cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << GetLastError() << endl; + h_Pipe = NULLVAL; return false; } else @@ -66,7 +65,19 @@ ConnectNamedPipe( h_Pipe, 0); - +#else + h_Pipe = open("PipeCmd.c_str()", O_RDONLY); + + if(INVALID_HANDLE_VALUE == h_Pipe) { + cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << endl; + h_Pipe = NULLVAL; + return false; + } + else + { + cout << "NamedPipeReader::openPipe> successfully opened pipe" << endl; + return true; + } #endif } @@ -82,14 +93,14 @@ } -#ifdef __LINUX__ - +#ifndef WIN32 + close(h_Pipe); #else DisconnectNamedPipe(h_Pipe); CloseHandle(h_Pipe); #endif - h_Pipe = NULL; + h_Pipe = NULLVAL; return true; } //--------------------------------------------------------------------------------------- @@ -193,7 +204,7 @@ localbuf = (char*) HeapAlloc(GetProcessHeap(), 0, localsize * sizeof(char)); #ifdef UNICODE wchar_t * wbuf = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, localsize * sizeof(wchar_t)); -#endif +#endif /* UNICODE */ if (localbuf != NULL) { bool append_line = false; @@ -205,7 +216,7 @@ ZeroMemory(localbuf, localsize * sizeof(char)); #ifdef UNICODE ZeroMemory(wbuf, localsize * sizeof(wchar_t)); -#endif +#endif /* UNICODE */ fSuccess = ReadFile( h_Pipe, @@ -222,9 +233,9 @@ { extractLines(wbuf, vect, append_line, cbRead); } -#else +#else /* UNICODE */ extractLines(localbuf, vect, append_line, cbRead); -#endif +#endif /* UNICODE */ } while (!fSuccess); // repeat loop if ERROR_MORE_DATA } while (append_line); @@ -235,13 +246,52 @@ HeapFree(GetProcessHeap(), 0, localbuf); #ifdef UNICODE HeapFree(GetProcessHeap(), 0, wbuf); -#endif +#endif /* UNICODE */ } else { return 0; } -#endif + +#else /* WIN32 */ + + localbuf = (char*) malloc(localsize * sizeof(char)); + if (localbuf != NULL) + { + + DWORD cbRead; + + bool append_line = false; + do + { + do + { + memset(localbuf, 0, localsize * sizeof(char)); + + cbRead = read(h_Pipe, + localbuf, + (localsize-1) * sizeof(char)); + + if (cbRead > 0) + { + extractLines(localbuf, vect, append_line, cbRead); + } + + } while (!cbRead); // repeat loop as long as there is data to read + } while (append_line); + + if (cbRead < 0) + return 0; + + + free(localbuf); + } + else + { + return 0; + } + +#endif /* WIN32 */ return (vect.size () - lines); } Modified: trunk/reactos/tools/sysreg/namedpipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.h (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.h Mon Jan 22 22:34:53 2007 @@ -18,10 +18,20 @@ #include <stdio.h> #include <stdlib.h> -#ifdef __LINUX__ - -#elif defined(WIN32) - #include <windows.h> +#if defined(WIN32) +#include <windows.h> +#define NULLVAL NULL +#else +#include <unistd.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#define NULLVAL 0 +#define DWORD unsigned long +#define HANDLE long +#ifndef INVALID_HANDLE_VALUE +#define INVALID_HANDLE_VALUE -1 +#endif #endif namespace System_ @@ -110,8 +120,6 @@ void extractLines(TCHAR * buffer, std::vector<string> & vect, bool & append_line, unsigned long cbRead); - - HANDLE h_Pipe; }; // end of class NamedPipeReader Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Jan 22 22:34:53 2007 @@ -11,7 +11,7 @@ #include "rosboot_test.h" #include "pipe_reader.h" -//#include "namedpipe_reader.h" +#include "namedpipe_reader.h" //#include "sym_file.h" #include "file_reader.h" #include "os_support.h" @@ -31,10 +31,8 @@ { using std::vector; using System_::PipeReader; -#if 0 using System_::NamedPipeReader; - using System_::SymbolFile; -#endif +/* using System_::SymbolFile; */ using System_::FileReader; using System_::OsSupport; @@ -349,8 +347,8 @@ /// FIXME /// split up arguments + OsSupport::ProcessID pid = OsSupport::createProcess ((TCHAR*)boot_cmd.c_str (), 0, NULL); -#if 0 string::size_type pipe_pos = boot_cmd.find (_T("serial pipe:")); NamedPipeReader namedpipe_reader; @@ -440,7 +438,7 @@ } _sleep(3* CLOCKS_PER_SEC); OsSupport::terminateProcess (pid); -#endif + return ret; } //--------------------------------------------------------------------------------------- Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Mon Jan 22 22:34:53 2007 @@ -13,6 +13,10 @@ #include "reg_test.h" #include <vector> +#ifndef WIN32 +#include <unistd.h> +#define _sleep sleep +#endif namespace Sysreg_ { Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Mon Jan 22 22:34:53 2007 @@ -22,6 +22,7 @@ conf_parser.cpp \ env_var.cpp \ pipe_reader.cpp \ + namedpipe_reader.cpp \ rosboot_test.cpp \ sysreg.cpp \ file_reader.cpp \ @@ -87,4 +88,4 @@ .PHONY: sysregbuild_clean sysreg_clean: -@$(rm) $(SYSREGBUILD_TARGET) $(SYSREGBUILD_OBJECTS) 2>$(NUL) -clean: sysreg_clean +clean: sysreg_clean

17 years, 8 months

[gedmurphy] 25598: A temporary set of white cursors containing 1 bit and 32 bit variations. I have some much better ones than these, but they are 32bit only. Making 1 bit versions of these (all ROS can handle at the moment) looked ugly. 32bit cursor support should be ready within the coming weeks.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Jan 22 21:11:21 2007 New Revision: 25598 URL: http://svn.reactos.org/svn/reactos?rev=25598&view=rev Log: A temporary set of white cursors containing 1 bit and 32 bit variations. I have some much better ones than these, but they are 32bit only. Making 1 bit versions of these (all ROS can handle at the moment) looked ugly. 32bit cursor support should be ready within the coming weeks. Modified: trunk/reactos/dll/win32/user32/resources/ocr_appstarting.cur trunk/reactos/dll/win32/user32/resources/ocr_cdautostart.cur trunk/reactos/dll/win32/user32/resources/ocr_cross.cur trunk/reactos/dll/win32/user32/resources/ocr_dragobject.cur trunk/reactos/dll/win32/user32/resources/ocr_hand.cur trunk/reactos/dll/win32/user32/resources/ocr_help.cur trunk/reactos/dll/win32/user32/resources/ocr_ibeam.cur trunk/reactos/dll/win32/user32/resources/ocr_icon.cur trunk/reactos/dll/win32/user32/resources/ocr_no.cur trunk/reactos/dll/win32/user32/resources/ocr_normal.cur trunk/reactos/dll/win32/user32/resources/ocr_pen.cur trunk/reactos/dll/win32/user32/resources/ocr_size.cur trunk/reactos/dll/win32/user32/resources/ocr_sizeall.cur trunk/reactos/dll/win32/user32/resources/ocr_sizenesw.cur trunk/reactos/dll/win32/user32/resources/ocr_sizens.cur trunk/reactos/dll/win32/user32/resources/ocr_sizenwse.cur trunk/reactos/dll/win32/user32/resources/ocr_sizewe.cur trunk/reactos/dll/win32/user32/resources/ocr_up.cur trunk/reactos/dll/win32/user32/resources/ocr_wait.cur Modified: trunk/reactos/dll/win32/user32/resources/ocr_appstarting.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_cdautostart.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_cross.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_dragobject.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_hand.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_help.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_ibeam.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_icon.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_no.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_normal.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_pen.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_size.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizeall.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizenesw.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizens.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizenwse.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_sizewe.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_up.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/user32/resources/ocr_wait.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary files - no diff available.

17 years, 8 months

[weiden] 25597: Silence a warning

by weiden＠svn.reactos.org

Author: weiden Date: Mon Jan 22 20:52:47 2007 New Revision: 25597 URL: http://svn.reactos.org/svn/reactos?rev=25597&view=rev Log: Silence a warning Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Mon Jan 22 20:52:47 2007 @@ -490,7 +490,7 @@ IN BOOLEAN DoInit) { ULONG i, j, Index; - PHANDLE_TABLE_ENTRY Low, *Mid, **High, *SecondLevel, **ThirdLevel; + PHANDLE_TABLE_ENTRY Low = NULL, *Mid, **High, *SecondLevel, **ThirdLevel; ULONG NewFree, FirstFree; PVOID Value; ULONG_PTR TableBase = HandleTable->TableCode & ~3;

17 years, 8 months

← Newer
1
...
4
5
6
7
8
9
10
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2007