Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 25484: - Implement ExReferenceCallBackBlock and ExDereferenceCallBackBlock. - Code is very similar to Ob* Fast Referencing, and the use of macros to encapsulate generic referencing should be done later. Essentially, Ob sticks ObRefs around FastRefs, while ExCallbacks sticks ExRundown around FastRefs.
by ion＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: ion Date: Tue Jan 16 10:20:16 2007 New Revision: 25484 URL: http://svn.reactos.org/svn/reactos?rev=25484&view=rev Log: - Implement ExReferenceCallBackBlock and ExDereferenceCallBackBlock. - Code is very similar to Ob* Fast Referencing, and the use of macros to encapsulate generic referencing should be done later. Essentially, Ob sticks ObRefs around FastRefs, while ExCallbacks sticks ExRundown around FastRefs. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/ex/callback.c 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 Tue Jan 16 10:20:16 2007 @@ -6519,6 +6519,22 @@ IN OUT PKGUARDED_MUTEX GuardedMutex ); +NTKERNELAPI +BOOLEAN +FASTCALL +ExAcquireRundownProtectionEx( + IN OUT PEX_RUNDOWN_REF RunRef, + IN ULONG Count +); + +NTKERNELAPI +VOID +FASTCALL +ExReleaseRundownProtectionEx( + IN OUT PEX_RUNDOWN_REF RunRef, + IN ULONG Count +); + /* Fast Mutex */ #define ExInitializeFastMutex(_FastMutex) \ { \ Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c (original) +++ trunk/reactos/ntoskrnl/ex/callback.c Tue Jan 16 10:20:16 2007 @@ -42,7 +42,7 @@ VOID NTAPI -ExInitializeCallback(IN OUT PEX_CALLBACK Callback) +ExInitializeCallBack(IN OUT PEX_CALLBACK Callback) { /* Initialize the fast references */ Callback->RoutineBlock.Object = NULL; @@ -73,7 +73,7 @@ VOID NTAPI -ExFreeCallback(IN PEX_CALLBACK_ROUTINE_BLOCK Callback) +ExFreeCallBack(IN PEX_CALLBACK_ROUTINE_BLOCK Callback) { /* Just free it from memory */ ExFreePool(Callback); @@ -108,15 +108,125 @@ ExDereferenceCallBackBlock(IN OUT PEX_CALLBACK CallBack, IN PEX_CALLBACK_ROUTINE_BLOCK CallbackRoutineBlock) { - /* FIXME: TODO */ + PEX_FAST_REF FastRef = &CallBack->RoutineBlock; + EX_FAST_REF Value, NewValue; + + /* Sanity checks */ + ASSERT(CallbackRoutineBlock); + ASSERT(!(((ULONG_PTR)CallbackRoutineBlock) & MAX_FAST_REFS)); + + /* Start dereference loop */ + for (;;) + { + /* Get the current count */ + Value = *FastRef; + if ((Value.Value ^ (ULONG_PTR)CallbackRoutineBlock) < MAX_FAST_REFS) + { + /* Decrease the reference count */ + NewValue.Value = Value.Value + 1; + NewValue.Object = InterlockedCompareExchangePointer(&FastRef->Object, + NewValue.Object, + Value.Object); + if (NewValue.Object != Value.Object) continue; + + /* We're all done */ + break; + } + else + { + /* Release rundown protection */ + ExReleaseRundownProtection(&CallbackRoutineBlock->RundownProtect); + } + } } PEX_CALLBACK_ROUTINE_BLOCK NTAPI ExReferenceCallBackBlock(IN OUT PEX_CALLBACK CallBack) { - /* FIXME: TODO */ - return NULL; + PEX_FAST_REF FastRef = &CallBack->RoutineBlock; + EX_FAST_REF Value, NewValue; + PEX_CALLBACK_ROUTINE_BLOCK CallbackRoutineBlock; + + /* Start reference loop */ + for (;;) + { + /* Get the current count */ + Value = *FastRef; + if (Value.RefCnt != 0) + { + /* Increase the reference count */ + NewValue.Value = Value.Value - 1; + NewValue.Object = InterlockedCompareExchangePointer(&FastRef->Object, + NewValue.Object, + Value.Object); + if (NewValue.Object != Value.Object) continue; + } + + /* All done */ + break; + } + + /* Fail if there isn't any object */ + if (!Value.Value) return NULL; + + /* Check if we don't have a reference */ + if (!Value.RefCnt) + { + /* FIXME: Race */ + CallbackRoutineBlock = NULL; + DPRINT1("Unhandled callback race condition\n"); + KEBUGCHECK(0); + } + else + { + /* Get the callback block */ + CallbackRoutineBlock = (PVOID)(Value.Value &~ MAX_FAST_REFS); + + /* Check if this is the last reference */ + if (Value.RefCnt == 1) + { + /* Acquire rundown protection */ + if (ExfAcquireRundownProtectionEx(&CallbackRoutineBlock-> + RundownProtect, + MAX_FAST_REFS)) + { + /* Sanity check */ + ASSERT(!(((ULONG_PTR)CallbackRoutineBlock) & MAX_FAST_REFS)); + + /* Start reference loop */ + for (;;) + { + /* Check if the current count is too high */ + Value = *FastRef; + if (((Value.RefCnt + MAX_FAST_REFS) > MAX_FAST_REFS) || + ((Value.Value &~ MAX_FAST_REFS) != + (ULONG_PTR)CallbackRoutineBlock)) + { + /* Backdown the rundown acquire */ + ExfReleaseRundownProtectionEx(&CallbackRoutineBlock-> + RundownProtect, + MAX_FAST_REFS); + break; + } + + /* Increase the reference count */ + NewValue.Value = Value.Value + MAX_FAST_REFS; + NewValue.Object = + InterlockedCompareExchangePointer(&FastRef->Object, + NewValue.Object, + Value.Object); + if (NewValue.Object != Value.Object) continue; + + /* Break out if the change was OK */ + break; + } + } + } + } + + /* Return the callback block */ + return CallbackRoutineBlock; } VOID

1 0

