Ros-diffs February 2007

ros-diffs@reactos.org

16 participants
265 discussions

[fireball] 25732: Merge 25725, 25726, 25728.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Feb 5 23:59:18 2007 New Revision: 25732 URL: http://svn.reactos.org/svn/reactos?rev=25732&view=rev Log: Merge 25725, 25726, 25728. Modified: branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/bitmap.c branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/icon.c Modified: branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/bitmap.c (original) +++ branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/bitmap.c Mon Feb 5 23:59:18 2007 @@ -186,9 +186,8 @@ UINT fuLoad, ULONG uType) { + HRSRC hResInfo; HANDLE hResource; - HANDLE h2Resource; - HANDLE hfRes; HANDLE hFile; HANDLE hSection; CURSORICONFILEDIR *IconDIR; @@ -211,25 +210,20 @@ if (hinst == NULL) hinst = User32Instance; - hResource = hfRes = FindResourceW(hinst, lpszName, + hResInfo = FindResourceW(hinst, lpszName, Icon ? RT_GROUP_ICON : RT_GROUP_CURSOR); - if (hResource == NULL) - return NULL; - - if (fuLoad & LR_SHARED) - { - hIcon = NtUserFindExistingCursorIcon(hinst, (HRSRC)hfRes, width, height); - if (hIcon) - return hIcon; - } - - hResource = LoadResource(hinst, hResource); + if (hResInfo == NULL) + return NULL; + + hResource = LoadResource(hinst, hResInfo); if (hResource == NULL) return NULL; IconResDir = LockResource(hResource); if (IconResDir == NULL) - return NULL; + { + return NULL; + } /* * Find the best fitting in the IconResDir for this resolution @@ -238,27 +232,45 @@ id = LookupIconIdFromDirectoryEx((PBYTE)IconResDir, Icon, width, height, fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); - h2Resource = FindResourceW(hinst, MAKEINTRESOURCEW(id), + hResInfo = FindResourceW(hinst, MAKEINTRESOURCEW(id), Icon ? MAKEINTRESOURCEW(RT_ICON) : MAKEINTRESOURCEW(RT_CURSOR)); - if (h2Resource == NULL) - return NULL; - - hResource = LoadResource(hinst, h2Resource); + if (hResInfo == NULL) + { + return NULL; + } + + /* Now we have found the icon we want to load. + * Let's see if we already loaded it */ + if (fuLoad & LR_SHARED) + { + hIcon = NtUserFindExistingCursorIcon(hinst, hResInfo, 0, 0); + if (hIcon) + { + return hIcon; + } + } + + hResource = LoadResource(hinst, hResInfo); if (hResource == NULL) - return NULL; + { + return NULL; + } ResIcon = LockResource(hResource); if (ResIcon == NULL) - return NULL; + { + return NULL; + } hIcon = CreateIconFromResourceEx((PBYTE)ResIcon, - SizeofResource(hinst, h2Resource), + SizeofResource(hinst, hResInfo), Icon, 0x00030000, width, height, fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); + if (hIcon && 0 != (fuLoad & LR_SHARED)) { - NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, (HRSRC)hfRes, + NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, hResInfo, (HRSRC)NULL); } Modified: branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/icon.c (original) +++ branches/ros-branch-0_3_1/reactos/dll/win32/user32/windows/icon.c Mon Feb 5 23:59:18 2007 @@ -206,7 +206,7 @@ BOOL fIcon, DWORD dwVer) { - return CreateIconFromResourceEx(presbits, dwResSize, fIcon, dwVer, 0, 0, 0); + return CreateIconFromResourceEx(presbits, dwResSize, fIcon, dwVer, 0, 0, LR_DEFAULTSIZE|LR_SHARED ); }

17 years, 7 months

