Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[fireball] 32814: - Rewrite the SD Cache functions to use the Windows 2003 structures (thanks to Alex for providing them). - Use pushlocks instead of the fast mutex that was previously used. - Improve the performance of some paths by reducing lock acquisition time, and using atomic operations instead when possible. - Implement the exported Ob APIs which were added in Windows XP to access the Sd cache (ObReference/DereferenceSecurityDescriptor and ObLogSecurityDescriptor). These are used by file

by fireball＠svn.reactos.org

Author: fireball Date: Tue Apr 1 16:09:28 2008 New Revision: 32814 URL: http://svn.reactos.org/svn/reactos?rev=32814&view=rev Log: - Rewrite the SD Cache functions to use the Windows 2003 structures (thanks to Alex for providing them). - Use pushlocks instead of the fast mutex that was previously used. - Improve the performance of some paths by reducing lock acquisition time, and using atomic operations instead when possible. - Implement the exported Ob APIs which were added in Windows XP to access the Sd cache (ObReference/DereferenceSecurityDescriptor and ObLogSecurityDescriptor). These are used by file systems (such as NPFS) on Windows XP and higher. Added: trunk/reactos/ntoskrnl/ob/obsdcach.c - copied, changed from r32796, trunk/reactos/ntoskrnl/ob/sdcache.c Removed: trunk/reactos/ntoskrnl/ob/sdcache.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/ob/obsecure.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Tue Apr 1 16:09:28 2008 @@ -83,6 +83,18 @@ ((POBJECT_HEADER)((ULONG_PTR)x->Object & ~OBJ_HANDLE_ATTRIBUTES)) // +// Recovers the security descriptor from a cached security descriptor header +// +#define ObpGetHeaderForSd(x) \ + CONTAINING_RECORD((x), SECURITY_DESCRIPTOR_HEADER, SecurityDescriptor) + +// +// Recovers the security descriptor from a cached security descriptor list entry +// +#define ObpGetHeaderForEntry(x) \ + CONTAINING_RECORD((x), SECURITY_DESCRIPTOR_HEADER, Link) + +// // Context Structures for Ex*Handle Callbacks // typedef struct _OBP_SET_HANDLE_ATTRIBUTES_CONTEXT @@ -90,17 +102,39 @@ KPROCESSOR_MODE PreviousMode; OBJECT_HANDLE_ATTRIBUTE_INFORMATION Information; } OBP_SET_HANDLE_ATTRIBUTES_CONTEXT, *POBP_SET_HANDLE_ATTRIBUTES_CONTEXT; + typedef struct _OBP_CLOSE_HANDLE_CONTEXT { PHANDLE_TABLE HandleTable; KPROCESSOR_MODE AccessMode; } OBP_CLOSE_HANDLE_CONTEXT, *POBP_CLOSE_HANDLE_CONTEXT; + typedef struct _OBP_FIND_HANDLE_DATA { POBJECT_HEADER ObjectHeader; POBJECT_TYPE ObjectType; POBJECT_HANDLE_INFORMATION HandleInformation; } OBP_FIND_HANDLE_DATA, *POBP_FIND_HANDLE_DATA; + +// +// Cached Security Descriptor Header +// +typedef struct _SECURITY_DESCRIPTOR_HEADER +{ + LIST_ENTRY Link; + ULONG RefCount; + ULONG FullHash; + QUAD SecurityDescriptor; +} SECURITY_DESCRIPTOR_HEADER, *PSECURITY_DESCRIPTOR_HEADER; + +// +// Cached Security Descriptor List +// +typedef struct _OB_SD_CACHE_LIST +{ + EX_PUSH_LOCK PushLock; + LIST_ENTRY Head; +} OB_SD_CACHE_LIST, *POB_SD_CACHE_LIST; // // Structure for quick-compare of a DOS Device path @@ -388,23 +422,10 @@ VOID ); -NTSTATUS -NTAPI -ObpAddSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SourceSD, - OUT PSECURITY_DESCRIPTOR *DestinationSD -); - PSECURITY_DESCRIPTOR NTAPI -ObpReferenceCachedSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SecurityDescriptor -); - -VOID -NTAPI -ObpDereferenceCachedSecurityDescriptor( - IN PSECURITY_DESCRIPTOR SecurityDescriptor +ObpReferenceSecurityDescriptor( + IN POBJECT_HEADER ObjectHeader ); // Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Tue Apr 1 16:09:28 2008 @@ -29,13 +29,13 @@ { ULONG Slot; POBJECT_TYPE ObjectType = ObjectHeader->Type; - + /* Sanity check */ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); - + /* Pick a slot */ Slot = ObpSelectObjectLockSlot(ObjectHeader); - + /* Enter a critical region and acquire the resource */ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&ObjectType->ObjectLocks[Slot], TRUE); @@ -47,13 +47,13 @@ { ULONG Slot; POBJECT_TYPE ObjectType = ObjectHeader->Type; - + /* Sanity check */ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); - + /* Pick a slot */ Slot = ObpSelectObjectLockSlot(ObjectHeader); - + /* Enter a critical region and acquire the resource */ KeEnterCriticalRegion(); ExAcquireResourceSharedLite(&ObjectType->ObjectLocks[Slot], TRUE); @@ -65,14 +65,14 @@ { ULONG Slot; POBJECT_TYPE ObjectType = ObjectHeader->Type; - + /* Pick a slot */ Slot = ObpSelectObjectLockSlot(ObjectHeader); - - /* Enter a critical region and acquire the resource */ + + /* Release the resource and leave a critical region */ ExReleaseResourceLite(&ObjectType->ObjectLocks[Slot]); KeLeaveCriticalRegion(); - + /* Sanity check */ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); } Copied: trunk/reactos/ntoskrnl/ob/obsdcach.c (from r32796, trunk/reactos/ntoskrnl/ob/sdcache.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsdcach.c?p2=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/sdcache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] Tue Apr 1 16:09:28 2008 @@ -7,344 +7,330 @@ * PROGRAMMERS: David Welch (welch(a)cwcom.net) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> - - -/* TYPES ********************************************************************/ - -typedef struct _SD_CACHE_ENTRY -{ - LIST_ENTRY ListEntry; - ULONG HashValue; - ULONG Index; - ULONG RefCount; -} SD_CACHE_ENTRY, *PSD_CACHE_ENTRY; - - -/* GLOBALS ******************************************************************/ +#include <debug.h> + +/* GLOBALS ********************************************************************/ #define SD_CACHE_ENTRIES 0x100 - -LIST_ENTRY ObpSdCache[SD_CACHE_ENTRIES]; -FAST_MUTEX ObpSdCacheMutex; - -/* FUNCTIONS ****************************************************************/ +OB_SD_CACHE_LIST ObsSecurityDescriptorCache[SD_CACHE_ENTRIES]; + +ULONGLONG Cycles; +ULONG TimeDelta; + +#define ObpSdCacheBeginPerfCount() \ + Cycles = __rdtsc(); + +#define ObpSdCacheEndPerfCount() \ + TimeDelta += __rdtsc() - Cycles; + + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +FORCEINLINE +ObpSdAcquireLock(IN POB_SD_CACHE_LIST CacheEntry) +{ + /* Acquire the lock */ + KeEnterCriticalRegion(); + ExAcquirePushLockExclusive(&CacheEntry->PushLock); +} + +VOID +FORCEINLINE +ObpSdReleaseLock(IN POB_SD_CACHE_LIST CacheEntry) +{ + /* Release the lock */ + ExReleasePushLockExclusive(&CacheEntry->PushLock); + KeLeaveCriticalRegion(); +} + +VOID +FORCEINLINE +ObpSdAcquireLockShared(IN POB_SD_CACHE_LIST CacheEntry) +{ + /* Acquire the lock */ + KeEnterCriticalRegion(); + ExAcquirePushLockShared(&CacheEntry->PushLock); +} + +VOID +FORCEINLINE +ObpSdReleaseLockShared(IN POB_SD_CACHE_LIST CacheEntry) +{ + /* Release the lock */ + ExReleasePushLock(&CacheEntry->PushLock); + KeLeaveCriticalRegion(); +} NTSTATUS NTAPI ObpInitSdCache(VOID) { - ULONG i; - - for (i = 0; i < (sizeof(ObpSdCache) / sizeof(ObpSdCache[0])); i++) - { - InitializeListHead(&ObpSdCache[i]); - } - - ExInitializeFastMutex(&ObpSdCacheMutex); - - return STATUS_SUCCESS; -} - - -static __inline VOID -ObpSdCacheLock(VOID) -{ - /* can't acquire a fast mutex in the early boot process... */ - if(KeGetCurrentThread() != NULL) - { - ExAcquireFastMutex(&ObpSdCacheMutex); - } -} - - -static __inline VOID -ObpSdCacheUnlock(VOID) -{ - /* can't acquire a fast mutex in the early boot process... */ - if(KeGetCurrentThread() != NULL) - { - ExReleaseFastMutex(&ObpSdCacheMutex); - } -} - - -static ULONG -ObpHash(PVOID Buffer, - ULONG Length) -{ - PUCHAR Ptr; - ULONG Value; - ULONG i; - - Ptr = (PUCHAR)Buffer; - Value = 0; - for (i = 0; i < Length; i++) - { - Value += *Ptr; - Ptr++; - } - - return Value; -} - - -static ULONG -ObpHashSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - ULONG Value; - BOOLEAN Defaulted; - BOOLEAN DaclPresent; - BOOLEAN SaclPresent; - PSID Owner = NULL; - PSID Group = NULL; - PACL Dacl = NULL; - PACL Sacl = NULL; - - RtlGetOwnerSecurityDescriptor(SecurityDescriptor, - &Owner, - &Defaulted); - - RtlGetGroupSecurityDescriptor(SecurityDescriptor, - &Group, - &Defaulted); - - RtlGetDaclSecurityDescriptor(SecurityDescriptor, - &DaclPresent, - &Dacl, - &Defaulted); - - RtlGetSaclSecurityDescriptor(SecurityDescriptor, - &SaclPresent, - &Sacl, - &Defaulted); - - Value = 0; - if (Owner != NULL) - { - Value += ObpHash(Owner, RtlLengthSid(Owner)); - } - - if (Group != NULL) - { - Value += ObpHash(Group, RtlLengthSid(Group)); - } - - if (DaclPresent == TRUE && Dacl != NULL) - { - Value += ObpHash(Dacl, Dacl->AclSize); - } - - if (SaclPresent == TRUE && Sacl != NULL) - { - Value += ObpHash(Sacl, Sacl->AclSize); - } - - return Value; -} - - -static PSD_CACHE_ENTRY + ULONG i; + + /* Loop each cache entry */ + for (i = 0; i < SD_CACHE_ENTRIES; i++) + { + /* Initialize the lock and the list */ + InitializeListHead(&ObsSecurityDescriptorCache[i].Head); + ExInitializePushLock((PULONG_PTR)&ObsSecurityDescriptorCache[i].PushLock); + } + + /* Return success */ + return STATUS_SUCCESS; +} + +ULONG +NTAPI +ObpHash(IN PVOID Buffer, + IN ULONG Length) +{ + PULONG p, pp; + PUCHAR pb, ppb; + ULONG Hash = 0; + + /* Setup aligned and byte buffers */ + p = Buffer; + ppb = (PUCHAR)((ULONG_PTR)Buffer + Length); + pp = (PULONG)ALIGN_DOWN(p + Length, ULONG); + + /* Loop aligned data */ + while (p < pp) + { + /* XOR-rotate */ + Hash ^= *p++; + Hash = _rotl(Hash, 3); + } + + /* Loop non-aligned data */ + pb = (PUCHAR)p; + while (pb < ppb) + { + /* XOR-rotate */ + Hash ^= *pb++; + Hash = _rotl(Hash, 3); + } + + /* Return the hash */ + return Hash; +} + +ULONG +NTAPI +ObpHashSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN ULONG Length) +{ + /* Just hash the entire SD */ + return ObpHash(SecurityDescriptor, Length); +} + +PSECURITY_DESCRIPTOR_HEADER +NTAPI ObpCreateCacheEntry(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG HashValue, - IN ULONG Index, - OUT PSECURITY_DESCRIPTOR *NewSD) -{ - PSECURITY_DESCRIPTOR Sd; - PSD_CACHE_ENTRY CacheEntry; - ULONG Length; - - DPRINT("ObpCreateCacheEntry() called\n"); - - Length = RtlLengthSecurityDescriptor(SecurityDescriptor); - - CacheEntry = ExAllocatePool(NonPagedPool, - sizeof(SD_CACHE_ENTRY) + Length); - if (CacheEntry == NULL) - { - DPRINT1("ExAllocatePool() failed\n"); - return NULL; - } - - CacheEntry->HashValue = HashValue; - CacheEntry->Index = Index; - CacheEntry->RefCount = 1; - - Sd = (PSECURITY_DESCRIPTOR)(CacheEntry + 1); - RtlCopyMemory(Sd, - SecurityDescriptor, - Length); - - *NewSD = Sd; - - DPRINT("ObpCreateCacheEntry() done\n"); - - return CacheEntry; -} - - -static BOOLEAN + IN ULONG Length, + IN ULONG FullHash, + IN ULONG RefCount) +{ + ULONG CacheSize; + PSECURITY_DESCRIPTOR_HEADER SdHeader; + ASSERT(Length == RtlLengthSecurityDescriptor(SecurityDescriptor)); + + /* Calculate the memory we'll need to allocate and allocate it */ + CacheSize = Length + (sizeof(SECURITY_DESCRIPTOR_HEADER) - sizeof(QUAD)); + SdHeader = ExAllocatePoolWithTag(PagedPool, CacheSize, TAG('O', 'b', 'S', 'c')); + if (!SdHeader) return NULL; + + /* Setup the header */ + SdHeader->RefCount = RefCount; + SdHeader->FullHash = FullHash; + + /* Copy the descriptor */ + RtlCopyMemory(&SdHeader->SecurityDescriptor, SecurityDescriptor, Length); + + /* Return it */ + return SdHeader; +} + +BOOLEAN +NTAPI ObpCompareSecurityDescriptors(IN PSECURITY_DESCRIPTOR Sd1, - IN PSECURITY_DESCRIPTOR Sd2) -{ - ULONG Length1; - ULONG Length2; - - Length1 = RtlLengthSecurityDescriptor(Sd1); - Length2 = RtlLengthSecurityDescriptor(Sd2); - if (Length1 != Length2) - return FALSE; - - if (RtlCompareMemory(Sd1, Sd2, Length1) != Length1) - return FALSE; - - return TRUE; -} - - -NTSTATUS -NTAPI -ObpAddSecurityDescriptor(IN PSECURITY_DESCRIPTOR SourceSD, - OUT PSECURITY_DESCRIPTOR *DestinationSD) -{ - PSECURITY_DESCRIPTOR Sd; - PLIST_ENTRY CurrentEntry; - PSD_CACHE_ENTRY CacheEntry; - ULONG HashValue; - ULONG Index; - NTSTATUS Status; - - DPRINT("ObpAddSecurityDescriptor() called\n"); - - HashValue = ObpHashSecurityDescriptor(SourceSD); - Index = HashValue & 0xFF; - - ObpSdCacheLock(); - - if (!IsListEmpty(&ObpSdCache[Index])) - { - CurrentEntry = ObpSdCache[Index].Flink; - while (CurrentEntry != &ObpSdCache[Index]) - { - CacheEntry = CONTAINING_RECORD(CurrentEntry, - SD_CACHE_ENTRY, - ListEntry); - Sd = (PSECURITY_DESCRIPTOR)(CacheEntry + 1); - - if (CacheEntry->HashValue == HashValue && - ObpCompareSecurityDescriptors(SourceSD, Sd)) - { - CacheEntry->RefCount++; - DPRINT("RefCount %lu\n", CacheEntry->RefCount); - *DestinationSD = Sd; - - ObpSdCacheUnlock(); - - DPRINT("ObpAddSecurityDescriptor() done\n"); - - return STATUS_SUCCESS; - } - - CurrentEntry = CurrentEntry->Flink; - } - } - - CacheEntry = ObpCreateCacheEntry(SourceSD, - HashValue, - Index, - DestinationSD); - if (CacheEntry == NULL) - { - DPRINT1("ObpCreateCacheEntry() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - } - else - { - DPRINT("RefCount 1\n"); - InsertTailList(&ObpSdCache[Index], &CacheEntry->ListEntry); - Status = STATUS_SUCCESS; - } - - ObpSdCacheUnlock(); - - DPRINT("ObpAddSecurityDescriptor() done\n"); - - return Status; -} - - -NTSTATUS -NTAPI -ObpRemoveSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - PSD_CACHE_ENTRY CacheEntry; - - DPRINT("ObpRemoveSecurityDescriptor() called\n"); - - ObpSdCacheLock(); - - CacheEntry = (PSD_CACHE_ENTRY)((ULONG_PTR)SecurityDescriptor - sizeof(SD_CACHE_ENTRY)); - - CacheEntry->RefCount--; - DPRINT("RefCount %lu\n", CacheEntry->RefCount); - if (CacheEntry->RefCount == 0) - { - DPRINT("Remove cache entry\n"); - RemoveEntryList(&CacheEntry->ListEntry); - ExFreePool(CacheEntry); - } - - ObpSdCacheUnlock(); - - DPRINT("ObpRemoveSecurityDescriptor() done\n"); - - return STATUS_SUCCESS; + IN ULONG Length1, + IN PSECURITY_DESCRIPTOR Sd2) +{ + ULONG Length2; + ASSERT(Length1 == RtlLengthSecurityDescriptor(Sd1)); + + /* Get the length of the second SD */ + Length2 = RtlLengthSecurityDescriptor(Sd2); + + /* Compare lengths */ + if (Length1 != Length2) return FALSE; + + /* Compare contents */ + return RtlEqualMemory(Sd1, Sd2, Length1); +} + +PVOID +NTAPI +ObpDestroySecurityDescriptorHeader(IN PSECURITY_DESCRIPTOR_HEADER SdHeader) +{ + ASSERT(SdHeader->RefCount == 0); + + /* Just unlink the SD and return it back to the caller */ + RemoveEntryList(&SdHeader->Link); + return SdHeader; } PSECURITY_DESCRIPTOR NTAPI -ObpReferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - PSD_CACHE_ENTRY CacheEntry; - - /* Lock the cache */ - ObpSdCacheLock(); - - /* Make sure we got a descriptor */ - if (SecurityDescriptor) - { - /* Get the entry */ - CacheEntry = (PSD_CACHE_ENTRY)((ULONG_PTR)SecurityDescriptor - - sizeof(SD_CACHE_ENTRY)); - - /* Reference it */ - CacheEntry->RefCount++; - DPRINT("RefCount %lu\n", CacheEntry->RefCount); - } - - /* Unlock the cache and return the descriptor */ - ObpSdCacheUnlock(); +ObpReferenceSecurityDescriptor(IN POBJECT_HEADER ObjectHeader) +{ + PSECURITY_DESCRIPTOR SecurityDescriptor; + PSECURITY_DESCRIPTOR_HEADER SdHeader; + ObpSdCacheBeginPerfCount(); + + /* Get the SD */ + SecurityDescriptor = ObjectHeader->SecurityDescriptor; + if (!SecurityDescriptor) + { + /* No SD, nothing to do */ + ObpSdCacheEndPerfCount(); + return NULL; + } + + /* Lock the object */ + ObpAcquireObjectLockShared(ObjectHeader); + + /* Get the object header */ + SdHeader = ObpGetHeaderForSd(SecurityDescriptor); + + /* Do the reference */ + InterlockedIncrement((PLONG)&SdHeader->RefCount); + + /* Release the lock and return */ + ObpReleaseObjectLock(ObjectHeader); + ObpSdCacheEndPerfCount(); return SecurityDescriptor; } -VOID -NTAPI -ObpDereferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - DPRINT("ObpDereferenceCachedSecurityDescriptor() called\n"); - - ObpRemoveSecurityDescriptor(SecurityDescriptor); - - DPRINT("ObpDereferenceCachedSecurityDescriptor() done\n"); +/* PUBLIC FUNCTIONS ***********************************************************/ + +/*++ + * @name ObReferenceSecurityDescriptor + * @implemented NT5.2 + * + * The ObReferenceSecurityDescriptor routine <FILLMEIN> + * + * @param SecurityDescriptor + * <FILLMEIN> + * + * @param Count + * <FILLMEIN> + * + * @return STATUS_SUCCESS or appropriate error value. + * + * @remarks None. + * + *--*/ +VOID +NTAPI +ObReferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN ULONG Count) +{ + PSECURITY_DESCRIPTOR_HEADER SdHeader; + ObpSdCacheBeginPerfCount(); + + /* Get the header */ + SdHeader = ObpGetHeaderForSd(SecurityDescriptor); + + /* Do the references */ + InterlockedExchangeAdd((PLONG)&SdHeader->RefCount, Count); + ObpSdCacheEndPerfCount(); +} + +/*++ + * @name ObDereferenceSecurityDescriptor + * @implemented NT5.2 + * + * The ObDereferenceSecurityDescriptor routine <FILLMEIN> + * + * @param SecurityDescriptor + * <FILLMEIN> + * + * @param Count + * <FILLMEIN> + * + * @return STATUS_SUCCESS or appropriate error value. + * + * @remarks None. + * + *--*/ +VOID +NTAPI +ObDereferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN ULONG Count) +{ + PSECURITY_DESCRIPTOR_HEADER SdHeader; + LONG OldValue, NewValue; + ULONG Index; + POB_SD_CACHE_LIST CacheEntry; + ObpSdCacheBeginPerfCount(); + + /* Get the header */ + SdHeader = ObpGetHeaderForSd(SecurityDescriptor); + + /* Get the current reference count */ + OldValue = SdHeader->RefCount; + + /* Check if the caller is destroying this SD -- we need the lock for that */ + while (OldValue != Count) + { + /* He isn't, we can just try to derefeference atomically */ + NewValue = InterlockedCompareExchange((PLONG)&SdHeader->RefCount, + OldValue - Count, + OldValue); + if (NewValue == OldValue) ObpSdCacheEndPerfCount(); return; + + /* Try again */ + OldValue = NewValue; + } + + /* At this point, we need the lock, so choose an entry */ + Index = SdHeader->FullHash % SD_CACHE_ENTRIES; + CacheEntry = &ObsSecurityDescriptorCache[Index]; + + /* Acquire the lock for it */ + ObpSdAcquireLock(CacheEntry); + ASSERT(SdHeader->RefCount != 0); + + /* Now do the dereference */ + if (InterlockedExchangeAdd((PLONG)&SdHeader->RefCount, -(LONG)Count) == Count) + { + /* We're down to zero -- destroy the header */ + SdHeader = ObpDestroySecurityDescriptorHeader(SdHeader); + + /* Release the lock */ + ObpSdReleaseLock(CacheEntry); + + /* Free the header */ + ExFreePool(SdHeader); + } + else + { + /* Just release the lock */ + ObpSdReleaseLock(CacheEntry); + } + + ObpSdCacheEndPerfCount(); } /*++ * @name ObLogSecurityDescriptor -* @unimplemented NT5.2 +* @implemented NT5.2 * * The ObLogSecurityDescriptor routine <FILLMEIN> * @@ -368,42 +354,107 @@ OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, IN ULONG RefBias) { - /* HACK: Return the same descriptor back */ - PISECURITY_DESCRIPTOR SdCopy; - ULONG Length; - DPRINT("ObLogSecurityDescriptor is not implemented!\n", - InputSecurityDescriptor); - + PSECURITY_DESCRIPTOR_HEADER SdHeader = NULL, NewHeader = NULL; + ULONG Length, Hash, Index; + POB_SD_CACHE_LIST CacheEntry; + BOOLEAN Result; + PLIST_ENTRY NextEntry; + ObpSdCacheBeginPerfCount(); + + /* Get the length */ Length = RtlLengthSecurityDescriptor(InputSecurityDescriptor); - SdCopy = ExAllocatePool(PagedPool, Length); - RtlCopyMemory(SdCopy, InputSecurityDescriptor, Length); - *OutputSecurityDescriptor = SdCopy; + + /* Get the hash */ + Hash = ObpHashSecurityDescriptor(InputSecurityDescriptor, Length); + + /* Now select the appropriate cache entry */ + Index = Hash % SD_CACHE_ENTRIES; + CacheEntry = &ObsSecurityDescriptorCache[Index]; + + /* Lock it shared */ + ObpSdAcquireLockShared(CacheEntry); + + /* Start our search */ + while (TRUE) + { + /* Reset result found */ + Result = FALSE; + + /* Loop the hash list */ + NextEntry = CacheEntry->Head.Flink; + while (NextEntry != &CacheEntry->Head) + { + /* Get the header */ + SdHeader = ObpGetHeaderForEntry(NextEntry); + + /* Our hashes are ordered, so quickly check if we should stop now */ + if (SdHeader->FullHash > Hash) break; + + /* We survived the quick hash check, now check for equalness */ + if (SdHeader->FullHash == Hash) + { + /* Hashes match, now compare descriptors */ + Result = ObpCompareSecurityDescriptors(InputSecurityDescriptor, + Length, + &SdHeader->SecurityDescriptor); + if (Result) break; + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Check if we found anything */ + if (Result) + { + /* Increment its reference count */ + InterlockedExchangeAdd((PLONG)&SdHeader->RefCount, RefBias); + + /* Release the lock */ + ObpSdReleaseLockShared(CacheEntry); + + /* Return the descriptor */ + *OutputSecurityDescriptor = &SdHeader->SecurityDescriptor; + + /* Free anything that we may have had to create */ + if (NewHeader) ExFreePool(NewHeader); + ObpSdCacheEndPerfCount(); + return STATUS_SUCCESS; + } + + /* Check if we got here, and didn't create a descriptor yet */ + if (!NewHeader) + { + /* Release the lock */ + ObpSdReleaseLockShared(CacheEntry); + + /* This should be our first time in the loop, create it */ + NewHeader = ObpCreateCacheEntry(InputSecurityDescriptor, + Length, + Hash, + RefBias); + if (!NewHeader) return STATUS_INSUFFICIENT_RESOURCES; + + /* Now acquire the exclusive lock and we should hit the right path */ + ObpSdAcquireLock(CacheEntry); + } + else + { + /* We have inserted the SD, we're fine now */ + break; + } + } + + /* Okay, now let's do the insert, we should have the exclusive lock */ + InsertTailList(NextEntry, &NewHeader->Link); + + /* Release the lock */ + ObpSdReleaseLock(CacheEntry); + + /* Return the SD*/ + *OutputSecurityDescriptor = &NewHeader->SecurityDescriptor; + ObpSdCacheEndPerfCount(); return STATUS_SUCCESS; } -/*++ -* @name ObDereferenceSecurityDescriptor -* @unimplemented NT5.2 -* -* The ObDereferenceSecurityDescriptor routine <FILLMEIN> -* -* @param SecurityDescriptor -* <FILLMEIN> -* -* @param Count -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -VOID -NTAPI -ObDereferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG Count) -{ - DPRINT1("ObDereferenceSecurityDescriptor is not implemented!\n"); -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] Tue Apr 1 16:09:28 2008 @@ -25,7 +25,7 @@ NTSTATUS Status; PSECURITY_DESCRIPTOR NewSd; PAGED_CODE(); - + /* Get the object header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); if (!SecurityDescriptor) @@ -34,19 +34,19 @@ ObjectHeader->SecurityDescriptor = NULL; return STATUS_SUCCESS; } - + /* Add it to our internal cache */ - Status = ObpAddSecurityDescriptor(SecurityDescriptor, &NewSd); + Status = ObLogSecurityDescriptor(SecurityDescriptor, &NewSd, 1); if (NT_SUCCESS(Status)) { /* Free the old copy */ ExFreePool(SecurityDescriptor); - + /* Set the new pointer */ ASSERT(NewSd); ObjectHeader->SecurityDescriptor = NewSd; } - + /* Return status */ return Status; } @@ -56,11 +56,11 @@ ObDeassignSecurity(IN OUT PSECURITY_DESCRIPTOR *SecurityDescriptor) { /* Dereference it */ - ObpDereferenceCachedSecurityDescriptor(*SecurityDescriptor); - + ObDereferenceSecurityDescriptor(*SecurityDescriptor, 1); + /* Don't free again later */ *SecurityDescriptor = NULL; - + /* All done */ return STATUS_SUCCESS; } @@ -77,13 +77,13 @@ NTSTATUS Status; PSECURITY_DESCRIPTOR ObjectSd; PAGED_CODE(); - + /* Get the object header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); - + /* Get the SD */ - ObjectSd = ObpReferenceCachedSecurityDescriptor(ObjectHeader->SecurityDescriptor); - + ObjectSd = ObpReferenceSecurityDescriptor(ObjectHeader); + /* Query the information */ Status = SeQuerySecurityDescriptorInfo(SecurityInformation, SecurityDescriptor, @@ -91,8 +91,8 @@ &ObjectSd); /* Check if we have an object SD and dereference it, if so */ - if (ObjectSd) ObpDereferenceCachedSecurityDescriptor(ObjectSd); - + if (ObjectSd) ObDereferenceSecurityDescriptor(ObjectSd, 1); + /* Return status */ return Status; } @@ -110,15 +110,15 @@ POBJECT_HEADER ObjectHeader; PSECURITY_DESCRIPTOR OldDescriptor, NewDescriptor, CachedDescriptor; PAGED_CODE(); - + /* Get the object header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); while (TRUE) { /* Reference the old descriptor */ - OldDescriptor = ObpReferenceCachedSecurityDescriptor(ObjectHeader->SecurityDescriptor); + OldDescriptor = ObpReferenceSecurityDescriptor(ObjectHeader); NewDescriptor = OldDescriptor; - + /* Set the SD information */ Status = SeSetSecurityDescriptorInfo(Object, SecurityInformation, @@ -129,39 +129,39 @@ if (NT_SUCCESS(Status)) { /* Now add this to the cache */ - Status = ObpAddSecurityDescriptor(NewDescriptor, &CachedDescriptor); - + Status = ObLogSecurityDescriptor(NewDescriptor, &CachedDescriptor, 1); + /* Let go of our uncached copy */ ExFreePool(NewDescriptor); - + /* Check for success */ if (NT_SUCCESS(Status)) { /* Dereference the old one */ ASSERT(OldDescriptor == ObjectHeader->SecurityDescriptor); - + /* Now set this as the new descriptor */ ObjectHeader->SecurityDescriptor = CachedDescriptor; - + /* And dereference the old one */ - ObpDereferenceCachedSecurityDescriptor(OldDescriptor); + ObDereferenceSecurityDescriptor(OldDescriptor, 1); break; } else { /* We failed, dereference the old one */ - ObpDereferenceCachedSecurityDescriptor(OldDescriptor); + ObDereferenceSecurityDescriptor(OldDescriptor, 1); break; } } else { /* We failed, dereference the old one */ - if (OldDescriptor) ObpDereferenceCachedSecurityDescriptor(OldDescriptor); + if (OldDescriptor) ObDereferenceSecurityDescriptor(OldDescriptor, 1); break; } } - + /* Return status */ return Status; } @@ -585,8 +585,7 @@ if (Type->TypeInfo.SecurityProcedure == SeDefaultObjectMethod) { /* Reference the descriptor */ - *SecurityDescriptor = - ObpReferenceCachedSecurityDescriptor(Header->SecurityDescriptor); + *SecurityDescriptor = ObpReferenceSecurityDescriptor(Header); return STATUS_SUCCESS; } @@ -678,7 +677,7 @@ else { /* Otherwise this means we used an internal descriptor */ - ObpDereferenceCachedSecurityDescriptor(SecurityDescriptor); + ObDereferenceSecurityDescriptor(SecurityDescriptor, 1); } } Removed: trunk/reactos/ntoskrnl/ob/sdcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/sdcache.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/sdcache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/sdcache.c (removed) @@ -1,409 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ob/sdcache.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - - -/* TYPES ********************************************************************/ - -typedef struct _SD_CACHE_ENTRY -{ - LIST_ENTRY ListEntry; - ULONG HashValue; - ULONG Index; - ULONG RefCount; -} SD_CACHE_ENTRY, *PSD_CACHE_ENTRY; - - -/* GLOBALS ******************************************************************/ - -#define SD_CACHE_ENTRIES 0x100 - -LIST_ENTRY ObpSdCache[SD_CACHE_ENTRIES]; -FAST_MUTEX ObpSdCacheMutex; - -/* FUNCTIONS ****************************************************************/ - -NTSTATUS -NTAPI -ObpInitSdCache(VOID) -{ - ULONG i; - - for (i = 0; i < (sizeof(ObpSdCache) / sizeof(ObpSdCache[0])); i++) - { - InitializeListHead(&ObpSdCache[i]); - } - - ExInitializeFastMutex(&ObpSdCacheMutex); - - return STATUS_SUCCESS; -} - - -static __inline VOID -ObpSdCacheLock(VOID) -{ - /* can't acquire a fast mutex in the early boot process... */ - if(KeGetCurrentThread() != NULL) - { - ExAcquireFastMutex(&ObpSdCacheMutex); - } -} - - -static __inline VOID -ObpSdCacheUnlock(VOID) -{ - /* can't acquire a fast mutex in the early boot process... */ - if(KeGetCurrentThread() != NULL) - { - ExReleaseFastMutex(&ObpSdCacheMutex); - } -} - - -static ULONG -ObpHash(PVOID Buffer, - ULONG Length) -{ - PUCHAR Ptr; - ULONG Value; - ULONG i; - - Ptr = (PUCHAR)Buffer; - Value = 0; - for (i = 0; i < Length; i++) - { - Value += *Ptr; - Ptr++; - } - - return Value; -} - - -static ULONG -ObpHashSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - ULONG Value; - BOOLEAN Defaulted; - BOOLEAN DaclPresent; - BOOLEAN SaclPresent; - PSID Owner = NULL; - PSID Group = NULL; - PACL Dacl = NULL; - PACL Sacl = NULL; - - RtlGetOwnerSecurityDescriptor(SecurityDescriptor, - &Owner, - &Defaulted); - - RtlGetGroupSecurityDescriptor(SecurityDescriptor, - &Group, - &Defaulted); - - RtlGetDaclSecurityDescriptor(SecurityDescriptor, - &DaclPresent, - &Dacl, - &Defaulted); - - RtlGetSaclSecurityDescriptor(SecurityDescriptor, - &SaclPresent, - &Sacl, - &Defaulted); - - Value = 0; - if (Owner != NULL) - { - Value += ObpHash(Owner, RtlLengthSid(Owner)); - } - - if (Group != NULL) - { - Value += ObpHash(Group, RtlLengthSid(Group)); - } - - if (DaclPresent == TRUE && Dacl != NULL) - { - Value += ObpHash(Dacl, Dacl->AclSize); - } - - if (SaclPresent == TRUE && Sacl != NULL) - { - Value += ObpHash(Sacl, Sacl->AclSize); - } - - return Value; -} - - -static PSD_CACHE_ENTRY -ObpCreateCacheEntry(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG HashValue, - IN ULONG Index, - OUT PSECURITY_DESCRIPTOR *NewSD) -{ - PSECURITY_DESCRIPTOR Sd; - PSD_CACHE_ENTRY CacheEntry; - ULONG Length; - - DPRINT("ObpCreateCacheEntry() called\n"); - - Length = RtlLengthSecurityDescriptor(SecurityDescriptor); - - CacheEntry = ExAllocatePool(NonPagedPool, - sizeof(SD_CACHE_ENTRY) + Length); - if (CacheEntry == NULL) - { - DPRINT1("ExAllocatePool() failed\n"); - return NULL; - } - - CacheEntry->HashValue = HashValue; - CacheEntry->Index = Index; - CacheEntry->RefCount = 1; - - Sd = (PSECURITY_DESCRIPTOR)(CacheEntry + 1); - RtlCopyMemory(Sd, - SecurityDescriptor, - Length); - - *NewSD = Sd; - - DPRINT("ObpCreateCacheEntry() done\n"); - - return CacheEntry; -} - - -static BOOLEAN -ObpCompareSecurityDescriptors(IN PSECURITY_DESCRIPTOR Sd1, - IN PSECURITY_DESCRIPTOR Sd2) -{ - ULONG Length1; - ULONG Length2; - - Length1 = RtlLengthSecurityDescriptor(Sd1); - Length2 = RtlLengthSecurityDescriptor(Sd2); - if (Length1 != Length2) - return FALSE; - - if (RtlCompareMemory(Sd1, Sd2, Length1) != Length1) - return FALSE; - - return TRUE; -} - - -NTSTATUS -NTAPI -ObpAddSecurityDescriptor(IN PSECURITY_DESCRIPTOR SourceSD, - OUT PSECURITY_DESCRIPTOR *DestinationSD) -{ - PSECURITY_DESCRIPTOR Sd; - PLIST_ENTRY CurrentEntry; - PSD_CACHE_ENTRY CacheEntry; - ULONG HashValue; - ULONG Index; - NTSTATUS Status; - - DPRINT("ObpAddSecurityDescriptor() called\n"); - - HashValue = ObpHashSecurityDescriptor(SourceSD); - Index = HashValue & 0xFF; - - ObpSdCacheLock(); - - if (!IsListEmpty(&ObpSdCache[Index])) - { - CurrentEntry = ObpSdCache[Index].Flink; - while (CurrentEntry != &ObpSdCache[Index]) - { - CacheEntry = CONTAINING_RECORD(CurrentEntry, - SD_CACHE_ENTRY, - ListEntry); - Sd = (PSECURITY_DESCRIPTOR)(CacheEntry + 1); - - if (CacheEntry->HashValue == HashValue && - ObpCompareSecurityDescriptors(SourceSD, Sd)) - { - CacheEntry->RefCount++; - DPRINT("RefCount %lu\n", CacheEntry->RefCount); - *DestinationSD = Sd; - - ObpSdCacheUnlock(); - - DPRINT("ObpAddSecurityDescriptor() done\n"); - - return STATUS_SUCCESS; - } - - CurrentEntry = CurrentEntry->Flink; - } - } - - CacheEntry = ObpCreateCacheEntry(SourceSD, - HashValue, - Index, - DestinationSD); - if (CacheEntry == NULL) - { - DPRINT1("ObpCreateCacheEntry() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - } - else - { - DPRINT("RefCount 1\n"); - InsertTailList(&ObpSdCache[Index], &CacheEntry->ListEntry); - Status = STATUS_SUCCESS; - } - - ObpSdCacheUnlock(); - - DPRINT("ObpAddSecurityDescriptor() done\n"); - - return Status; -} - - -NTSTATUS -NTAPI -ObpRemoveSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - PSD_CACHE_ENTRY CacheEntry; - - DPRINT("ObpRemoveSecurityDescriptor() called\n"); - - ObpSdCacheLock(); - - CacheEntry = (PSD_CACHE_ENTRY)((ULONG_PTR)SecurityDescriptor - sizeof(SD_CACHE_ENTRY)); - - CacheEntry->RefCount--; - DPRINT("RefCount %lu\n", CacheEntry->RefCount); - if (CacheEntry->RefCount == 0) - { - DPRINT("Remove cache entry\n"); - RemoveEntryList(&CacheEntry->ListEntry); - ExFreePool(CacheEntry); - } - - ObpSdCacheUnlock(); - - DPRINT("ObpRemoveSecurityDescriptor() done\n"); - - return STATUS_SUCCESS; -} - -PSECURITY_DESCRIPTOR -NTAPI -ObpReferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - PSD_CACHE_ENTRY CacheEntry; - - /* Lock the cache */ - ObpSdCacheLock(); - - /* Make sure we got a descriptor */ - if (SecurityDescriptor) - { - /* Get the entry */ - CacheEntry = (PSD_CACHE_ENTRY)((ULONG_PTR)SecurityDescriptor - - sizeof(SD_CACHE_ENTRY)); - - /* Reference it */ - CacheEntry->RefCount++; - DPRINT("RefCount %lu\n", CacheEntry->RefCount); - } - - /* Unlock the cache and return the descriptor */ - ObpSdCacheUnlock(); - return SecurityDescriptor; -} - -VOID -NTAPI -ObpDereferenceCachedSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - DPRINT("ObpDereferenceCachedSecurityDescriptor() called\n"); - - ObpRemoveSecurityDescriptor(SecurityDescriptor); - - DPRINT("ObpDereferenceCachedSecurityDescriptor() done\n"); -} - -/*++ -* @name ObLogSecurityDescriptor -* @unimplemented NT5.2 -* -* The ObLogSecurityDescriptor routine <FILLMEIN> -* -* @param InputSecurityDescriptor -* <FILLMEIN> -* -* @param OutputSecurityDescriptor -* <FILLMEIN> -* -* @param RefBias -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -ObLogSecurityDescriptor(IN PSECURITY_DESCRIPTOR InputSecurityDescriptor, - OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, - IN ULONG RefBias) -{ - /* HACK: Return the same descriptor back */ - PISECURITY_DESCRIPTOR SdCopy; - ULONG Length; - DPRINT("ObLogSecurityDescriptor is not implemented!\n", - InputSecurityDescriptor); - - Length = RtlLengthSecurityDescriptor(InputSecurityDescriptor); - SdCopy = ExAllocatePool(PagedPool, Length); - RtlCopyMemory(SdCopy, InputSecurityDescriptor, Length); - *OutputSecurityDescriptor = SdCopy; - return STATUS_SUCCESS; -} - -/*++ -* @name ObDereferenceSecurityDescriptor -* @unimplemented NT5.2 -* -* The ObDereferenceSecurityDescriptor routine <FILLMEIN> -* -* @param SecurityDescriptor -* <FILLMEIN> -* -* @param Count -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -VOID -NTAPI -ObDereferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG Count) -{ - DPRINT1("ObDereferenceSecurityDescriptor is not implemented!\n"); -} - -/* EOF */

16 years, 5 months

[cfinck] 32813: - Upgraded MediaWiki to version 1.12.0. The 1.10.x series isn't listed anymore at mediawiki.org under "Current Versions", so I did a major upgrade to the 1.12.x series. - Revert frik85's changes to "subsys_login.php" in r28600. They cause the Login system to loop forever, when you use the "Special:Userlogin" page in the Wiki, because $roscms_intern_webserver_roscms was not initialized. We cannot include "custom.php" for this as we don't know the relative path to it. Another issue

by cfinck＠svn.reactos.org

16 years, 5 months

[fireball] 32812: - Lock only the object header for an object instead of the entire object type, for better contention. Implement exclusive/shared lock and release routines around the existing lock slots in the object type (this allows up to 4 different objects to be locked in the same time, instead of locking the entire type). - Thanks to Alex for reporting this.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Apr 1 15:07:36 2008 New Revision: 32812 URL: http://svn.reactos.org/svn/reactos?rev=32812&view=rev Log: - Lock only the object header for an object instead of the entire object type, for better contention. Implement exclusive/shared lock and release routines around the existing lock slots in the object type (this allows up to 4 different objects to be locked in the same time, instead of locking the entire type). - Thanks to Alex for reporting this. Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/oblink.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Tue Apr 1 15:07:36 2008 @@ -14,6 +14,68 @@ #define OBP_LOCK_STATE_POST_ACQUISITION_SHARED 0xDDDD1234 #define OBP_LOCK_STATE_RELEASED 0xEEEE1234 #define OBP_LOCK_STATE_INITIALIZED 0xFFFF1234 + +ULONG +FORCEINLINE +ObpSelectObjectLockSlot(IN POBJECT_HEADER ObjectHeader) +{ + /* We have 4 locks total, this will return a 0-index slot */ + return (((ULONG_PTR)ObjectHeader) >> 8) & 3; +} + +VOID +FORCEINLINE +ObpAcquireObjectLock(IN POBJECT_HEADER ObjectHeader) +{ + ULONG Slot; + POBJECT_TYPE ObjectType = ObjectHeader->Type; + + /* Sanity check */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + + /* Pick a slot */ + Slot = ObpSelectObjectLockSlot(ObjectHeader); + + /* Enter a critical region and acquire the resource */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&ObjectType->ObjectLocks[Slot], TRUE); +} + +VOID +FORCEINLINE +ObpAcquireObjectLockShared(IN POBJECT_HEADER ObjectHeader) +{ + ULONG Slot; + POBJECT_TYPE ObjectType = ObjectHeader->Type; + + /* Sanity check */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + + /* Pick a slot */ + Slot = ObpSelectObjectLockSlot(ObjectHeader); + + /* Enter a critical region and acquire the resource */ + KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&ObjectType->ObjectLocks[Slot], TRUE); +} + +VOID +FORCEINLINE +ObpReleaseObjectLock(IN POBJECT_HEADER ObjectHeader) +{ + ULONG Slot; + POBJECT_TYPE ObjectType = ObjectHeader->Type; + + /* Pick a slot */ + Slot = ObpSelectObjectLockSlot(ObjectHeader); + + /* Enter a critical region and acquire the resource */ + ExReleaseResourceLite(&ObjectType->ObjectLocks[Slot]); + KeLeaveCriticalRegion(); + + /* Sanity check */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); +} POBJECT_HEADER_NAME_INFO FORCEINLINE Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Tue Apr 1 15:07:36 2008 @@ -495,8 +495,8 @@ ObjectHeader->HandleCount, ObjectHeader->PointerCount); - /* Lock the object type */ - ObpEnterObjectTypeMutex(ObjectType); + /* Lock the object */ + ObpAcquireObjectLock(ObjectHeader); /* Set default counts */ SystemHandleCount = ObjectHeader->HandleCount; @@ -571,7 +571,7 @@ } /* Release the lock */ - ObpLeaveObjectTypeMutex(ObjectType); + ObpReleaseObjectLock(ObjectHeader); /* Check if we have a close procedure */ if (ObjectType->TypeInfo.CloseProcedure) @@ -796,8 +796,8 @@ ProbeMode = AccessMode; } - /* Lock the object type */ - ObpEnterObjectTypeMutex(ObjectType); + /* Lock the object */ + ObpAcquireObjectLock(ObjectHeader); /* Charge quota and remove the creator info flag */ Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType, &NewObject); @@ -922,7 +922,7 @@ } /* Release the lock */ - ObpLeaveObjectTypeMutex(ObjectType); + ObpReleaseObjectLock(ObjectHeader); /* Check if we have an open procedure */ Status = STATUS_SUCCESS; @@ -988,7 +988,7 @@ Quickie: /* Release lock and return */ - ObpLeaveObjectTypeMutex(ObjectType); + ObpReleaseObjectLock(ObjectHeader); return Status; } @@ -1049,7 +1049,7 @@ ObjectHeader->PointerCount); /* Lock the object type */ - ObpEnterObjectTypeMutex(ObjectType); + ObpAcquireObjectLock(ObjectHeader); /* Charge quota and remove the creator info flag */ Status = ObpChargeQuotaForObject(ObjectHeader, ObjectType, &NewObject); @@ -1149,7 +1149,7 @@ } /* Release the lock */ - ObpLeaveObjectTypeMutex(ObjectType); + ObpReleaseObjectLock(ObjectHeader); /* Check if we have an open procedure */ Status = STATUS_SUCCESS; @@ -1207,7 +1207,7 @@ Quickie: /* Release lock and return */ - ObpLeaveObjectTypeMutex(ObjectType); + ObpReleaseObjectLock(ObjectHeader); return Status; } @@ -3093,8 +3093,8 @@ } else { - /* Otherwise, lock the object type */ - ObpEnterObjectTypeMutex(ObjectType); + /* Otherwise, lock the object */ + ObpAcquireObjectLock(ObjectHeader); /* And charge quota for the process to make it appear as used */ RealStatus = ObpChargeQuotaForObject(ObjectHeader, @@ -3102,7 +3102,7 @@ &IsNewObject); /* Release the lock */ - ObpLeaveObjectTypeMutex(ObjectType); + ObpReleaseObjectLock(ObjectHeader); /* Check if we failed and dereference the object if so */ if (!NT_SUCCESS(RealStatus)) ObDereferenceObject(Object); Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Tue Apr 1 15:07:36 2008 @@ -262,8 +262,8 @@ /* Get the header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); - /* Acquire object type lock */ - ObpEnterObjectTypeMutex(ObjectHeader->Type); + /* Acquire object lock */ + ObpAcquireObjectLock(ObjectHeader); /* Check what we're doing to it */ if (Permanent) @@ -272,7 +272,7 @@ ObjectHeader->Flags |= OB_FLAG_PERMANENT; /* Release the lock */ - ObpLeaveObjectTypeMutex(ObjectHeader->Type); + ObpReleaseObjectLock(ObjectHeader); } else { @@ -280,7 +280,7 @@ ObjectHeader->Flags &= ~OB_FLAG_PERMANENT; /* Release the lock */ - ObpLeaveObjectTypeMutex(ObjectHeader->Type); + ObpReleaseObjectLock(ObjectHeader); /* Check if we should delete the object now */ ObpDeleteNameCheck(ObjectBody); Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Tue Apr 1 15:07:36 2008 @@ -503,9 +503,8 @@ NULL); if (NT_SUCCESS(Status)) { - /* Lock the object type */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&ObSymbolicLinkType->Mutex, TRUE); + /* Lock the object */ + ObpAcquireObjectLock(OBJECT_TO_OBJECT_HEADER(SymlinkObject)); /* * So here's the thing: If you specify a return length, then the @@ -549,9 +548,8 @@ } _SEH_END; - /* Unlock the object type and reference the object */ - ExReleaseResourceLite(&ObSymbolicLinkType->Mutex); - KeLeaveCriticalRegion(); + /* Unlock the object and reference the object */ + ObpReleaseObjectLock(OBJECT_TO_OBJECT_HEADER(SymlinkObject)); ObDereferenceObject(SymlinkObject); } Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Tue Apr 1 15:07:36 2008 @@ -206,8 +206,8 @@ &Context); if (Object) { - /* Lock the object type */ - ObpEnterObjectTypeMutex(ObjectType); + /* Lock the object */ + ObpAcquireObjectLock(ObjectHeader); /* Make sure we can still delete the object */ if (!(ObjectHeader->HandleCount) && @@ -238,7 +238,7 @@ } /* Release the lock */ - ObpLeaveObjectTypeMutex(ObjectType); + ObpReleaseObjectLock(ObjectHeader); } /* Cleanup after lookup */