[ion] 25483: - Start partial implementation of Executive Lightweight Callbacks: ExAllocateCallBack, ExInitializeCallBack, ExFreeCallBack, ExWaitForCallBacks, ExGetCallBackBlockRoutine, ExGetcallBackBlockContext, ExDoCallBack. - Stub ExReferenceCallBackBlock and ExDereferenceCallBackBlock until I get the locking right. - These callbacks are used by Cm as well as Ps inside Windows NT and combine the power of PushLocks, Rundown Protection and Fast Referencing to ensure callbacks only get called onc
by ion＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: ion Date: Tue Jan 16 08:31:05 2007 New Revision: 25483 URL: http://svn.reactos.org/svn/reactos?rev=25483&view=rev Log: - Start partial implementation of Executive Lightweight Callbacks: ExAllocateCallBack, ExInitializeCallBack, ExFreeCallBack, ExWaitForCallBacks, ExGetCallBackBlockRoutine, ExGetcallBackBlockContext, ExDoCallBack. - Stub ExReferenceCallBackBlock and ExDereferenceCallBackBlock until I get the locking right. - These callbacks are used by Cm as well as Ps inside Windows NT and combine the power of PushLocks, Rundown Protection and Fast Referencing to ensure callbacks only get called once and thread safely. Not yet used in ROS. Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/ntoskrnl/ex/callback.c Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h (original) +++ trunk/reactos/include/ndk/extypes.h Tue Jan 16 08:31:05 2007 @@ -514,7 +514,7 @@ typedef struct _EX_CALLBACK_ROUTINE_BLOCK { EX_RUNDOWN_REF RundownProtect; - PVOID Function; + PEX_CALLBACK_FUNCTION Function; PVOID Context; } EX_CALLBACK_ROUTINE_BLOCK, *PEX_CALLBACK_ROUTINE_BLOCK; Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c (original) +++ trunk/reactos/ntoskrnl/ex/callback.c Tue Jan 16 08:31:05 2007 @@ -39,6 +39,110 @@ KEVENT ExpCallbackEvent; /* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +ExInitializeCallback(IN OUT PEX_CALLBACK Callback) +{ + /* Initialize the fast references */ + Callback->RoutineBlock.Object = NULL; +} + +PEX_CALLBACK_ROUTINE_BLOCK +NTAPI +ExAllocateCallBack(IN PEX_CALLBACK_FUNCTION Function, + IN PVOID Context) +{ + PEX_CALLBACK_ROUTINE_BLOCK Callback; + + /* Allocate a callback */ + Callback = ExAllocatePoolWithTag(PagedPool, + sizeof(*Callback), + TAG('C', 'b', 'r', 'b')); + if (Callback) + { + /* Initialize it */ + Callback->Function = Function; + Callback->Context = Context; + ExInitializeRundownProtection(&Callback->RundownProtect); + } + + /* Return it */ + return Callback; +} + +VOID +NTAPI +ExFreeCallback(IN PEX_CALLBACK_ROUTINE_BLOCK Callback) +{ + /* Just free it from memory */ + ExFreePool(Callback); +} + +VOID +NTAPI +ExWaitForCallBacks(IN PEX_CALLBACK_ROUTINE_BLOCK Callback) +{ + /* Wait on the rundown */ + ExWaitForRundownProtectionRelease(&Callback->RundownProtect); +} + +PEX_CALLBACK_FUNCTION +NTAPI +ExGetCallBackBlockRoutine(IN PEX_CALLBACK_ROUTINE_BLOCK Callback) +{ + /* Return the function */ + return Callback->Function; +} + +PVOID +NTAPI +ExGetCallBackBlockContext(IN PEX_CALLBACK_ROUTINE_BLOCK Callback) +{ + /* Return the context */ + return Callback->Context; +} + +VOID +NTAPI +ExDereferenceCallBackBlock(IN OUT PEX_CALLBACK CallBack, + IN PEX_CALLBACK_ROUTINE_BLOCK CallbackRoutineBlock) +{ + /* FIXME: TODO */ +} + +PEX_CALLBACK_ROUTINE_BLOCK +NTAPI +ExReferenceCallBackBlock(IN OUT PEX_CALLBACK CallBack) +{ + /* FIXME: TODO */ + return NULL; +} + +VOID +NTAPI // FIXME: FORCEINLINE AFTER TESTING! +ExDoCallBack(IN OUT PEX_CALLBACK Callback, + IN PVOID Context, + IN PVOID Argument1, + IN PVOID Argument2) +{ + PEX_CALLBACK_ROUTINE_BLOCK CallbackRoutineBlock; + PEX_CALLBACK_FUNCTION Function; + + /* Reference the block */ + CallbackRoutineBlock = ExReferenceCallBackBlock(Callback); + if (CallbackRoutineBlock) + { + /* Get the function */ + Function = ExGetCallBackBlockRoutine(CallbackRoutineBlock); + + /* Do the callback */ + Function(Context, Argument1, Argument2); + + /* Now dereference it */ + ExDereferenceCallBackBlock(Callback, CallbackRoutineBlock); + } +} VOID NTAPI

1 0

[ion] 25482: - Large cleanup of exported callback implementation. It was my first code to ReactOS and quite messy. - Make code use standard NT structures. - Fix object type initialization. - Fix calls to ExCreatecallback during system initalization which were randomly overwriting memory. - Fix ExREgisterCallback which was allocating only a pointer inside of the entire structure, also over-writing system memory.
by ion＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: ion Date: Tue Jan 16 07:16:31 2007 New Revision: 25482 URL: http://svn.reactos.org/svn/reactos?rev=25482&view=rev Log: - Large cleanup of exported callback implementation. It was my first code to ReactOS and quite messy. - Make code use standard NT structures. - Fix object type initialization. - Fix calls to ExCreatecallback during system initalization which were randomly overwriting memory. - Fix ExREgisterCallback which was allocating only a pointer inside of the entire structure, also over-writing system memory. Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h (original) +++ trunk/reactos/include/ndk/extypes.h Tue Jan 16 07:16:31 2007 @@ -488,11 +488,25 @@ // typedef struct _CALLBACK_OBJECT { - ULONG Name; + ULONG Signature; KSPIN_LOCK Lock; LIST_ENTRY RegisteredCallbacks; - ULONG AllowMultipleCallbacks; -} CALLBACK_OBJECT , *PCALLBACK_OBJECT; + BOOLEAN AllowMultipleCallbacks; + UCHAR reserved[3]; +} CALLBACK_OBJECT, *PCALLBACK_OBJECT; + +// +// Callback Handle +// +typedef struct _CALLBACK_REGISTRATION +{ + LIST_ENTRY Link; + PCALLBACK_OBJECT CallbackObject; + PCALLBACK_FUNCTION CallbackFunction; + PVOID CallbackContext; + ULONG Busy; + BOOLEAN UnregisterWaiting; +} CALLBACK_REGISTRATION, *PCALLBACK_REGISTRATION; // // Internal Callback Object Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c (original) +++ trunk/reactos/ntoskrnl/ex/callback.c Tue Jan 16 07:16:31 2007 @@ -3,54 +3,30 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ex/callback.c * PURPOSE: Executive callbacks - * PROGRAMMERS: Filip Navara - * Alex Ionescu (alex(a)relsoft.net) + * 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, ExpInitializeCallbacks) -#endif - - -/* TYPES ********************************************************************/ +/* TYPES *********************************************************************/ /* Mapping for Callback Object */ GENERIC_MAPPING ExpCallbackMapping = { - CALLBACK_READ, - CALLBACK_WRITE, - CALLBACK_EXECUTE, - CALLBACK_ALL_ACCESS + CALLBACK_READ, + CALLBACK_WRITE, + CALLBACK_EXECUTE, + CALLBACK_ALL_ACCESS }; - -/* Structure used to hold Callbacks */ -typedef struct _CALLBACK_REGISTRATION -{ - LIST_ENTRY RegisteredCallbacks; - PCALLBACK_OBJECT CallbackObject; - PCALLBACK_FUNCTION CallbackFunction; - PVOID CallbackContext; - ULONG InUse; - BOOLEAN PendingDeletion; -} CALLBACK_REGISTRATION, *PCALLBACK_REGISTRATION; - -typedef struct -{ - PCALLBACK_OBJECT *CallbackObject; - PWSTR Name; -} SYSTEM_CALLBACKS; /* Kernel Default Callbacks */ PCALLBACK_OBJECT SetSystemTimeCallback; PCALLBACK_OBJECT SetSystemStateCallback; PCALLBACK_OBJECT PowerStateCallback; - SYSTEM_CALLBACKS ExpInitializeCallback[] = { {&SetSystemTimeCallback, L"\\Callback\\SetSystemTime"}, @@ -62,7 +38,15 @@ POBJECT_TYPE ExCallbackObjectType; KEVENT ExpCallbackEvent; -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +ExpDeleteCallback(IN PVOID Object) +{ + /* Sanity check */ + ASSERT(IsListEmpty(&((PCALLBACK_OBJECT)Object)->RegisteredCallbacks)); +} /*++ * @name ExpInitializeCallbacks @@ -75,7 +59,7 @@ * @remarks None * *--*/ -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeCallbacks(VOID) @@ -89,43 +73,33 @@ HANDLE DirectoryHandle; ULONG i; - /* Initialize the Callback Object type */ + /* Initialize the Callback Object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Callback"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(CALLBACK_OBJECT); + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObjectTypeInitializer.GenericMapping = ExpCallbackMapping; ObjectTypeInitializer.PoolType = NonPagedPool; - - Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExCallbackObjectType); - - /* Fail if it wasn't created successfully */ - if (!NT_SUCCESS(Status)) - { - return; - } + ObjectTypeInitializer.DeleteProcedure = ExpDeleteCallback; + ObjectTypeInitializer.ValidAccessMask = CALLBACK_ALL_ACCESS; + Status = ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &ExCallbackObjectType); + if (!NT_SUCCESS(Status)) return FALSE; /* Initialize the Object */ - InitializeObjectAttributes( - &ObjectAttributes, - &DirName, - OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, - NULL, - NULL - ); + InitializeObjectAttributes(&ObjectAttributes, + &DirName, + OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, + NULL, + SePublicDefaultSd); /* Create the Object Directory */ - Status = NtCreateDirectoryObject( - &DirectoryHandle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes - ); - - /* Fail if couldn't create */ - if (!NT_SUCCESS(Status)) - { - return; - } + Status = NtCreateDirectoryObject(&DirectoryHandle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) return FALSE; /* Close Handle... */ NtClose(DirectoryHandle); @@ -134,36 +108,31 @@ KeInitializeEvent(&ExpCallbackEvent, NotificationEvent, 0); /* Default NT Kernel Callbacks. */ - for (i=0; ExpInitializeCallback[i].CallbackObject; i++) + for (i = 0; ExpInitializeCallback[i].CallbackObject; i++) { /* Create the name from the structure */ RtlInitUnicodeString(&CallbackName, ExpInitializeCallback[i].Name); /* Initialize the Object Attributes Structure */ - InitializeObjectAttributes( - &ObjectAttributes, - &CallbackName, - OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, - NULL, - NULL - ); + InitializeObjectAttributes(&ObjectAttributes, + &CallbackName, + OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, + NULL, + NULL); /* Create the Callback Object */ - Status = ExCreateCallback( - (PCALLBACK_OBJECT*)&(ExpInitializeCallback[i].CallbackObject), - &ObjectAttributes, - TRUE, - TRUE - ); - - /* Make sure Global Callbacks have been created */ - if (!NT_SUCCESS(Status)) - { - return; - } - } + Status = ExCreateCallback(ExpInitializeCallback[i].CallbackObject, + &ObjectAttributes, + TRUE, + TRUE); + if (!NT_SUCCESS(Status)) return FALSE; + } + /* Everything successful */ -} + return TRUE; +} + +/* PUBLIC FUNCTIONS **********************************************************/ /*++ * @name ExCreateCallback @@ -200,15 +169,15 @@ IN BOOLEAN Create, IN BOOLEAN AllowMultipleCallbacks) { - PCALLBACK_OBJECT Callback; - NTSTATUS Status; - HANDLE Handle; - + PCALLBACK_OBJECT Callback = NULL; + NTSTATUS Status; + HANDLE Handle = NULL; PAGED_CODE(); /* Open a handle to the callback if it exists */ if (ObjectAttributes->ObjectName) { + /* Open the handle */ Status = ObOpenObjectByName(ObjectAttributes, ExCallbackObjectType, KernelMode, @@ -219,12 +188,14 @@ } else { + /* Otherwise, fail */ Status = STATUS_UNSUCCESSFUL; } /* We weren't able to open it...should we create it? */ - if(!NT_SUCCESS(Status) && Create ) - { + if (!(NT_SUCCESS(Status)) && (Create)) + { + /* Create the object */ Status = ObCreateObject(KernelMode, ExCallbackObjectType, ObjectAttributes, @@ -233,25 +204,27 @@ sizeof(CALLBACK_OBJECT), 0, 0, - (PVOID *)&Callback ); - - /* We Created it...let's initialize the structure now */ - if(NT_SUCCESS(Status)) + (PVOID *)&Callback); + if (NT_SUCCESS(Status)) { - KeInitializeSpinLock(&Callback->Lock); /* SpinLock */ - InitializeListHead(&Callback->RegisteredCallbacks); /* Callback Entries */ - Callback->AllowMultipleCallbacks = AllowMultipleCallbacks; /* Multiple Callbacks */ - /* Create the object */ + /* Set it up */ + Callback->Signature = TAG('C', 'a', 'l', 'l'); + KeInitializeSpinLock(&Callback->Lock); + InitializeListHead(&Callback->RegisteredCallbacks); + Callback->AllowMultipleCallbacks = AllowMultipleCallbacks; + + /* Insert the object into the object namespace */ Status = ObInsertObject(Callback, NULL, FILE_READ_DATA, 0, NULL, - &Handle ); + &Handle); } } - if(NT_SUCCESS(Status)) + /* Check if we have success until here */ + if (NT_SUCCESS(Status)) { /* Get a pointer to the new object from the handle we just got */ Status = ObReferenceObjectByHandle(Handle, @@ -260,15 +233,13 @@ KernelMode, (PVOID)&Callback, NULL); + /* Close the Handle, since we now have the pointer */ ZwClose(Handle); } /* Everything went fine, so return a pointer to the Object */ - if (NT_SUCCESS(Status)) - { - *CallbackObject = (PCALLBACK_OBJECT)Callback; - } + if (NT_SUCCESS(Status)) *CallbackObject = Callback; return Status; } @@ -278,7 +249,6 @@ * * Calls a function pointer (a registered callback) * See: http://www.osronline.com/ddkx/kmarch/k102_2f5e.htm - * http://msdn.microsoft.com/library/en-us/Kernel_d/hh/Kernel_d/Synchro_e954f5… * http://vmsone.com/~decuslib/vmssig/vmslt99b/nt/wdm-callback.txt * * @param CallbackObject @@ -297,17 +267,24 @@ *--*/ VOID NTAPI -ExNotifyCallback(IN PCALLBACK_OBJECT OpaqueCallbackObject, +ExNotifyCallback(IN PCALLBACK_OBJECT CallbackObject, IN PVOID Argument1, IN PVOID Argument2) { - PCALLBACK_OBJECT CallbackObject = (PCALLBACK_OBJECT)OpaqueCallbackObject; - PLIST_ENTRY RegisteredCallbacks; - PCALLBACK_REGISTRATION CallbackRegistration; - KIRQL OldIrql; + PLIST_ENTRY RegisteredCallbacks; + PCALLBACK_REGISTRATION CallbackRegistration; + KIRQL OldIrql; + + /* Check if we don't have an object or registrations */ + if (!(CallbackObject) || + (IsListEmpty(&CallbackObject->RegisteredCallbacks))) + { + /* Don't notify */ + return; + } /* Acquire the Lock */ - OldIrql = KfAcquireSpinLock(&CallbackObject->Lock); + KeAcquireSpinLock(&CallbackObject->Lock, &OldIrql); /* Enumerate through all the registered functions */ for (RegisteredCallbacks = CallbackObject->RegisteredCallbacks.Flink; @@ -317,39 +294,41 @@ /* Get a pointer to a Callback Registration from the List Entries */ CallbackRegistration = CONTAINING_RECORD(RegisteredCallbacks, CALLBACK_REGISTRATION, - RegisteredCallbacks); - - /* Don't bother doing Callback Notification if it's pending to be deleted */ - if (!CallbackRegistration->PendingDeletion) + Link); + + /* Don't bother doing notification if it's pending to be deleted */ + if (!CallbackRegistration->UnregisterWaiting) { - /* Mark the Callback in use, so it won't get deleted while we are calling it */ - CallbackRegistration->InUse += 1; + /* Mark the Callback in use, so it won't get deleted */ + CallbackRegistration->Busy += 1; /* Release the Spinlock before making the call */ - KfReleaseSpinLock(&CallbackObject->Lock, OldIrql); + KeReleaseSpinLock(&CallbackObject->Lock, OldIrql); /* Call the Registered Function */ - CallbackRegistration->CallbackFunction( - CallbackRegistration->CallbackContext, - Argument1, - Argument2 - ); + CallbackRegistration->CallbackFunction(CallbackRegistration-> + CallbackContext, + Argument1, + Argument2); /* Get SpinLock back */ - OldIrql = KfAcquireSpinLock(&CallbackObject->Lock); + KeAcquireSpinLock(&CallbackObject->Lock, &OldIrql); /* We are not in use anymore */ - CallbackRegistration->InUse -= 1; - - /* If another instance of this function isn't running and deletion is pending, signal the event */ - if (CallbackRegistration->PendingDeletion && CallbackRegistration->InUse == 0) + CallbackRegistration->Busy -= 1; + + /* Check if removal is pending and we're not active */ + if ((CallbackRegistration->UnregisterWaiting) && + !(CallbackRegistration->Busy)) { + /* Signal the callback event */ KeSetEvent(&ExpCallbackEvent, 0, FALSE); } } } - /* Unsynchronize and release the Callback Object */ - KfReleaseSpinLock(&CallbackObject->Lock, OldIrql); + + /* Release the Callback Object */ + KeReleaseSpinLock(&CallbackObject->Lock, OldIrql); } /*++ @@ -377,53 +356,64 @@ *--*/ PVOID NTAPI -ExRegisterCallback(IN PCALLBACK_OBJECT OpaqueCallbackObject, +ExRegisterCallback(IN PCALLBACK_OBJECT CallbackObject, IN PCALLBACK_FUNCTION CallbackFunction, IN PVOID CallbackContext) { - PCALLBACK_OBJECT CallbackObject = (PCALLBACK_OBJECT)OpaqueCallbackObject; - PCALLBACK_REGISTRATION CallbackRegistration = NULL; - KIRQL OldIrql; - - PAGED_CODE(); + PCALLBACK_REGISTRATION CallbackRegistration = NULL; + KIRQL OldIrql; + + /* Sanity checks */ + ASSERT(CallbackFunction); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Create reference to Callback Object */ - ObReferenceObject (CallbackObject); + ObReferenceObject(CallbackObject); /* Allocate memory for the structure */ - CallbackRegistration = ExAllocatePoolWithTag( - NonPagedPool, - sizeof(CallbackRegistration), - CALLBACK_TAG - ); - /* Fail if memory allocation failed */ - if(!CallbackRegistration) - { + CallbackRegistration = ExAllocatePoolWithTag(NonPagedPool, + sizeof(CALLBACK_REGISTRATION), + CALLBACK_TAG); + if (!CallbackRegistration) + { + /* Dereference and fail */ ObDereferenceObject (CallbackObject); return NULL; } /* Create Callback Registration */ - CallbackRegistration->CallbackObject = CallbackObject; /* When unregistering, drivers send a handle to the Registration, not the object... */ - CallbackRegistration->CallbackFunction = CallbackFunction; /* NotifyCallback uses Objects, so this needs to be here in order to call the registered functions */ - CallbackRegistration->CallbackContext = CallbackContext; /* The documented NotifyCallback returns the Context, so we must save this somewhere */ + CallbackRegistration->CallbackObject = CallbackObject; + CallbackRegistration->CallbackFunction = CallbackFunction; + CallbackRegistration->CallbackContext = CallbackContext; + CallbackRegistration->Busy = 0; + CallbackRegistration->UnregisterWaiting = FALSE; /* Acquire SpinLock */ - OldIrql = KfAcquireSpinLock (&CallbackObject->Lock); - - /* Add Callback if 1) No Callbacks registered or 2) Multiple Callbacks allowed */ - if(CallbackObject->AllowMultipleCallbacks || IsListEmpty(&CallbackObject->RegisteredCallbacks)) - { - InsertTailList(&CallbackObject->RegisteredCallbacks,&CallbackRegistration->RegisteredCallbacks); + KeAcquireSpinLock(&CallbackObject->Lock, &OldIrql); + + /* Check if 1) No Callbacks registered or 2) Multiple Callbacks allowed */ + if ((CallbackObject->AllowMultipleCallbacks) || + (IsListEmpty(&CallbackObject->RegisteredCallbacks))) + { + /* Register the callback */ + InsertTailList(&CallbackObject->RegisteredCallbacks, + &CallbackRegistration->Link); + + /* Release SpinLock */ + KeReleaseSpinLock(&CallbackObject->Lock, OldIrql); } else { + /* Release SpinLock */ + KeReleaseSpinLock(&CallbackObject->Lock, OldIrql); + + /* Free the registration */ ExFreePool(CallbackRegistration); CallbackRegistration = NULL; - } - - /* Release SpinLock */ - KfReleaseSpinLock(&CallbackObject->Lock, OldIrql); + + /* Dereference the object */ + ObDereferenceObject(CallbackObject); + } /* Return handle to Registration Object */ return (PVOID)CallbackRegistration; @@ -448,51 +438,48 @@ NTAPI ExUnregisterCallback(IN PVOID CallbackRegistrationHandle) { - PCALLBACK_REGISTRATION CallbackRegistration; - PCALLBACK_OBJECT CallbackObject; - KIRQL OldIrql; - - PAGED_CODE(); + PCALLBACK_REGISTRATION CallbackRegistration; + PCALLBACK_OBJECT CallbackObject; + KIRQL OldIrql; + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Convert Handle to valid Structure Pointer */ - CallbackRegistration = (PCALLBACK_REGISTRATION) CallbackRegistrationHandle; + CallbackRegistration = (PCALLBACK_REGISTRATION)CallbackRegistrationHandle; /* Get the Callback Object */ CallbackObject = CallbackRegistration->CallbackObject; /* Lock the Object */ - OldIrql = KfAcquireSpinLock (&CallbackObject->Lock); - - /* We can't Delete the Callback if it's in use, because this would create a call towards a null pointer => crash */ - while (CallbackRegistration->InUse) - { - /* Similarly, we also don't want to wait ages for all pending callbacks to be called */ - CallbackRegistration->PendingDeletion = TRUE; + KeAcquireSpinLock (&CallbackObject->Lock, &OldIrql); + + /* We can't Delete the Callback if it's in use */ + while (CallbackRegistration->Busy) + { + /* Let everyone else know we're unregistering */ + CallbackRegistration->UnregisterWaiting = TRUE; /* We are going to wait for the event, so the Lock isn't necessary */ - KfReleaseSpinLock (&CallbackObject->Lock, OldIrql); + KeReleaseSpinLock(&CallbackObject->Lock, OldIrql); /* Make sure the event is cleared */ - KeClearEvent (&ExpCallbackEvent); + KeClearEvent(&ExpCallbackEvent); /* Wait for the Event */ - KeWaitForSingleObject ( - &ExpCallbackEvent, - Executive, - KernelMode, - FALSE, - NULL - ); + KeWaitForSingleObject(&ExpCallbackEvent, + Executive, + KernelMode, + FALSE, + NULL); /* We need the Lock again */ - OldIrql = KfAcquireSpinLock(&CallbackObject->Lock); + KeAcquireSpinLock(&CallbackObject->Lock, &OldIrql); } /* Remove the Callback */ - RemoveEntryList(&CallbackRegistration->RegisteredCallbacks); + RemoveEntryList(&CallbackRegistration->Link); /* It's now safe to release the lock */ - KfReleaseSpinLock(&CallbackObject->Lock, OldIrql); + KeReleaseSpinLock(&CallbackObject->Lock, OldIrql); /* Delete this registration */ ExFreePool(CallbackRegistration); 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 16 07:16:31 2007 @@ -34,6 +34,12 @@ LIST_ENTRY WakeTimerListEntry; } ETIMER, *PETIMER; +typedef struct +{ + PCALLBACK_OBJECT *CallbackObject; + PWSTR Name; +} SYSTEM_CALLBACKS; + #define MAX_FAST_REFS 7 #define EX_OBJ_TO_HDR(eob) ((POBJECT_HEADER)((ULONG_PTR)(eob) & \ @@ -107,7 +113,7 @@ IN PLIST_ENTRY ListHead ); -VOID +BOOLEAN NTAPI ExpInitializeCallbacks(VOID);