[fireball] 25731: Update ex/timer.c up to 25610.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Feb 5 23:41:00 2007 New Revision: 25731 URL: http://svn.reactos.org/svn/reactos?rev=25731&view=rev Log: Update ex/timer.c up to 25610. Modified: branches/ros-branch-0_3_1/reactos/include/ndk/kefuncs.h branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/timer.c branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/ex.h Modified: branches/ros-branch-0_3_1/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_1/reactos/include/ndk/kefuncs.h (original) +++ branches/ros-branch-0_3_1/reactos/include/ndk/kefuncs.h Mon Feb 5 23:41:00 2007 @@ -195,6 +195,12 @@ VOID ); +VOID +NTAPI +KeFlushQueuedDpcs( + VOID +); + BOOLEAN NTAPI KiIpiServiceRoutine( Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/timer.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/timer.c Mon Feb 5 23:41:00 2007 @@ -1,40 +1,18 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ex/timer.c * PURPOSE: Executive Timer Implementation - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * David Welch (welch(a)mcmail.com) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, ExpInitializeTimerImplementation) -#endif - - -/* TYPES ********************************************************************/ - -/* Executive Timer Object */ -typedef struct _ETIMER -{ - KTIMER KeTimer; - KAPC TimerApc; - KDPC TimerDpc; - LIST_ENTRY ActiveTimerListEntry; - KSPIN_LOCK Lock; - BOOLEAN ApcAssociated; - BOOLEAN WakeTimer; - LIST_ENTRY WakeTimerListEntry; -} ETIMER, *PETIMER; - -/* GLOBALS ******************************************************************/ +#include <debug.h> + +/* GLOBALS *******************************************************************/ /* Timer Object Type */ POBJECT_TYPE ExTimerType = NULL; @@ -55,191 +33,198 @@ static const INFORMATION_CLASS_INFO ExTimerInfoClass[] = { /* TimerBasicInformation */ - ICI_SQ_SAME( sizeof(TIMER_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), + ICI_SQ_SAME(sizeof(TIMER_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY), }; -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ VOID -STDCALL +NTAPI ExTimerRundown(VOID) { PETHREAD Thread = PsGetCurrentThread(); KIRQL OldIrql; PLIST_ENTRY CurrentEntry; PETIMER Timer; - - /* Lock the Thread's Active Timer List*/ + ULONG DerefsToDo; + + /* Lock the Thread's Active Timer List and loop it */ KeAcquireSpinLock(&Thread->ActiveTimerListLock, &OldIrql); - - while (!IsListEmpty(&Thread->ActiveTimerListHead)) - { - /* Remove a Timer */ - CurrentEntry = RemoveTailList(&Thread->ActiveTimerListHead); - - /* Get the Timer */ + CurrentEntry = Thread->ActiveTimerListHead.Flink; + while (CurrentEntry != &Thread->ActiveTimerListHead) + { + /* Get the timer */ Timer = CONTAINING_RECORD(CurrentEntry, ETIMER, ActiveTimerListEntry); - DPRINT("Timer, ThreadList: 0x%p, 0x%p\n", Timer, Thread); - - /* Mark it as deassociated */ - ASSERT (Timer->ApcAssociated); - Timer->ApcAssociated = FALSE; + + /* Reference it */ + ObReferenceObject(Timer); + DerefsToDo = 1; + + /* Unlock the list */ + KeReleaseSpinLock(&Thread->ActiveTimerListLock, OldIrql); + + /* Lock the Timer */ + KeAcquireSpinLock(&Timer->Lock, &OldIrql); + + /* Lock the list again */ + KeAcquireSpinLockAtDpcLevel(&Thread->ActiveTimerListLock); + + /* Make sure that the timer is valid */ + if ((Timer->ApcAssociated) && (&Thread->Tcb == Timer->TimerApc.Thread)) + { + /* Remove it from the list */ + RemoveEntryList(&Timer->ActiveTimerListEntry); + Timer->ApcAssociated = FALSE; + + /* Cancel the timer and remove its DPC and APC */ + KeCancelTimer(&Timer->KeTimer); + KeRemoveQueueDpc(&Timer->TimerDpc); + if (KeRemoveQueueApc(&Timer->TimerApc)) DerefsToDo++; + + /* Add another dereference to do */ + DerefsToDo++; + } /* Unlock the list */ KeReleaseSpinLockFromDpcLevel(&Thread->ActiveTimerListLock); - /* Lock the Timer */ - KeAcquireSpinLockAtDpcLevel(&Timer->Lock); - - /* Cancel the timer and remove its DPC and APC */ - ASSERT(&Thread->Tcb == Timer->TimerApc.Thread); - KeCancelTimer(&Timer->KeTimer); - KeRemoveQueueDpc(&Timer->TimerDpc); - KeRemoveQueueApc(&Timer->TimerApc); - /* Unlock the Timer */ KeReleaseSpinLock(&Timer->Lock, OldIrql); /* Dereference it */ - ObDereferenceObject(Timer); + ObDereferenceObjectEx(Timer, DerefsToDo); /* Loop again */ KeAcquireSpinLock(&Thread->ActiveTimerListLock, &OldIrql); + CurrentEntry = Thread->ActiveTimerListHead.Flink; } /* Release lock and return */ KeReleaseSpinLock(&Thread->ActiveTimerListLock, OldIrql); - return; } VOID -STDCALL -ExpDeleteTimer(PVOID ObjectBody) +NTAPI +ExpDeleteTimer(IN PVOID ObjectBody) { KIRQL OldIrql; PETIMER Timer = ObjectBody; - DPRINT("ExpDeleteTimer(Timer: 0x%p)\n", Timer); /* Check if it has a Wait List */ - if (Timer->WakeTimer) + if (Timer->WakeTimerListEntry.Flink) { /* Lock the Wake List */ KeAcquireSpinLock(&ExpWakeListLock, &OldIrql); /* Check again, since it might've changed before we locked */ - if (Timer->WakeTimer) + if (Timer->WakeTimerListEntry.Flink) { /* Remove it from the Wait List */ - DPRINT("Removing wake list\n"); RemoveEntryList(&Timer->WakeTimerListEntry); - Timer->WakeTimer = FALSE; + Timer->WakeTimerListEntry.Flink = NULL; } /* Release the Wake List */ KeReleaseSpinLock(&ExpWakeListLock, OldIrql); } - /* Tell the Kernel to cancel the Timer */ - DPRINT("Cancelling Timer\n"); + /* Tell the Kernel to cancel the Timer and flush all queued DPCs */ KeCancelTimer(&Timer->KeTimer); + KeFlushQueuedDpcs(); } VOID -STDCALL -ExpTimerDpcRoutine(PKDPC Dpc, - PVOID DeferredContext, - PVOID SystemArgument1, - PVOID SystemArgument2) +NTAPI +ExpTimerDpcRoutine(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + PETIMER Timer = DeferredContext; + BOOLEAN Inserted = FALSE; + + /* Reference the timer */ + if (!ObReferenceObjectSafe(Timer)) return; + + /* Lock the Timer */ + KeAcquireSpinLockAtDpcLevel(&Timer->Lock); + + /* Check if the timer is associated */ + if (Timer->ApcAssociated) + { + /* Queue the APC */ + Inserted = KeInsertQueueApc(&Timer->TimerApc, + SystemArgument1, + SystemArgument2, + IO_NO_INCREMENT); + } + + /* Release the Timer */ + KeReleaseSpinLockFromDpcLevel(&Timer->Lock); + + /* Dereference it if we couldn't queue the APC */ + if (!Inserted) ObDereferenceObject(Timer); +} + +VOID +NTAPI +ExpTimerApcKernelRoutine(IN PKAPC Apc, + IN OUT PKNORMAL_ROUTINE* NormalRoutine, + IN OUT PVOID* NormalContext, + IN OUT PVOID* SystemArgument1, + IN OUT PVOID* SystemArguemnt2) { PETIMER Timer; KIRQL OldIrql; - - DPRINT("ExpTimerDpcRoutine(Dpc: 0x%p)\n", Dpc); - - /* Get the Timer Object */ - Timer = (PETIMER)DeferredContext; + ULONG DerefsToDo = 1; + PETHREAD Thread = PsGetCurrentThread(); + + /* We need to find out which Timer we are */ + Timer = CONTAINING_RECORD(Apc, ETIMER, TimerApc); /* Lock the Timer */ KeAcquireSpinLock(&Timer->Lock, &OldIrql); - /* Queue the APC */ - if(Timer->ApcAssociated) - { - DPRINT("Queuing APC\n"); - KeInsertQueueApc(&Timer->TimerApc, - SystemArgument1, - SystemArgument2, - IO_NO_INCREMENT); - } - - /* Release the Timer */ + /* Lock the Thread's Active Timer List*/ + KeAcquireSpinLockAtDpcLevel(&Thread->ActiveTimerListLock); + + /* Make sure that the Timer is valid, and that it belongs to this thread */ + if ((Timer->ApcAssociated) && (&Thread->Tcb == Timer->TimerApc.Thread)) + { + /* Check if it's not periodic */ + if (!Timer->Period) + { + /* Remove it from the Active Timers List */ + RemoveEntryList(&Timer->ActiveTimerListEntry); + + /* Disable it */ + Timer->ApcAssociated = FALSE; + DerefsToDo++; + } + } + else + { + /* Clear the normal routine */ + *NormalRoutine = NULL; + } + + /* Release locks */ + KeReleaseSpinLockFromDpcLevel(&Thread->ActiveTimerListLock); KeReleaseSpinLock(&Timer->Lock, OldIrql); - return; -} - - -VOID -STDCALL -ExpTimerApcKernelRoutine(PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArguemnt2) -{ - PETIMER Timer; - KIRQL OldIrql; - PETHREAD CurrentThread = PsGetCurrentThread(); - - /* We need to find out which Timer we are */ - Timer = CONTAINING_RECORD(Apc, ETIMER, TimerApc); - DPRINT("ExpTimerApcKernelRoutine(Apc: 0x%p. Timer: 0x%p)\n", Apc, Timer); - - /* Lock the Timer */ - KeAcquireSpinLock(&Timer->Lock, &OldIrql); - - /* Lock the Thread's Active Timer List*/ - KeAcquireSpinLockAtDpcLevel(&CurrentThread->ActiveTimerListLock); - - /* - * Make sure that the Timer is still valid, and that it belongs to this thread - * Remove it if it's not periodic - */ - if ((Timer->ApcAssociated) && - (&CurrentThread->Tcb == Timer->TimerApc.Thread) && - (!Timer->KeTimer.Period)) - { - /* Remove it from the Active Timers List */ - DPRINT("Removing Timer\n"); - RemoveEntryList(&Timer->ActiveTimerListEntry); - - /* Disable it */ - Timer->ApcAssociated = FALSE; - - /* Release spinlocks */ - KeReleaseSpinLockFromDpcLevel(&CurrentThread->ActiveTimerListLock); - KeReleaseSpinLock(&Timer->Lock, OldIrql); - - /* Dereference the Timer Object */ - ObDereferenceObject(Timer); - return; - } - - /* Release spinlocks */ - KeReleaseSpinLockFromDpcLevel(&CurrentThread->ActiveTimerListLock); - KeReleaseSpinLock(&Timer->Lock, OldIrql); + + /* Dereference as needed */ + ObDereferenceObjectEx(Timer, DerefsToDo); } VOID INIT_FUNCTION -STDCALL +NTAPI ExpInitializeTimerImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT("Creating Timer Object Type\n"); - - /* Create the Event Pair Object Type */ + /* Create the Timer Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Timer"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); @@ -256,8 +241,10 @@ InitializeListHead(&ExpWakeList); } +/* PUBLIC FUNCTIONS **********************************************************/ + NTSTATUS -STDCALL +NTAPI NtCancelTimer(IN HANDLE TimerHandle, OUT PBOOLEAN CurrentState OPTIONAL) { @@ -266,13 +253,12 @@ BOOLEAN State; KIRQL OldIrql; PETHREAD TimerThread; - BOOLEAN KillTimer = FALSE; + ULONG DerefsToDo = 1; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtCancelTimer(0x%p, 0x%x)\n", TimerHandle, CurrentState); /* Check Parameter Validity */ - if(CurrentState && PreviousMode != KernelMode) + if ((CurrentState) && (PreviousMode != KernelMode)) { _SEH_TRY { @@ -283,7 +269,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; } @@ -294,30 +279,25 @@ PreviousMode, (PVOID*)&Timer, NULL); - - /* Check for success */ - if(NT_SUCCESS(Status)) - { - DPRINT("Timer Referenced: 0x%p\n", Timer); - + if (NT_SUCCESS(Status)) + { /* Lock the Timer */ KeAcquireSpinLock(&Timer->Lock, &OldIrql); /* Check if it's enabled */ if (Timer->ApcAssociated) { - /* - * First, remove it from the Thread's Active List - * Get the Thread. - */ - TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb); - DPRINT("Removing from Thread: 0x%p\n", TimerThread); + /* Get the Thread. */ + TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, + ETHREAD, + Tcb); /* Lock its active list */ KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); /* Remove it */ RemoveEntryList(&TimerThread->ActiveTimerListHead); + Timer->ApcAssociated = FALSE; /* Unlock the list */ KeReleaseSpinLockFromDpcLevel(&TimerThread->ActiveTimerListLock); @@ -325,30 +305,27 @@ /* Cancel the Timer */ KeCancelTimer(&Timer->KeTimer); KeRemoveQueueDpc(&Timer->TimerDpc); - KeRemoveQueueApc(&Timer->TimerApc); - Timer->ApcAssociated = FALSE; - KillTimer = TRUE; + if (KeRemoveQueueApc(&Timer->TimerApc)) DerefsToDo++; + DerefsToDo++; } else { /* If timer was disabled, we still need to cancel it */ - DPRINT("APC was not Associated. Cancelling Timer\n"); KeCancelTimer(&Timer->KeTimer); } /* Handle a Wake Timer */ - if (Timer->WakeTimer) + if (Timer->WakeTimerListEntry.Flink) { /* Lock the Wake List */ KeAcquireSpinLockAtDpcLevel(&ExpWakeListLock); /* Check again, since it might've changed before we locked */ - if (Timer->WakeTimer) + if (Timer->WakeTimerListEntry.Flink) { /* Remove it from the Wait List */ - DPRINT("Removing wake list\n"); RemoveEntryList(&Timer->WakeTimerListEntry); - Timer->WakeTimer = FALSE; + Timer->WakeTimerListEntry.Flink = NULL; } /* Release the Wake List */ @@ -362,14 +339,10 @@ State = KeReadStateTimer(&Timer->KeTimer); /* Dereference the Object */ - ObDereferenceObject(Timer); - - /* Dereference if it was previously enabled */ - if (KillTimer) ObDereferenceObject(Timer); - DPRINT1("Timer disabled\n"); + ObDereferenceObjectEx(Timer, DerefsToDo); /* Make sure it's safe to write to the handle */ - if(CurrentState) + if (CurrentState) { _SEH_TRY { @@ -377,7 +350,7 @@ } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - Status = _SEH_GetExceptionCode(); + } _SEH_END; } @@ -388,7 +361,7 @@ } NTSTATUS -STDCALL +NTAPI NtCreateTimer(OUT PHANDLE TimerHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, @@ -399,7 +372,14 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtCreateTimer(Handle: 0x%p, Type: %d)\n", TimerHandle, TimerType); + + /* Check for correct timer type */ + if ((TimerType != NotificationTimer) && + (TimerType != SynchronizationTimer)) + { + /* Fail */ + return STATUS_INVALID_PARAMETER_4; + } /* Check Parameter Validity */ if (PreviousMode != KernelMode) @@ -413,15 +393,7 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; - } - - /* Check for correct timer type */ - if ((TimerType != NotificationTimer) && (TimerType != SynchronizationTimer)) - { - DPRINT1("Invalid Timer Type!\n"); - return STATUS_INVALID_PARAMETER_4; } /* Create the Object */ @@ -434,23 +406,19 @@ 0, 0, (PVOID*)&Timer); - - /* Check for Success */ - if(NT_SUCCESS(Status)) - { - /* Initialize the Kernel Timer */ - DPRINT("Initializing Timer: 0x%p\n", Timer); - KeInitializeTimerEx(&Timer->KeTimer, TimerType); - - /* Initialize the Timer Lock */ - KeInitializeSpinLock(&Timer->Lock); - + if (NT_SUCCESS(Status)) + { /* Initialize the DPC */ KeInitializeDpc(&Timer->TimerDpc, ExpTimerDpcRoutine, Timer); - /* Set Initial State */ + /* Initialize the Kernel Timer */ + KeInitializeTimerEx(&Timer->KeTimer, TimerType); + + /* Initialize the timer fields */ + KeInitializeSpinLock(&Timer->Lock); Timer->ApcAssociated = FALSE; Timer->WakeTimer = FALSE; + Timer->WakeTimerListEntry.Flink = NULL; /* Insert the Timer */ Status = ObInsertObject((PVOID)Timer, @@ -459,18 +427,21 @@ 0, NULL, &hTimer); - DPRINT("Timer Inserted\n"); - - /* Make sure it's safe to write to the handle */ - _SEH_TRY - { - *TimerHandle = hTimer; - } - _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* Make sure it's safe to write to the handle */ + _SEH_TRY + { + *TimerHandle = hTimer; + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + + } + _SEH_END; + } } /* Return to Caller */ @@ -478,7 +449,7 @@ } NTSTATUS -STDCALL +NTAPI NtOpenTimer(OUT PHANDLE TimerHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes) @@ -487,7 +458,6 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtOpenTimer(TimerHandle: 0x%p)\n", TimerHandle); /* Check Parameter Validity */ if (PreviousMode != KernelMode) @@ -501,7 +471,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; } @@ -513,9 +482,7 @@ DesiredAccess, NULL, &hTimer); - - /* Check for success */ - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* Make sure it's safe to write to the handle */ _SEH_TRY @@ -524,7 +491,7 @@ } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - Status = _SEH_GetExceptionCode(); + } _SEH_END; } @@ -533,35 +500,30 @@ return Status; } - NTSTATUS -STDCALL +NTAPI NtQueryTimer(IN HANDLE TimerHandle, IN TIMER_INFORMATION_CLASS TimerInformationClass, OUT PVOID TimerInformation, IN ULONG TimerInformationLength, - OUT PULONG ReturnLength OPTIONAL) + OUT PULONG ReturnLength OPTIONAL) { PETIMER Timer; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; - PTIMER_BASIC_INFORMATION BasicInfo = (PTIMER_BASIC_INFORMATION)TimerInformation; + NTSTATUS Status; + PTIMER_BASIC_INFORMATION BasicInfo = TimerInformation; PAGED_CODE(); - DPRINT("NtQueryTimer(TimerHandle: 0x%p, Class: %d)\n", TimerHandle, TimerInformationClass); /* Check Validity */ Status = DefaultQueryInfoBufferCheck(TimerInformationClass, ExTimerInfoClass, - sizeof(ExTimerInfoClass) / sizeof(ExTimerInfoClass[0]), + sizeof(ExTimerInfoClass) / + sizeof(ExTimerInfoClass[0]), TimerInformation, TimerInformationLength, ReturnLength, PreviousMode); - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryTimer() failed, Status: 0x%x\n", Status); - return Status; - } + if(!NT_SUCCESS(Status)) return Status; /* Get the Timer Object */ Status = ObReferenceObjectByHandle(TimerHandle, @@ -570,25 +532,21 @@ PreviousMode, (PVOID*)&Timer, NULL); - - /* Check for Success */ if(NT_SUCCESS(Status)) { /* Return the Basic Information */ _SEH_TRY { /* Return the remaining time, corrected */ - BasicInfo->TimeRemaining.QuadPart = Timer->KeTimer.DueTime.QuadPart - + BasicInfo->TimeRemaining.QuadPart = Timer-> + KeTimer.DueTime.QuadPart - KeQueryInterruptTime(); /* Return the current state */ BasicInfo->SignalState = KeReadStateTimer(&Timer->KeTimer); /* Return the buffer length if requested */ - if(ReturnLength != NULL) *ReturnLength = sizeof(TIMER_BASIC_INFORMATION); - - DPRINT("Returning Information for Timer: 0x%p. Time Remaining: %I64x\n", - Timer, BasicInfo->TimeRemaining.QuadPart); + if (ReturnLength) *ReturnLength = sizeof(TIMER_BASIC_INFORMATION); } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { @@ -605,7 +563,7 @@ } NTSTATUS -STDCALL +NTAPI NtSetTimer(IN HANDLE TimerHandle, IN PLARGE_INTEGER DueTime, IN PTIMER_APC_ROUTINE TimerApcRoutine OPTIONAL, @@ -618,14 +576,15 @@ KIRQL OldIrql; BOOLEAN State; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PETHREAD CurrentThread = PsGetCurrentThread(); + PETHREAD Thread = PsGetCurrentThread(); LARGE_INTEGER TimerDueTime; PETHREAD TimerThread; - BOOLEAN KillTimer = FALSE; + ULONG DerefsToDo = 1; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtSetTimer(TimerHandle: 0x%p, DueTime: %I64x, Apc: 0x%p, Period: %d)\n", - TimerHandle, DueTime->QuadPart, TimerApcRoutine, Period); + + /* Check for a valid Period */ + if (Period < 0) return STATUS_INVALID_PARAMETER_6; /* Check Parameter Validity */ if (PreviousMode != KernelMode) @@ -633,26 +592,19 @@ _SEH_TRY { TimerDueTime = ProbeForReadLargeInteger(DueTime); - - if(PreviousState) - { - ProbeForWriteBoolean(PreviousState); - } + if (PreviousState) ProbeForWriteBoolean(PreviousState); } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; } - - /* Check for a valid Period */ - if (Period < 0) - { - DPRINT1("Invalid Period for timer\n"); - return STATUS_INVALID_PARAMETER_6; + else + { + /* Capture the time directly */ + TimerDueTime = *DueTime; } /* Get the Timer Object */ @@ -666,7 +618,7 @@ /* * Tell the user we don't support Wake Timers... * when we have the ability to use/detect the Power Management - * functionatliy required to support them, make this check dependent + * functionality required to support them, make this check dependent * on the actual PM capabilities */ if (WakeTimer) Status = STATUS_TIMER_RESUME_IGNORED; @@ -675,24 +627,22 @@ if (NT_SUCCESS(Status)) { /* Lock the Timer */ - DPRINT("Timer Referencced: 0x%p\n", Timer); KeAcquireSpinLock(&Timer->Lock, &OldIrql); /* Cancel Running Timer */ if (Timer->ApcAssociated) { - /* - * First, remove it from the Thread's Active List - * Get the Thread. - */ - TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb); - DPRINT("Thread already running. Removing from Thread: 0x%p\n", TimerThread); + /* Get the Thread. */ + TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, + ETHREAD, + Tcb); /* Lock its active list */ KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); /* Remove it */ RemoveEntryList(&TimerThread->ActiveTimerListHead); + Timer->ApcAssociated = FALSE; /* Unlock the list */ KeReleaseSpinLockFromDpcLevel(&TimerThread->ActiveTimerListLock); @@ -700,14 +650,12 @@ /* Cancel the Timer */ KeCancelTimer(&Timer->KeTimer); KeRemoveQueueDpc(&Timer->TimerDpc); - KeRemoveQueueApc(&Timer->TimerApc); - Timer->ApcAssociated = FALSE; - KillTimer = TRUE; - - } else { - + if (KeRemoveQueueApc(&Timer->TimerApc)) DerefsToDo++; + DerefsToDo++; + } + else + { /* If timer was disabled, we still need to cancel it */ - DPRINT("No APCs. Simply cancelling\n"); KeCancelTimer(&Timer->KeTimer); } @@ -715,62 +663,60 @@ State = KeReadStateTimer(&Timer->KeTimer); /* Handle Wake Timers */ - DPRINT("Doing Wake Semantics\n"); + Timer->WakeTimer = WakeTimer; KeAcquireSpinLockAtDpcLevel(&ExpWakeListLock); - if (WakeTimer && !Timer->WakeTimer) + if ((WakeTimer) && !(Timer->WakeTimerListEntry.Flink)) { /* Insert it into the list */ - Timer->WakeTimer = TRUE; InsertTailList(&ExpWakeList, &Timer->WakeTimerListEntry); } - else if (!WakeTimer && Timer->WakeTimer) + else if (!(WakeTimer) && (Timer->WakeTimerListEntry.Flink)) { /* Remove it from the list */ RemoveEntryList(&Timer->WakeTimerListEntry); - Timer->WakeTimer = FALSE; + Timer->WakeTimerListEntry.Flink = NULL; } KeReleaseSpinLockFromDpcLevel(&ExpWakeListLock); /* Set up the APC Routine if specified */ + Timer->Period = Period; if (TimerApcRoutine) { /* Initialize the APC */ - DPRINT("Initializing APC: 0x%p\n", Timer->TimerApc); KeInitializeApc(&Timer->TimerApc, - &CurrentThread->Tcb, + &Thread->Tcb, CurrentApcEnvironment, - &ExpTimerApcKernelRoutine, + ExpTimerApcKernelRoutine, (PKRUNDOWN_ROUTINE)NULL, (PKNORMAL_ROUTINE)TimerApcRoutine, PreviousMode, TimerContext); /* Lock the Thread's Active List and Insert */ - KeAcquireSpinLockAtDpcLevel(&CurrentThread->ActiveTimerListLock); - InsertTailList(&CurrentThread->ActiveTimerListHead, + KeAcquireSpinLockAtDpcLevel(&Thread->ActiveTimerListLock); + InsertTailList(&Thread->ActiveTimerListHead, &Timer->ActiveTimerListEntry); - KeReleaseSpinLockFromDpcLevel(&CurrentThread->ActiveTimerListLock); - + Timer->ApcAssociated = TRUE; + KeReleaseSpinLockFromDpcLevel(&Thread->ActiveTimerListLock); + + /* One less dereference to do */ + DerefsToDo--; } /* Enable and Set the Timer */ - DPRINT("Setting Kernel Timer\n"); KeSetTimerEx(&Timer->KeTimer, TimerDueTime, Period, - TimerApcRoutine ? &Timer->TimerDpc : 0); - Timer->ApcAssociated = TimerApcRoutine ? TRUE : FALSE; + TimerApcRoutine ? &Timer->TimerDpc : NULL); /* Unlock the Timer */ KeReleaseSpinLock(&Timer->Lock, OldIrql); /* Dereference if it was previously enabled */ - if (!TimerApcRoutine) ObDereferenceObject(Timer); - if (KillTimer) ObDereferenceObject(Timer); - DPRINT("Finished Setting the Timer\n"); + if (DerefsToDo) ObDereferenceObjectEx(Timer, DerefsToDo); /* Make sure it's safe to write to the handle */ - if(PreviousState != NULL) + if (PreviousState) { _SEH_TRY { @@ -778,7 +724,6 @@ } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - Status = _SEH_GetExceptionCode(); } _SEH_END; } @@ -787,5 +732,3 @@ /* Return to Caller */ return Status; } - -/* EOF */ Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/ex.h (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/ex.h Mon Feb 5 23:41:00 2007 @@ -21,6 +21,19 @@ ULONG ExpUnicodeCaseTableDataOffset; PVOID ExpNlsSectionPointer; +typedef struct _ETIMER +{ + KTIMER KeTimer; + KAPC TimerApc; + KDPC TimerDpc; + LIST_ENTRY ActiveTimerListEntry; + KSPIN_LOCK Lock; + LONG Period; + BOOLEAN ApcAssociated; + BOOLEAN WakeTimer; + LIST_ENTRY WakeTimerListEntry; +} ETIMER, *PETIMER; + #define MAX_FAST_REFS 7 #define EX_OBJ_TO_HDR(eob) ((POBJECT_HEADER)((ULONG_PTR)(eob) & \

17 years, 7 months

[fireball] 25730: Merge 25584, 25588.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Feb 5 23:14:59 2007 New Revision: 25730 URL: http://svn.reactos.org/svn/reactos?rev=25730&view=rev Log: Merge 25584, 25588. Added: branches/ros-branch-0_3_1/reactos/dll/win32/syssetup/syssetup_It.rc - copied unchanged from r25588, trunk/reactos/dll/win32/syssetup/syssetup_It.rc Modified: branches/ros-branch-0_3_1/reactos/dll/win32/syssetup/syssetup.rc branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/init.c branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/pushlock.c branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/ex.h Modified: branches/ros-branch-0_3_1/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/win32/syssetup/syssetup.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/win32/syssetup/syssetup.rc Mon Feb 5 23:14:59 2007 @@ -51,3 +51,4 @@ #include "syssetup_Es.rc" #include "syssetup_Hu.rc" #include "syssetup_Uk.rc" +#include "syssetup_It.rc" Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/init.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/init.c Mon Feb 5 23:14:59 2007 @@ -1,11 +1,11 @@ /* -* PROJECT: ReactOS Kernel -* LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/ex/init.c -* PURPOSE: Executive Initialization Code -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) -* Eric Kohl (ekohl(a)rz-online.de) -*/ + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ex/init.c + * PURPOSE: Executive Initialization Code + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl (ekohl(a)rz-online.de) + */ /* INCLUDES ******************************************************************/ Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/pushlock.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/ex/pushlock.c Mon Feb 5 23:14:59 2007 @@ -342,6 +342,33 @@ } /*++ + * @name ExWaitForUnblockPushLock + * + * The ExWaitForUnblockPushLock routine waits for a pushlock + * to be unblocked, for a specified internal. + * + * @param PushLock + * Pointer to a pushlock whose waiter list needs to be optimized. + * + * @param WaitBlock + * Pointer to the pushlock's wait block. + * + * @return STATUS_SUCCESS is the pushlock is now unblocked, otherwise the error + * code returned by KeWaitForSingleObject. + * + * @remarks If the wait fails, then a manual unblock is attempted. + * + *--*/ +VOID +FASTCALL +ExWaitForUnblockPushLock(IN PEX_PUSH_LOCK PushLock, + IN PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock) +{ + /* Call the timed function with no timeout */ + ExTimedWaitForUnblockPushLock(PushLock, WaitBlock, NULL); +} + +/*++ * @name ExBlockPushLock * * The ExBlockPushLock routine blocks a pushlock. @@ -360,25 +387,33 @@ VOID FASTCALL ExBlockPushLock(PEX_PUSH_LOCK PushLock, - PVOID WaitBlock) -{ - PVOID NewValue, OldValue; + PVOID pWaitBlock) +{ + PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock = pWaitBlock; + EX_PUSH_LOCK NewValue, OldValue; + + /* Detect invalid wait block alignment */ + ASSERT((ULONG_PTR)pWaitBlock & 0x10); /* Set the waiting bit */ - ((PEX_PUSH_LOCK_WAIT_BLOCK)WaitBlock)->Flags |= EX_PUSH_LOCK_FLAGS_WAIT; - - /* Link the wait blocks */ - ((PEX_PUSH_LOCK_WAIT_BLOCK)WaitBlock)->Next = PushLock->Ptr; - - /* Try to set this one as the wait block now */ - NewValue = PushLock->Ptr; + WaitBlock->Flags = EX_PUSH_LOCK_FLAGS_WAIT; + + /* Get the old value */ + OldValue = *PushLock; + + /* Start block loop */ for (;;) { + /* Link the wait blocks */ + WaitBlock->Next = OldValue.Ptr; + /* Set the new wait block value */ - OldValue = InterlockedCompareExchangePointer(&PushLock->Ptr, - WaitBlock, - NewValue); - if (OldValue == NewValue) break; + NewValue.Ptr = InterlockedCompareExchangePointer(&PushLock->Ptr, + WaitBlock, + OldValue.Ptr); + if (OldValue.Ptr == NewValue.Ptr) break; + + /* Try again with the new value */ NewValue = OldValue; } } @@ -404,7 +439,7 @@ FASTCALL ExfAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock) { - EX_PUSH_LOCK_WAIT_BLOCK WaitBlock; + DEFINE_WAIT_BLOCK(WaitBlock); EX_PUSH_LOCK OldValue = *PushLock, NewValue, TempValue; BOOLEAN NeedWake; ULONG i; @@ -435,23 +470,23 @@ else { /* We'll have to create a Waitblock */ - WaitBlock.Flags = EX_PUSH_LOCK_FLAGS_EXCLUSIVE | - EX_PUSH_LOCK_FLAGS_WAIT; - WaitBlock.Previous = NULL; + WaitBlock->Flags = EX_PUSH_LOCK_FLAGS_EXCLUSIVE | + EX_PUSH_LOCK_FLAGS_WAIT; + WaitBlock->Previous = NULL; NeedWake = FALSE; /* Check if there is already a waiter */ if (OldValue.Waiting) { /* Nobody is the last waiter yet */ - WaitBlock.Last = NULL; + WaitBlock->Last = NULL; /* We are an exclusive waiter */ - WaitBlock.ShareCount = 0; + WaitBlock->ShareCount = 0; /* Set the current Wait Block pointer */ - WaitBlock.Next = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR) - OldValue.Ptr &~ EX_PUSH_LOCK_PTR_BITS); + WaitBlock->Next = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR) + OldValue.Ptr &~ EX_PUSH_LOCK_PTR_BITS); /* Point to ours */ NewValue.Value = (OldValue.Value & EX_PUSH_LOCK_MULTIPLE_SHARED) | @@ -466,10 +501,10 @@ else { /* We are the first waiter, so loop the wait block */ - WaitBlock.Last = &WaitBlock; + WaitBlock->Last = WaitBlock; /* Set the share count */ - WaitBlock.ShareCount = OldValue.Shared; + WaitBlock->ShareCount = OldValue.Shared; /* Check if someone is sharing this pushlock */ if (OldValue.Shared > 1) @@ -483,7 +518,7 @@ else { /* No shared count */ - WaitBlock.ShareCount = 0; + WaitBlock->ShareCount = 0; /* Point to our wait block */ NewValue.Value = EX_PUSH_LOCK_LOCK | @@ -494,10 +529,10 @@ #if DBG /* Setup the Debug Wait Block */ - WaitBlock.Signaled = 0; - WaitBlock.OldValue = OldValue; - WaitBlock.NewValue = NewValue; - WaitBlock.PushLock = PushLock; + WaitBlock->Signaled = 0; + WaitBlock->OldValue = OldValue; + WaitBlock->NewValue = NewValue; + WaitBlock->PushLock = PushLock; #endif /* Sanity check */ @@ -524,26 +559,26 @@ } /* Set up the Wait Gate */ - KeInitializeGate(&WaitBlock.WakeGate); + KeInitializeGate(&WaitBlock->WakeGate); /* Now spin on the push lock if necessary */ i = ExPushLockSpinCount; - if ((i) && (WaitBlock.Flags & EX_PUSH_LOCK_WAITING)) + if ((i) && (WaitBlock->Flags & EX_PUSH_LOCK_WAITING)) { /* Spin */ while (--i) YieldProcessor(); } /* Now try to remove the wait bit */ - if (InterlockedBitTestAndReset(&WaitBlock.Flags, 1)) + if (InterlockedBitTestAndReset(&WaitBlock->Flags, 1)) { /* Nobody removed it already, let's do a full wait */ - KeWaitForGate(&WaitBlock.WakeGate, WrPushLock, KernelMode); - ASSERT(WaitBlock.Signaled); + KeWaitForGate(&WaitBlock->WakeGate, WrPushLock, KernelMode); + ASSERT(WaitBlock->Signaled); } /* We shouldn't be shared anymore */ - ASSERT((WaitBlock.ShareCount == 0)); + ASSERT((WaitBlock->ShareCount == 0)); /* Loop again */ OldValue = NewValue; @@ -570,7 +605,7 @@ FASTCALL ExfAcquirePushLockShared(PEX_PUSH_LOCK PushLock) { - EX_PUSH_LOCK_WAIT_BLOCK WaitBlock; + DEFINE_WAIT_BLOCK(WaitBlock); EX_PUSH_LOCK OldValue = *PushLock, NewValue; BOOLEAN NeedWake; ULONG i; @@ -614,20 +649,20 @@ else { /* We'll have to create a Waitblock */ - WaitBlock.Flags = EX_PUSH_LOCK_FLAGS_WAIT; - WaitBlock.ShareCount = 0; + WaitBlock->Flags = EX_PUSH_LOCK_FLAGS_WAIT; + WaitBlock->ShareCount = 0; NeedWake = FALSE; - WaitBlock.Previous = NULL; + WaitBlock->Previous = NULL; /* Check if there is already a waiter */ if (OldValue.Waiting) { /* Set the current Wait Block pointer */ - WaitBlock.Next = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR) - OldValue.Ptr &~ EX_PUSH_LOCK_PTR_BITS); + WaitBlock->Next = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR) + OldValue.Ptr &~ EX_PUSH_LOCK_PTR_BITS); /* Nobody is the last waiter yet */ - WaitBlock.Last = NULL; + WaitBlock->Last = NULL; /* Point to ours */ NewValue.Value = (OldValue.Value & (EX_PUSH_LOCK_MULTIPLE_SHARED | @@ -642,7 +677,7 @@ else { /* We are the first waiter, so loop the wait block */ - WaitBlock.Last = &WaitBlock; + WaitBlock->Last = WaitBlock; /* Point to our wait block */ NewValue.Value = (OldValue.Value & (EX_PUSH_LOCK_MULTIPLE_SHARED | @@ -656,10 +691,10 @@ #if DBG /* Setup the Debug Wait Block */ - WaitBlock.Signaled = 0; - WaitBlock.OldValue = OldValue; - WaitBlock.NewValue = NewValue; - WaitBlock.PushLock = PushLock; + WaitBlock->Signaled = 0; + WaitBlock->OldValue = OldValue; + WaitBlock->NewValue = NewValue; + WaitBlock->PushLock = PushLock; #endif /* Write the new value */ @@ -683,26 +718,26 @@ } /* Set up the Wait Gate */ - KeInitializeGate(&WaitBlock.WakeGate); + KeInitializeGate(&WaitBlock->WakeGate); /* Now spin on the push lock if necessary */ i = ExPushLockSpinCount; - if ((i) && (WaitBlock.Flags & EX_PUSH_LOCK_WAITING)) + if ((i) && (WaitBlock->Flags & EX_PUSH_LOCK_WAITING)) { /* Spin */ while (--i) YieldProcessor(); } /* Now try to remove the wait bit */ - if (InterlockedBitTestAndReset(&WaitBlock.Flags, 1)) + if (InterlockedBitTestAndReset(&WaitBlock->Flags, 1)) { /* Fast-path did not work, we need to do a full wait */ - KeWaitForGate(&WaitBlock.WakeGate, WrPushLock, KernelMode); - ASSERT(WaitBlock.Signaled); + KeWaitForGate(&WaitBlock->WakeGate, WrPushLock, KernelMode); + ASSERT(WaitBlock->Signaled); } /* We shouldn't be shared anymore */ - ASSERT((WaitBlock.ShareCount == 0)); + ASSERT((WaitBlock->ShareCount == 0)); } } } @@ -1004,7 +1039,7 @@ FASTCALL ExfReleasePushLockExclusive(PEX_PUSH_LOCK PushLock) { - EX_PUSH_LOCK NewValue; + EX_PUSH_LOCK NewValue, WakeValue; EX_PUSH_LOCK OldValue = *PushLock; /* Loop until we can change */ @@ -1023,6 +1058,28 @@ /* Sanity check */ ASSERT(NewValue.Waking && !NewValue.Locked); + + /* Write the New Value. Save our original value for waking */ + WakeValue = NewValue; + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + + /* Check if the value changed behind our back */ + if (NewValue.Value != OldValue.Value) + { + /* Wake the Pushlock */ + ExfWakePushLock(PushLock, WakeValue); + break; + } + } + else + { + /* A simple unlock */ + NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_LOCK; + + /* Sanity check */ + ASSERT(NewValue.Waking && !NewValue.Waiting); /* Write the New Value */ NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, @@ -1030,36 +1087,11 @@ OldValue.Ptr); /* Check if the value changed behind our back */ - if (NewValue.Value != OldValue.Value) - { - /* Loop again */ - OldValue = NewValue; - continue; - } - - /* Wake the Pushlock */ - ExfWakePushLock(PushLock, NewValue); - break; - } - else - { - /* A simple unlock */ - NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_LOCK; - - /* Sanity check */ - ASSERT(NewValue.Waking && !NewValue.Waiting); - - /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, - NewValue.Ptr, - OldValue.Ptr); - - /* Check if the value changed behind our back */ if (NewValue.Value == OldValue.Value) break; - - /* Loop again */ - OldValue = NewValue; - } + } + + /* Loop again */ + OldValue = NewValue; } } @@ -1128,7 +1160,7 @@ KIRQL OldIrql = DISPATCH_LEVEL; /* Get the wait block and erase the previous one */ - WaitBlock = InterlockedExchangePointer(PushLock->Ptr, 0); + WaitBlock = InterlockedExchangePointer(&PushLock->Ptr, NULL); if (WaitBlock) { /* Check if there is a linked pushlock and raise IRQL appropriately */ @@ -1144,7 +1176,7 @@ if (InterlockedBitTestAndReset(&WaitBlock->Flags, 1)) { /* Nobody removed the flag before us, so signal the event */ - KeSetEventBoostPriority(&WaitBlock->WakeEvent, IO_NO_INCREMENT); + KeSetEventBoostPriority(&WaitBlock->WakeEvent, NULL); } /* Check if there was a next block */ @@ -1161,6 +1193,6 @@ EX_PUSH_LOCK_FLAGS_WAIT)) { /* Wait for the pushlock to be unblocked */ - ExTimedWaitForUnblockPushLock(PushLock, CurrentWaitBlock, NULL); - } -} + ExWaitForUnblockPushLock(PushLock, CurrentWaitBlock); + } +} Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/ex.h (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/include/internal/ex.h Mon Feb 5 23:14:59 2007 @@ -49,6 +49,36 @@ #define ExRundownCompleted _ExRundownCompleted #define ExGetPreviousMode KeGetPreviousMode +// +// Detect GCC 4.1.2+ +// +#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40102 + +// +// Broken GCC with Alignment Bug. We'll do alignment ourselves at higher cost. +// +#define DEFINE_WAIT_BLOCK(x) \ + struct _AlignHack \ + { \ + UCHAR Hack[15]; \ + EX_PUSH_LOCK_WAIT_BLOCK UnalignedBlock; \ + } WaitBlockBuffer; \ + PEX_PUSH_LOCK_WAIT_BLOCK x = (PEX_PUSH_LOCK_WAIT_BLOCK) \ + ((ULONG_PTR)&WaitBlockBuffer.UnalignedBlock &~ 0xF); + +#else + +// +// This is only for compatibility; the compiler will optimize the extra +// local variable (the actual pointer) away, so we don't take any perf hit +// by doing this. +// +#define DEFINE_WAIT_BLOCK(x) \ + EX_PUSH_LOCK_WAIT_BLOCK WaitBlockBuffer; \ + PEX_PUSH_LOCK_WAIT_BLOCK x = &WaitBlockBuffer; + +#endif + /* INITIALIZATION FUNCTIONS *************************************************/ VOID @@ -498,6 +528,23 @@ /* PUSHLOCKS *****************************************************************/ +/* FIXME: VERIFY THESE! */ + +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); + /*++ * @name ExInitializePushLock * INTERNAL MACRO @@ -653,12 +700,16 @@ FORCEINLINE ExWaitOnPushLock(PEX_PUSH_LOCK PushLock) { - /* Acquire the lock */ - ExfAcquirePushLockExclusive(PushLock); - ASSERT(PushLock->Locked); - - /* Release it */ - ExfReleasePushLockExclusive(PushLock); + /* Check if we're locked */ + if (PushLock->Locked) + { + /* Acquire the lock */ + ExfAcquirePushLockExclusive(PushLock); + ASSERT(PushLock->Locked); + + /* Release it */ + ExfReleasePushLockExclusive(PushLock); + } } /*++