16 years, 5 months

[fireball] 32811: - Fix initialiization of the object manager lookaside lists. - Rename the variables to understandable names. - Don't leak object locks when destroying an object type. - Directory objects must be case-insensitive. - Symbolic links must be case-insensitive. - Create \KernelObjects directory during startup.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Apr 1 14:27:58 2008 New Revision: 32811 URL: http://svn.reactos.org/svn/reactos?rev=32811&view=rev Log: - Fix initialiization of the object manager lookaside lists. - Rename the variables to understandable names. - Don't leak object locks when destroying an object type. - Directory objects must be case-insensitive. - Symbolic links must be case-insensitive. - Create \KernelObjects directory during startup. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Tue Apr 1 14:27:58 2008 @@ -124,6 +124,21 @@ } OB_TEMP_BUFFER, *POB_TEMP_BUFFER; // +// Startup and Shutdown Functions +// +BOOLEAN +NTAPI +ObInitSystem( + VOID +); + +VOID +NTAPI +ObShutdownSystem( + VOID +); + +// // Directory Namespace Functions // BOOLEAN @@ -328,6 +343,12 @@ NTAPI ObpFreeObjectNameBuffer( IN PUNICODE_STRING Name +); + +VOID +NTAPI +ObpDeleteObjectType( + IN PVOID Object ); // @@ -541,7 +562,7 @@ extern PHANDLE_TABLE ObpKernelHandleTable; extern WORK_QUEUE_ITEM ObpReaperWorkItem; extern volatile PVOID ObpReaperList; -extern NPAGED_LOOKASIDE_LIST ObpNmLookasideList, ObpCiLookasideList; +extern GENERAL_LOOKASIDE ObpNameBufferLookasideList, ObpCreateInfoLookasideList; extern BOOLEAN IoCountOperations; extern ALIGNEDNAME ObpDosDevicesShortNamePrefix; extern ALIGNEDNAME ObpDosDevicesShortNameRoot; Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Tue Apr 1 14:27:58 2008 @@ -61,7 +61,7 @@ { CCHAR i; PKPRCB Prcb; - PNPAGED_LOOKASIDE_LIST CurrentList = NULL; + PGENERAL_LOOKASIDE CurrentList = NULL; /* Now allocate the per-processor lists */ for (i = 0; i < KeNumberProcessors; i++) @@ -70,54 +70,52 @@ Prcb = KiProcessorBlock[(int)i]; /* Set the OBJECT_CREATE_INFORMATION List */ - Prcb->PPLookasideList[LookasideCreateInfoList].L = &ObpCiLookasideList.L; + Prcb->PPLookasideList[LookasideCreateInfoList].L = &ObpCreateInfoLookasideList; CurrentList = ExAllocatePoolWithTag(NonPagedPool, - sizeof(NPAGED_LOOKASIDE_LIST), + sizeof(GENERAL_LOOKASIDE), TAG('O', 'b', 'C', 'I')); if (CurrentList) { /* Initialize it */ - ExInitializeNPagedLookasideList(CurrentList, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(CurrentList, + NonPagedPool, sizeof(OBJECT_CREATE_INFORMATION), TAG('O', 'b', 'C', 'I'), - 32); + 32, + &ExSystemLookasideListHead); } else { /* No list, use the static buffer */ - CurrentList = &ObpCiLookasideList; + CurrentList = &ObpCreateInfoLookasideList; } /* Link it */ - Prcb->PPLookasideList[LookasideCreateInfoList].P = &CurrentList->L; + Prcb->PPLookasideList[LookasideCreateInfoList].P = CurrentList; /* Set the captured UNICODE_STRING Object Name List */ - Prcb->PPLookasideList[LookasideNameBufferList].L = &ObpNmLookasideList.L; + Prcb->PPLookasideList[LookasideNameBufferList].L = &ObpNameBufferLookasideList; CurrentList = ExAllocatePoolWithTag(NonPagedPool, - sizeof(NPAGED_LOOKASIDE_LIST), + sizeof(GENERAL_LOOKASIDE), TAG('O', 'b', 'N', 'M')); if (CurrentList) { /* Initialize it */ - ExInitializeNPagedLookasideList(CurrentList, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(CurrentList, + PagedPool, 248, TAG('O', 'b', 'N', 'M'), - 16); + 16, + &ExSystemLookasideListHead); } else { /* No list, use the static buffer */ - CurrentList = &ObpNmLookasideList; + CurrentList = &ObpNameBufferLookasideList; } /* Link it */ - Prcb->PPLookasideList[LookasideNameBufferList].P = &CurrentList->L; + Prcb->PPLookasideList[LookasideNameBufferList].P = CurrentList; } return TRUE; @@ -144,34 +142,32 @@ if (ObpInitializationPhase != 0) goto ObPostPhase0; /* Initialize the OBJECT_CREATE_INFORMATION List */ - ExInitializeNPagedLookasideList(&ObpCiLookasideList, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(&ObpCreateInfoLookasideList, + NonPagedPool, sizeof(OBJECT_CREATE_INFORMATION), TAG('O', 'b', 'C', 'I'), - 32); + 32, + &ExSystemLookasideListHead); /* Set the captured UNICODE_STRING Object Name List */ - ExInitializeNPagedLookasideList(&ObpNmLookasideList, - NULL, - NULL, - 0, + ExInitializeSystemLookasideList(&ObpNameBufferLookasideList, + PagedPool, 248, TAG('O', 'b', 'N', 'M'), - 16); + 16, + &ExSystemLookasideListHead); /* Temporarily setup both pointers to the shared list */ - Prcb->PPLookasideList[LookasideCreateInfoList].L = &ObpCiLookasideList.L; - Prcb->PPLookasideList[LookasideCreateInfoList].P = &ObpCiLookasideList.L; - Prcb->PPLookasideList[LookasideNameBufferList].L = &ObpNmLookasideList.L; - Prcb->PPLookasideList[LookasideNameBufferList].P = &ObpNmLookasideList.L; + Prcb->PPLookasideList[LookasideCreateInfoList].L = &ObpCreateInfoLookasideList; + Prcb->PPLookasideList[LookasideCreateInfoList].P = &ObpCreateInfoLookasideList; + Prcb->PPLookasideList[LookasideNameBufferList].L = &ObpNameBufferLookasideList; + Prcb->PPLookasideList[LookasideNameBufferList].P = &ObpNameBufferLookasideList; /* Initialize the security descriptor cache */ ObpInitSdCache(); /* Initialize the Default Event */ - KeInitializeEvent(&ObpDefaultObject, NotificationEvent, TRUE ); + KeInitializeEvent(&ObpDefaultObject, NotificationEvent, TRUE); /* Setup default access for the system process */ PsGetCurrentProcess()->GrantedAccess = PROCESS_ALL_ACCESS; @@ -198,21 +194,22 @@ ObjectTypeInitializer.GenericMapping = ObpTypeMapping; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_TYPE); ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; + ObjectTypeInitializer.DeleteProcedure = ObpDeleteObjectType; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObpTypeObjectType); /* Create the Directory Type */ RtlInitUnicodeString(&Name, L"Directory"); ObjectTypeInitializer.ValidAccessMask = DIRECTORY_ALL_ACCESS; - ObjectTypeInitializer.UseDefaultObject = FALSE; + ObjectTypeInitializer.CaseInsensitive = TRUE; ObjectTypeInitializer.MaintainTypeList = FALSE; ObjectTypeInitializer.GenericMapping = ObpDirectoryMapping; + ObjectTypeInitializer.DeleteProcedure = NULL; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_DIRECTORY); ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObDirectoryType); /* Create 'symbolic link' object type */ RtlInitUnicodeString(&Name, L"SymbolicLink"); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = - sizeof(OBJECT_SYMBOLIC_LINK); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_SYMBOLIC_LINK); ObjectTypeInitializer.GenericMapping = ObpSymbolicLinkMapping; ObjectTypeInitializer.ValidAccessMask = SYMBOLIC_LINK_ALL_ACCESS; ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; @@ -251,6 +248,24 @@ NULL); if (!NT_SUCCESS(Status)) return FALSE; + /* Close the extra handle */ + Status = NtClose(Handle); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Initialize Object Types directory attributes */ + RtlInitUnicodeString(&Name, L"\\KernelObjects"); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, + NULL, + NULL); + + /* Create the directory */ + Status = NtCreateDirectoryObject(&Handle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) return FALSE; + /* Close the extra handle */ Status = NtClose(Handle); if (!NT_SUCCESS(Status)) return FALSE; Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Tue Apr 1 14:27:58 2008 @@ -22,7 +22,7 @@ POBJECT_TYPE ObpTypeObjectType = NULL; KEVENT ObpDefaultObject; -NPAGED_LOOKASIDE_LIST ObpNmLookasideList, ObpCiLookasideList; +GENERAL_LOOKASIDE ObpNameBufferLookasideList, ObpCreateInfoLookasideList; WORK_QUEUE_ITEM ObpReaperWorkItem; volatile PVOID ObpReaperList; @@ -1236,6 +1236,24 @@ return STATUS_INSUFFICIENT_RESOURCES; } +VOID +NTAPI +ObpDeleteObjectType(IN PVOID Object) +{ + ULONG i; + POBJECT_TYPE ObjectType = (PVOID)Object; + + /* Loop our locks */ + for (i = 0; i < 4; i++) + { + /* Delete each one */ + ExDeleteResourceLite(&ObjectType->ObjectLocks[i]); + } + + /* Delete our main mutex */ + ExDeleteResourceLite(&ObjectType->Mutex); +} + /*++ * @name ObMakeTemporaryObject * @implemented NT4

16 years, 5 months

[tkreuzer] 32810: fix handling of unsafe string parameter in NtGdiGetFontResourceInfoInternalW

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 1 13:21:06 2008 New Revision: 32810 URL: http://svn.reactos.org/svn/reactos?rev=32810&view=rev Log: fix handling of unsafe string parameter in NtGdiGetFontResourceInfoInternalW Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Tue Apr 1 13:21:06 2008 @@ -4358,6 +4358,7 @@ DWORD dwBytes; UNICODE_STRING SafeFileNames; BOOL bRet = FALSE; + ULONG cbStringSize; union { @@ -4375,13 +4376,26 @@ return FALSE; } - /* Check buffers and copy pwszFiles */ + /* Allocate a safe unicode string buffer */ + cbStringSize = cwc * sizeof(WCHAR); + SafeFileNames.MaximumLength = SafeFileNames.Length = cbStringSize - sizeof(WCHAR); + SafeFileNames.Buffer = ExAllocatePoolWithTag(PagedPool, + cbStringSize, + TAG('R','T','S','U')); + if (!SafeFileNames.Buffer) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Check buffers and copy pwszFiles to safe unicode string */ _SEH_TRY { - ProbeForRead(pwszFiles, cwc * sizeof(WCHAR), 1); - bRet = RtlCreateUnicodeString(&SafeFileNames, pwszFiles); + ProbeForRead(pwszFiles, cbStringSize, 1); ProbeForWrite(pdwBytes, sizeof(DWORD), 1); ProbeForWrite(pvBuf, cjIn, 1); + + RtlCopyMemory(SafeFileNames.Buffer, pwszFiles, cbStringSize); } _SEH_HANDLE { @@ -4389,20 +4403,15 @@ } _SEH_END - if(!bRet) - { - /* Could not create the unicode string, so return instantly */ + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + /* Free the string buffer for the safe filename */ + ExFreePool(SafeFileNames.Buffer); return FALSE; } - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - /* Free the string for the filename */ - RtlFreeUnicodeString(&SafeFileNames); - return FALSE; - } - + /* Do the actual call */ bRet = IntGdiGetFontResourceInfo(&SafeFileNames, &Buffer, &dwBytes, dwType); /* Check if succeeded and the buffer is big enough */ @@ -4428,8 +4437,8 @@ } } - /* Free the string for the filename */ - RtlFreeUnicodeString(&SafeFileNames); + /* Free the string for the safe filenames */ + ExFreePool(SafeFileNames.Buffer); return bRet; }

16 years, 5 months

[fireball] 32809: - Use C define for the bit in the wait block flags that we set to specify waiting, instead of a hardcoded "1". - Fix broken code when trying to find the last wait block in several parts of the pushlock code. - Fix broken algorithm in the optimization of the pushlock waiter list. - The wake event for the pushlock should be a synchronization event, not a notification event. - Fix broken algorithm during the release of a pushlock (in shared cases). - Fix broken code during "try to

by fireball＠svn.reactos.org

Author: fireball Date: Tue Apr 1 13:14:01 2008 New Revision: 32809 URL: http://svn.reactos.org/svn/reactos?rev=32809&view=rev Log: - Use C define for the bit in the wait block flags that we set to specify waiting, instead of a hardcoded "1". - Fix broken code when trying to find the last wait block in several parts of the pushlock code. - Fix broken algorithm in the optimization of the pushlock waiter list. - The wake event for the pushlock should be a synchronization event, not a notification event. - Fix broken algorithm during the release of a pushlock (in shared cases). - Fix broken code during "try to wake pushlock". - Remove DbgPrints from inlined pushlock code during contention. - Thanks to Alex for noticing these bugs and providing advice on the fixes. This fixes lots of race issues in the handle table implementation. Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/ntoskrnl/ex/pushlock.c (contents, props changed) 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 [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Tue Apr 1 13:14:01 2008 @@ -147,6 +147,7 @@ // Pushlock Wait Block Flags // #define EX_PUSH_LOCK_FLAGS_EXCLUSIVE 1 +#define EX_PUSH_LOCK_FLAGS_WAIT_V 1 #define EX_PUSH_LOCK_FLAGS_WAIT 2 // Modified: trunk/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/pushlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] Tue Apr 1 13:14:01 2008 @@ -65,7 +65,7 @@ EX_PUSH_LOCK OldValue) { EX_PUSH_LOCK NewValue; - PEX_PUSH_LOCK_WAIT_BLOCK PreviousWaitBlock, FirstWaitBlock, NextWaitBlock; + PEX_PUSH_LOCK_WAIT_BLOCK PreviousWaitBlock, FirstWaitBlock, LastWaitBlock; PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock; KIRQL OldIrql; @@ -99,23 +99,30 @@ /* Save the First Block */ FirstWaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & ~EX_PUSH_LOCK_PTR_BITS); - NextWaitBlock = FirstWaitBlock; - WaitBlock = NextWaitBlock->Last; - - /* Try to find a wait block */ - while (!WaitBlock) - { + WaitBlock = FirstWaitBlock; + + /* Try to find the last block */ + while (TRUE) + { + /* Get the last wait block */ + LastWaitBlock = WaitBlock->Last; + + /* Check if we found it */ + if (LastWaitBlock) + { + /* Use it */ + WaitBlock = LastWaitBlock; + break; + } + /* Save the previous block */ - PreviousWaitBlock = NextWaitBlock; + PreviousWaitBlock = WaitBlock; /* Move to next block */ - NextWaitBlock = NextWaitBlock->Next; + WaitBlock = WaitBlock->Next; /* Save the previous block */ - NextWaitBlock->Previous = PreviousWaitBlock; - - /* Move to the next one */ - WaitBlock = NextWaitBlock->Last; + WaitBlock->Previous = PreviousWaitBlock; } /* Check if the last Wait Block is not Exclusive or if it's the only one */ @@ -211,58 +218,65 @@ ExpOptimizePushLockList(PEX_PUSH_LOCK PushLock, EX_PUSH_LOCK OldValue) { - PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock, LastWaitBlock, PreviousWaitBlock; + PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock, LastWaitBlock, PreviousWaitBlock, FirstWaitBlock; EX_PUSH_LOCK NewValue; - /* Check if the pushlock is locked */ - if (OldValue.Locked) - { - /* Start main loop */ - for (;;) - { - /* Get the wait block */ - WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & - ~EX_PUSH_LOCK_PTR_BITS); - - /* Loop the blocks */ + /* Start main loop */ + for (;;) + { + /* Check if we've been unlocked */ + if (!OldValue.Locked) + { + /* Wake us up and leave */ + ExfWakePushLock(PushLock, OldValue); + break; + } + + /* Get the wait block */ + WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & + ~EX_PUSH_LOCK_PTR_BITS); + + /* Loop the blocks */ + FirstWaitBlock = WaitBlock; + while (TRUE) + { + /* Get the last wait block */ LastWaitBlock = WaitBlock->Last; - while (!LastWaitBlock) - { - /* Save the block */ - PreviousWaitBlock = WaitBlock; - - /* Get the next block */ - WaitBlock = WaitBlock->Next; - - /* Save the previous */ - WaitBlock->Previous = PreviousWaitBlock; - - /* Move to the next */ - LastWaitBlock = WaitBlock->Last; - } - - /* Remove the wake bit */ - NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_WAKING; - - /* Sanity checks */ - ASSERT(NewValue.Locked); - ASSERT(!NewValue.Waking); - - /* Update the value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, - NewValue.Ptr, - OldValue.Ptr); - - /* If we updated correctly, leave */ - if (NewValue.Value == OldValue.Value) return; - - /* If the value is now locked, loop again */ - if (NewValue.Locked) continue; - } - } - - /* Wake the push lock */ - ExfWakePushLock(PushLock, OldValue); + if (LastWaitBlock) + { + /* Set this as the new last block, we're done */ + FirstWaitBlock->Last = LastWaitBlock; + break; + } + + /* Save the block */ + PreviousWaitBlock = WaitBlock; + + /* Get the next block */ + WaitBlock = WaitBlock->Next; + + /* Save the previous */ + WaitBlock->Previous = PreviousWaitBlock; + } + + /* Remove the wake bit */ + NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_WAKING; + + /* Sanity checks */ + ASSERT(NewValue.Locked); + ASSERT(!NewValue.Waking); + + /* Update the value */ + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + + /* If we updated correctly, leave */ + if (NewValue.Value == OldValue.Value) break; + + /* Update value */ + OldValue = NewValue; + } } /*++ @@ -297,7 +311,7 @@ /* Initialize the wait event */ KeInitializeEvent(&((PEX_PUSH_LOCK_WAIT_BLOCK)WaitBlock)->WakeEvent, - NotificationEvent, + SynchronizationEvent, FALSE); /* Spin on the push lock if necessary */ @@ -320,7 +334,7 @@ /* Now try to remove the wait bit */ if (InterlockedBitTestAndReset(&((PEX_PUSH_LOCK_WAIT_BLOCK)WaitBlock)->Flags, - 1)) + EX_PUSH_LOCK_FLAGS_WAIT_V)) { /* Nobody removed it already, let's do a full wait */ Status = KeWaitForSingleObject(&((PEX_PUSH_LOCK_WAIT_BLOCK)WaitBlock)-> @@ -766,18 +780,17 @@ FASTCALL ExfReleasePushLock(PEX_PUSH_LOCK PushLock) { - EX_PUSH_LOCK OldValue = *PushLock; - EX_PUSH_LOCK NewValue; - PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock; + EX_PUSH_LOCK OldValue = *PushLock, NewValue, WakeValue; + PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock, LastWaitBlock; /* Sanity check */ ASSERT(OldValue.Locked); - - /* Check if someone is waiting on the lock */ - if (!OldValue.Waiting) - { - /* Nobody is waiting on it, so we'll try a quick release */ - for (;;) + + /* Start main loop */ + while (TRUE) + { + /* Check if someone is waiting on the lock */ + if (!OldValue.Waiting) { /* Check if it's shared */ if (OldValue.Shared > 1) @@ -800,28 +813,179 @@ /* Did it enter a wait state? */ OldValue = NewValue; - if (NewValue.Waiting) break; - } + } + else + { + /* Ok, we do know someone is waiting on it. Are there more then one? */ + if (OldValue.MultipleShared) + { + /* Get the wait block */ + WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & + ~EX_PUSH_LOCK_PTR_BITS); + + /* Loop until we find the last wait block */ + while (TRUE) + { + /* Get the last wait block */ + LastWaitBlock = WaitBlock->Last; + + /* Did it exist? */ + if (LastWaitBlock) + { + /* Choose it */ + WaitBlock = LastWaitBlock; + break; + } + + /* Keep searching */ + WaitBlock = WaitBlock->Next; + } + + /* Make sure the Share Count is above 0 */ + if (WaitBlock->ShareCount > 0) + { + /* This shouldn't be an exclusive wait block */ + ASSERT(WaitBlock->Flags & EX_PUSH_LOCK_FLAGS_EXCLUSIVE); + + /* Do the decrease and check if the lock isn't shared anymore */ + if (InterlockedDecrement(&WaitBlock->ShareCount) > 0) return; + } + } + + /* + * If nobody was waiting on the block, then we possibly reduced the number + * of times the pushlock was shared, and we unlocked it. + * If someone was waiting, and more then one person is waiting, then we + * reduced the number of times the pushlock is shared in the wait block. + * Therefore, at this point, we can now 'satisfy' the wait. + */ + for (;;) + { + /* Now we need to see if it's waking */ + if (OldValue.Waking) + { + /* Remove the lock and multiple shared bits */ + NewValue.Value = OldValue.Value; + NewValue.MultipleShared = FALSE; + NewValue.Locked = FALSE; + + /* Sanity check */ + ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared); + + /* Write the new value */ + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + if (NewValue.Value == OldValue.Value) return; + } + else + { + /* Remove the lock and multiple shared bits */ + NewValue.Value = OldValue.Value; + NewValue.MultipleShared = FALSE; + NewValue.Locked = FALSE; + + /* It's not already waking, so add the wake bit */ + NewValue.Waking = TRUE; + + /* Sanity check */ + ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared); + + /* Write the new value */ + WakeValue = NewValue; + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + if (NewValue.Value != OldValue.Value) continue; + + /* The write was successful. The pushlock is Unlocked and Waking */ + ExfWakePushLock(PushLock, WakeValue); + return; + } + } + } + } +} + +/*++ + * @name ExfReleasePushLockShared + * @implemented NT5.2 + * + * The ExfReleasePushLockShared macro releases a previously acquired PushLock. + * + * @params PushLock + * Pointer to a previously acquired pushlock. + * + * @return None. + * + * @remarks Callers of ExReleasePushLockShared must be running at IRQL <= APC_LEVEL. + * This macro should usually be paired up with KeLeaveCriticalRegion. + * + *--*/ +VOID +FASTCALL +ExfReleasePushLockShared(PEX_PUSH_LOCK PushLock) +{ + EX_PUSH_LOCK OldValue = *PushLock, NewValue, WakeValue; + PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock, LastWaitBlock; + + /* Check if someone is waiting on the lock */ + while (!OldValue.Waiting) + { + /* Check if it's shared */ + if (OldValue.Shared > 1) + { + /* Write the Old Value but decrease share count */ + NewValue = OldValue; + NewValue.Shared--; + } + else + { + /* Simply clear the lock */ + NewValue.Value = 0; + } + + /* Write the New Value */ + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + if (NewValue.Value == OldValue.Value) return; + + /* Did it enter a wait state? */ + OldValue = NewValue; } /* Ok, we do know someone is waiting on it. Are there more then one? */ if (OldValue.MultipleShared) { - /* Find the last Wait Block */ - for (WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & - ~EX_PUSH_LOCK_PTR_BITS); - !WaitBlock->Last; - WaitBlock = WaitBlock->Next); - - /* Make sure the Share Count is above 0 */ - if (WaitBlock->ShareCount > 0) - { - /* This shouldn't be an exclusive wait block */ - ASSERT(WaitBlock->Flags & EX_PUSH_LOCK_FLAGS_EXCLUSIVE); - - /* Do the decrease and check if the lock isn't shared anymore */ - if (InterlockedDecrement(&WaitBlock->ShareCount) > 0) return; - } + /* Get the wait block */ + WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & + ~EX_PUSH_LOCK_PTR_BITS); + + /* Loop until we find the last wait block */ + while (TRUE) + { + /* Get the last wait block */ + LastWaitBlock = WaitBlock->Last; + + /* Did it exist? */ + if (LastWaitBlock) + { + /* Choose it */ + WaitBlock = LastWaitBlock; + break; + } + + /* Keep searching */ + WaitBlock = WaitBlock->Next; + } + + /* Sanity checks */ + ASSERT(WaitBlock->ShareCount > 0); + ASSERT(WaitBlock->Flags & EX_PUSH_LOCK_FLAGS_EXCLUSIVE); + + /* Do the decrease and check if the lock isn't shared anymore */ + if (InterlockedDecrement(&WaitBlock->ShareCount) > 0) return; } /* @@ -864,131 +1028,14 @@ ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared); /* Write the new value */ + WakeValue = NewValue; NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, NewValue.Ptr, OldValue.Ptr); if (NewValue.Value != OldValue.Value) continue; /* The write was successful. The pushlock is Unlocked and Waking */ - ExfWakePushLock(PushLock, NewValue); - return; - } - } -} - -/*++ - * @name ExfReleasePushLockShared - * @implemented NT5.2 - * - * The ExfReleasePushLockShared macro releases a previously acquired PushLock. - * - * @params PushLock - * Pointer to a previously acquired pushlock. - * - * @return None. - * - * @remarks Callers of ExReleasePushLockShared must be running at IRQL <= APC_LEVEL. - * This macro should usually be paired up with KeLeaveCriticalRegion. - * - *--*/ -VOID -FASTCALL -ExfReleasePushLockShared(PEX_PUSH_LOCK PushLock) -{ - EX_PUSH_LOCK OldValue = *PushLock; - EX_PUSH_LOCK NewValue; - PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock; - - /* Check if someone is waiting on the lock */ - while (!OldValue.Waiting) - { - /* Check if it's shared */ - if (OldValue.Shared > 1) - { - /* Write the Old Value but decrease share count */ - NewValue = OldValue; - NewValue.Shared--; - } - else - { - /* Simply clear the lock */ - NewValue.Value = 0; - } - - /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, - NewValue.Ptr, - OldValue.Ptr); - if (NewValue.Value == OldValue.Value) return; - - /* Did it enter a wait state? */ - OldValue = NewValue; - } - - /* Ok, we do know someone is waiting on it. Are there more then one? */ - if (OldValue.MultipleShared) - { - /* Find the last Wait Block */ - for (WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & - ~EX_PUSH_LOCK_PTR_BITS); - !WaitBlock->Last; - WaitBlock = WaitBlock->Next); - - /* Sanity checks */ - ASSERT(WaitBlock->ShareCount > 0); - ASSERT(WaitBlock->Flags & EX_PUSH_LOCK_FLAGS_EXCLUSIVE); - - /* Do the decrease and check if the lock isn't shared anymore */ - if (InterlockedDecrement(&WaitBlock->ShareCount) > 0) return; - } - - /* - * If nobody was waiting on the block, then we possibly reduced the number - * of times the pushlock was shared, and we unlocked it. - * If someone was waiting, and more then one person is waiting, then we - * reduced the number of times the pushlock is shared in the wait block. - * Therefore, at this point, we can now 'satisfy' the wait. - */ - for (;;) - { - /* Now we need to see if it's waking */ - if (OldValue.Waking) - { - /* Remove the lock and multiple shared bits */ - NewValue.Value = OldValue.Value; - NewValue.MultipleShared = FALSE; - NewValue.Locked = FALSE; - - /* Sanity check */ - ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared); - - /* Write the new value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, - NewValue.Ptr, - OldValue.Ptr); - if (NewValue.Value == OldValue.Value) return; - } - else - { - /* Remove the lock and multiple shared bits */ - NewValue.Value = OldValue.Value; - NewValue.MultipleShared = FALSE; - NewValue.Locked = FALSE; - - /* It's not already waking, so add the wake bit */ - NewValue.Waking = TRUE; - - /* Sanity check */ - ASSERT(NewValue.Waking && !NewValue.Locked && !NewValue.MultipleShared); - - /* Write the new value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, - NewValue.Ptr, - OldValue.Ptr); - if (NewValue.Value != OldValue.Value) continue; - - /* The write was successful. The pushlock is Unlocked and Waking */ - ExfWakePushLock(PushLock, NewValue); + ExfWakePushLock(PushLock, WakeValue); return; } } @@ -1094,21 +1141,19 @@ * If the Pushlock is not waiting on anything, or if it's already waking up * and locked, don't do anything */ - if (!(OldValue.Value == (EX_PUSH_LOCK_WAKING | EX_PUSH_LOCK_LOCK)) && - (OldValue.Waiting)) - { - /* Make it Waking */ - NewValue = OldValue; - NewValue.Waking = TRUE; - - /* Write the New Value */ - if (InterlockedCompareExchangePointer(PushLock, - NewValue.Ptr, - OldValue.Ptr) == OldValue.Ptr) - { - /* Wake the Pushlock */ - ExfWakePushLock(PushLock, NewValue); - } + if ((OldValue.Waking) || (OldValue.Locked) || !(OldValue.Waiting)) return; + + /* Make it Waking */ + NewValue = OldValue; + NewValue.Waking = TRUE; + + /* Write the New Value */ + if (InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr) == OldValue.Ptr) + { + /* Wake the Pushlock */ + ExfWakePushLock(PushLock, NewValue); } } @@ -1142,20 +1187,20 @@ if (WaitBlock->Next) KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); /* Start block loop */ - for (;;) + while (WaitBlock) { /* Get the next block */ NextWaitBlock = WaitBlock->Next; /* Remove the wait flag from the Wait block */ - if (InterlockedBitTestAndReset(&WaitBlock->Flags, 1)) + if (!InterlockedBitTestAndReset(&WaitBlock->Flags, EX_PUSH_LOCK_FLAGS_WAIT_V)) { /* Nobody removed the flag before us, so signal the event */ KeSetEventBoostPriority(&WaitBlock->WakeEvent, NULL); } - /* Check if there was a next block */ - if (!NextWaitBlock) break; + /* Try the next one */ + WaitBlock = NextWaitBlock; } /* Lower IRQL if needed */ Propchange: trunk/reactos/ntoskrnl/ex/pushlock.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Tue Apr 1 13:14:01 2008 @@ -26,6 +26,7 @@ extern ULONG NtGlobalFlag; extern ULONG ExpInitializationPhase; extern ULONG ExpAltTimeZoneBias; +extern LIST_ENTRY ExSystemLookasideListHead; typedef struct _EXHANDLE { @@ -711,7 +712,6 @@ if (InterlockedBitTestAndSet((PLONG)PushLock, EX_PUSH_LOCK_LOCK_V)) { /* Someone changed it, use the slow path */ - // DbgPrint("%s - Contention!\n", __FUNCTION__); ExfAcquirePushLockExclusive(PushLock); } @@ -750,6 +750,7 @@ } /* Got acquired */ + ASSERT (PushLock->Locked); return TRUE; } @@ -783,7 +784,6 @@ if (ExpChangePushlock(PushLock, NewValue.Ptr, 0)) { /* Someone changed it, use the slow path */ - // DbgPrint("%s - Contention!\n", __FUNCTION__); ExfAcquirePushLockShared(PushLock); } @@ -897,7 +897,6 @@ if (ExpChangePushlock(PushLock, 0, OldValue.Ptr) != OldValue.Ptr) { /* There are still other people waiting on it */ - DbgPrint("%s - Contention!\n", __FUNCTION__); ExfReleasePushLockShared(PushLock); } } @@ -945,7 +944,6 @@ if ((OldValue.Waiting) && !(OldValue.Waking)) { /* Wake it up */ - DbgPrint("%s - Contention!\n", __FUNCTION__); ExfTryToWakePushLock(PushLock); } } @@ -997,7 +995,6 @@ OldValue.Ptr)) { /* We have waiters, use the long path */ - // DbgPrint("%s - Contention!\n", __FUNCTION__); ExfReleasePushLock(PushLock); } }

16 years, 5 months

[fireball] 32808: - Implement inline version of _rotl. The Win32 version of the CRT has this function in the standard library, but the NT one doesn't, so we need to rely on the inline version (which MSVC supports).

by fireball＠svn.reactos.org

Author: fireball Date: Tue Apr 1 12:49:03 2008 New Revision: 32808 URL: http://svn.reactos.org/svn/reactos?rev=32808&view=rev Log: - Implement inline version of _rotl. The Win32 version of the CRT has this function in the standard library, but the NT one doesn't, so we need to rely on the inline version (which MSVC supports). Modified: trunk/reactos/include/psdk/intrin_x86.h trunk/reactos/lib/rtl/rtl.h trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intrin_x86.h [iso-8859-1] Tue Apr 1 12:49:03 2008 @@ -680,6 +680,15 @@ return retval; } +#ifndef __MSVCRT__ +static __inline__ __attribute__((always_inline)) unsigned short _rotl(const unsigned long value, const unsigned char shift) +{ + unsigned short retval; + __asm__("roll %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); + return retval; +} +#endif + static __inline__ __attribute__((always_inline)) unsigned char _rotr8(const unsigned char value, const unsigned char shift) { unsigned char retval; Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=32808&r1… ============================================================================== --- trunk/reactos/lib/rtl/rtl.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.h [iso-8859-1] Tue Apr 1 12:49:03 2008 @@ -14,6 +14,7 @@ /* We're a core NT DLL, we don't import syscalls */ #define WIN32_NO_STATUS #define _INC_SWPRINTF_INL_ +#undef __MSVCRT__ /* C Headers */ #include <stdlib.h> Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Tue Apr 1 12:49:03 2008 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ /* Version Data */ +#undef __MSVCRT__ #include <psdk/ntverp.h> #define _WIN32_WINNT _WIN32_WINNT_WS03 #define NTDDI_VERSION NTDDI_WS03SP1

16 years, 5 months

[tkreuzer] 32807: - make some text metric settings compatible to windows xp. - zero out lfWidth member when returning logfont in IntGdiGetFontResourceInfo. Fixes recently introduced bug in fontview display, also fixes ms fontview.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 1 12:07:12 2008 New Revision: 32807 URL: http://svn.reactos.org/svn/reactos?rev=32807&view=rev Log: - make some text metric settings compatible to windows xp. - zero out lfWidth member when returning logfont in IntGdiGetFontResourceInfo. Fixes recently introduced bug in fontview display, also fixes ms fontview. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Tue Apr 1 12:07:12 2008 @@ -993,9 +993,9 @@ Lf->lfItalic = TM->tmItalic; Lf->lfPitchAndFamily = (TM->tmPitchAndFamily & 0xf1) + 1; Lf->lfCharSet = TM->tmCharSet; - Lf->lfOutPrecision = OUT_STROKE_PRECIS; - Lf->lfClipPrecision = CLIP_STROKE_PRECIS; - Lf->lfQuality = DRAFT_QUALITY; + Lf->lfOutPrecision = OUT_OUTLINE_PRECIS; + Lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; + Lf->lfQuality = PROOF_QUALITY; Ntm = &Info->NewTextMetricEx.ntmTm; Ntm->tmHeight = TM->tmHeight; @@ -4322,6 +4322,7 @@ break; case 2: /* Copy a LOGFONTW structure */ + Info.EnumLogFontEx.elfLogFont.lfWidth = 0; memcpy(pBuffer, &Info.EnumLogFontEx.elfLogFont, sizeof(LOGFONTW)); *pdwBytes = sizeof(LOGFONTW); break;

16 years, 5 months

[tkreuzer] 32806: fix calculation of cwc parameter for NtGdiGetFontResourceInfoInternalW.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 1 11:57:17 2008 New Revision: 32806 URL: http://svn.reactos.org/svn/reactos?rev=32806&view=rev Log: fix calculation of cwc parameter for NtGdiGetFontResourceInfoInternalW. Modified: trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Tue Apr 1 11:57:17 2008 @@ -428,7 +428,7 @@ bRet = NtGdiGetFontResourceInfoInternalW( NtFileName.Buffer, - NtFileName.Length, + (NtFileName.Length / sizeof(WCHAR)) + 1, 1, *pdwBufSize, pdwBufSize,

16 years, 5 months

[dchapyshev] 32805: - Update Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Apr 1 09:48:01 2008 New Revision: 32805 URL: http://svn.reactos.org/svn/reactos?rev=32805&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Tue Apr 1 09:48:01 2008 @@ -208,7 +208,7 @@ ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY LTEXT "Òèï ôàéëà:", 14004, 8, 35, 50, 10 - LTEXT "File", 14005, 68, 35, 160, 10 + LTEXT "ôàéë", 14005, 68, 35, 160, 10 LTEXT "Ïðèëîæåíèå:", 14006, 8, 53, 50, 10 LTEXT "", 14007, 68, 53, 160, 10 LTEXT "Ðàçìåùåíèå:", 14008, 8, 72, 45, 10 @@ -641,7 +641,7 @@ FCIDM_SHVIEW_NEWFOLDER "&Ïàïêà" FCIDM_SHVIEW_NEWLINK "&ßðëûê" IDS_FOLDER_OPTIONS "Ñâîéñòâà ïàïêè" - IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" - IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_RECYCLEBIN_LOCATION "Ðàñïîëîæåíèå Êîðçèíû" + IDS_RECYCLEBIN_DISKSPACE "Äîñòóïíîå ïðîñòðàíñòâî" + +END

16 years, 5 months

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 April 2008