Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[pschweitzer] 49155: [HEAP] Hackfixed build by stubbing RtlpValidateHeapHeaders(), RtlpValidateHeapEntry() and hackplementing RtlpValidateHeap(). To be properly fixed.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Oct 15 15:05:15 2010 New Revision: 49155 URL: http://svn.reactos.org/svn/reactos?rev=49155&view=rev Log: [HEAP] Hackfixed build by stubbing RtlpValidateHeapHeaders(), RtlpValidateHeapEntry() and hackplementing RtlpValidateHeap(). To be properly fixed. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=49155&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Fri Oct 15 15:05:15 2010 @@ -1638,6 +1638,23 @@ return ret; } +BOOLEAN NTAPI +RtlpValidateHeap(HEAP * Heap, BOOLEAN ForceValidation) +{ + return HEAP_IsRealArena(Heap, Heap->flags, NULL, TRUE); +} + +BOOLEAN NTAPI +RtlpValidateHeapHeaders(HEAP * Heap, BOOLEAN Recalculate) +{ + return TRUE; +} + +BOOLEAN NTAPI +RtlpValidateHeapEntry(HEAP * Heap, PVOID HeapEntry) +{ + return TRUE; +} /*********************************************************************** * RtlValidateHeap

14 years, 2 months

[fireball] 49154: [HEAP] - Implement parameters validation ("DebugHeap") in all used RTL heap APIs. Winetests failures down to 4.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Oct 15 13:16:48 2010 New Revision: 49154 URL: http://svn.reactos.org/svn/reactos?rev=49154&view=rev Log: [HEAP] - Implement parameters validation ("DebugHeap") in all used RTL heap APIs. Winetests failures down to 4. Modified: trunk/reactos/lib/rtl/heap.h trunk/reactos/lib/rtl/heap_rewrite.c trunk/reactos/lib/rtl/heapdbg.c Modified: trunk/reactos/lib/rtl/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.h?rev=49154&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.h [iso-8859-1] Fri Oct 15 13:16:48 2010 @@ -322,6 +322,15 @@ PHEAP_ENTRY_EXTRA NTAPI RtlpGetExtraStuffPointer(PHEAP_ENTRY HeapEntry); +BOOLEAN NTAPI +RtlpValidateHeap(PHEAP Heap, BOOLEAN ForceValidation); + +BOOLEAN NTAPI +RtlpValidateHeapEntry(PHEAP Heap, PHEAP_ENTRY HeapEntry); + +BOOLEAN NTAPI +RtlpValidateHeapHeaders(PHEAP Heap, BOOLEAN Recalculate); + /* heapdbg.c */ HANDLE NTAPI RtlDebugCreateHeap(ULONG Flags, @@ -331,7 +340,7 @@ PVOID Lock, PRTL_HEAP_PARAMETERS Parameters); -HANDLE NTAPI +BOOLEAN NTAPI RtlDebugDestroyHeap(HANDLE HeapPtr); PVOID NTAPI Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Fri Oct 15 13:16:48 2010 @@ -1476,23 +1476,9 @@ TotalSize = ROUND_UP(CommitSize, 16 * PAGE_SIZE); } - if (RtlpGetMode() == UserMode) - { - /* TODO: Here should be a call to special "Debug" heap, which does parameters validation, - however we're just going to simulate setting correct flags here */ - if (Flags & (HEAP_VALIDATE_ALL_ENABLED | - HEAP_VALIDATE_PARAMETERS_ENABLED | - HEAP_CAPTURE_STACK_BACKTRACES | - HEAP_FLAG_PAGE_ALLOCS | - HEAP_CREATE_ENABLE_TRACING) && - !(Flags & HEAP_SKIP_VALIDATION_CHECKS)) - { - // RtlDebugCreateHeap(Flags, Addr, TotalSize, CommitSize, Lock, Parameters); - Flags |= HEAP_SKIP_VALIDATION_CHECKS | - HEAP_TAIL_CHECKING_ENABLED | - HEAP_FREE_CHECKING_ENABLED; - } - } + /* Call special heap */ + if (RtlpHeapIsSpecial(Flags)) + return RtlDebugCreateHeap(Flags, Addr, TotalSize, CommitSize, Lock, Parameters); /* Calculate header size */ HeaderSize = sizeof(HEAP); @@ -1736,7 +1722,11 @@ if (!HeapPtr) return NULL; - // TODO: Check for special heap + /* Call special heap */ + if (RtlpHeapIsSpecial(Heap->Flags)) + { + if (!RtlDebugDestroyHeap(Heap)) return HeapPtr; + } /* Check for a process heap */ if (RtlpGetMode() == UserMode && @@ -2103,6 +2093,10 @@ /* Force flags */ Flags |= Heap->ForceFlags; + /* Call special heap */ + if (RtlpHeapIsSpecial(Flags)) + return RtlDebugAllocateHeap(Heap, Flags, Size); + /* Check for the maximum size */ if (Size >= 0x80000000) { @@ -2111,14 +2105,10 @@ return NULL; } - if (Flags & ( - HEAP_VALIDATE_ALL_ENABLED | - HEAP_VALIDATE_PARAMETERS_ENABLED | - HEAP_FLAG_PAGE_ALLOCS | - HEAP_CREATE_ENABLE_TRACING | - HEAP_CREATE_ALIGN_16)) - { - DPRINT("HEAP: RtlAllocateHeap is called with unsupported flags %x, ignoring\n", Flags); + if (Flags & (HEAP_CREATE_ENABLE_TRACING | + HEAP_CREATE_ALIGN_16)) + { + DPRINT1("HEAP: RtlAllocateHeap is called with unsupported flags %x, ignoring\n", Flags); } //DPRINT("RtlAllocateHeap(%p %x %x)\n", Heap, Flags, Size); @@ -2328,6 +2318,10 @@ /* Get pointer to the heap and force flags */ Heap = (PHEAP)HeapPtr; Flags |= Heap->ForceFlags; + + /* Call special heap */ + if (RtlpHeapIsSpecial(Flags)) + return RtlDebugFreeHeap(Heap, Flags, Ptr); /* Lock if necessary */ if (!(Flags & HEAP_NO_SERIALIZE)) @@ -2733,7 +2727,9 @@ /* Force heap flags */ Flags |= Heap->ForceFlags; - // Check for special heap + /* Call special heap */ + if (RtlpHeapIsSpecial(Flags)) + return RtlDebugReAllocateHeap(Heap, Flags, Ptr, Size); /* Make sure size is valid */ if (Size >= 0x80000000) @@ -3222,7 +3218,9 @@ /* Force flags */ Flags |= Heap->Flags; - // FIXME Special heap + /* Call special heap */ + if (RtlpHeapIsSpecial(Flags)) + return RtlDebugSizeHeap(Heap, Flags, Ptr); /* Get the heap entry pointer */ HeapEntry = (PHEAP_ENTRY)Ptr - 1; @@ -3825,6 +3823,10 @@ /* Force flags */ Flags |= Heap->Flags; + /* Call special heap */ + if (RtlpHeapIsSpecial(Flags)) + return RtlDebugSetUserValueHeap(Heap, Flags, BaseAddress, UserValue); + /* Lock if it's lockable */ if (!(Heap->Flags & HEAP_NO_SERIALIZE)) { @@ -3880,6 +3882,10 @@ /* Force flags */ Flags |= Heap->Flags; + /* Call special heap */ + if (RtlpHeapIsSpecial(Flags)) + return RtlDebugSetUserFlagsHeap(Heap, Flags, BaseAddress, UserFlagsReset, UserFlagsSet); + /* Lock if it's lockable */ if (!(Heap->Flags & HEAP_NO_SERIALIZE)) { @@ -3932,6 +3938,10 @@ /* Force flags */ Flags |= Heap->Flags; + /* Call special heap */ + if (RtlpHeapIsSpecial(Flags)) + return RtlDebugGetUserInfoHeap(Heap, Flags, BaseAddress, UserValue, UserFlags); + /* Lock if it's lockable */ if (!(Heap->Flags & HEAP_NO_SERIALIZE)) { Modified: trunk/reactos/lib/rtl/heapdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heapdbg.c?rev=4915… ============================================================================== --- trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] Fri Oct 15 13:16:48 2010 @@ -25,18 +25,111 @@ HANDLE NTAPI RtlDebugCreateHeap(ULONG Flags, PVOID Addr, - SIZE_T TotalSize, + SIZE_T ReserveSize, SIZE_T CommitSize, PVOID Lock, PRTL_HEAP_PARAMETERS Parameters) { - return NULL; -} - -HANDLE NTAPI + MEMORY_BASIC_INFORMATION MemoryInfo; + NTSTATUS Status; + PHEAP Heap; + + /* Validate parameters */ + if (ReserveSize <= HEAP_ENTRY_SIZE) + { + DPRINT1("HEAP: Incorrect ReserveSize %x\n", ReserveSize); + return NULL; + } + + if (ReserveSize < CommitSize) + { + DPRINT1("HEAP: Incorrect CommitSize %x\n", CommitSize); + return NULL; + } + + if (Flags & HEAP_NO_SERIALIZE && Lock) + { + DPRINT1("HEAP: Can't specify Lock routine and have HEAP_NO_SERIALIZE flag set\n"); + return NULL; + } + + /* If the address is specified, check it's virtual memory */ + if (Addr) + { + Status = ZwQueryVirtualMemory(NtCurrentProcess(), + Addr, + MemoryBasicInformation, + &MemoryInfo, + sizeof(MemoryInfo), + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("HEAP: Specified heap base address %p is invalid, Status 0x%08X\n", Addr, Status); + return NULL; + } + + if (MemoryInfo.BaseAddress != Addr) + { + DPRINT1("HEAP: Specified heap base address %p is not really a base one %p\n", Addr, MemoryInfo.BaseAddress); + return NULL; + } + + if (MemoryInfo.State == MEM_FREE) + { + DPRINT1("HEAP: Specified heap base address %p is free\n", Addr); + return NULL; + } + } + + /* All validation performed, now call the real routine with skip validation check flag */ + Flags |= HEAP_SKIP_VALIDATION_CHECKS | + HEAP_TAIL_CHECKING_ENABLED | + HEAP_FREE_CHECKING_ENABLED; + + Heap = RtlCreateHeap(Flags, Addr, ReserveSize, CommitSize, Lock, Parameters); + if (!Heap) return NULL; + + // FIXME: Capture stack backtrace + + RtlpValidateHeapHeaders(Heap, TRUE); + + return Heap; +} + +BOOLEAN NTAPI RtlDebugDestroyHeap(HANDLE HeapPtr) { - return NULL; + SIZE_T Size; + PHEAP Heap = (PHEAP)HeapPtr; + + if (Heap == RtlGetCurrentPeb()->ProcessHeap) + { + DPRINT1("HEAP: It's forbidden delete process heap!"); + return FALSE; + } + + if (Heap->Signature != HEAP_SIGNATURE) + { + DPRINT1("HEAP: Invalid heap %p signature 0x%x\n", Heap, Heap->Signature); + return FALSE; + } + + if (!RtlpValidateHeap(Heap, FALSE)) return FALSE; + + /* Make heap invalid by zeroing its signature */ + Heap->Signature = 0; + + /* Free validate headers copy if it was existing */ + if (Heap->HeaderValidateCopy) + { + ZwFreeVirtualMemory(NtCurrentProcess(), + &Heap->HeaderValidateCopy, + &Size, + MEM_RELEASE); + } + + return TRUE; } PVOID NTAPI @@ -44,7 +137,64 @@ ULONG Flags, SIZE_T Size) { - return NULL; + PHEAP Heap = (PHEAP)HeapPtr; + SIZE_T AllocSize = 1; + BOOLEAN HeapLocked = FALSE; + PVOID Result; + + //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + //return RtlpPageHeapAllocateHeap(HeapPtr, Flags, Size); + + if (Heap->Signature != HEAP_SIGNATURE) + { + DPRINT1("HEAP: Invalid heap %p signature 0x%x\n", Heap, Heap->Signature); + return NULL; + } + + /* Add settable user value flag */ + Flags |= Heap->ForceFlags | HEAP_SETTABLE_USER_VALUE | HEAP_SKIP_VALIDATION_CHECKS; + + /* Calculate size */ + if (Size) AllocSize = Size; + AllocSize = ((AllocSize + Heap->AlignRound) & Heap->AlignMask) + sizeof(HEAP_ENTRY_EXTRA); + + /* Check if size didn't exceed max one */ + if (AllocSize < Size || + AllocSize > Heap->MaximumAllocationSize) + { + DPRINT1("HEAP: Too big allocation size %x (max allowed %x)\n", Size, Heap->MaximumAllocationSize); + return NULL; + } + + /* Lock the heap ourselves */ + if (!(Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + + /* Add no serialize flag so that the main routine won't try to acquire the lock again */ + Flags |= HEAP_NO_SERIALIZE; + } + + /* Validate the heap if necessary */ + RtlpValidateHeap(Heap, FALSE); + + /* Call main routine to do the stuff */ + Result = RtlAllocateHeap(HeapPtr, Flags, Size); + + /* Validate heap headers */ + RtlpValidateHeapHeaders(Heap, TRUE); + + if (Result) + { + if (Heap->Flags & HEAP_VALIDATE_ALL_ENABLED) + RtlpValidateHeap(Heap, FALSE); + } + + /* Release the lock */ + if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + + return Result; } PVOID NTAPI @@ -53,7 +203,70 @@ PVOID Ptr, SIZE_T Size) { - return NULL; + PHEAP Heap = (PHEAP)HeapPtr; + SIZE_T AllocSize = 1; + BOOLEAN HeapLocked = FALSE; + PVOID Result = NULL; + PHEAP_ENTRY HeapEntry; + + //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + //return RtlpPageHeapReAllocateHeap(HeapPtr, Flags, Size); + + if (Heap->Signature != HEAP_SIGNATURE) + { + DPRINT1("HEAP: Invalid heap %p signature 0x%x\n", Heap, Heap->Signature); + return NULL; + } + + /* Add settable user value flag */ + Flags |= Heap->ForceFlags | HEAP_SETTABLE_USER_VALUE | HEAP_SKIP_VALIDATION_CHECKS; + + /* Calculate size */ + if (Size) AllocSize = Size; + AllocSize = ((AllocSize + Heap->AlignRound) & Heap->AlignMask) + sizeof(HEAP_ENTRY_EXTRA); + + /* Check if size didn't exceed max one */ + if (AllocSize < Size || + AllocSize > Heap->MaximumAllocationSize) + { + DPRINT1("HEAP: Too big allocation size %x (max allowed %x)\n", Size, Heap->MaximumAllocationSize); + return NULL; + } + + /* Lock the heap ourselves */ + if (!(Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + + /* Add no serialize flag so that the main routine won't try to acquire the lock again */ + Flags |= HEAP_NO_SERIALIZE; + } + + /* Validate the heap if necessary */ + RtlpValidateHeap(Heap, FALSE); + + /* Get the existing heap entry */ + HeapEntry = (PHEAP_ENTRY)Ptr - 1; + + /* Validate it */ + if (RtlpValidateHeapEntry(Heap, HeapEntry)) + { + /* Call main routine to do the stuff */ + Result = RtlReAllocateHeap(HeapPtr, Flags, Ptr, Size); + + if (Result) + { + /* Validate heap headers and then heap itself */ + RtlpValidateHeapHeaders(Heap, TRUE); + RtlpValidateHeap(Heap, FALSE); + } + } + + /* Release the lock */ + if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + + return Result; } BOOLEAN NTAPI @@ -61,7 +274,54 @@ ULONG Flags, PVOID Ptr) { - return FALSE; + PHEAP Heap = (PHEAP)HeapPtr; + BOOLEAN HeapLocked = FALSE; + PHEAP_ENTRY HeapEntry; + BOOLEAN Result = FALSE; + + //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + //return RtlpPageHeapFreeHeap(HeapPtr, Flags, Size); + + if (Heap->Signature != HEAP_SIGNATURE) + { + DPRINT1("HEAP: Invalid heap %p signature 0x%x\n", Heap, Heap->Signature); + return FALSE; + } + + /* Add skip validation flag */ + Flags |= Heap->ForceFlags | HEAP_SKIP_VALIDATION_CHECKS; + + /* Lock the heap ourselves */ + if (!(Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + + /* Add no serialize flag so that the main routine won't try to acquire the lock again */ + Flags |= HEAP_NO_SERIALIZE; + } + + /* Validate the heap if necessary */ + RtlpValidateHeap(Heap, FALSE); + + /* Get the existing heap entry */ + HeapEntry = (PHEAP_ENTRY)Ptr - 1; + + /* Validate it */ + if (RtlpValidateHeapEntry(Heap, HeapEntry)) + { + /* If it succeeded - call the main routine */ + Result = RtlFreeHeap(HeapPtr, Flags, Ptr); + + /* Validate heap headers and then heap itself */ + RtlpValidateHeapHeaders(Heap, TRUE); + RtlpValidateHeap(Heap, FALSE); + } + + /* Release the lock */ + if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + + return Result; } BOOLEAN NTAPI @@ -71,7 +331,50 @@ PVOID *UserValue, PULONG UserFlags) { - return FALSE; + PHEAP Heap = (PHEAP)HeapHandle; + BOOLEAN HeapLocked = FALSE; + PHEAP_ENTRY HeapEntry; + BOOLEAN Result = FALSE; + + //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + //return RtlpPageHeapGetUserInfoHeap(HeapPtr, Flags, Size); + + if (Heap->Signature != HEAP_SIGNATURE) + { + DPRINT1("HEAP: Invalid heap %p signature 0x%x\n", Heap, Heap->Signature); + return FALSE; + } + + /* Add skip validation flag */ + Flags |= Heap->ForceFlags | HEAP_SKIP_VALIDATION_CHECKS; + + /* Lock the heap ourselves */ + if (!(Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + + /* Add no serialize flag so that the main routine won't try to acquire the lock again */ + Flags |= HEAP_NO_SERIALIZE; + } + + /* Validate the heap if necessary */ + RtlpValidateHeap(Heap, FALSE); + + /* Get the existing heap entry */ + HeapEntry = (PHEAP_ENTRY)BaseAddress - 1; + + /* Validate it */ + if (RtlpValidateHeapEntry(Heap, HeapEntry)) + { + /* If it succeeded - call the main routine */ + Result = RtlGetUserInfoHeap(HeapHandle, Flags, BaseAddress, UserValue, UserFlags); + } + + /* Release the lock */ + if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + + return Result; } BOOLEAN NTAPI @@ -80,7 +383,53 @@ PVOID BaseAddress, PVOID UserValue) { - return FALSE; + PHEAP Heap = (PHEAP)HeapHandle; + BOOLEAN HeapLocked = FALSE; + PHEAP_ENTRY HeapEntry; + BOOLEAN Result = FALSE; + + //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + //return RtlpPageHeapSetUserValueHeap(HeapPtr, Flags, Size); + + if (Heap->Signature != HEAP_SIGNATURE) + { + DPRINT1("HEAP: Invalid heap %p signature 0x%x\n", Heap, Heap->Signature); + return FALSE; + } + + /* Add skip validation flag */ + Flags |= Heap->ForceFlags | HEAP_SKIP_VALIDATION_CHECKS; + + /* Lock the heap ourselves */ + if (!(Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + + /* Add no serialize flag so that the main routine won't try to acquire the lock again */ + Flags |= HEAP_NO_SERIALIZE; + } + + /* Validate the heap if necessary */ + RtlpValidateHeap(Heap, FALSE); + + /* Get the existing heap entry */ + HeapEntry = (PHEAP_ENTRY)BaseAddress - 1; + + /* Validate it */ + if (RtlpValidateHeapEntry(Heap, HeapEntry)) + { + /* If it succeeded - call the main routine */ + Result = RtlSetUserValueHeap(HeapHandle, Flags, BaseAddress, UserValue); + + /* Validate the heap */ + RtlpValidateHeap(Heap, FALSE); + } + + /* Release the lock */ + if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + + return Result; } BOOLEAN @@ -91,7 +440,60 @@ ULONG UserFlagsReset, ULONG UserFlagsSet) { - return FALSE; + PHEAP Heap = (PHEAP)HeapHandle; + BOOLEAN HeapLocked = FALSE; + PHEAP_ENTRY HeapEntry; + BOOLEAN Result = FALSE; + + //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + //return RtlPageHeapSetUserFlagsHeap(HeapPtr, Flags, BaseAddress, UserFlagsReset, UserFlagsSet); + + /* Check if this heap allows flags to be set at all */ + if (UserFlagsSet & ~HEAP_SETTABLE_USER_FLAGS || + UserFlagsReset & ~HEAP_SETTABLE_USER_FLAGS) + { + return FALSE; + } + + if (Heap->Signature != HEAP_SIGNATURE) + { + DPRINT1("HEAP: Invalid heap %p signature 0x%x\n", Heap, Heap->Signature); + return FALSE; + } + + /* Add skip validation flag */ + Flags |= Heap->ForceFlags | HEAP_SKIP_VALIDATION_CHECKS; + + /* Lock the heap ourselves */ + if (!(Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + + /* Add no serialize flag so that the main routine won't try to acquire the lock again */ + Flags |= HEAP_NO_SERIALIZE; + } + + /* Validate the heap if necessary */ + RtlpValidateHeap(Heap, FALSE); + + /* Get the existing heap entry */ + HeapEntry = (PHEAP_ENTRY)BaseAddress - 1; + + /* Validate it */ + if (RtlpValidateHeapEntry(Heap, HeapEntry)) + { + /* If it succeeded - call the main routine */ + Result = RtlSetUserFlagsHeap(HeapHandle, Flags, BaseAddress, UserFlagsReset, UserFlagsSet); + + /* Validate the heap */ + RtlpValidateHeap(Heap, FALSE); + } + + /* Release the lock */ + if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + + return Result; } SIZE_T NTAPI @@ -99,7 +501,51 @@ ULONG Flags, PVOID Ptr) { - return 0; + PHEAP Heap = (PHEAP)HeapPtr; + BOOLEAN HeapLocked = FALSE; + PHEAP_ENTRY HeapEntry; + SIZE_T Result = ~(SIZE_T)0; + + //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + //return RtlPageHeapSizeHeap(HeapPtr, Flags, Ptr); + + /* Check heap signature */ + if (Heap->Signature != HEAP_SIGNATURE) + { + DPRINT1("HEAP: Invalid heap %p signature 0x%x\n", Heap, Heap->Signature); + return FALSE; + } + + /* Add skip validation flag */ + Flags |= Heap->ForceFlags | HEAP_SKIP_VALIDATION_CHECKS; + + /* Lock the heap ourselves */ + if (!(Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + + /* Add no serialize flag so that the main routine won't try to acquire the lock again */ + Flags |= HEAP_NO_SERIALIZE; + } + + /* Validate the heap if necessary */ + RtlpValidateHeap(Heap, FALSE); + + /* Get the existing heap entry */ + HeapEntry = (PHEAP_ENTRY)Ptr - 1; + + /* Validate it */ + if (RtlpValidateHeapEntry(Heap, HeapEntry)) + { + /* If it succeeded - call the main routine */ + Result = RtlSizeHeap(HeapPtr, Flags, Ptr); + } + + /* Release the lock */ + if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + + return Result; }

14 years, 2 months

[tkreuzer] 49153: [CRT] Add powf() wrapper

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Oct 15 12:33:08 2010 New Revision: 49153 URL: http://svn.reactos.org/svn/reactos?rev=49153&view=rev Log: [CRT] Add powf() wrapper Added: trunk/reactos/lib/sdk/crt/math/powf.c (with props) Added: trunk/reactos/lib/sdk/crt/math/powf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/powf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/powf.c (added) +++ trunk/reactos/lib/sdk/crt/math/powf.c [iso-8859-1] Fri Oct 15 12:33:08 2010 @@ -1,0 +1,11 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#include <math.h> + +float powf(float x, float y) +{ + return (float)pow((double)x, (double)y); +} Propchange: trunk/reactos/lib/sdk/crt/math/powf.c ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 2 months

[gadamopoulos] 49152: [win32k] - Clean up co_IntPeekMessage

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Oct 15 08:34:59 2010 New Revision: 49152 URL: http://svn.reactos.org/svn/reactos?rev=49152&view=rev Log: [win32k] - Clean up co_IntPeekMessage Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Fri Oct 15 08:34:59 2010 @@ -679,10 +679,85 @@ return FALSE; } -BOOL ProcessMouseMessage(MSG* Msg, USHORT HitTest, UINT RemoveMsg) +BOOL ProcessMouseMessage(MSG* Msg, BOOLEAN RemoveMessages) { MOUSEHOOKSTRUCT MHook; EVENTMSG Event; + PTHREADINFO pti; + PUSER_MESSAGE_QUEUE ThreadQueue; + USER_REFERENCE_ENTRY Ref; + USHORT HitTest = HTNOWHERE; + + pti = PsGetCurrentThreadWin32Thread(); + ThreadQueue = pti->MessageQueue; + + if(RemoveMessages) + { + PWND MsgWindow = NULL; + + /* Mouse message process */ + + if( Msg->hwnd && + ( MsgWindow = UserGetWindowObject(Msg->hwnd) ) && + Msg->message >= WM_MOUSEFIRST && + Msg->message <= WM_MOUSELAST ) + { + USHORT HitTest; + + UserRefObjectCo(MsgWindow, &Ref); + + if ( co_IntTranslateMouseMessage( ThreadQueue, + Msg, + &HitTest, + TRUE)) + /* FIXME - check message filter again, if the message doesn't match anymore, + search again */ + { + UserDerefObjectCo(MsgWindow); + /* eat the message, search again */ + return FALSE; + } + + if(ThreadQueue->CaptureWindow == NULL) + { + co_IntSendHitTestMessages(ThreadQueue, Msg); + + if ( ( Msg->message != WM_MOUSEMOVE && + Msg->message != WM_NCMOUSEMOVE ) && + IS_BTN_MESSAGE(Msg->message, DOWN) && + co_IntActivateWindowMouse(ThreadQueue, Msg, MsgWindow, &HitTest) ) + { + UserDerefObjectCo(MsgWindow); + /* eat the message, search again */ + return FALSE; + } + } + + UserDerefObjectCo(MsgWindow); + } + else + { + co_IntSendHitTestMessages(ThreadQueue, Msg); + } + + return TRUE; + } + + if ( ( Msg->hwnd && + Msg->message >= WM_MOUSEFIRST && + Msg->message <= WM_MOUSELAST ) && + co_IntTranslateMouseMessage( ThreadQueue, + Msg, + &HitTest, + FALSE) ) + /* FIXME - check message filter again, if the message doesn't match anymore, + search again */ + { + /* eat the message, search again */ + return FALSE; + } + + pti->rpdesk->htEx = HitTest; /* Now set the capture hit. */ Event.message = Msg->message; Event.time = Msg->time; @@ -697,7 +772,7 @@ MHook.wHitTestCode = HitTest; MHook.dwExtraInfo = 0; if (co_HOOK_CallHooks( WH_MOUSE, - RemoveMsg ? HC_ACTION : HC_NOREMOVE, + RemoveMessages ? HC_ACTION : HC_NOREMOVE, Msg->message, (LPARAM)&MHook )) { @@ -715,7 +790,7 @@ return TRUE; } -BOOL ProcessKeyboardMessage(MSG* Msg, UINT RemoveMsg) +BOOL ProcessKeyboardMessage(MSG* Msg, BOOLEAN RemoveMessages) { EVENTMSG Event; @@ -728,7 +803,7 @@ co_HOOK_CallHooks( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)&Event); if (co_HOOK_CallHooks( WH_KEYBOARD, - RemoveMsg ? HC_ACTION : HC_NOREMOVE, + RemoveMessages ? HC_ACTION : HC_NOREMOVE, LOWORD(Msg->wParam), Msg->lParam)) { @@ -741,6 +816,26 @@ } return TRUE; } + +BOOL ProcessHardwareMessage(MSG* Msg, BOOLEAN RemoveMessages) +{ + if ( IS_MOUSE_MESSAGE(Msg->message)) + { + if (!ProcessMouseMessage(Msg, RemoveMessages)) + { + return FALSE; + } + } + else if ( IS_KBD_MESSAGE(Msg->message)) + { + if(!ProcessKeyboardMessage(Msg, RemoveMessages)) + { + return FALSE; + } + } + + return TRUE; +} /* * Internal version of PeekMessage() doing all the work */ @@ -755,223 +850,107 @@ LARGE_INTEGER LargeTickCount; PUSER_MESSAGE_QUEUE ThreadQueue; PUSER_MESSAGE Message; - BOOL Present, RemoveMessages; - USER_REFERENCE_ENTRY Ref; - USHORT HitTest; - - /* The queues and order in which they are checked are documented in the MSDN - article on GetMessage() */ + BOOL RemoveMessages; pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - /* Inspect RemoveMsg flags */ - /* Note: - The only flag we process is PM_REMOVE. - Processing (High word) PM_QS_Xx Is needed. This and MsgFilterXxx can result - with QS_Xx flags to be used to isolate which message check to test for. - ATM, we look at all messages and the filters are sent to co_MsqFindMessage - and there, it is cross checked. - Example: Wine server/queue.c is_keyboard_msg, check_msg_filter and - filter_contains_hw_range. - */ RemoveMessages = RemoveMsg & PM_REMOVE; -/* - If no filter is specified, messages are processed in the following order: - - * Sent messages - * Posted messages - * Input (hardware) messages and system internal events - * Sent messages (again) - * WM_PAINT messages - * WM_TIMER messages - */ -CheckMessages: - - HitTest = HTNOWHERE; - - Present = FALSE; - - KeQueryTickCount(&LargeTickCount); - ThreadQueue->LastMsgRead = LargeTickCount.u.LowPart; - - /* Dispatch sent messages here. */ - while (co_MsqDispatchOneSentMessage(ThreadQueue)) - ; - - /* Now look for a quit message. */ - - if (ThreadQueue->QuitPosted) - { - /* According to the PSDK, WM_QUIT messages are always returned, regardless - of the filter specified */ - Msg->Msg.hwnd = NULL; - Msg->Msg.message = WM_QUIT; - Msg->Msg.wParam = ThreadQueue->QuitExitCode; - Msg->Msg.lParam = 0; - if (RemoveMessages) - { - ThreadQueue->QuitPosted = FALSE; - } - goto MsgExit; - } - - /* Now check for normal messages. */ - Present = co_MsqFindMessage( ThreadQueue, - FALSE, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - &Message ); - if (Present) - { - RtlCopyMemory(Msg, Message, sizeof(USER_MESSAGE)); - if (RemoveMessages) - { - MsqDestroyMessage(Message); - } - goto MessageFound; - } - - /* Check for hardware events. */ - Present = co_MsqFindMessage( ThreadQueue, - TRUE, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - &Message ); - if (Present) - { - RtlCopyMemory(Msg, Message, sizeof(USER_MESSAGE)); - if (RemoveMessages) - { - MsqDestroyMessage(Message); - } - goto MessageFound; - } - - /* Check for sent messages again. */ - while (co_MsqDispatchOneSentMessage(ThreadQueue)) - ; - - /* Check for paint messages. */ - if ( IntGetPaintMessage( Window, - MsgFilterMin, - MsgFilterMax, - pti, - &Msg->Msg, - RemoveMessages)) - { - goto MsgExit; - } - - if (PostTimerMessages(Window)) - goto CheckMessages; - - if(Present) - { -MessageFound: - - if(RemoveMessages) - { - PWND MsgWindow = NULL; - - /* Mouse message process */ - - if( Msg->Msg.hwnd && - ( MsgWindow = UserGetWindowObject(Msg->Msg.hwnd) ) && - Msg->Msg.message >= WM_MOUSEFIRST && - Msg->Msg.message <= WM_MOUSELAST ) - { - USHORT HitTest; - - UserRefObjectCo(MsgWindow, &Ref); - - if ( co_IntTranslateMouseMessage( ThreadQueue, - &Msg->Msg, - &HitTest, - TRUE)) - /* FIXME - check message filter again, if the message doesn't match anymore, - search again */ - { - UserDerefObjectCo(MsgWindow); - /* eat the message, search again */ - goto CheckMessages; - } - - if(ThreadQueue->CaptureWindow == NULL) - { - co_IntSendHitTestMessages(ThreadQueue, &Msg->Msg); - - if ( ( Msg->Msg.message != WM_MOUSEMOVE && - Msg->Msg.message != WM_NCMOUSEMOVE ) && - IS_BTN_MESSAGE(Msg->Msg.message, DOWN) && - co_IntActivateWindowMouse(ThreadQueue, &Msg->Msg, MsgWindow, &HitTest) ) - { - UserDerefObjectCo(MsgWindow); - /* eat the message, search again */ - goto CheckMessages; - } - } - - UserDerefObjectCo(MsgWindow); - } - else - { - co_IntSendHitTestMessages(ThreadQueue, &Msg->Msg); - } - -// if(MsgWindow) -// { -// UserDereferenceObject(MsgWindow); -// } - - goto MsgExit; - } - - if ( ( Msg->Msg.hwnd && - Msg->Msg.message >= WM_MOUSEFIRST && - Msg->Msg.message <= WM_MOUSELAST ) && - co_IntTranslateMouseMessage( ThreadQueue, - &Msg->Msg, - &HitTest, - FALSE) ) - /* FIXME - check message filter again, if the message doesn't match anymore, - search again */ - { - /* eat the message, search again */ - goto CheckMessages; - } - -MsgExit: - pti->rpdesk->htEx = HitTest; /* Now set the capture hit. */ - - if ( IS_MOUSE_MESSAGE(Msg->Msg.message)) - { - if (!ProcessMouseMessage(&Msg->Msg, HitTest, RemoveMsg)) + do + { + KeQueryTickCount(&LargeTickCount); + ThreadQueue->LastMsgRead = LargeTickCount.u.LowPart; + + /* Dispatch sent messages here. */ + while (co_MsqDispatchOneSentMessage(ThreadQueue)) + ; + + /* Now look for a quit message. */ + + if (ThreadQueue->QuitPosted) + { + /* According to the PSDK, WM_QUIT messages are always returned, regardless + of the filter specified */ + Msg->Msg.hwnd = NULL; + Msg->Msg.message = WM_QUIT; + Msg->Msg.wParam = ThreadQueue->QuitExitCode; + Msg->Msg.lParam = 0; + if (RemoveMessages) { - return FALSE; + ThreadQueue->QuitPosted = FALSE; } - } - - if ( IS_KBD_MESSAGE(Msg->Msg.message)) - { - if(!ProcessKeyboardMessage(&Msg->Msg, RemoveMsg)) + + return TRUE; + } + + /* Now check for normal messages. */ + if (co_MsqFindMessage( ThreadQueue, + FALSE, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + &Message )) + { + RtlCopyMemory(Msg, Message, sizeof(USER_MESSAGE)); + if (RemoveMessages) { - return FALSE; + MsqDestroyMessage(Message); } - } - // The WH_GETMESSAGE hook enables an application to monitor messages about to - // be returned by the GetMessage or PeekMessage function. - - co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg->Msg); - return TRUE; - } - - return Present; + break; + } + + /* Check for hardware events. */ + if(co_MsqFindMessage( ThreadQueue, + TRUE, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + &Message )) + { + RtlCopyMemory(Msg, Message, sizeof(USER_MESSAGE)); + if (RemoveMessages) + { + MsqDestroyMessage(Message); + } + + if(!ProcessHardwareMessage(&Msg->Msg, RemoveMessages)) + continue; + + break; + } + + /* Check for sent messages again. */ + while (co_MsqDispatchOneSentMessage(ThreadQueue)) + ; + + /* Check for paint messages. */ + if( IntGetPaintMessage( Window, + MsgFilterMin, + MsgFilterMax, + pti, + &Msg->Msg, + RemoveMessages)) + { + break; + } + + if (PostTimerMessages(Window)) + { + continue; + } + + return FALSE; + } + while (TRUE); + + // The WH_GETMESSAGE hook enables an application to monitor messages about to + // be returned by the GetMessage or PeekMessage function. + + co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg->Msg); + return TRUE; } static NTSTATUS FASTCALL

14 years, 2 months

[janderwald] 49151: [WDMAUD_KERNEL] - Implement registering event routine which gets called when a topology node (volume / mute node) changes - Implement fetching event changes [MMIXER] - Implement...

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Oct 15 02:24:35 2010 New Revision: 49151 URL: http://svn.reactos.org/svn/reactos?rev=49151&view=rev Log: [WDMAUD_KERNEL] - Implement registering event routine which gets called when a topology node (volume / mute node) changes - Implement fetching event changes [MMIXER] - Implement support routines which get called when a topology node changes its state - Volume changes / mute on/off changes should now be broadcasted again to all listening applications Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/mixer.c trunk/reactos/lib/drivers/sound/mmixer/mmixer.h trunk/reactos/lib/drivers/sound/mmixer/priv.h trunk/reactos/lib/drivers/sound/mmixer/sup.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c [iso-8859-1] Fri Oct 15 02:24:35 2010 @@ -318,6 +318,53 @@ FreeItem(Data); } +VOID +EventCallback( + IN PVOID MixerEventContext, + IN HANDLE hMixer, + IN ULONG NotificationType, + IN ULONG Value) +{ + PWDMAUD_CLIENT ClientInfo; + PEVENT_ENTRY Entry; + ULONG Index; + + /* get client context */ + ClientInfo = (PWDMAUD_CLIENT)MixerEventContext; + + /* now search for the mixer which originated the request */ + for(Index = 0; Index < ClientInfo->NumPins; Index++) + { + if (ClientInfo->hPins[Index].Handle == hMixer && ClientInfo->hPins[Index].Type == MIXER_DEVICE_TYPE) + { + if (ClientInfo->hPins[Index].NotifyEvent) + { + /* allocate event entry */ + Entry = AllocateItem(NonPagedPool, sizeof(EVENT_ENTRY)); + if (!Entry) + { + /* no memory */ + break; + } + + /* setup event entry */ + Entry->NotificationType = NotificationType; + Entry->Value = Value; + Entry->hMixer = hMixer; + + /* insert entry */ + InsertTailList(&ClientInfo->MixerEventList, &Entry->Entry); + + /* now notify the client */ + KeSetEvent(ClientInfo->hPins[Index].NotifyEvent, 0, FALSE); + } + /* done */ + break; + } + } +} + + NTSTATUS WdmAudMixerInitialize( IN PDEVICE_OBJECT DeviceObject) @@ -378,7 +425,7 @@ } } - if (MMixerOpen(&MixerContext, DeviceInfo->DeviceIndex, EventObject, NULL /* FIXME */, &hMixer) != MM_STATUS_SUCCESS) + if (MMixerOpen(&MixerContext, DeviceInfo->DeviceIndex, ClientInfo, EventCallback, &hMixer) != MM_STATUS_SUCCESS) { ObDereferenceObject(EventObject); DPRINT1("Failed to open mixer\n"); @@ -511,7 +558,39 @@ IN PWDMAUD_DEVICE_INFO DeviceInfo, IN PWDMAUD_CLIENT ClientInfo) { - UNIMPLEMENTED + PLIST_ENTRY Entry; + PEVENT_ENTRY EventEntry; + + /* enumerate event list and check if there is a new event */ + Entry = ClientInfo->MixerEventList.Flink; + + while(Entry != &ClientInfo->MixerEventList) + { + /* grab event entry */ + EventEntry = (PEVENT_ENTRY)CONTAINING_RECORD(Entry, EVENT_ENTRY, Entry); + + if (EventEntry->hMixer == DeviceInfo->hDevice) + { + /* found an entry */ + DeviceInfo->u.MixerEvent.hMixer = EventEntry->hMixer; + DeviceInfo->u.MixerEvent.NotificationType = EventEntry->NotificationType; + DeviceInfo->u.MixerEvent.Value = EventEntry->Value; + + /* remove entry from list */ + RemoveEntryList(&EventEntry->Entry); + + /* free event entry */ + FreeItem(EventEntry); + + /* done */ + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); + } + + /* move to next */ + Entry = Entry->Flink; + } + + /* no event entry available */ return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, sizeof(WDMAUD_DEVICE_INFO)); } Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Fri Oct 15 02:24:35 2010 @@ -38,6 +38,14 @@ typedef struct { LIST_ENTRY Entry; + ULONG NotificationType; + ULONG Value; + HANDLE hMixer; +}EVENT_ENTRY, *PEVENT_ENTRY; + +typedef struct +{ + LIST_ENTRY Entry; UNICODE_STRING SymbolicLink; }SYSAUDIO_ENTRY, *PSYSAUDIO_ENTRY; Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Fri Oct 15 02:24:35 2010 @@ -1086,20 +1086,22 @@ MMixerAddEvent( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, - IN ULONG NodeId) -{ - KSE_NODE Property; - LPEVENT_ITEM EventData; - ULONG BytesReturned; - MIXER_STATUS Status; - - EventData = (LPEVENT_ITEM)MixerContext->AllocEventData(sizeof(LIST_ENTRY)); + IN PVOID MixerEventContext, + IN PMIXER_EVENT MixerEventRoutine) +{ + //KSE_NODE Property; + PEVENT_NOTIFICATION_ENTRY EventData; + //ULONG BytesReturned; + //MIXER_STATUS Status; + + EventData = (PEVENT_NOTIFICATION_ENTRY)MixerContext->AllocEventData(sizeof(EVENT_NOTIFICATION_ENTRY)); if (!EventData) { /* not enough memory */ return MM_STATUS_NO_MEMORY; } +#if 0 /* setup request */ Property.Event.Set = KSEVENTSETID_AudioControlChange; Property.Event.Flags = KSEVENT_TYPE_TOPOLOGY|KSEVENT_TYPE_ENABLE; @@ -1115,45 +1117,14 @@ MixerContext->FreeEventData(EventData); return Status; } +#endif + + /* initialize notification entry */ + EventData->MixerEventContext = MixerEventContext; + EventData->MixerEventRoutine; /* store event */ InsertTailList(&MixerInfo->EventList, &EventData->Entry); - return Status; -} - -MIXER_STATUS -MMixerAddEvents( - IN PMIXER_CONTEXT MixerContext, - IN OUT LPMIXER_INFO MixerInfo) -{ - PKSMULTIPLE_ITEM NodeTypes; - ULONG Index; - MIXER_STATUS Status; - LPGUID Guid; - - /* get filter node types */ - Status = MMixerGetFilterTopologyProperty(MixerContext, MixerInfo->hMixer, KSPROPERTY_TOPOLOGY_NODES, &NodeTypes); - - if (Status != MM_STATUS_SUCCESS) - { - /* failed */ - return Status; - } - - for(Index = 0; Index < NodeTypes->Count; Index++) - { - Guid = MMixerGetNodeType(NodeTypes, Index); - if (IsEqualGUID(&KSNODETYPE_VOLUME, Guid) || IsEqualGUID(&KSNODETYPE_MUTE, Guid)) - { - /* add an event for volume / mute controls - * TODO: support extra control types - */ - MMixerAddEvent(MixerContext, MixerInfo, Index); - } - } - - /* free node types */ - MixerContext->Free(NodeTypes); - return MM_STATUS_SUCCESS; } + Modified: trunk/reactos/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Fri Oct 15 02:24:35 2010 @@ -76,7 +76,7 @@ MMixerOpen( IN PMIXER_CONTEXT MixerContext, IN ULONG MixerId, - IN PVOID MixerEvent, + IN PVOID MixerEventContext, IN PMIXER_EVENT MixerEventRoutine, OUT PHANDLE MixerHandle) { @@ -92,6 +92,7 @@ return Status; } + /* get mixer info */ MixerInfo = (LPMIXER_INFO)MMixerGetMixerInfoByIndex(MixerContext, MixerId); if (!MixerInfo) { @@ -99,11 +100,8 @@ return MM_STATUS_INVALID_PARAMETER; } - /* FIXME - * handle event notification - */ - - Status = MMixerAddEvents(MixerContext, MixerInfo); + /* add the event */ + Status = MMixerAddEvent(MixerContext, MixerInfo, MixerEventContext, MixerEventRoutine); /* store result */ @@ -396,10 +394,10 @@ switch(MixerControl->dwControlType) { case MIXERCONTROL_CONTROLTYPE_MUTE: - Status = MMixerSetGetMuteControlDetails(MixerContext, MixerInfo->hMixer, NodeId, MixerLine->Line.dwLineID, MixerControlDetails, FALSE); + Status = MMixerSetGetMuteControlDetails(MixerContext, MixerInfo, NodeId, MixerLine->Line.dwLineID, MixerControlDetails, FALSE); break; case MIXERCONTROL_CONTROLTYPE_VOLUME: - Status = MMixerSetGetVolumeControlDetails(MixerContext, MixerInfo->hMixer, NodeId, FALSE, MixerControl, MixerControlDetails, MixerLine); + Status = MMixerSetGetVolumeControlDetails(MixerContext, MixerInfo, NodeId, FALSE, MixerControl, MixerControlDetails, MixerLine); break; default: Status = MM_STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] Fri Oct 15 02:24:35 2010 @@ -48,7 +48,10 @@ IN HANDLE hKey); typedef VOID (*PMIXER_EVENT)( - IN PVOID MixerEvent); + IN PVOID MixerEventContext, + IN HANDLE hMixer, + IN ULONG NotificationType, + IN ULONG Value); typedef VOID (*PMIXER_COPY)( IN PVOID Dst, @@ -130,7 +133,7 @@ MMixerOpen( IN PMIXER_CONTEXT MixerContext, IN ULONG MixerId, - IN PVOID MixerEvent, + IN PVOID MixerEventContext, IN PMIXER_EVENT MixerEventRoutine, OUT PHANDLE MixerHandle); Modified: trunk/reactos/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] Fri Oct 15 02:24:35 2010 @@ -61,13 +61,6 @@ PTOPOLOGY_NODE TopologyNodes; }TOPOLOGY, *PTOPOLOGY; - - -typedef struct -{ - KSEVENTDATA EventData; - LIST_ENTRY Entry; -}EVENT_ITEM, *LPEVENT_ITEM; typedef struct { @@ -141,6 +134,14 @@ LIST_ENTRY WaveOutList; }MIXER_LIST, *PMIXER_LIST; +typedef struct +{ + LIST_ENTRY Entry; + PVOID MixerEventContext; + PMIXER_EVENT MixerEventRoutine; + +}EVENT_NOTIFICATION_ENTRY, *PEVENT_NOTIFICATION_ENTRY; + #define DESTINATION_LINE 0xFFFF0000 ULONG @@ -262,7 +263,7 @@ MIXER_STATUS MMixerSetGetMuteControlDetails( IN PMIXER_CONTEXT MixerContext, - IN HANDLE hMixer, + IN LPMIXER_INFO MixerInfo, IN ULONG NodeId, IN ULONG dwLineID, IN LPMIXERCONTROLDETAILS MixerControlDetails, @@ -271,7 +272,7 @@ MIXER_STATUS MMixerSetGetVolumeControlDetails( IN PMIXER_CONTEXT MixerContext, - IN HANDLE hMixer, + IN LPMIXER_INFO MixerInfo, IN ULONG NodeId, IN ULONG bSet, LPMIXERCONTROLW MixerControl, @@ -324,9 +325,11 @@ IN PULONG Pins); MIXER_STATUS -MMixerAddEvents( - IN PMIXER_CONTEXT MixerContext, - IN OUT LPMIXER_INFO MixerInfo); +MMixerAddEvent( + IN PMIXER_CONTEXT MixerContext, + IN OUT LPMIXER_INFO MixerInfo, + IN PVOID MixerEvent, + IN PMIXER_EVENT MixerEventRoutine); /* topology.c */ Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Fri Oct 15 02:24:35 2010 @@ -233,10 +233,38 @@ return VolumeData->InputSteppingDelta * (VolumeData->ValuesCount-1); } +VOID +MMixerNotifyControlChange( + IN PMIXER_CONTEXT MixerContext, + IN LPMIXER_INFO MixerInfo, + IN ULONG NotificationType, + IN ULONG Value) +{ + PLIST_ENTRY Entry; + PEVENT_NOTIFICATION_ENTRY NotificationEntry; + + /* enumerate list and add a notification entry */ + Entry = MixerInfo->LineList.Flink; + while(Entry != &MixerInfo->EventList) + { + /* get notification entry offset */ + NotificationEntry = (PEVENT_NOTIFICATION_ENTRY)CONTAINING_RECORD(Entry, EVENT_NOTIFICATION_ENTRY, Entry); + + if (NotificationEntry->MixerEventRoutine) + { + /* now perform the callback */ + NotificationEntry->MixerEventRoutine(NotificationEntry->MixerEventContext, (HANDLE)MixerInfo, NotificationType, Value); + } + + /* move to next notification entry */ + Entry = Entry->Flink; + } +} + MIXER_STATUS MMixerSetGetMuteControlDetails( IN PMIXER_CONTEXT MixerContext, - IN HANDLE hMixer, + IN LPMIXER_INFO MixerInfo, IN ULONG NodeId, IN ULONG dwLineID, IN LPMIXERCONTROLDETAILS MixerControlDetails, @@ -257,7 +285,7 @@ Value = Input->fValue; /* set control details */ - Status = MMixerSetGetControlDetails(MixerContext, hMixer, NodeId, bSet, KSPROPERTY_AUDIO_MUTE, 0, &Value); + Status = MMixerSetGetControlDetails(MixerContext, MixerInfo->hMixer, NodeId, bSet, KSPROPERTY_AUDIO_MUTE, 0, &Value); if (Status != MM_STATUS_SUCCESS) return Status; @@ -270,7 +298,8 @@ } else { - /* FIXME notify wdmaud clients MM_MIXM_LINE_CHANGE dwLineID */ + /* notify wdmaud clients MM_MIXM_LINE_CHANGE dwLineID */ + MMixerNotifyControlChange(MixerContext, MixerInfo, MM_MIXM_LINE_CHANGE, dwLineID); } return Status; @@ -279,7 +308,7 @@ MIXER_STATUS MMixerSetGetVolumeControlDetails( IN PMIXER_CONTEXT MixerContext, - IN HANDLE hMixer, + IN LPMIXER_INFO MixerInfo, IN ULONG NodeId, IN ULONG bSet, LPMIXERCONTROLW MixerControl, @@ -322,12 +351,12 @@ if (bSet) { /* TODO */ - Status = MMixerSetGetControlDetails(MixerContext, hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 0, &Value); - Status = MMixerSetGetControlDetails(MixerContext, hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 1, &Value); + Status = MMixerSetGetControlDetails(MixerContext, MixerInfo->hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 0, &Value); + Status = MMixerSetGetControlDetails(MixerContext, MixerInfo->hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 1, &Value); } else { - Status = MMixerSetGetControlDetails(MixerContext, hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, Channel, &Value); + Status = MMixerSetGetControlDetails(MixerContext, MixerInfo->hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, Channel, &Value); } if (!bSet) @@ -339,6 +368,7 @@ else { /* notify clients of a line change MM_MIXM_CONTROL_CHANGE with MixerControl->dwControlID */ + MMixerNotifyControlChange(MixerContext, MixerInfo, MM_MIXM_CONTROL_CHANGE, MixerControl->dwControlID); } return Status; } @@ -407,8 +437,6 @@ MixerData->hDeviceInterfaceKey = hKey; MixerData->Topology = NULL; - - InsertTailList(&MixerList->MixerData, &MixerData->Entry); MixerList->MixerDataCount++; return MM_STATUS_SUCCESS;

14 years, 2 months

[janderwald] 49150: [MMIXER] - Rewrite topology node enumeration algorithm - Old algorithm didnt properly take in account sum/mux nodes, may assign nodes to multiple lines and was not able to detec...

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Oct 15 00:20:15 2010 New Revision: 49150 URL: http://svn.reactos.org/svn/reactos?rev=49150&view=rev Log: [MMIXER] - Rewrite topology node enumeration algorithm - Old algorithm didnt properly take in account sum/mux nodes, may assign nodes to multiple lines and was not able to detect circuits which may lead to infinite loops - New algorithm properly partitions the nodes and also checks if nodes has already been assigned. As a plus, it is also faster - Algorithm based on msdn http://msdn.microsoft.com/en-us/library/ff538873(v=VS.85).aspx - Tested on VBox 3.28 (AC97) - Please retest supported soundcards for regressions Added: trunk/reactos/lib/drivers/sound/mmixer/topology.c (with props) Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/filter.c trunk/reactos/lib/drivers/sound/mmixer/mixer.c trunk/reactos/lib/drivers/sound/mmixer/mmixer.rbuild trunk/reactos/lib/drivers/sound/mmixer/priv.h trunk/reactos/lib/drivers/sound/mmixer/sup.c trunk/reactos/lib/drivers/sound/mmixer/wave.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… Modified: trunk/reactos/lib/drivers/sound/mmixer/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/f… Modified: trunk/reactos/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… Modified: trunk/reactos/lib/drivers/sound/mmixer/mmixer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… Modified: trunk/reactos/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p… Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… Added: trunk/reactos/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/t… Modified: trunk/reactos/lib/drivers/sound/mmixer/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/w…

14 years, 2 months

[fireball] 49149: [HEAP] - Add special debug heap function declarations and stubs. - Add a useful inline for detecting whether a special or normal heap is going to be used.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 14 20:55:38 2010 New Revision: 49149 URL: http://svn.reactos.org/svn/reactos?rev=49149&view=rev Log: [HEAP] - Add special debug heap function declarations and stubs. - Add a useful inline for detecting whether a special or normal heap is going to be used. Modified: trunk/reactos/lib/rtl/heap.h trunk/reactos/lib/rtl/heapdbg.c Modified: trunk/reactos/lib/rtl/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.h?rev=49149&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.h [iso-8859-1] Thu Oct 14 20:55:38 2010 @@ -53,6 +53,26 @@ /* Segment flags */ #define HEAP_USER_ALLOCATED 0x1 + +/* A handy inline to distinguis normal heap, special "debug heap" and special "page heap" */ +FORCEINLINE BOOLEAN +RtlpHeapIsSpecial(ULONG Flags) +{ + if (Flags & HEAP_SKIP_VALIDATION_CHECKS) return FALSE; + + if (Flags & (HEAP_FLAG_PAGE_ALLOCS | + HEAP_VALIDATE_ALL_ENABLED | + HEAP_VALIDATE_PARAMETERS_ENABLED | + HEAP_CAPTURE_STACK_BACKTRACES | + HEAP_CREATE_ENABLE_TRACING)) + { + /* This is a special heap */ + return TRUE; + } + + /* No need for a special treatment */ + return FALSE; +} /* Heap structures */ struct _HEAP_COMMON_ENTRY @@ -304,6 +324,59 @@ /* heapdbg.c */ HANDLE NTAPI +RtlDebugCreateHeap(ULONG Flags, + PVOID Addr, + SIZE_T TotalSize, + SIZE_T CommitSize, + PVOID Lock, + PRTL_HEAP_PARAMETERS Parameters); + +HANDLE NTAPI +RtlDebugDestroyHeap(HANDLE HeapPtr); + +PVOID NTAPI +RtlDebugAllocateHeap(PVOID HeapPtr, + ULONG Flags, + SIZE_T Size); + +PVOID NTAPI +RtlDebugReAllocateHeap(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr, + SIZE_T Size); + +BOOLEAN NTAPI +RtlDebugFreeHeap(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr); + +BOOLEAN NTAPI +RtlDebugGetUserInfoHeap(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + PVOID *UserValue, + PULONG UserFlags); + +BOOLEAN NTAPI +RtlDebugSetUserValueHeap(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + PVOID UserValue); + +BOOLEAN +NTAPI +RtlDebugSetUserFlagsHeap(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + ULONG UserFlagsReset, + ULONG UserFlagsSet); + +SIZE_T NTAPI +RtlDebugSizeHeap(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr); + +HANDLE NTAPI RtlpPageHeapCreate(ULONG Flags, PVOID Addr, SIZE_T TotalSize, Modified: trunk/reactos/lib/rtl/heapdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heapdbg.c?rev=4914… ============================================================================== --- trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] Thu Oct 14 20:55:38 2010 @@ -23,6 +23,89 @@ /* FUNCTIONS ******************************************************************/ HANDLE NTAPI +RtlDebugCreateHeap(ULONG Flags, + PVOID Addr, + SIZE_T TotalSize, + SIZE_T CommitSize, + PVOID Lock, + PRTL_HEAP_PARAMETERS Parameters) +{ + return NULL; +} + +HANDLE NTAPI +RtlDebugDestroyHeap(HANDLE HeapPtr) +{ + return NULL; +} + +PVOID NTAPI +RtlDebugAllocateHeap(PVOID HeapPtr, + ULONG Flags, + SIZE_T Size) +{ + return NULL; +} + +PVOID NTAPI +RtlDebugReAllocateHeap(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr, + SIZE_T Size) +{ + return NULL; +} + +BOOLEAN NTAPI +RtlDebugFreeHeap(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr) +{ + return FALSE; +} + +BOOLEAN NTAPI +RtlDebugGetUserInfoHeap(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + PVOID *UserValue, + PULONG UserFlags) +{ + return FALSE; +} + +BOOLEAN NTAPI +RtlDebugSetUserValueHeap(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + PVOID UserValue) +{ + return FALSE; +} + +BOOLEAN +NTAPI +RtlDebugSetUserFlagsHeap(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + ULONG UserFlagsReset, + ULONG UserFlagsSet) +{ + return FALSE; +} + +SIZE_T NTAPI +RtlDebugSizeHeap(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr) +{ + return 0; +} + + +// Page heap -> move to another file + +HANDLE NTAPI RtlpPageHeapCreate(ULONG Flags, PVOID Addr, SIZE_T TotalSize,

14 years, 2 months

[jgardou] 49148: [CMAKE] - include stlport directory in set_cpp macro - move set_cpp macro where it belongs : it's generic enough to go to CMakeMacros.cmake

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 14 20:16:57 2010 New Revision: 49148 URL: http://svn.reactos.org/svn/reactos?rev=49148&view=rev Log: [CMAKE] - include stlport directory in set_cpp macro - move set_cpp macro where it belongs : it's generic enough to go to CMakeMacros.cmake Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/base/shell/explorer/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Thu Oct 14 20:16:57 2010 @@ -138,4 +138,9 @@ add_custom_target(${_nameoncd}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd}) add_dependencies(minicd ${_nameoncd}_minicd) -ENDMACRO(add_minicd) +ENDMACRO(add_minicd) + +macro(set_cpp) + include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport) + set(IS_CPP 1) +endmacro() Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Thu Oct 14 20:16:57 2010 @@ -4,8 +4,9 @@ set_unicode() #NOTE : explorer doesn't follow standard c++, and so doesn't compile with stlport headers -#I'm not willing to do it if explorer_new is hanging around -set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") +#I'm not willing to do it if explorer_new is hanging around. +#jgardou +#set_cpp() add_definitions(-DWIN32) add_definitions(-D__WINDRES__) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=491… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Thu Oct 14 20:16:57 2010 @@ -16,9 +16,6 @@ # Compiler Core add_definitions(-pipe -fms-extensions) - -# stlport includes -set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> -I${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport <FLAGS> -o <OBJECT> -c <SOURCE>") set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") @@ -123,10 +120,6 @@ set(IS_UNICODE 1) endmacro() -macro(set_cpp) - set(IS_CPP 1) - endmacro() - # Workaround lack of mingw RC support in cmake macro(set_rc_compiler) get_directory_property(defines COMPILE_DEFINITIONS) Modified: branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlp… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Thu Oct 14 20:16:57 2010 @@ -4,7 +4,7 @@ add_definitions(-D_STLP_USE_EXCEPTIONS) -include_directories(BEFORE stlport) +set_cpp() list(APPEND SOURCE src/allocators.cpp

14 years, 2 months

[fireball] 49147: [HEAP] - Add ability to dynamically allocate UCR descriptors when preallocated amount is exhausted. - Fix a few bugs in RtlpFindAndCommitPages and in deactivated RtlpDecommitFreeB...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Oct 14 20:04:20 2010 New Revision: 49147 URL: http://svn.reactos.org/svn/reactos?rev=49147&view=rev Log: [HEAP] - Add ability to dynamically allocate UCR descriptors when preallocated amount is exhausted. - Fix a few bugs in RtlpFindAndCommitPages and in deactivated RtlpDecommitFreeBlock. - Enable free blocks decommitting. - New heap manager would now be ready to replace the old one. Modified: trunk/reactos/lib/rtl/heap.h trunk/reactos/lib/rtl/heap_rewrite.c Modified: trunk/reactos/lib/rtl/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.h?rev=49147&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.h [iso-8859-1] Thu Oct 14 20:04:20 2010 @@ -178,6 +178,7 @@ USHORT SegmentAllocatorBackTraceIndex; USHORT Reserved; LIST_ENTRY UCRSegmentList; + ULONG Flags; ULONG ForceFlags; ULONG CompatibilityFlags; @@ -200,6 +201,7 @@ USHORT MaximumTagIndex; PHEAP_TAG_ENTRY TagEntries; LIST_ENTRY UCRList; + LIST_ENTRY UCRSegments; // FIXME: non-Vista ULONG AlignRound; ULONG AlignMask; LIST_ENTRY VirtualAllocdBlocks; @@ -252,6 +254,13 @@ ULONG Size; } HEAP_UCR_DESCRIPTOR, *PHEAP_UCR_DESCRIPTOR; +typedef struct _HEAP_UCR_SEGMENT +{ + LIST_ENTRY ListEntry; + SIZE_T ReservedSize; + SIZE_T CommittedSize; +} HEAP_UCR_SEGMENT, *PHEAP_UCR_SEGMENT; + typedef struct _HEAP_ENTRY_EXTRA { union Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Thu Oct 14 20:04:20 2010 @@ -104,7 +104,7 @@ /* Prepare a list of UCRs */ InitializeListHead(&Heap->UCRList); - InitializeListHead(&Heap->UCRSegmentList); + InitializeListHead(&Heap->UCRSegments); UcrDescriptor = NextHeapBase; for (i=0; i<NumUCRs; i++, UcrDescriptor++) @@ -408,14 +408,86 @@ { PLIST_ENTRY Entry; PHEAP_UCR_DESCRIPTOR UcrDescriptor; + PHEAP_UCR_SEGMENT UcrSegment; PHEAP Heap = Segment->Heap; + SIZE_T ReserveSize = 16 * PAGE_SIZE; + SIZE_T CommitSize = 1 * PAGE_SIZE; + NTSTATUS Status; DPRINT("RtlpCreateUnCommittedRange(%p)\n", Segment); /* Check if we have unused UCRs */ if (IsListEmpty(&Heap->UCRList)) { - ASSERT(FALSE); + /* Get a pointer to the first UCR segment */ + UcrSegment = CONTAINING_RECORD(&Heap->UCRSegments.Flink, HEAP_UCR_SEGMENT, ListEntry); + + /* Check the list of UCR segments */ + if (IsListEmpty(&Heap->UCRSegments) || + UcrSegment->ReservedSize == UcrSegment->CommittedSize) + { + /* We need to create a new one. Reserve 16 pages for it */ + UcrSegment = NULL; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + (PVOID *)&UcrSegment, + 0, + &ReserveSize, + MEM_RESERVE, + PAGE_READWRITE); + + if (!NT_SUCCESS(Status)) return NULL; + + /* Commit one page */ + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + (PVOID *)&UcrSegment, + 0, + &CommitSize, + MEM_COMMIT, + PAGE_READWRITE); + + if (!NT_SUCCESS(Status)) + { + /* Release reserved memory */ + ZwFreeVirtualMemory(NtCurrentProcess(), + (PVOID *)&UcrDescriptor, + &ReserveSize, + MEM_RELEASE); + return NULL; + } + + /* Set it's data */ + UcrSegment->ReservedSize = ReserveSize; + UcrSegment->CommittedSize = CommitSize; + + /* Add it to the head of the list */ + InsertHeadList(&Heap->UCRSegments, &UcrSegment->ListEntry); + + /* Get a pointer to the first available UCR descriptor */ + UcrDescriptor = (PHEAP_UCR_DESCRIPTOR)(UcrSegment + 1); + } + else + { + /* It's possible to use existing UCR segment. Commit one more page */ + UcrDescriptor = (PHEAP_UCR_DESCRIPTOR)((PCHAR)UcrSegment + UcrSegment->CommittedSize); + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + (PVOID *)&UcrDescriptor, + 0, + &CommitSize, + MEM_COMMIT, + PAGE_READWRITE); + + if (!NT_SUCCESS(Status)) return NULL; + + /* Update sizes */ + UcrSegment->CommittedSize += CommitSize; + } + + /* There is a whole bunch of new UCR descriptors. Put them into the unused list */ + while ((PCHAR)UcrDescriptor < ((PCHAR)UcrSegment + UcrSegment->CommittedSize)) + { + InsertTailList(&Heap->UCRList, &UcrDescriptor->ListEntry); + UcrDescriptor++; + } } /* There are unused UCRs, just get the first one */ @@ -506,9 +578,10 @@ RtlpFindAndCommitPages(PHEAP Heap, PHEAP_SEGMENT Segment, PSIZE_T Size, - PVOID Address) + PVOID AddressRequested) { PLIST_ENTRY Current; + ULONG_PTR Address = 0; PHEAP_UCR_DESCRIPTOR UcrDescriptor, PreviousUcr = NULL; PHEAP_ENTRY FirstEntry, LastEntry, PreviousLastEntry; NTSTATUS Status; @@ -523,20 +596,20 @@ /* Check if we can use that one right away */ if (UcrDescriptor->Size >= *Size && - (UcrDescriptor->Address == Address || !Address)) + (UcrDescriptor->Address == AddressRequested || !AddressRequested)) { /* Get the address */ - Address = UcrDescriptor->Address; + Address = (ULONG_PTR)UcrDescriptor->Address; /* Commit it */ if (Heap->CommitRoutine) { - Status = Heap->CommitRoutine(Heap, &Address, Size); + Status = Heap->CommitRoutine(Heap, (PVOID *)&Address, Size); } else { Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &Address, + (PVOID *)&Address, 0, Size, MEM_COMMIT, @@ -597,7 +670,7 @@ LastEntry->Flags &= ~HEAP_ENTRY_LAST_ENTRY; /* Update UCR descriptor */ - UcrDescriptor->Address = (PUCHAR)UcrDescriptor->Address + *Size; + UcrDescriptor->Address = (PVOID)((ULONG_PTR)UcrDescriptor->Address + *Size); UcrDescriptor->Size -= *Size; DPRINT("Updating UcrDescriptor %p, new Address %p, size %d\n", @@ -644,6 +717,7 @@ } /* Advance to the next descriptor */ + PreviousUcr = UcrDescriptor; Current = Current->Flink; } @@ -655,14 +729,15 @@ PHEAP_FREE_ENTRY FreeEntry, SIZE_T Size) { -#if 0 PHEAP_SEGMENT Segment; PHEAP_ENTRY PrecedingInUseEntry = NULL, NextInUseEntry = NULL; PHEAP_FREE_ENTRY NextFreeEntry; PHEAP_UCR_DESCRIPTOR UcrDescriptor; ULONG PrecedingSize, NextSize, DecommitSize; - ULONG DecommitBase; + ULONG_PTR DecommitBase; NTSTATUS Status; + + DPRINT("Decommitting %p %p %x\n", Heap, FreeEntry, Size); /* We can't decommit if there is a commit routine! */ if (Heap->CommitRoutine) @@ -692,7 +767,7 @@ } /* Get the next entry */ - NextFreeEntry = (PHEAP_FREE_ENTRY)((PHEAP_ENTRY)FreeEntry + (Size >> HEAP_ENTRY_SHIFT)); + NextFreeEntry = (PHEAP_FREE_ENTRY)((PHEAP_ENTRY)FreeEntry + Size); DecommitSize = ROUND_DOWN(NextFreeEntry, PAGE_SIZE); NextSize = (PHEAP_ENTRY)NextFreeEntry - (PHEAP_ENTRY)DecommitSize; @@ -708,14 +783,17 @@ NextInUseEntry = (PHEAP_ENTRY)NextFreeEntry; } - NextFreeEntry = (PHEAP_FREE_ENTRY)((PHEAP_ENTRY)NextFreeEntry - NextSize); - + NextFreeEntry = (PHEAP_FREE_ENTRY)((PHEAP_ENTRY)NextFreeEntry - NextSize); + + /* Calculate real decommit size */ if (DecommitSize > DecommitBase) + { DecommitSize -= DecommitBase; + } else { /* Nothing to decommit */ - RtlpInsertFreeBlock(Heap, FreeEntry, PrecedingSize); + RtlpInsertFreeBlock(Heap, FreeEntry, Size); return; } @@ -739,7 +817,7 @@ if (!NT_SUCCESS(Status)) { - RtlpInsertFreeBlock(Heap, FreeEntry, PrecedingSize); + RtlpInsertFreeBlock(Heap, FreeEntry, Size); return; } @@ -753,18 +831,22 @@ FreeEntry->Flags = HEAP_ENTRY_LAST_ENTRY; FreeEntry->Size = PrecedingSize; Heap->TotalFreeSize += PrecedingSize; + + /* Set last entry in the segment to this entry */ Segment->LastEntryInSegment = (PHEAP_ENTRY)FreeEntry; - RtlpInsertFreeBlockHelper(Heap, FreeEntry, PrecedingSize); - } - else if (NextInUseEntry) + + /* Insert it into the free list */ + RtlpInsertFreeBlockHelper(Heap, FreeEntry, PrecedingSize, FALSE); + } + else if (PrecedingInUseEntry) { /* Adjust preceding in use entry */ PrecedingInUseEntry->Flags |= HEAP_ENTRY_LAST_ENTRY; Segment->LastEntryInSegment = PrecedingInUseEntry; - } - else if ((Segment->LastEntryInSegment >= (PHEAP_ENTRY)DecommitBase)) - { - /* Adjust last entry in the segment */ + } else if ((ULONG_PTR)Segment->LastEntryInSegment >= DecommitBase && + ((PCHAR)Segment->LastEntryInSegment < ((PCHAR)DecommitBase + DecommitSize))) + { + /* Update this segment's last entry */ Segment->LastEntryInSegment = Segment->FirstEntry; } @@ -779,16 +861,13 @@ ((PHEAP_FREE_ENTRY)((PHEAP_ENTRY)NextFreeEntry + NextSize))->PreviousSize = NextSize; - Heap->TotalFreeSize += PrecedingSize; - RtlpInsertFreeBlockHelper(Heap, NextFreeEntry, NextSize); + Heap->TotalFreeSize += NextSize; + RtlpInsertFreeBlockHelper(Heap, NextFreeEntry, NextSize, FALSE); } else if (NextInUseEntry) { NextInUseEntry->PreviousSize = 0; } -#else - RtlpInsertFreeBlock(Heap, FreeEntry, Size); -#endif } BOOLEAN NTAPI @@ -1047,7 +1126,7 @@ /* Advance FreeEntry and update sizes */ FreeEntry = CurrentEntry; - *FreeSize += CurrentEntry->Size; + *FreeSize = *FreeSize + CurrentEntry->Size; Heap->TotalFreeSize -= CurrentEntry->Size; FreeEntry->Size = *FreeSize; @@ -1086,7 +1165,7 @@ RtlpRemoveFreeBlock(Heap, NextEntry, FALSE, FALSE); /* Update sizes */ - *FreeSize += NextEntry->Size; + *FreeSize = *FreeSize + NextEntry->Size; Heap->TotalFreeSize -= NextEntry->Size; FreeEntry->Size = *FreeSize; @@ -1648,7 +1727,7 @@ { PHEAP Heap = (PHEAP)HeapPtr; PLIST_ENTRY Current; - PHEAP_UCR_DESCRIPTOR UcrDescriptor; + PHEAP_UCR_SEGMENT UcrSegment; PHEAP_VIRTUAL_ALLOC_ENTRY VirtualEntry; PVOID BaseAddress; SIZE_T Size; @@ -1695,27 +1774,23 @@ Heap->LockVariable = NULL; } - /* Go through heap's global uncommitted ranges list and free them */ - DPRINT1("HEAP: Freeing segment's UCRs is not yet implemented!\n"); - Current = Heap->UCRSegmentList.Flink; - while(Current != &Heap->UCRSegmentList) - { - UcrDescriptor = CONTAINING_RECORD(Current, HEAP_UCR_DESCRIPTOR, ListEntry); - - if (UcrDescriptor) - { - BaseAddress = UcrDescriptor->Address; - Size = 0; - - /* Release that memory */ - ZwFreeVirtualMemory(NtCurrentProcess(), - &BaseAddress, - &Size, - MEM_RELEASE); - } + /* Free UCR segments if any were created */ + Current = Heap->UCRSegments.Flink; + while(Current != &Heap->UCRSegments) + { + UcrSegment = CONTAINING_RECORD(Current, HEAP_UCR_SEGMENT, ListEntry); /* Advance to the next descriptor */ Current = Current->Flink; + + BaseAddress = (PVOID)UcrSegment; + Size = 0; + + /* Release that memory */ + ZwFreeVirtualMemory(NtCurrentProcess(), + &BaseAddress, + &Size, + MEM_RELEASE); } /* Go through segments and destroy them */ @@ -2043,7 +2118,7 @@ HEAP_CREATE_ENABLE_TRACING | HEAP_CREATE_ALIGN_16)) { - DPRINT1("HEAP: RtlAllocateHeap is called with unsupported flags %x, ignoring\n", Flags); + DPRINT("HEAP: RtlAllocateHeap is called with unsupported flags %x, ignoring\n", Flags); } //DPRINT("RtlAllocateHeap(%p %x %x)\n", Heap, Flags, Size); @@ -3000,7 +3075,7 @@ if (Size > OldSize && (Flags & HEAP_ZERO_MEMORY)) { - RtlZeroMemory((PCHAR)NewBaseAddress + OldSize, Size - OldSize ); + RtlZeroMemory((PCHAR)NewBaseAddress + OldSize, Size - OldSize); } /* Free the old block */ @@ -3701,7 +3776,7 @@ */ ULONG NTAPI RtlGetProcessHeaps(ULONG count, - HANDLE *heaps ) + HANDLE *heaps) { UNIMPLEMENTED; return 0;

14 years, 2 months

[ekohl] 49146: [RPCRT4] Add a missing format type to unmarshall_discriminant().

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Oct 14 19:41:03 2010 New Revision: 49146 URL: http://svn.reactos.org/svn/reactos?rev=49146&view=rev Log: [RPCRT4] Add a missing format type to unmarshall_discriminant(). Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] Thu Oct 14 19:41:03 2010 @@ -6032,6 +6032,7 @@ case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: + case RPC_FC_ENUM16: { USHORT d; ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ro… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] Thu Oct 14 19:41:03 2010 @@ -15,6 +15,18 @@ #define EPM_PROTOCOL_OSI_TP4 0x05 #define EPM_PROTOCOL_OSI_CLNS 0x06 #define EPM_PROTOCOL_TCP 0x07 +Index: ndr_marshall.c +=================================================================== +--- ndr_marshall.c (working copy) ++++ ndr_marshall.c (working copy) +@@ -6032,6 +6032,7 @@ + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: ++ case RPC_FC_ENUM16: + { + USHORT d; + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); Index: rpc_epmap.c =================================================================== --- rpc_epmap.c (working copy)

14 years, 2 months

← Newer
1
...
21
22
23
24
25
26
27
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010