17 years, 7 months

[greatlrd] 25729: fixed 5.01 can be type in calc it did remove the zero so the result was 5.1 See issue #2019 for more details.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Feb 5 19:34:29 2007 New Revision: 25729 URL: http://svn.reactos.org/svn/reactos?rev=25729&view=rev Log: fixed 5.01 can be type in calc it did remove the zero so the result was 5.1 See issue #2019 for more details. Modified: trunk/reactos/base/applications/calc/winecalc.c Modified: trunk/reactos/base/applications/calc/winecalc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winecalc.c (original) +++ trunk/reactos/base/applications/calc/winecalc.c Mon Feb 5 19:34:29 2007 @@ -2882,16 +2882,16 @@ MessageBeep(0); } - if (point) { - p = calc->buffer; - n = _tcslen(p) - 1; - while (*(p+n) && - *(p+n) != TEXT('.') && - *(p+n) == TEXT('0')) { - calc->buffer[n] = TEXT('\0'); - n--; - } - } + //if (point) { + // p = calc->buffer; + // n = _tcslen(p) - 1; + // while (*(p+n) && + // *(p+n) != TEXT('.') && + // *(p+n) == TEXT('0')) { + // calc->buffer[n] = TEXT('\0'); + // n--; + // } + //} // remove leading zeros

17 years, 7 months

[tkreuzer] 25728: FreeResource is deprecated. Not needed to free any mem.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 5 16:37:16 2007 New Revision: 25728 URL: http://svn.reactos.org/svn/reactos?rev=25728&view=rev Log: FreeResource is deprecated. Not needed to free any mem. Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Mon Feb 5 16:37:16 2007 @@ -222,15 +222,12 @@ IconResDir = LockResource(hResource); if (IconResDir == NULL) { - FreeResource(hResource); return NULL; } /* Find the best fitting in the IconResDir for this resolution */ id = LookupIconIdFromDirectoryEx((PBYTE)IconResDir, Icon, width, height, fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); - - FreeResource(hResource); hResInfo = FindResourceW(hinst, MAKEINTRESOURCEW(id), Icon ? (LPCWSTR) RT_ICON : @@ -260,7 +257,6 @@ ResIcon = LockResource(hResource); if (ResIcon == NULL) { - FreeResource(hResource); return NULL; } @@ -268,7 +264,6 @@ SizeofResource(hinst, hResInfo), Icon, 0x00030000, width, height, fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); - FreeResource(hResource); if (hIcon && 0 != (fuLoad & LR_SHARED)) {

17 years, 7 months

[fireball] 25727: Those Wmi*() are not kernel APIs.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Feb 5 13:47:27 2007 New Revision: 25727 URL: http://svn.reactos.org/svn/reactos?rev=25727&view=rev Log: Those Wmi*() are not kernel APIs. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Mon Feb 5 13:47:27 2007 @@ -10526,7 +10526,6 @@ /** WMI library support routines **/ -NTKERNELAPI NTSTATUS NTAPI WmiCompleteRequest( @@ -10536,7 +10535,6 @@ IN ULONG BufferUsed, IN CCHAR PriorityBoost); -NTKERNELAPI NTSTATUS NTAPI WmiFireEvent( @@ -10556,7 +10554,6 @@ OUT PULONG RequiredLength OPTIONAL, IN PVOID Buffer OPTIONAL); -NTKERNELAPI NTSTATUS NTAPI WmiSystemControl(