1 0

[ion] 25481: - Fix major bugs in the definition of _KTHREAD inside the NDK. I made some stupid assumptions when reading the .pdb dump data. _KTHREAD should now be the right size and structure as Win 2003. (the reason this bug wasn't more evident was because we were using 1-byte packing and a "padding" field. this has now been removed).
by ion＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: ion Date: Tue Jan 16 05:40:41 2007 New Revision: 25481 URL: http://svn.reactos.org/svn/reactos?rev=25481&view=rev Log: - Fix major bugs in the definition of _KTHREAD inside the NDK. I made some stupid assumptions when reading the .pdb dump data. _KTHREAD should now be the right size and structure as Win 2003. (the reason this bug wasn't more evident was because we were using 1-byte packing and a "padding" field. this has now been removed). Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Tue Jan 16 05:40:41 2007 @@ -679,7 +679,6 @@ // // Kernel Thread (KTHREAD) // -#include <pshpack1.h> typedef struct _KTHREAD { DISPATCHER_HEADER DispatcherHeader; @@ -700,31 +699,31 @@ { UCHAR ApcStateFill[23]; UCHAR ApcQueueable; - }; - }; - volatile UCHAR NextProcessor; - volatile UCHAR DeferredProcessor; - UCHAR AdjustReason; - SCHAR AdjustIncrement; + volatile UCHAR NextProcessor; + volatile UCHAR DeferredProcessor; + UCHAR AdjustReason; + SCHAR AdjustIncrement; + }; + }; KSPIN_LOCK ApcQueueLock; ULONG ContextSwitches; volatile UCHAR State; UCHAR NpxState; - UCHAR WaitIrql; - SCHAR WaitMode; - LONG WaitStatus; + KIRQL WaitIrql; + KPROCESSOR_MODE WaitMode; + LONG_PTR WaitStatus; union { PKWAIT_BLOCK WaitBlockList; PKGATE GateObject; }; - UCHAR Alertable; - UCHAR WaitNext; + BOOLEAN Alertable; + BOOLEAN WaitNext; UCHAR WaitReason; SCHAR Priority; - UCHAR EnableStackSwap; + BOOLEAN EnableStackSwap; volatile UCHAR SwapBusy; - UCHAR Alerted[2]; + BOOLEAN Alerted[MaximumMode]; union { LIST_ENTRY WaitListEntry; @@ -745,51 +744,50 @@ union { KTIMER Timer; - UCHAR TimerFill[40]; - }; - union - { - struct - { - LONG AutoAlignment:1; - LONG DisableBoost:1; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - LONG EtwStackTrace1ApcInserted:1; - LONG EtwStackTrace2ApcInserted:1; - LONG CycleChargePending:1; - LONG ReservedFlags:27; + struct + { + UCHAR TimerFill[40]; + union + { + struct + { + LONG AutoAlignment:1; + LONG DisableBoost:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + LONG EtwStackTrace1ApcInserted:1; + LONG EtwStackTrace2ApcInserted:1; + LONG CycleChargePending:1; + LONG ReservedFlags:27; #else - LONG ReservedFlags:30; -#endif - }; - LONG ThreadFlags; - }; - PVOID Padding; - union - { - KWAIT_BLOCK WaitBlock[4]; - union - { - struct - { - UCHAR WaitBlockFill0[23]; - UCHAR SystemAffinityActive; + LONG ReservedFlags:30; +#endif + }; + LONG ThreadFlags; }; - struct - { - UCHAR WaitBlockFill1[47]; - SCHAR PreviousMode; - }; - struct - { - UCHAR WaitBlockFill2[71]; - UCHAR ResourceIndex; - }; - struct - { - UCHAR WaitBlockFill3[95]; - UCHAR LargeStack; - }; + }; + }; + union + { + KWAIT_BLOCK WaitBlock[THREAD_WAIT_OBJECTS + 1]; + struct + { + UCHAR WaitBlockFill0[23]; + BOOLEAN SystemAffinityActive; + }; + struct + { + UCHAR WaitBlockFill1[47]; + CCHAR PreviousMode; + }; + struct + { + UCHAR WaitBlockFill2[71]; + UCHAR ResourceIndex; + }; + struct + { + UCHAR WaitBlockFill3[95]; + UCHAR LargeStack; }; }; LIST_ENTRY QueueListEntry; @@ -801,15 +799,15 @@ PVOID ServiceTable; UCHAR ApcStateIndex; UCHAR IdealProcessor; - UCHAR Preempted; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - UCHAR CalloutActive; + BOOLEAN Preempted; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + BOOLEAN CalloutActive; #else - UCHAR ProcessReadyQueue; -#endif - UCHAR KernelStackResident; - CHAR BasePriority; - CHAR PriorityDecrement; + BOOLEAN ProcessReadyQueue; +#endif + BOOLEAN KernelStackResident; + SCHAR BasePriority; + SCHAR PriorityDecrement; CHAR Saturation; #if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONG SystemCallNumber; @@ -833,29 +831,29 @@ union { KAPC_STATE SavedApcState; - union + struct { UCHAR SavedApcStateFill[23]; - SCHAR FreezeCount; - }; - }; - SCHAR SuspendCount; - UCHAR UserIdealProcessor; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - union - { - struct - { - UCHAR ReservedBits0:1; - UCHAR SegmentsPresent:1; - UCHAR Reservedbits1:1; - }; - UCHAR NestedStateFlags; - }; + CCHAR FreezeCount; + CCHAR SuspendCount; + UCHAR UserIdealProcessor; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + union + { + struct + { + UCHAR ReservedBits0:1; + UCHAR SegmentsPresent:1; + UCHAR Reservedbits1:1; + }; + UCHAR NestedStateFlags; + }; #else - UCHAR CalloutActive; -#endif - UCHAR Iopl; + UCHAR CalloutActive; +#endif + UCHAR Iopl; + }; + }; PVOID Win32Thread; PVOID StackBase; union @@ -894,15 +892,18 @@ { UCHAR SuspendApcFill5[47]; UCHAR PowerState; - }; - }; - ULONG UserTime; + ULONG UserTime; + }; + }; union { KSEMAPHORE SuspendSemaphore; - UCHAR SuspendSemaphorefill[20]; - }; - ULONG SListFaultCount; + struct + { + UCHAR SuspendSemaphorefill[20]; + ULONG SListFaultCount; + }; + }; LIST_ENTRY ThreadListEntry; #if (NTDDI_VERSION >= NTDDI_LONGHORN) LIST_ENTRY MutantListHead; @@ -912,7 +913,6 @@ PVOID MdlForLockedteb; #endif } KTHREAD; -#include <poppack.h> #define ASSERT_THREAD(object) \ ASSERT((((object)->DispatcherHeader.Type & KOBJECT_TYPE_MASK) == ThreadObject))

1 0

[ion] 25480: - Simplify KiWaitTest. - Add _ADJUST_REASON - Reformat some ke_x.h wait macros to use simpler/shorter variable names.
by ion＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: ion Date: Tue Jan 16 05:24:19 2007 New Revision: 25480 URL: http://svn.reactos.org/svn/reactos?rev=25480&view=rev Log: - Simplify KiWaitTest. - Add _ADJUST_REASON - Reformat some ke_x.h wait macros to use simpler/shorter variable names. Modified: trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Tue Jan 16 05:24:19 2007 @@ -281,6 +281,16 @@ } KTHREAD_STATE, *PKTHREAD_STATE; // +// Adjust reasons +// +typedef enum _ADJUST_REASON +{ + AdjustNone = 0, + AdjustUnwait = 1, + AdjustBoost = 2 +} ADJUST_REASON; + +// // Process States // typedef enum _KPROCESS_STATE 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 16 05:24:19 2007 @@ -503,28 +503,27 @@ IN KPRIORITY Increment) { PLIST_ENTRY WaitEntry, WaitList; - PKWAIT_BLOCK CurrentWaitBlock; + PKWAIT_BLOCK WaitBlock; PKTHREAD WaitThread; ULONG WaitKey; /* Loop the Wait Entries */ WaitList = &Object->WaitListHead; + ASSERT(IsListEmpty(&Object->WaitListHead) == FALSE); WaitEntry = WaitList->Flink; do { /* Get the current wait block */ - CurrentWaitBlock = CONTAINING_RECORD(WaitEntry, - KWAIT_BLOCK, - WaitListEntry); + WaitBlock = CONTAINING_RECORD(WaitEntry, KWAIT_BLOCK, WaitListEntry); /* Get the waiting thread */ - WaitThread = CurrentWaitBlock->Thread; + WaitThread = WaitBlock->Thread; /* Check the current Wait Mode */ - if (CurrentWaitBlock->WaitType == WaitAny) + if (WaitBlock->WaitType == WaitAny) { /* Use the actual wait key */ - WaitKey = CurrentWaitBlock->WaitKey; + WaitKey = WaitBlock->WaitKey; } else { @@ -549,37 +548,34 @@ IN KPRIORITY Increment) { PLIST_ENTRY WaitEntry, WaitList; - PKWAIT_BLOCK CurrentWaitBlock; + PKWAIT_BLOCK WaitBlock; PKTHREAD WaitThread; /* Loop the Wait Entries */ WaitList = &Event->Header.WaitListHead; + ASSERT(IsListEmpty(&Event->Header.WaitListHead) == FALSE); WaitEntry = WaitList->Flink; do { /* Get the current wait block */ - CurrentWaitBlock = CONTAINING_RECORD(WaitEntry, - KWAIT_BLOCK, - WaitListEntry); + WaitBlock = CONTAINING_RECORD(WaitEntry, KWAIT_BLOCK, WaitListEntry); /* Get the waiting thread */ - WaitThread = CurrentWaitBlock->Thread; + WaitThread = WaitBlock->Thread; /* Check the current Wait Mode */ - if (CurrentWaitBlock->WaitType == WaitAny) + if (WaitBlock->WaitType == WaitAny) { /* Un-signal it */ Event->Header.SignalState = 0; /* Un-signal the event and unwait the thread */ - KiUnwaitThread(WaitThread, CurrentWaitBlock->WaitKey, Increment); + KiUnwaitThread(WaitThread, WaitBlock->WaitKey, Increment); break; } - else - { - /* Unwait the thread with STATUS_KERNEL_APC */ - KiUnwaitThread(WaitThread, STATUS_KERNEL_APC, Increment); - } + + /* Unwait the thread with STATUS_KERNEL_APC */ + KiUnwaitThread(WaitThread, STATUS_KERNEL_APC, Increment); /* Next entry */ WaitEntry = WaitList->Flink; Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=254… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Tue Jan 16 05:24:19 2007 @@ -42,75 +42,33 @@ KiWaitTest(IN PVOID ObjectPointer, IN KPRIORITY Increment) { - PLIST_ENTRY WaitEntry; - PLIST_ENTRY WaitList; - PKWAIT_BLOCK CurrentWaitBlock; - PKWAIT_BLOCK NextWaitBlock; + PLIST_ENTRY WaitEntry, WaitList; + PKWAIT_BLOCK WaitBlock; PKTHREAD WaitThread; - PKMUTANT FirstObject = ObjectPointer, Object; + PKMUTANT FirstObject = ObjectPointer; + NTSTATUS WaitStatus; /* Loop the Wait Entries */ WaitList = &FirstObject->Header.WaitListHead; WaitEntry = WaitList->Flink; - while ((FirstObject->Header.SignalState > 0) && - (WaitEntry != WaitList)) + while ((FirstObject->Header.SignalState > 0) && (WaitEntry != WaitList)) { /* Get the current wait block */ - CurrentWaitBlock = CONTAINING_RECORD(WaitEntry, - KWAIT_BLOCK, - WaitListEntry); - WaitThread = CurrentWaitBlock->Thread; + WaitBlock = CONTAINING_RECORD(WaitEntry, KWAIT_BLOCK, WaitListEntry); + WaitThread = WaitBlock->Thread; + WaitStatus = STATUS_KERNEL_APC; /* Check the current Wait Mode */ - if (CurrentWaitBlock->WaitType == WaitAny) + if (WaitBlock->WaitType == WaitAny) { /* Easy case, satisfy only this wait */ - WaitEntry = WaitEntry->Blink; + WaitStatus = (NTSTATUS)WaitBlock->WaitKey; KiSatisfyObjectWait(FirstObject, WaitThread); } - else - { - /* Everything must be satisfied */ - NextWaitBlock = CurrentWaitBlock->NextWaitBlock; - - /* Loop first to make sure they are valid */ - while (NextWaitBlock != CurrentWaitBlock) - { - /* Make sure this isn't a timeout block */ - if (NextWaitBlock->WaitKey != STATUS_TIMEOUT) - { - /* Get the object */ - Object = NextWaitBlock->Object; - - /* Check if this is a mutant */ - if ((Object->Header.Type == MutantObject) && - (Object->Header.SignalState <= 0) && - (WaitThread == Object->OwnerThread)) - { - /* It's a signaled mutant */ - } - else if (Object->Header.SignalState <= 0) - { - /* Skip the unwaiting */ - goto SkipUnwait; - } - } - - /* Go to the next Wait block */ - NextWaitBlock = NextWaitBlock->NextWaitBlock; - } - - /* All the objects are signaled, we can satisfy */ - WaitEntry = WaitEntry->Blink; - KiWaitSatisfyAll(CurrentWaitBlock); - } - - /* All waits satisfied, unwait the thread */ - KiUnwaitThread(WaitThread, CurrentWaitBlock->WaitKey, Increment); - -SkipUnwait: - /* Next entry */ - WaitEntry = WaitEntry->Flink; + + /* Now do the rest of the unwait */ + KiUnwaitThread(WaitThread, WaitStatus, Increment); + WaitEntry = WaitList->Flink; } } @@ -166,7 +124,7 @@ /* Tell the scheduler do to the increment when it readies the thread */ ASSERT(Increment >= 0); Thread->AdjustIncrement = (SCHAR)Increment; - Thread->AdjustReason = 1; + Thread->AdjustReason = AdjustUnwait; /* Reschedule the Thread */ KiReadyThread(Thread);

1 0

[ion] 25479: - Fix insertion of special APC into APC delivery list. - Re-identize some APC code (just formatting change). - Detect APC during GateWait. Previous check scanned for DeferredReady, which is incorrect. - Simplfy KeremovequeueApc to take advantage of the fact RemoveEntryList now returns whether the list is empty or not.
by ion＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: ion Date: Tue Jan 16 04:27:36 2007 New Revision: 25479 URL: http://svn.reactos.org/svn/reactos?rev=25479&view=rev Log: - Fix insertion of special APC into APC delivery list. - Re-identize some APC code (just formatting change). - Detect APC during GateWait. Previous check scanned for DeferredReady, which is incorrect. - Simplfy KeremovequeueApc to take advantage of the fact RemoveEntryList now returns whether the list is empty or not. Modified: trunk/reactos/ntoskrnl/ex/timer.c trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ex/timer.c (original) +++ trunk/reactos/ntoskrnl/ex/timer.c Tue Jan 16 04:27:36 2007 @@ -280,7 +280,7 @@ PreviousMode, (PVOID*)&Timer, NULL); - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* Lock the Timer */ KeAcquireSpinLock(&Timer->Lock, &OldIrql); @@ -289,7 +289,9 @@ if (Timer->ApcAssociated) { /* Get the Thread. */ - TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb); + TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, + ETHREAD, + Tcb); /* Lock its active list */ KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); @@ -403,7 +405,7 @@ 0, 0, (PVOID*)&Timer); - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* Initialize the DPC */ KeInitializeDpc(&Timer->TimerDpc, ExpTimerDpcRoutine, Timer); @@ -475,7 +477,7 @@ DesiredAccess, NULL, &hTimer); - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* Make sure it's safe to write to the handle */ _SEH_TRY @@ -531,14 +533,15 @@ _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) *ReturnLength = sizeof(TIMER_BASIC_INFORMATION); + if (ReturnLength) *ReturnLength = sizeof(TIMER_BASIC_INFORMATION); } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=2547… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c (original) +++ trunk/reactos/ntoskrnl/ke/apc.c Tue Jan 16 04:27:36 2007 @@ -8,6 +8,7 @@ /* INCLUDES *****************************************************************/ +#define NTDDI_VERSION NTDDI_WS03 #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> @@ -89,7 +90,7 @@ PLIST_ENTRY ListHead, NextEntry; PKAPC QueuedApc; NTSTATUS Status; - BOOLEAN RequestInterrupt; + BOOLEAN RequestInterrupt = FALSE; /* * Check if the caller wanted this APC to use the thread's environment at @@ -137,8 +138,8 @@ { /* Special APC, find the first Normal APC in the list */ ListHead = &ApcState->ApcListHead[ApcMode]; - NextEntry = ListHead->Flink; - while(NextEntry != ListHead) + NextEntry = ListHead->Blink; + while (NextEntry != ListHead) { /* Get the APC */ QueuedApc = CONTAINING_RECORD(NextEntry, KAPC, ApcListEntry); @@ -147,11 +148,8 @@ if (QueuedApc->NormalRoutine) break; /* Move to the next APC in the Queue */ - NextEntry = NextEntry->Flink; - } - - /* Move to the APC before this one (ie: the last Special APC) */ - NextEntry = NextEntry->Blink; + NextEntry = NextEntry->Blink; + } /* Insert us here */ InsertHeadList(NextEntry, &Apc->ApcListEntry); @@ -185,23 +183,8 @@ /* Acquire the dispatcher lock */ KiAcquireDispatcherLock(); - /* Check if this is a non-kernel mode APC */ - if (ApcMode != KernelMode) - { - /* - * Not a Kernel-Mode APC. Are we waiting in user-mode? - * If so, then are we alertable or already have an APC pending? - */ - if (((Thread->State == Waiting) && (Thread->WaitMode == UserMode)) && - ((Thread->Alertable) || (Thread->ApcState.UserApcPending))) - { - /* Set user-mode APC pending */ - Thread->ApcState.UserApcPending = TRUE; - Status = STATUS_USER_APC; - goto Unwait; - } - } - else + /* Check if this is a kernel-mode APC */ + if (ApcMode == KernelMode) { /* Kernel-mode APC, set us pending */ Thread->ApcState.KernelApcPending = TRUE; @@ -211,45 +194,37 @@ { /* The thread is running, so remember to send a request */ RequestInterrupt = TRUE; -#ifndef CONFIG_SMP - /* On UP systems, request it immediately */ - HalRequestSoftwareInterrupt(APC_LEVEL); -#endif } - else + else if ((Thread->State == Waiting) && + (Thread->WaitIrql == PASSIVE_LEVEL) && + !(Thread->SpecialApcDisable) && + (!(Apc->NormalRoutine) || + (!(Thread->KernelApcDisable) && + !(Thread->ApcState.KernelApcInProgress)))) { - /* - * If the thread is Waiting at PASSIVE_LEVEL AND - * Special APCs are not disabled AND - * He is a Normal APC AND - * Kernel APCs are not disabled AND - * Kernel APC is not pending OR - * He is a Special APC THEN - * Unwait thread with STATUS_KERNEL_APC - */ - if ((Thread->State == Waiting) && - (Thread->WaitIrql == PASSIVE_LEVEL) && - !(Thread->SpecialApcDisable) && - (!(Apc->NormalRoutine) || - (!(Thread->KernelApcDisable) && - !(Thread->ApcState.KernelApcInProgress)))) - { - /* We'll unwait with this status */ - Status = STATUS_KERNEL_APC; - - /* Wake up the thread */ + /* We'll unwait with this status */ + Status = STATUS_KERNEL_APC; + + /* Wake up the thread */ Unwait: - KiUnwaitThread(Thread, Status, PriorityBoost); - } - else - { - /* Check if the thread is in a deferred ready state */ - if (Thread->State == DeferredReady) - { - /* FIXME: TODO in new scheduler */ - } - } + KiUnwaitThread(Thread, Status, PriorityBoost); } + else if (Thread->State == GateWait) + { + /* We were in a gate wait. FIXME: Handle this */ + DPRINT1("Not yet supported -- Report this to Alex\n"); + KEBUGCHECK(0); + } + } + else if ((Thread->State == Waiting) && + (Thread->WaitMode == UserMode) && + ((Thread->Alertable) || + (Thread->ApcState.UserApcPending))) + { + /* Set user-mode APC pending */ + Thread->ApcState.UserApcPending = TRUE; + Status = STATUS_USER_APC; + goto Unwait; } /* Release dispatcher lock */ @@ -891,10 +866,7 @@ /* Acquire the dispatcher lock and remove it from the list */ KiAcquireDispatcherLockAtDpcLevel(); - RemoveEntryList(&Apc->ApcListEntry); - - /* If the Queue is completely empty, then no more APCs are pending */ - if (IsListEmpty(&ApcState->ApcListHead[Apc->ApcMode])) + if (RemoveEntryList(&ApcState->ApcListHead[Apc->ApcMode])) { /* Set the correct state based on the APC Mode */ if (Apc->ApcMode == KernelMode)

1 0

[gedmurphy] 25478: don't leak a bitmap object if we fail to allocate memory
by gedmurphy＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: gedmurphy Date: Tue Jan 16 03:08:41 2007 New Revision: 25478 URL: http://svn.reactos.org/svn/reactos?rev=25478&view=rev Log: don't leak a bitmap object if we fail to allocate memory Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Tue Jan 16 03:08:41 2007 @@ -1516,8 +1516,8 @@ { BITMAPINFO bi; BITMAP bm; - BITMAPOBJ *Bitmap; - PBYTE pBits; + BITMAPOBJ *Bitmap = NULL; + PBYTE pBits = NULL; BLENDFUNCTION BlendFunc; BYTE Red, Green, Blue, Alpha; DWORD Count = 0; @@ -1547,6 +1547,7 @@ if (pBits == NULL) { DPRINT1("ExAllocatePoolWithTag() failed!\n"); + GDIOBJ_UnlockObjByPtr(GdiHandleTable, Bitmap); goto cleanup; } @@ -1609,7 +1610,6 @@ cleanup: if(DoFlickerFree) { - if(hOldOffBmp) NtGdiSelectObject(hdcOff, hOldOffBmp); if(hOldOffBrush) NtGdiSelectObject(hdcOff, hOldOffBrush); if(hbmOff) NtGdiDeleteObject(hbmOff);

1 0

[gedmurphy] 25477: use IC instead of DC
by gedmurphy＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: gedmurphy Date: Tue Jan 16 02:37:44 2007 New Revision: 25477 URL: http://svn.reactos.org/svn/reactos?rev=25477&view=rev Log: use IC instead of DC 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 Tue Jan 16 02:37:44 2007 @@ -661,9 +661,9 @@ } else { - HDC hdc = GetDC(0); + HDC hdc = CreateICW(NULL, NULL, NULL, NULL); ColorBits = GetDeviceCaps(hdc, BITSPIXEL); - ReleaseDC(0, hdc); + DeleteDC(hdc); } if(bIcon)

1 0

[gedmurphy] 25476: revert r25474
by gedmurphy＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: gedmurphy Date: Tue Jan 16 02:33:01 2007 New Revision: 25476 URL: http://svn.reactos.org/svn/reactos?rev=25476&view=rev Log: revert r25474 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 Tue Jan 16 02:33:01 2007 @@ -526,42 +526,39 @@ int Height, int ColorBits) { - int i, cx, cy, Bits, BestBits = 0, BestEntry = -1; - UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff; - UINT iTempXDiff, iTempYDiff, iTempColorDiff; - - /* Find Best Fit */ - iTotalDiff = 0xFFFFFFFF; - iColorDiff = 0xFFFFFFFF; + int i, MaxWidth, MaxHeight, cx, cy, Bits, BestEntry = -1; + + /* Double height to account for AND and XOR masks */ + Height *= 2; + + /* First find the largest one smaller than or equal to the requested size*/ + MaxWidth = MaxHeight = 0; for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) { - iTempXDiff = abs(Width - cx); - iTempYDiff = abs(Height - cy); - - if(iTotalDiff > (iTempXDiff + iTempYDiff)) + if ((cx <= Width) && (cy <= Height) && + (cx > MaxWidth) && (cy > MaxHeight) && + (Bits == 1)) { - iXDiff = iTempXDiff; - iYDiff = iTempYDiff; - iTotalDiff = iXDiff + iYDiff; + BestEntry = i; + MaxWidth = cx; + MaxHeight = cy; } } - - /* Find Best Colors for Best Fit */ + if (BestEntry != -1) + return BestEntry; + + /* Now find the smallest one larger than the requested size */ + MaxWidth = MaxHeight = 255; for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) { - if(abs(Width - cx) == iXDiff && abs(Height - cy) == iYDiff) + if (((cx < MaxWidth) && (cy < MaxHeight) && (Bits == 1)) || + (BestEntry == -1)) { - iTempColorDiff = abs(ColorBits - Bits); - if(iColorDiff > iTempColorDiff) - { - BestEntry = i; - BestBits = Bits; - iColorDiff = iTempColorDiff; - } + BestEntry = i; + MaxWidth = cx; + MaxHeight = cy; } } - - DPRINT("Best Cursor: ResId: %d, bits : %d\n", BestEntry, BestBits); return BestEntry; } @@ -672,7 +669,7 @@ if(bIcon) entry = CURSORICON_FindBestIconRes(dir, width, height, ColorBits); else - entry = CURSORICON_FindBestCursorRes(dir, width, height, ColorBits); + entry = CURSORICON_FindBestCursorRes(dir, width, height, 1); if (entry) retVal = entry->nID;

1 0

[gedmurphy] 25475: - implement correct alpha blending of icons - pixel bits must be pre-multiplied with the alpha channel - along with the previous LookupIconIdFromDirectoryEx, basic alpha blending is working. some bugfixing is still required.
by gedmurphy＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: gedmurphy Date: Tue Jan 16 02:25:35 2007 New Revision: 25475 URL: http://svn.reactos.org/svn/reactos?rev=25475&view=rev Log: - implement correct alpha blending of icons - pixel bits must be pre-multiplied with the alpha channel - along with the previous LookupIconIdFromDirectoryEx, basic alpha blending is working. some bugfixing is still required. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Tue Jan 16 02:25:35 2007 @@ -1400,14 +1400,10 @@ IconSize.cy = bmpMask.bmHeight / 2; } - /* A hack to get alpha-blending support for icons. - Disabled now because of a bug in alpha blending function - (which blends with white background instead of the background). - */ - /*if (bmpColor.bmBitsPixel == 32) + if (bmpColor.bmBitsPixel == 32) { bAlpha = TRUE; - }*/ + } if(!diFlags) diFlags = DI_NORMAL; @@ -1518,11 +1514,82 @@ { if (bAlpha) { + BITMAPINFO bi; + BITMAP bm; + BITMAPOBJ *Bitmap; + PBYTE pBits; BLENDFUNCTION BlendFunc; - BlendFunc.BlendOp = AC_SRC_OVER; /* right ? */ + BYTE Red, Green, Blue, Alpha; + DWORD Count = 0; + INT i, j; + + /* Bitmap header */ + bi.bmiHeader.biSize = sizeof(bi.bmiHeader); + bi.bmiHeader.biWidth = cxWidth; + bi.bmiHeader.biHeight = cyHeight; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 32; + bi.bmiHeader.biCompression = BI_RGB; + bi.bmiHeader.biSizeImage = cxWidth * cyHeight * 4; + bi.bmiHeader.biClrUsed = 0; + bi.bmiHeader.biClrImportant = 0; + + Bitmap = GDIOBJ_LockObj(GdiHandleTable, hbmOff, GDI_OBJECT_TYPE_BITMAP); + if (Bitmap == NULL) + { + DPRINT1("GDIOBJ_LockObj() failed!\n"); + goto cleanup; + } + BITMAP_GetObject(Bitmap, sizeof(BITMAP), &bm); + + /* Buffer */ + pBits = ExAllocatePoolWithTag(PagedPool, bm.bmWidthBytes * abs(bm.bmHeight), TAG_BITMAP); + if (pBits == NULL) + { + DPRINT1("ExAllocatePoolWithTag() failed!\n"); + goto cleanup; + } + + /* get icon bits */ + NtGdiGetBitmapBits(hbmOff, bm.bmWidthBytes * abs(bm.bmHeight), pBits); + + /* premultiply with the alpha channel value */ + for (i = 0; i < cyHeight; i++) + { + for (j = 0; j < cxWidth; j++) + { + DWORD OrigPixel = 0; + DWORD AlphaPixel = 0; + + OrigPixel = *(DWORD *)(pBits + Count); + + Red = (BYTE)((OrigPixel >> 0) & 0xff); + Green = (BYTE)((OrigPixel >> 8) & 0xff); + Blue = (BYTE)((OrigPixel >> 16) & 0xff); + Alpha = (BYTE)((OrigPixel >> 24) & 0xff); + + Red = (Red * Alpha) / 0xff; + Green = (Green * Alpha) / 0xff; + Blue = (Blue * Alpha) / 0xff; + + AlphaPixel = (DWORD)(Red | (Green << 8) | (Blue << 16) | (Alpha << 24)); + + *(DWORD *)(pBits + Count) = AlphaPixel; + Count += sizeof (DWORD); + } + } + + /* set icon bits */ + NtGdiSetBitmapBits(hbmOff, bm.bmWidthBytes * abs(bm.bmHeight), pBits); + ExFreePool(pBits); + + GDIOBJ_UnlockObjByPtr(GdiHandleTable, Bitmap); + + BlendFunc.BlendOp = AC_SRC_OVER; BlendFunc.BlendFlags = 0; BlendFunc.SourceConstantAlpha = 255; BlendFunc.AlphaFormat = AC_SRC_ALPHA; + NtGdiAlphaBlend(hDc, xLeft, yTop, cxWidth, cyHeight, hdcOff, 0, 0, cxWidth, cyHeight, BlendFunc); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs