Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 49039: [win32k] - Fix an ancient FIXME in PATH_PathToRegion
by gadamopoulos＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: gadamopoulos Date: Thu Oct 7 19:14:49 2010 New Revision: 49039 URL: http://svn.reactos.org/svn/reactos?rev=49039&view=rev Log: [win32k] - Fix an ancient FIXME in PATH_PathToRegion Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Thu Oct 7 19:14:49 2010 @@ -1062,14 +1062,17 @@ PATH_FlattenPath ( pPath ); - /* FIXME: What happens when number of points is zero? */ - /* First pass: Find out how many strokes there are in the path */ /* FIXME: We could eliminate this with some bookkeeping in GdiPath */ numStrokes=0; for(i=0; i<pPath->numEntriesUsed; i++) if((pPath->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO) numStrokes++; + + if(numStrokes == 0) + { + return FALSE; + } /* Allocate memory for number-of-points-in-stroke array */ pNumPointsInStroke = ExAllocatePoolWithTag(PagedPool, sizeof(ULONG) * numStrokes, TAG_PATH);

1 0

[cfinck] 49038: - Change the version to 0.3.12 - Set "Angelus_02_ROSWP.bmp" as the default wallpaper - Add a shortcut to RApps to the Desktop
by cfinck＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: cfinck Date: Thu Oct 7 18:31:36 2010 New Revision: 49038 URL: http://svn.reactos.org/svn/reactos?rev=49038&view=rev Log: - Change the version to 0.3.12 - Set "Angelus_02_ROSWP.bmp" as the default wallpaper - Add a shortcut to RApps to the Desktop Modified: branches/ros-branch-0_3_12/reactos/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_12/reactos/boot/bootdata/hivedef_i386.inf branches/ros-branch-0_3_12/reactos/dll/win32/syssetup/install.c branches/ros-branch-0_3_12/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_12/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/base/… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_12/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/boot/… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_12/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu Oct 7 18:31:36 2010 @@ -760,6 +760,7 @@ /* Create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\rapps.exe"), IDS_CMT_DOWNLOADER, TRUE); /* Create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE); Modified: branches/ros-branch-0_3_12/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/inclu… ============================================================================== --- branches/ros-branch-0_3_12/reactos/include/reactos/version.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/include/reactos/version.h [iso-8859-1] Thu Oct 7 18:31:36 2010 @@ -18,13 +18,13 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 12 #define COPYRIGHT_YEAR "2010" /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"" #endif

1 0

[sir_richard] 49037: [NTOS]: Fix copy/paste error.
by sir_richard＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: sir_richard Date: Thu Oct 7 17:41:20 2010 New Revision: 49037 URL: http://svn.reactos.org/svn/reactos?rev=49037&view=rev Log: [NTOS]: Fix copy/paste error. Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=49… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Oct 7 17:41:20 2010 @@ -373,9 +373,6 @@ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'Fake'); ASSERT(Vad); RtlZeroMemory(Vad, sizeof(MMVAD)); - EndingAddress = (((ULONG_PTR)PBaseAddress + PRegionSize - 1) | (PAGE_SIZE - 1)); - StartingAddress = (ULONG_PTR)PAGE_ALIGN(PBaseAddress); - Vad->StartingVpn = PAGE_ROUND_DOWN(marea->StartingAddress) >> PAGE_SHIFT; /* * For some strange reason, it is perfectly valid to create a MAREA from 0x1000 to... 0x1000.

1 0

[sir_richard] 49036: [NTOS]: Hackfix a hack. Should get rid of the recent VAD assert in user32/bpp changes.
by sir_richard＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: sir_richard Date: Thu Oct 7 17:35:25 2010 New Revision: 49036 URL: http://svn.reactos.org/svn/reactos?rev=49036&view=rev Log: [NTOS]: Hackfix a hack. Should get rid of the recent VAD assert in user32/bpp changes. Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=49… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Oct 7 17:35:25 2010 @@ -373,12 +373,23 @@ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'Fake'); ASSERT(Vad); RtlZeroMemory(Vad, sizeof(MMVAD)); + EndingAddress = (((ULONG_PTR)PBaseAddress + PRegionSize - 1) | (PAGE_SIZE - 1)); + StartingAddress = (ULONG_PTR)PAGE_ALIGN(PBaseAddress); + Vad->StartingVpn = PAGE_ROUND_DOWN(marea->StartingAddress) >> PAGE_SHIFT; - Vad->EndingVpn = PAGE_ROUND_DOWN((ULONG_PTR)marea->EndingAddress - 1) >> PAGE_SHIFT; - if (Vad->EndingVpn < Vad->StartingVpn) - { - DPRINT1("Building a broken VAD. Data: %p %p %lx %lx\n", marea->StartingAddress, marea->EndingAddress, Vad->StartingVpn, Vad->EndingVpn); - } + /* + * For some strange reason, it is perfectly valid to create a MAREA from 0x1000 to... 0x1000. + * In a normal OS/Memory Manager, this would be retarded, but ReactOS allows this (how it works + * I don't even want to know). + */ + if (marea->EndingAddress != marea->StartingAddress) + { + Vad->EndingVpn = PAGE_ROUND_DOWN((ULONG_PTR)marea->EndingAddress - 1) >> PAGE_SHIFT; + } + else + { + Vad->EndingVpn = Vad->StartingVpn; + } Vad->u.VadFlags.Spare = 1; Vad->u.VadFlags.PrivateMemory = 1; MiInsertVad(Vad, MmGetAddressSpaceOwner(AddressSpace));

1 0

[sir_richard] 49035: [NTOS]: Add support for user-mode VAD faults on page tables (just a couple lines of extra code). [NTOS]: Add support for user-mode VAD demand zero faults. [NTOS]: Remove broken...
by sir_richard＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: sir_richard Date: Thu Oct 7 17:27:23 2010 New Revision: 49035 URL: http://svn.reactos.org/svn/reactos?rev=49035&view=rev Log: [NTOS]: Add support for user-mode VAD faults on page tables (just a couple lines of extra code). [NTOS]: Add support for user-mode VAD demand zero faults. [NTOS]: Remove broken ASSERT. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Thu Oct 7 17:27:23 2010 @@ -32,8 +32,25 @@ /* No prototype/section support for now */ *ProtoVad = NULL; - /* Only valid for user VADs for now */ - ASSERT(VirtualAddress <= MM_HIGHEST_USER_ADDRESS); + /* Check if this is a page table address */ + if (MI_IS_PAGE_TABLE_ADDRESS(VirtualAddress)) + { + /* This should never happen, as these addresses are handled by the double-maping */ + if (((PMMPTE)VirtualAddress >= MiAddressToPte(MmPagedPoolStart)) && + ((PMMPTE)VirtualAddress <= MmPagedPoolInfo.LastPteForPagedPool)) + { + /* Fail such access */ + *ProtectCode = MM_NOACCESS; + return NULL; + } + + /* Return full access rights */ + *ProtectCode = MM_READWRITE; + return NULL; + } + + /* Should not be a session address */ + ASSERT(MI_IS_SESSION_ADDRESS(VirtualAddress) == FALSE); /* Special case for shared data */ if (PAGE_ALIGN(VirtualAddress) == (PVOID)USER_SHARED_DATA) @@ -642,7 +659,7 @@ // // Check for kernel fault // - if (Address >= MmSystemRangeStart) + while (Address >= MmSystemRangeStart) { // // What are you even DOING here? @@ -718,25 +735,16 @@ // if (MI_IS_PAGE_TABLE_OR_HYPER_ADDRESS(Address)) { - // - // This might happen...not sure yet - // - DPRINT1("FAULT ON PAGE TABLES: %p %lx %lx!\n", Address, *PointerPte, *PointerPde); #if (_MI_PAGING_LEVELS == 2) - // - // Map in the page table - // + /* Could be paged pool access from a new process -- synchronize the page directories */ if (MiCheckPdeForPagedPool(Address) == STATUS_WAIT_1) { DPRINT1("PAGE TABLES FAULTED IN!\n"); return STATUS_SUCCESS; } #endif - // - // Otherwise the page table doesn't actually exist - // - DPRINT1("FAILING\n"); - return STATUS_ACCESS_VIOLATION; + /* Otherwise this could be a commit of a virtual address */ + break; } /* In this path, we are using the system working set */ @@ -866,7 +874,8 @@ #endif /* First things first, is the PDE valid? */ - ASSERT(PointerPde != MiAddressToPde(PTE_BASE)); +// DPRINT1("The PDE we faulted on: %lx %lx\n", PointerPde, MiAddressToPde(PTE_BASE)); + //ASSERT(PointerPde != MiAddressToPde(PTE_BASE)); ASSERT(PointerPde->u.Hard.LargePage == 0); if (PointerPde->u.Hard.Valid == 0) { @@ -901,8 +910,27 @@ ASSERT(PointerPde->u.Hard.Valid == 1); } - /* Now capture the PTE. We only handle cases where it's totally empty */ + /* Now capture the PTE. Ignore virtual faults for now */ TempPte = *PointerPte; + ASSERT(TempPte.u.Hard.Valid == 0); + + /* Quick check for demand-zero */ + if (TempPte.u.Long == (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)) + { + /* Resolve the fault */ + //DPRINT1("VAD demand-zero fault: %p\n", Address); + MiResolveDemandZeroFault(Address, + PointerPte, + CurrentProcess, + MM_NOIRQL); + + /* Return the status */ + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return STATUS_PAGE_FAULT_DEMAND_ZERO; + } + + /* Don't handle prototype PTEs yet -- only kernel demand zero PTEs */ + ASSERT(TempPte.u.Soft.Prototype == 0); ASSERT(TempPte.u.Long == 0); /* Check if this address range belongs to a valid allocation (VAD) */