17 years, 7 months

[tkreuzer] 25726: Make LoadCursorIconImage() find shared icons, even if they don't have the desired width/height. Now explorer doesn't leak icons / bitmaps anymore. fixes bug 1554 See issue #1554 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 5 03:59:59 2007 New Revision: 25726 URL: http://svn.reactos.org/svn/reactos?rev=25726&view=rev Log: Make LoadCursorIconImage() find shared icons, even if they don't have the desired width/height. Now explorer doesn't leak icons / bitmaps anymore. fixes bug 1554 See issue #1554 for more details. Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Mon Feb 5 03:59:59 2007 @@ -186,9 +186,8 @@ UINT fuLoad, ULONG uType) { + HRSRC hResInfo; HANDLE hResource; - HANDLE h2Resource; - HANDLE hfRes; HANDLE hFile; HANDLE hSection; CURSORICONFILEDIR *IconDIR; @@ -211,52 +210,69 @@ if (hinst == NULL) hinst = User32Instance; - hResource = hfRes = FindResourceW(hinst, lpszName, + hResInfo = FindResourceW(hinst, lpszName, Icon ? RT_GROUP_ICON : RT_GROUP_CURSOR); - if (hResource == NULL) - return NULL; - - if (fuLoad & LR_SHARED) - { - hIcon = NtUserFindExistingCursorIcon(hinst, (HRSRC)hfRes, width, height); - if (hIcon) - return hIcon; - } - - hResource = LoadResource(hinst, hResource); + if (hResInfo == NULL) + return NULL; + + hResource = LoadResource(hinst, hResInfo); if (hResource == NULL) return NULL; IconResDir = LockResource(hResource); if (IconResDir == NULL) - return NULL; + { + FreeResource(hResource); + return NULL; + } /* Find the best fitting in the IconResDir for this resolution */ id = LookupIconIdFromDirectoryEx((PBYTE)IconResDir, Icon, width, height, fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); - h2Resource = FindResourceW(hinst, MAKEINTRESOURCEW(id), + FreeResource(hResource); + + hResInfo = FindResourceW(hinst, MAKEINTRESOURCEW(id), Icon ? (LPCWSTR) RT_ICON : (LPCWSTR) RT_CURSOR); - if (h2Resource == NULL) - return NULL; - - hResource = LoadResource(hinst, h2Resource); + if (hResInfo == NULL) + { + return NULL; + } + + /* Now we have found the icon we want to load. + * Let's see if we already loaded it */ + if (fuLoad & LR_SHARED) + { + hIcon = NtUserFindExistingCursorIcon(hinst, hResInfo, 0, 0); + if (hIcon) + { + return hIcon; + } + } + + hResource = LoadResource(hinst, hResInfo); if (hResource == NULL) - return NULL; + { + return NULL; + } ResIcon = LockResource(hResource); if (ResIcon == NULL) - return NULL; + { + FreeResource(hResource); + return NULL; + } hIcon = CreateIconFromResourceEx((PBYTE)ResIcon, - SizeofResource(hinst, h2Resource), + SizeofResource(hinst, hResInfo), Icon, 0x00030000, width, height, fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); + FreeResource(hResource); if (hIcon && 0 != (fuLoad & LR_SHARED)) { - NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, (HRSRC)hfRes, + NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, hResInfo, (HRSRC)NULL); } @@ -650,7 +666,7 @@ { /* Look if the colors of the DIB are black and white */ - monochrome = + monochrome = (bi->bmiColors[0].rgbRed == 0xff && bi->bmiColors[0].rgbGreen == 0xff && bi->bmiColors[0].rgbBlue == 0xff

17 years, 7 months

[tkreuzer] 25725: MSDN sais: "The CreateIconFromResource function calls CreateIconFromResourceEx passing LR_DEFAULTSIZE|LR_SHARED as flags." (not supported yet in CreateIconFromResourceEx())

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 5 03:21:38 2007 New Revision: 25725 URL: http://svn.reactos.org/svn/reactos?rev=25725&view=rev Log: MSDN sais: "The CreateIconFromResource function calls CreateIconFromResourceEx passing LR_DEFAULTSIZE|LR_SHARED as flags." (not supported yet in CreateIconFromResourceEx()) Modified: trunk/reactos/dll/win32/user32/windows/icon.c Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c Mon Feb 5 03:21:38 2007 @@ -206,7 +206,7 @@ BOOL fIcon, DWORD dwVer) { - return CreateIconFromResourceEx(presbits, dwResSize, fIcon, dwVer, 0, 0, 0); + return CreateIconFromResourceEx(presbits, dwResSize, fIcon, dwVer, 0, 0, LR_DEFAULTSIZE|LR_SHARED ); }

17 years, 7 months

[spetreolle] 25724: fix build

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Feb 5 01:35:09 2007 New Revision: 25724 URL: http://svn.reactos.org/svn/reactos?rev=25724&view=rev Log: fix build Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Mon Feb 5 01:35:09 2007 @@ -3,7 +3,7 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> -#include "bootvid\bootvid.h" +#include "bootvid/bootvid.h" /* GLOBALS *******************************************************************/ @@ -239,7 +239,7 @@ InbvAcquireLock(); /* Make sure we're installed and display the string */ - if (InbvBootDriverInstalled) VidDisplayString(String); + if (InbvBootDriverInstalled) VidDisplayString((PUCHAR) String); /* Call Headless (We don't support headless for now) HeadlessDispatch(DISPLAY_STRING); */

17 years, 7 months

[greatlrd] 25723: Good news after all bugfix in cmd it seam pipe works with unicode. only bug left 1. we need found where we miss translate some part from unicode -> ansi and use current codepage. This change are not for 0.3.1 it is target for next release.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Feb 5 00:48:07 2007 New Revision: 25723 URL: http://svn.reactos.org/svn/reactos?rev=25723&view=rev Log: Good news after all bugfix in cmd it seam pipe works with unicode. only bug left 1. we need found where we miss translate some part from unicode -> ansi and use current codepage. This change are not for 0.3.1 it is target for next release. Modified: trunk/reactos/base/shell/cmd/cmd.rbuild Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild Mon Feb 5 00:48:07 2007 @@ -4,6 +4,8 @@ <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> + <define name="UNICODE" /> + <define name="_UNICODE" /> <pch>precomp.h</pch> <compilationunit name="unit.c"> <file>alias.c</file> @@ -67,6 +69,8 @@ <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> + <define name="UNICODE" /> + <define name="_UNICODE" /> <library>cmd_base</library> <library>kernel32</library> <library>advapi32</library>

17 years, 7 months

← Newer
1
...
18
19
20
21
22
23
24
...
27
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 February 2007