Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 53990: [CMAKE] * Use the new cmake functions.
by akhaldi＠svn.reactos.org 04 Oct '11

04 Oct '11

Author: akhaldi Date: Tue Oct 4 16:41:21 2011 New Revision: 53990 URL: http://svn.reactos.org/svn/reactos?rev=53990&view=rev Log: [CMAKE] * Use the new cmake functions. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Tue Oct 4 16:41:21 2011 @@ -167,10 +167,10 @@ if(NOT MSVC) add_target_link_flags(freeldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") - set_target_properties(freeldr_pe_dbg PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") + add_target_link_flags(freeldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") else() add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") - set_target_properties(freeldr_pe_dbg PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") + add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") endif() set_image_base(freeldr_pe 0x10000) @@ -230,12 +230,14 @@ if(NOT MSVC) add_target_link_flags(setupldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") - set_target_properties(setupldr_pe_dbg PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") + add_target_link_flags(setupldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") else() add_target_link_flags(setupldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") - set_target_properties(setupldr_pe_dbg PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") -endif() + add_target_link_flags(setupldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") +endif() + add_target_compile_definitions(setupldr_pe FREELDR_REACTOS_SETUP) +add_target_compile_definitions(setupldr_pe_dbg FREELDR_REACTOS_SETUP) set_image_base(setupldr_pe 0x10000) set_subsystem(setupldr_pe native)

1 0

[tkreuzer] 53989: {FREE[FREELDR] Improve the new heap to use a freelist, which boosts allocation performance by a factor of 7. Its now even slightly faster then bget.
by tkreuzer＠svn.reactos.org 04 Oct '11

04 Oct '11

Author: tkreuzer Date: Tue Oct 4 14:55:23 2011 New Revision: 53989 URL: http://svn.reactos.org/svn/reactos?rev=53989&view=rev Log: {FREE[FREELDR] Improve the new heap to use a freelist, which boosts allocation performance by a factor of 7. Its now even slightly faster then bget. Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] Tue Oct 4 14:55:23 2011 @@ -28,12 +28,23 @@ PVOID FrLdrDefaultHeap; PVOID FrLdrTempHeap; -typedef struct _HEAP_BLOCK +typedef struct _BLOCK_HEADER { USHORT Size; USHORT PreviousSize; ULONG Tag; - UCHAR Data[]; +} BLOCK_HEADER, *PBLOCK_HEADER; + +typedef struct _BLOCK_DATA +{ + ULONG Flink; + ULONG Blink; +} BLOCK_DATA, *PBLOCK_DATA; + +typedef struct _HEAP_BLOCK +{ + BLOCK_HEADER; + BLOCK_DATA Data[]; } HEAP_BLOCK, *PHEAP_BLOCK; typedef struct _HEAP @@ -44,6 +55,9 @@ ULONG NumAllocs; ULONG NumFrees; ULONG LargestAllocation; + ULONGLONG AllocationTime; + ULONGLONG FreeTime; + ULONG TerminatingBlock; HEAP_BLOCK Blocks; } HEAP, *PHEAP; @@ -59,6 +73,7 @@ TRACE("HeapCreate(MemoryType=%ld)\n", MemoryType); /* Allocate some memory for the heap */ + MaximumSize = ALIGN_UP_BY(MaximumSize, MM_PAGE_SIZE); Heap = MmAllocateMemoryWithType(MaximumSize, MemoryType); if (!Heap) { @@ -68,7 +83,7 @@ } /* Initialize the heap header */ - Heap->MaximumSize = ALIGN_UP_BY(MaximumSize, MM_PAGE_SIZE); + Heap->MaximumSize = MaximumSize; Heap->CurrentAllocBytes = 0; Heap->MaxAllocBytes = 0; Heap->NumAllocs = 0; @@ -79,8 +94,8 @@ Remaining = (MaximumSize - sizeof(HEAP)) / sizeof(HEAP_BLOCK); TRACE("Remaining = %ld\n", Remaining); - /* Substract one for the terminating entry */ - Remaining--; + /* Substract 2 for the terminating entry (header + free entry) */ + Remaining -= 2; Block = &Heap->Blocks; PreviousSize = 0; @@ -92,6 +107,8 @@ Block->Size = (USHORT)min(MAXUSHORT, Remaining - 1); Block->PreviousSize = PreviousSize; Block->Tag = 0; + Block->Data[0].Flink = (Block - &Heap->Blocks) + Block->Size + 1; + Block->Data[0].Blink = (Block - &Heap->Blocks) - 1 - PreviousSize; /* Substract current block size from remainder */ Remaining -= (Block->Size + 1); @@ -104,9 +121,13 @@ } /* Now finish with a terminating block */ + Heap->TerminatingBlock = Block - &Heap->Blocks; Block->Size = 0; Block->PreviousSize = PreviousSize; Block->Tag = 'dnE#'; + Block->Data[0].Flink = 0; + Block->Data[0].Blink = (Block - &Heap->Blocks) - 1 - PreviousSize; + Heap->Blocks.Data[0].Blink = Heap->TerminatingBlock; return Heap; } @@ -117,11 +138,11 @@ { PHEAP Heap = HeapHandle; - /* Mark all pages free */ + /* Mark all pages as firmware temporary, so they are free for the kernel */ MmMarkPagesInLookupTable(PageLookupTableAddress, (ULONG_PTR)Heap / MM_PAGE_SIZE, Heap->MaximumSize / MM_PAGE_SIZE, - LoaderFree); + LoaderFirmwareTemporary); } VOID @@ -173,7 +194,7 @@ if (Block->Size == 0) break; } - TRACE("HeapRelease() done, freed %ld pages\n", AllFreePages); + ERR("HeapRelease() done, freed %ld pages\n", AllFreePages); } VOID @@ -182,17 +203,20 @@ PHEAP Heap; Heap = FrLdrDefaultHeap; - TRACE("Heap statistics for default heap:\n" + ERR("Heap statistics for default heap:\n" "CurrentAlloc=0x%lx, MaxAlloc=0x%lx, LargestAllocation=0x%lx\n" "NumAllocs=%ld, NumFrees=%ld\n", Heap->CurrentAllocBytes, Heap->MaxAllocBytes, Heap->LargestAllocation, Heap->NumAllocs, Heap->NumFrees); + ERR("AllocTime = %I64d, FreeTime = %I64d, sum = %I64d\n", + Heap->AllocationTime, Heap->FreeTime, Heap->AllocationTime + Heap->FreeTime); + /* Release fre pages */ HeapRelease(FrLdrDefaultHeap); Heap = FrLdrTempHeap; - TRACE("Heap statistics for temp heap:\n" + ERR("Heap statistics for temp heap:\n" "CurrentAlloc=0x%lx, MaxAlloc=0x%lx, LargestAllocation=0x%lx\n" "NumAllocs=%ld, NumFrees=%ld\n", Heap->CurrentAllocBytes, Heap->MaxAllocBytes, Heap->LargestAllocation, @@ -200,6 +224,46 @@ /* Destroy the heap */ HeapDestroy(FrLdrTempHeap); +} + +static VOID +HeapRemoveFreeList( + PHEAP Heap, + PHEAP_BLOCK Block) +{ + PHEAP_BLOCK Previous, Next; + + Next = &Heap->Blocks + Block->Data[0].Flink; + Previous = &Heap->Blocks + Block->Data[0].Blink; + ASSERT((Next->Tag == 0) || (Next->Tag == 'dnE#')); + ASSERT(Next->Data[0].Blink == Block - &Heap->Blocks); + ASSERT((Previous->Tag == 0) || (Previous->Tag == 'dnE#')); + ASSERT(Previous->Data[0].Flink == Block - &Heap->Blocks); + + Next->Data[0].Blink = Previous - &Heap->Blocks; + Previous->Data[0].Flink = Next - &Heap->Blocks; +} + +static VOID +HeapInsertFreeList( + PHEAP Heap, + PHEAP_BLOCK FreeBlock) +{ + PHEAP_BLOCK ListHead, NextBlock; + ASSERT(FreeBlock->Tag == 0); + + /* Terminating block serves as free list head */ + ListHead = &Heap->Blocks + Heap->TerminatingBlock; + + for (NextBlock = &Heap->Blocks + ListHead->Data[0].Flink; + NextBlock < FreeBlock; + NextBlock = &Heap->Blocks + NextBlock->Data[0].Flink); + + FreeBlock->Data[0].Flink = NextBlock - &Heap->Blocks; + FreeBlock->Data[0].Blink = NextBlock->Data[0].Blink; + NextBlock->Data[0].Blink = FreeBlock - &Heap->Blocks; + NextBlock = &Heap->Blocks + FreeBlock->Data[0].Blink; + NextBlock->Data[0].Flink = FreeBlock - &Heap->Blocks; } PVOID @@ -210,7 +274,8 @@ { PHEAP Heap = HeapHandle; PHEAP_BLOCK Block, NextBlock; - USHORT BlockSize, PreviousSize = 0, Remaining; + USHORT BlockSize, Remaining; + ULONGLONG Time = __rdtsc(); /* Check if the allocation is too large */ if ((ByteSize + sizeof(HEAP_BLOCK)) > MAXUSHORT * sizeof(HEAP_BLOCK)) @@ -225,22 +290,22 @@ /* Calculate alloc size */ BlockSize = (USHORT)((ByteSize + sizeof(HEAP_BLOCK) - 1) / sizeof(HEAP_BLOCK)); - /* Loop all heap chunks */ - for (Block = &Heap->Blocks; + /* Walk the free block list */ + Block = &Heap->Blocks + Heap->TerminatingBlock; + for (Block = &Heap->Blocks + Block->Data[0].Flink; Block->Size != 0; - Block = Block + 1 + Block->Size) - { - ASSERT(Block->PreviousSize == PreviousSize); - PreviousSize = Block->Size; - - /* Continue, if its not free */ - if (Block->Tag != 0) continue; + Block = &Heap->Blocks + Block->Data[0].Flink) + { + ASSERT(Block->Tag == 0); /* Continue, if its too small */ if (Block->Size < BlockSize) continue; /* This block is just fine, use it */ Block->Tag = Tag; + + /* Remove this entry from the free list */ + HeapRemoveFreeList(Heap, Block); /* Calculate the remaining size */ Remaining = Block->Size - BlockSize; @@ -259,6 +324,7 @@ NextBlock->Size = Remaining - 1; NextBlock->PreviousSize = BlockSize; BlockSize = NextBlock->Size; + HeapInsertFreeList(Heap, NextBlock); /* Advance to the next block */ NextBlock = NextBlock + 1 + BlockSize; @@ -281,6 +347,7 @@ Heap->MaxAllocBytes = max(Heap->MaxAllocBytes, Heap->CurrentAllocBytes); Heap->LargestAllocation = max(Heap->LargestAllocation, Block->Size * sizeof(HEAP_BLOCK)); + Heap->AllocationTime += (__rdtsc() - Time); TRACE("HeapAllocate(%p, %ld, %.4s) -> return %p\n", HeapHandle, ByteSize, &Tag, Block->Data); @@ -303,6 +370,7 @@ PHEAP Heap = HeapHandle; PHEAP_BLOCK Block, PrevBlock, NextBlock; USHORT PreviousSize = 0; + ULONGLONG Time = __rdtsc(); TRACE("HeapFree(%p, %p)\n", HeapHandle, Pointer); ASSERT(Tag != 'dnE#'); @@ -317,10 +385,10 @@ Block = ((PHEAP_BLOCK)Pointer) - 1; /* Check if the tag matches */ - if (Tag && (Block->Tag != Tag)) - { - ERR("HEAP: Bad tag! Pointer = %p: block tag '%.4s', requested '%.4s'\n", - Pointer, &Block->Tag, &Tag); + if ((Tag && (Block->Tag != Tag)) || (Block->Tag == 0)) + { + ERR("HEAP: Bad tag! Pointer=%p: block tag '%.4s', requested '%.4s', size=0x%lx\n", + Pointer, &Block->Tag, &Tag, Block->Size); ASSERT(FALSE); } @@ -336,29 +404,34 @@ NextBlock = Block + Block->Size + 1; /* Check if next block is free */ - if (NextBlock->Tag == 0) - { - /* Check if their combined size if small enough */ - if ((Block->Size + NextBlock->Size + 1) <= MAXUSHORT) - { - /* Merge next block into current */ - Block->Size += NextBlock->Size + 1; - NextBlock = Block + Block->Size + 1; - NextBlock->PreviousSize = Block->Size; - } + if ((NextBlock->Tag == 0) && + ((Block->Size + NextBlock->Size + 1) <= MAXUSHORT)) + { + /* Merge next block into current */ + Block->Size += NextBlock->Size + 1; + HeapRemoveFreeList(Heap, NextBlock); + + NextBlock = Block + Block->Size + 1; } /* Check if there is a block before and it's free */ - if ((Block->PreviousSize != 0) && (PrevBlock->Tag == 0)) - { - /* Check if their combined size if small enough */ - if ((PrevBlock->Size + Block->Size + 1) <= MAXUSHORT) - { - /* Merge current block into previous */ - PrevBlock->Size += Block->Size + 1; - NextBlock->PreviousSize = PrevBlock->Size; - } - } + if ((Block->PreviousSize != 0) && (PrevBlock->Tag == 0) && + ((PrevBlock->Size + Block->Size + 1) <= MAXUSHORT)) + { + /* Merge current block into previous */ + PrevBlock->Size += Block->Size + 1; + Block = PrevBlock; + } + else + { + /* Insert the entry into the free list */ + HeapInsertFreeList(Heap, Block); + } + + /* Update the next block's back link */ + NextBlock->PreviousSize = Block->Size; + + Heap->FreeTime += (__rdtsc() - Time); }

1 0

[akhaldi] 53988: [INTL] * Restrict exports according to the spec file.
by akhaldi＠svn.reactos.org 04 Oct '11

04 Oct '11

Author: akhaldi Date: Tue Oct 4 14:27:47 2011 New Revision: 53988 URL: http://svn.reactos.org/svn/reactos?rev=53988&view=rev Log: [INTL] * Restrict exports according to the spec file. Modified: trunk/reactos/dll/cpl/intl/CMakeLists.txt Modified: trunk/reactos/dll/cpl/intl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/cpl/intl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/CMakeLists.txt [iso-8859-1] Tue Oct 4 14:27:47 2011 @@ -16,7 +16,8 @@ languages.c advanced.c sort.c - intl.rc) + intl.rc + ${CMAKE_CURRENT_BINARY_DIR}/intl.def) set_module_type(intl cpl UNICODE)

1 0

[tfaber] 53987: [CMAKE/MSVC] - Calculate image checksums to fix warnings in WinDbg
by tfaber＠svn.reactos.org 04 Oct '11

04 Oct '11

Author: tfaber Date: Tue Oct 4 14:20:25 2011 New Revision: 53987 URL: http://svn.reactos.org/svn/reactos?rev=53987&view=rev Log: [CMAKE/MSVC] - Calculate image checksums to fix warnings in WinDbg Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53987… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Oct 4 14:20:25 2011 @@ -1,6 +1,6 @@ if(${CMAKE_BUILD_TYPE} MATCHES Debug) - # no optimitation + # no optimization elseif(OPTIMIZE STREQUAL "1") add_definitions(/O1) elseif(OPTIMIZE STREQUAL "2") @@ -22,9 +22,9 @@ add_compile_flags("/X /GR- /GS- /Zl /W3") if(${_MACHINE_ARCH_FLAG} MATCHES X86) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB") - set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB /RELEASE") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB /RELEASE") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO /NODEFAULTLIB /RELEASE") endif() if(${ARCH} MATCHES amd64)

1 0

[akhaldi] 53986: [CMAKE] * Revert r53484 since jom is still buggy (bug reported upstream, to no avail) and as a result useless for us.
by akhaldi＠svn.reactos.org 04 Oct '11

04 Oct '11

Author: akhaldi Date: Tue Oct 4 11:57:31 2011 New Revision: 53986 URL: http://svn.reactos.org/svn/reactos?rev=53986&view=rev Log: [CMAKE] * Revert r53484 since jom is still buggy (bug reported upstream, to no avail) and as a result useless for us. Modified: trunk/reactos/cmake/Platform/Windows-cl.cmake Modified: trunk/reactos/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-cl.… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] Tue Oct 4 11:57:31 2011 @@ -213,8 +213,8 @@ #SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") SET(CMAKE_BUILD_TYPE_INIT Debug) -SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/Ob0 /Od") -SET(CMAKE_C_FLAGS_DEBUG_INIT "/Ob0 /Od") +SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/Zi /Ob0 /Od") +SET(CMAKE_C_FLAGS_DEBUG_INIT "/Zi /Ob0 /Od") SET(CMAKE_CXX_FLAGS_INIT "") SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") SET(CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") @@ -244,13 +244,13 @@ SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES") ENDIF() -#IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) -# SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept") -# SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") -#ELSE (CMAKE_COMPILER_SUPPORTS_PDBTYPE) +IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) + SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept") + SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") +ELSE (CMAKE_COMPILER_SUPPORTS_PDBTYPE) SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug") SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") -#ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) +ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) # for release and minsize release default to no incremental linking SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT "/INCREMENTAL:NO") SET(CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT "/INCREMENTAL:NO")

1 0

[pschweitzer] 53985: [INFLIB] Fix memory leak
by pschweitzer＠svn.reactos.org 04 Oct '11

04 Oct '11

Author: pschweitzer Date: Tue Oct 4 11:57:26 2011 New Revision: 53985 URL: http://svn.reactos.org/svn/reactos?rev=53985&view=rev Log: [INFLIB] Fix memory leak Modified: trunk/reactos/lib/inflib/infhostgen.c Modified: trunk/reactos/lib/inflib/infhostgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infhostgen.c?re… ============================================================================== --- trunk/reactos/lib/inflib/infhostgen.c [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infhostgen.c [iso-8859-1] Tue Oct 4 11:57:26 2011 @@ -137,6 +137,7 @@ if (FileLength != fread(FileBuffer, (size_t)1, (size_t)FileLength, File)) { DPRINT1("fread() failed (errno %d)\n", errno); + FREE(FileBuffer); fclose(File); return -1; }

1 0

[gadamopoulos] 53984: [shell32] - Remove CS_HREDRAW and CS_VREDRAW stlye from the defview class. Reduces flicker
by gadamopoulos＠svn.reactos.org 04 Oct '11

04 Oct '11

Author: gadamopoulos Date: Tue Oct 4 11:11:18 2011 New Revision: 53984 URL: http://svn.reactos.org/svn/reactos?rev=53984&view=rev Log: [shell32] - Remove CS_HREDRAW and CS_VREDRAW stlye from the defview class. Reduces flicker Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Tue Oct 4 11:11:18 2011 @@ -212,7 +212,7 @@ { static ATL::CWndClassInfo wc = { - { sizeof(WNDCLASSEX), CS_HREDRAW | CS_VREDRAW, StartWindowProc, + { sizeof(WNDCLASSEX), 0, StartWindowProc, 0, 0, NULL, NULL, LoadCursor(NULL, IDC_ARROW), (HBRUSH)(COLOR_BACKGROUND + 1), NULL, SV_CLASS_NAME, NULL }, NULL, NULL, IDC_ARROW, TRUE, 0, _T("")

1 0

[tkreuzer] 53983: [FREELDR] Implement directory buffer caching for FAT
by tkreuzer＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: tkreuzer Date: Mon Oct 3 23:35:27 2011 New Revision: 53983 URL: http://svn.reactos.org/svn/reactos?rev=53983&view=rev Log: [FREELDR] Implement directory buffer caching for FAT Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Mon Oct 3 23:35:27 2011 @@ -370,9 +370,21 @@ } } +typedef struct _DIRECTORY_BUFFER +{ + LIST_ENTRY Link; + PVOID Volume; + ULONG DirectoryStartCluster; + ULONG DirectorySize; + UCHAR Data[]; +} DIRECTORY_BUFFER, *PDIRECTORY_BUFFER; + +LIST_ENTRY DirectoryBufferListHead = {&DirectoryBufferListHead, &DirectoryBufferListHead}; + PVOID FatBufferDirectory(PFAT_VOLUME_INFO Volume, ULONG DirectoryStartCluster, ULONG *DirectorySize, BOOLEAN RootDirectory) { - PVOID DirectoryBuffer; + PDIRECTORY_BUFFER DirectoryBuffer; + PLIST_ENTRY Entry; TRACE("FatBufferDirectory() DirectoryStartCluster = %d RootDirectory = %s\n", DirectoryStartCluster, (RootDirectory ? "TRUE" : "FALSE")); @@ -386,6 +398,23 @@ RootDirectory = FALSE; } + /* Search the list for a match */ + for (Entry = DirectoryBufferListHead.Flink; + Entry != &DirectoryBufferListHead; + Entry = Entry->Flink) + { + DirectoryBuffer = CONTAINING_RECORD(Entry, DIRECTORY_BUFFER, Link); + + /* Check if it matches */ + if ((DirectoryBuffer->Volume == Volume) && + (DirectoryBuffer->DirectoryStartCluster == DirectoryStartCluster)) + { + TRACE("Found cached buffer\n"); + *DirectorySize = DirectoryBuffer->DirectorySize; + return DirectoryBuffer->Data; + } + } + // // Calculate the size of the directory // @@ -402,7 +431,7 @@ // Attempt to allocate memory for directory buffer // TRACE("Trying to allocate (DirectorySize) %d bytes.\n", *DirectorySize); - DirectoryBuffer = MmHeapAlloc(*DirectorySize); + DirectoryBuffer = MmHeapAlloc(*DirectorySize + sizeof(DIRECTORY_BUFFER)); if (DirectoryBuffer == NULL) { @@ -414,7 +443,7 @@ // if (RootDirectory) { - if (!FatReadVolumeSectors(Volume, Volume->RootDirSectorStart, Volume->RootDirSectors, DirectoryBuffer)) + if (!FatReadVolumeSectors(Volume, Volume->RootDirSectorStart, Volume->RootDirSectors, DirectoryBuffer->Data)) { MmHeapFree(DirectoryBuffer); return NULL; @@ -422,14 +451,20 @@ } else { - if (!FatReadClusterChain(Volume, DirectoryStartCluster, 0xFFFFFFFF, DirectoryBuffer)) + if (!FatReadClusterChain(Volume, DirectoryStartCluster, 0xFFFFFFFF, DirectoryBuffer->Data)) { MmHeapFree(DirectoryBuffer); return NULL; } } - return DirectoryBuffer; + /* Enqueue it in the list */ + DirectoryBuffer->Volume = Volume; + DirectoryBuffer->DirectoryStartCluster = DirectoryStartCluster; + DirectoryBuffer->DirectorySize = *DirectorySize; + InsertTailList(&DirectoryBufferListHead, &DirectoryBuffer->Link); + + return DirectoryBuffer->Data; } BOOLEAN FatSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) @@ -774,7 +809,6 @@ { if (!FatXSearchDirectoryBufferForFile(Volume, DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) { - MmHeapFree(DirectoryBuffer); return ENOENT; } } @@ -782,12 +816,9 @@ { if (!FatSearchDirectoryBufferForFile(Volume, DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) { - MmHeapFree(DirectoryBuffer); return ENOENT; } } - - MmHeapFree(DirectoryBuffer); // // If we have another sub-directory to go then

1 0

[tkreuzer] 53982: [FREELDR] Fix a bug, when the memory for a file cluster chain record was freed from the heap although it was still in use. Instead free the buffer when the file is closed.
by tkreuzer＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: tkreuzer Date: Mon Oct 3 22:59:33 2011 New Revision: 53982 URL: http://svn.reactos.org/svn/reactos?rev=53982&view=rev Log: [FREELDR] Fix a bug, when the memory for a file cluster chain record was freed from the heap although it was still in use. Instead free the buffer when the file is closed. Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Mon Oct 3 22:59:33 2011 @@ -804,8 +804,9 @@ return ENOTDIR; } DirectoryStartCluster = FatFileInfo.FileFatChain[0]; - } - MmHeapFree(FatFileInfo.FileFatChain); + MmHeapFree(FatFileInfo.FileFatChain); + FatFileInfo.FileFatChain = NULL; + } } memcpy(FatFileInfoPointer, &FatFileInfo, sizeof(FAT_FILE_INFO)); @@ -1332,6 +1333,7 @@ { PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + if (FileHandle->FileFatChain) MmHeapFree(FileHandle->FileFatChain); MmHeapFree(FileHandle); return ESUCCESS;

1 0

[tkreuzer] 53981: [FREELDR] - Fix bugs in the new heap code and improve it a bit
by tkreuzer＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: tkreuzer Date: Mon Oct 3 22:37:42 2011 New Revision: 53981 URL: http://svn.reactos.org/svn/reactos?rev=53981&view=rev Log: [FREELDR] - Fix bugs in the new heap code and improve it a bit Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] Mon Oct 3 22:37:42 2011 @@ -210,7 +210,7 @@ { PHEAP Heap = HeapHandle; PHEAP_BLOCK Block, NextBlock; - USHORT BlockSize, Remaining; + USHORT BlockSize, PreviousSize = 0, Remaining; /* Check if the allocation is too large */ if ((ByteSize + sizeof(HEAP_BLOCK)) > MAXUSHORT * sizeof(HEAP_BLOCK)) @@ -223,13 +223,16 @@ if (Tag == 0) Tag = 'enoN'; /* Calculate alloc size */ - BlockSize = (USHORT)(ByteSize + sizeof(HEAP_BLOCK) - 1) / sizeof(HEAP_BLOCK); + BlockSize = (USHORT)((ByteSize + sizeof(HEAP_BLOCK) - 1) / sizeof(HEAP_BLOCK)); /* Loop all heap chunks */ for (Block = &Heap->Blocks; Block->Size != 0; Block = Block + 1 + Block->Size) { + ASSERT(Block->PreviousSize == PreviousSize); + PreviousSize = Block->Size; + /* Continue, if its not free */ if (Block->Tag != 0) continue; @@ -252,22 +255,25 @@ NextBlock = Block + 1 + BlockSize; /* Make it a free block */ + NextBlock->Tag = 0; NextBlock->Size = Remaining - 1; NextBlock->PreviousSize = BlockSize; - NextBlock->Tag = 0; + BlockSize = NextBlock->Size; /* Advance to the next block */ - BlockSize = NextBlock->Size; NextBlock = NextBlock + 1 + BlockSize; } else { /* Not enough left, use the full block */ + BlockSize = Block->Size; + + /* Get the next block */ NextBlock = Block + 1 + BlockSize; } /* Update the next blocks back link */ - NextBlock->PreviousSize = Block->Size; + NextBlock->PreviousSize = BlockSize; /* Update heap usage */ Heap->NumAllocs++; @@ -296,6 +302,7 @@ { PHEAP Heap = HeapHandle; PHEAP_BLOCK Block, PrevBlock, NextBlock; + USHORT PreviousSize = 0; TRACE("HeapFree(%p, %p)\n", HeapHandle, Pointer); ASSERT(Tag != 'dnE#'); @@ -303,14 +310,14 @@ if ((Pointer < (PVOID)(Heap + 1)) || (Pointer > (PVOID)((PUCHAR)Heap + Heap->MaximumSize))) { - ERR("Bad free of %p from heap %p\n", Pointer, Heap); + ERR("HEAP: trying to free %p outside of heap %p\n", Pointer, Heap); ASSERT(FALSE); } Block = ((PHEAP_BLOCK)Pointer) - 1; /* Check if the tag matches */ - if (Tag && Block->Tag != Tag) + if (Tag && (Block->Tag != Tag)) { ERR("HEAP: Bad tag! Pointer = %p: block tag '%.4s', requested '%.4s'\n", Pointer, &Block->Tag, &Tag); @@ -341,11 +348,11 @@ } } - /* Check if there is a block before and is free */ + /* Check if there is a block before and it's free */ if ((Block->PreviousSize != 0) && (PrevBlock->Tag == 0)) { /* Check if their combined size if small enough */ - if ((PrevBlock->Size + Block->Size + 2) < MAXUSHORT) + if ((PrevBlock->Size + Block->Size + 1) <= MAXUSHORT) { /* Merge current block into previous */ PrevBlock->Size += Block->Size + 1;

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