1 0

[fireball] 49034: [HEAP] - Fix allocated/free memory fillers to match those Windows uses (winetests) - Add missing coalesce-on-free flag check in RtlCreateHeap - Turn on tail check/pattern filling ...
by fireball＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: fireball Date: Thu Oct 7 17:05:29 2010 New Revision: 49034 URL: http://svn.reactos.org/svn/reactos?rev=49034&view=rev Log: [HEAP] - Fix allocated/free memory fillers to match those Windows uses (winetests) - Add missing coalesce-on-free flag check in RtlCreateHeap - Turn on tail check/pattern filling in RtlAllocateHeap. - Add extra stuff storage support in RtlAllocateHeap and its helpers. - Set win32 statuses where necessary. - Return success in RtlValidateHeap to reduce spam when running winetest. Modified: trunk/reactos/lib/rtl/heap_rewrite.c 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 7 17:05:29 2010 @@ -30,8 +30,8 @@ #define HEAP_ENTRY_SHIFT 3 #define HEAP_MAX_BLOCK_SIZE ((0x80000 - PAGE_SIZE) >> HEAP_ENTRY_SHIFT) -#define ARENA_INUSE_FILLER 0x55555555 -#define ARENA_FREE_FILLER 0xaaaaaaaa +#define ARENA_INUSE_FILLER 0xBAADF00D +#define ARENA_FREE_FILLER 0xFEEEFEEE #define HEAP_TAIL_FILL 0xab // from ntifs.h, should go to another header! @@ -261,6 +261,7 @@ HEAP_ENTRY BusyBlock; } HEAP_VIRTUAL_ALLOC_ENTRY, *PHEAP_VIRTUAL_ALLOC_ENTRY; +extern BOOLEAN RtlpPageHeapEnabled; HANDLE NTAPI RtlpSpecialHeapCreate(ULONG Flags, PVOID Addr, @@ -341,6 +342,9 @@ PSIZE_T FreeSize, BOOLEAN Remove); +PHEAP_ENTRY_EXTRA NTAPI +RtlpGetExtraStuffPointer(PHEAP_ENTRY HeapEntry); + /* FUNCTIONS *****************************************************************/ VOID NTAPI @@ -1546,7 +1550,8 @@ Heap = RtlpSpecialHeapCreate(Flags, Addr, TotalSize, CommitSize, Lock, Parameters); if (Heap) return Heap; - ASSERT(FALSE); + //ASSERT(FALSE); + DPRINT1("Enabling page heap failed\n"); } /* Check validation flags */ @@ -1560,11 +1565,17 @@ if (!Parameters) Parameters = &SafeParams; /* Check global flags */ + if (NtGlobalFlags & FLG_HEAP_DISABLE_COALESCING) + Flags |= HEAP_DISABLE_COALESCE_ON_FREE; + if (NtGlobalFlags & FLG_HEAP_ENABLE_FREE_CHECK) Flags |= HEAP_FREE_CHECKING_ENABLED; if (NtGlobalFlags & FLG_HEAP_ENABLE_TAIL_CHECK) Flags |= HEAP_TAIL_CHECKING_ENABLED; + + if (Flags & HEAP_TAIL_CHECKING_ENABLED) + DPRINT1("TailChecking!\n"); if (RtlpGetMode() == UserMode) { @@ -2014,7 +2025,7 @@ if (FreeFlags & HEAP_ENTRY_LAST_ENTRY) { /* Insert it to the free list if it's the last entry */ - RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, TRUE); + RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE); Heap->TotalFreeSize += FreeSize; } else @@ -2025,7 +2036,7 @@ if (SplitBlock2->Flags & HEAP_ENTRY_BUSY) { SplitBlock2->PreviousSize = (USHORT)FreeSize; - RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, TRUE); + RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE); Heap->TotalFreeSize += FreeSize; } else @@ -2034,7 +2045,7 @@ SplitBlock->Flags = SplitBlock2->Flags; /* Remove that next entry */ - RtlpRemoveFreeBlock(Heap, SplitBlock2, FALSE, TRUE); + RtlpRemoveFreeBlock(Heap, SplitBlock2, FALSE, FALSE); /* Update sizes */ FreeSize += SplitBlock2->Size; @@ -2052,7 +2063,7 @@ } /* Actually insert it */ - RtlpInsertFreeBlockHelper( Heap, SplitBlock, (USHORT)FreeSize, TRUE ); + RtlpInsertFreeBlockHelper(Heap, SplitBlock, (USHORT)FreeSize, FALSE); /* Update total size */ Heap->TotalFreeSize += FreeSize; @@ -2094,6 +2105,7 @@ PLIST_ENTRY FreeListHead, Next; PHEAP_FREE_ENTRY FreeBlock; PHEAP_ENTRY InUseEntry; + PHEAP_ENTRY_EXTRA Extra; EXCEPTION_RECORD ExceptionRecord; /* Go through the zero list to find a place where to insert the new entry */ @@ -2130,6 +2142,27 @@ /* Zero memory if that was requested */ if (Flags & HEAP_ZERO_MEMORY) RtlZeroMemory(InUseEntry + 1, Size); + else if (Heap->Flags & HEAP_FREE_CHECKING_ENABLED) + { + /* Fill this block with a special pattern */ + RtlFillMemoryUlong(InUseEntry + 1, Size & ~0x3, ARENA_INUSE_FILLER); + } + + /* Fill tail of the block with a special pattern too if requested */ + if (Heap->Flags & HEAP_TAIL_CHECKING_ENABLED) + { + RtlFillMemory((PCHAR)(InUseEntry + 1) + Size, sizeof(HEAP_ENTRY), HEAP_TAIL_FILL); + InUseEntry->Flags |= HEAP_ENTRY_FILL_PATTERN; + } + + /* Prepare extra if it's present */ + if (InUseEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) + { + Extra = RtlpGetExtraStuffPointer(InUseEntry); + RtlZeroMemory(Extra, sizeof(HEAP_ENTRY_EXTRA)); + + // TODO: Tagging + } /* Return pointer to the */ return InUseEntry + 1; @@ -2158,13 +2191,34 @@ /* Zero memory if that was requested */ if (Flags & HEAP_ZERO_MEMORY) RtlZeroMemory(InUseEntry + 1, Size); + else if (Heap->Flags & HEAP_FREE_CHECKING_ENABLED) + { + /* Fill this block with a special pattern */ + RtlFillMemoryUlong(InUseEntry + 1, Size & ~0x3, ARENA_INUSE_FILLER); + } + + /* Fill tail of the block with a special pattern too if requested */ + if (Heap->Flags & HEAP_TAIL_CHECKING_ENABLED) + { + RtlFillMemory((PCHAR)(InUseEntry + 1) + Size, sizeof(HEAP_ENTRY), HEAP_TAIL_FILL); + InUseEntry->Flags |= HEAP_ENTRY_FILL_PATTERN; + } + + /* Prepare extra if it's present */ + if (InUseEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) + { + Extra = RtlpGetExtraStuffPointer(InUseEntry); + RtlZeroMemory(Extra, sizeof(HEAP_ENTRY_EXTRA)); + + // TODO: Tagging + } /* Return pointer to the */ return InUseEntry + 1; } /* Really unfortunate, out of memory condition */ - //STATUS_NO_MEMORY; + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_NO_MEMORY); /* Generate an exception */ if (Flags & HEAP_GENERATE_EXCEPTIONS) @@ -2209,6 +2263,7 @@ EXCEPTION_RECORD ExceptionRecord; BOOLEAN HeapLocked = FALSE; PHEAP_VIRTUAL_ALLOC_ENTRY VirtualBlock = NULL; + PHEAP_ENTRY_EXTRA Extra; NTSTATUS Status; /* Force flags */ @@ -2217,7 +2272,7 @@ /* Check for the maximum size */ if (Size >= 0x80000000) { - // STATUS_NO_MEMORY + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_NO_MEMORY); return FALSE; } @@ -2225,24 +2280,27 @@ HEAP_VALIDATE_ALL_ENABLED | HEAP_VALIDATE_PARAMETERS_ENABLED | HEAP_FLAG_PAGE_ALLOCS | - HEAP_EXTRA_FLAGS_MASK | HEAP_CREATE_ENABLE_TRACING | - HEAP_FREE_CHECKING_ENABLED | - HEAP_TAIL_CHECKING_ENABLED | HEAP_CREATE_ALIGN_16)) { DPRINT1("HEAP: RtlAllocateHeap is called with unsupported flags %x, ignoring\n", Flags); } + if (Flags & HEAP_TAIL_CHECKING_ENABLED) + DPRINT1("TailChecking, Heap %p\n!", Heap); + /* Calculate allocation size and index */ - if (!Size) Size = 1; - AllocationSize = (Size + Heap->AlignRound) & Heap->AlignMask; + if (Size) + AllocationSize = Size; + else + AllocationSize = 1; + AllocationSize = (AllocationSize + Heap->AlignRound) & Heap->AlignMask; Index = AllocationSize >> HEAP_ENTRY_SHIFT; /* Acquire the lock if necessary */ if (!(Flags & HEAP_NO_SERIALIZE)) { - RtlEnterHeapLock( Heap->LockVariable ); + RtlEnterHeapLock(Heap->LockVariable); HeapLocked = TRUE; } @@ -2261,7 +2319,7 @@ /* Save flags and remove the free entry */ FreeFlags = FreeBlock->Flags; - RtlpRemoveFreeBlock(Heap, FreeBlock, TRUE, TRUE); + RtlpRemoveFreeBlock(Heap, FreeBlock, TRUE, FALSE); /* Update the total free size of the heap */ Heap->TotalFreeSize -= Index; @@ -2308,7 +2366,7 @@ FreeBlock = CONTAINING_RECORD(FreeListHead->Blink, HEAP_FREE_ENTRY, FreeList); - RtlpRemoveFreeBlock(Heap, FreeBlock, TRUE, TRUE); + RtlpRemoveFreeBlock(Heap, FreeBlock, TRUE, FALSE); /* Split it */ InUseEntry = RtlpSplitEntry(Heap, FreeBlock, AllocationSize, Index, Size); @@ -2320,6 +2378,27 @@ /* Zero memory if that was requested */ if (Flags & HEAP_ZERO_MEMORY) RtlZeroMemory(InUseEntry + 1, Size); + else if (Heap->Flags & HEAP_FREE_CHECKING_ENABLED) + { + /* Fill this block with a special pattern */ + RtlFillMemoryUlong(InUseEntry + 1, Size & ~0x3, ARENA_INUSE_FILLER); + } + + /* Fill tail of the block with a special pattern too if requested */ + if (Heap->Flags & HEAP_TAIL_CHECKING_ENABLED) + { + RtlFillMemory((PCHAR)(InUseEntry + 1) + Size, sizeof(HEAP_ENTRY), HEAP_TAIL_FILL); + InUseEntry->Flags |= HEAP_ENTRY_FILL_PATTERN; + } + + /* Prepare extra if it's present */ + if (InUseEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) + { + Extra = RtlpGetExtraStuffPointer(InUseEntry); + RtlZeroMemory(Extra, sizeof(HEAP_ENTRY_EXTRA)); + + // TODO: Tagging + } /* User data starts right after the entry's header */ return InUseEntry + 1; @@ -2377,7 +2456,7 @@ RtlRaiseException(&ExceptionRecord); } - //STATUS_BUFFER_TOO_SMALL; + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_BUFFER_TOO_SMALL); /* Release the lock */ if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); @@ -2431,7 +2510,7 @@ { /* This is an invalid block */ DPRINT1("HEAP: Trying to free an invalid address %p!\n", Ptr); - // FIXME: Set STATUS_INVALID_PARAMETER + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); /* Release the heap lock */ if (Locked) RtlLeaveHeapLock(Heap->LockVariable); @@ -2457,7 +2536,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed releasing memory with Status 0x%08X\n", Status); - // TODO: Set this status in user mode + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(Status); } } else @@ -2593,7 +2672,7 @@ /* Return success in case of a null pointer */ if (!Ptr) { - // STATUS_SUCCESS + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_SUCCESS); return NULL; } @@ -2605,7 +2684,7 @@ /* Make sure size is valid */ if (Size >= 0x80000000) { - // STATUS_NO_MEMORY + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_NO_MEMORY); return NULL; } @@ -2635,7 +2714,7 @@ /* If that entry is not really in-use, we have a problem */ if (!(InUseEntry->Flags & HEAP_ENTRY_BUSY)) { - // STATUS_INVALID_PARAMETER + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); /* Release the lock and return */ if (HeapLocked) @@ -3086,7 +3165,7 @@ /* Return -1 if that entry is free */ if (!(HeapEntry->Flags & HEAP_ENTRY_BUSY)) { - // STATUS_INVALID_PARAMETER + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); return (SIZE_T)-1; } @@ -3131,7 +3210,9 @@ ) { UNIMPLEMENTED; - return FALSE; + + /* Imitate success */ + return TRUE; } VOID

1 0

[fireball] 49033: [NTDLL] - Fix a typo which always set page heap enabled to true.
by fireball＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: fireball Date: Thu Oct 7 16:51:19 2010 New Revision: 49033 URL: http://svn.reactos.org/svn/reactos?rev=49033&view=rev Log: [NTDLL] - Fix a typo which always set page heap enabled to true. Modified: trunk/reactos/dll/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Thu Oct 7 16:51:19 2010 @@ -139,53 +139,53 @@ FLG_USER_STACK_TRACE_DB | FLG_HEAP_ENABLE_TAGGING | FLG_HEAP_ENABLE_TAG_BY_DLL); - } - - /* Get page heap flags without checking return value */ - LdrQueryImageFileExecutionOptions(&ImageName, - L"PageHeapFlags", - REG_DWORD, - (PVOID)&RtlpPageHeapGlobalFlags, - sizeof(RtlpPageHeapGlobalFlags), - &ValueSize); - - LdrQueryImageFileExecutionOptions(&ImageName, - L"PageHeapSizeRangeStart", - REG_DWORD, - (PVOID)&RtlpPageHeapSizeRangeStart, - sizeof(RtlpPageHeapSizeRangeStart), - &ValueSize); - - LdrQueryImageFileExecutionOptions(&ImageName, - L"PageHeapSizeRangeEnd", - REG_DWORD, - (PVOID)&RtlpPageHeapSizeRangeEnd, - sizeof(RtlpPageHeapSizeRangeEnd), - &ValueSize); - - LdrQueryImageFileExecutionOptions(&ImageName, - L"PageHeapDllRangeStart", - REG_DWORD, - (PVOID)&RtlpPageHeapDllRangeStart, - sizeof(RtlpPageHeapDllRangeStart), - &ValueSize); - - LdrQueryImageFileExecutionOptions(&ImageName, - L"PageHeapDllRangeEnd", - REG_DWORD, - (PVOID)&RtlpPageHeapDllRangeEnd, - sizeof(RtlpPageHeapDllRangeEnd), - &ValueSize); - - LdrQueryImageFileExecutionOptions(&ImageName, - L"PageHeapTargetDlls", - REG_SZ, - (PVOID)RtlpPageHeapTargetDlls, - sizeof(RtlpPageHeapTargetDlls), - &ValueSize); - - /* Now when all parameters are read, enable page heap */ - RtlpPageHeapEnabled = TRUE; + + /* Get page heap flags without checking return value */ + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapFlags", + REG_DWORD, + (PVOID)&RtlpPageHeapGlobalFlags, + sizeof(RtlpPageHeapGlobalFlags), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapSizeRangeStart", + REG_DWORD, + (PVOID)&RtlpPageHeapSizeRangeStart, + sizeof(RtlpPageHeapSizeRangeStart), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapSizeRangeEnd", + REG_DWORD, + (PVOID)&RtlpPageHeapSizeRangeEnd, + sizeof(RtlpPageHeapSizeRangeEnd), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapDllRangeStart", + REG_DWORD, + (PVOID)&RtlpPageHeapDllRangeStart, + sizeof(RtlpPageHeapDllRangeStart), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapDllRangeEnd", + REG_DWORD, + (PVOID)&RtlpPageHeapDllRangeEnd, + sizeof(RtlpPageHeapDllRangeEnd), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapTargetDlls", + REG_SZ, + (PVOID)RtlpPageHeapTargetDlls, + sizeof(RtlpPageHeapTargetDlls), + &ValueSize); + + /* Now when all parameters are read, enable page heap */ + RtlpPageHeapEnabled = TRUE; + } } }

1 0

[khornicek] 49032: Don't deny people their bugchecks. Merge r49031.
by khornicek＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: khornicek Date: Thu Oct 7 14:07:45 2010 New Revision: 49032 URL: http://svn.reactos.org/svn/reactos?rev=49032&view=rev Log: Don't deny people their bugchecks. Merge r49031. Modified: branches/ros-branch-0_3_12/reactos/ntoskrnl/ke/bug.c Modified: branches/ros-branch-0_3_12/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/ntosk… ============================================================================== --- branches/ros-branch-0_3_12/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Thu Oct 7 14:07:45 2010 @@ -1431,8 +1431,8 @@ IN ULONG_PTR BugCheckParameter4) { /* Workaround for Windows Server 2003 Checked PCI Driver issue */ - if (!(BugCheckCode == PCI_BUS_DRIVER_INTERNAL) && - (BugCheckParameter1 == 0xDEAD0010)) + if (!((BugCheckCode == PCI_BUS_DRIVER_INTERNAL) && + (BugCheckParameter1 == 0xDEAD0010))) { /* Call the internal API */ KeBugCheckWithTf(BugCheckCode,

1 0

[sir_richard] 49031: [NTOS]: My attempt at making bugchecks a thing of the past has failed, someone has caught the typo. Bugchecks will now happen in ReactOS again instead of being ignored. Maybe y...
by sir_richard＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: sir_richard Date: Thu Oct 7 13:52:42 2010 New Revision: 49031 URL: http://svn.reactos.org/svn/reactos?rev=49031&view=rev Log: [NTOS]: My attempt at making bugchecks a thing of the past has failed, someone has caught the typo. Bugchecks will now happen in ReactOS again instead of being ignored. Maybe you can "forget" to merge this one with the release branch? ;-) Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4903… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Thu Oct 7 13:52:42 2010 @@ -1431,8 +1431,8 @@ IN ULONG_PTR BugCheckParameter4) { /* Workaround for Windows Server 2003 Checked PCI Driver issue */ - if (!(BugCheckCode == PCI_BUS_DRIVER_INTERNAL) && - (BugCheckParameter1 == 0xDEAD0010)) + if (!((BugCheckCode == PCI_BUS_DRIVER_INTERNAL) && + (BugCheckParameter1 == 0xDEAD0010))) { /* Call the internal API */ KeBugCheckWithTf(BugCheckCode,

1 0

[jgardou] 49030: [CMAKE] - add missing file to mingw_common
by jgardou＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: jgardou Date: Thu Oct 7 11:47:29 2010 New Revision: 49030 URL: http://svn.reactos.org/svn/reactos?rev=49030&view=rev Log: [CMAKE] - add missing file to mingw_common Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Thu Oct 7 11:47:29 2010 @@ -7,7 +7,7 @@ add_definitions(-Wno-main) endif(NOT MSVC) -set(MINGW_COMMON_SOURCE +list(APPEND MINGW_COMMON_SOURCE _newmode.c atonexit.c binmode.c @@ -27,6 +27,7 @@ pseudo-reloc.c pseudo-reloc-list.c tlsmcrt.c + tlsmthread.c tlssup.c tlsthrd.c txtmode.c @@ -40,7 +41,8 @@ add_library(mingw_common ${MINGW_COMMON_SOURCE}) if(NOT MSVC) -target_link_libraries(mingw_common oldnames -lkernel32 -lntdll) + target_link_libraries(mingw_common oldnames) + add_importlibs(mingw_common kernel32 ntdll) endif(NOT MSVC) set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs