Index: heappage.c =================================================================== --- sdk/lib/rtl/heappage.c (revision 72778) +++ sdk/lib/rtl/heappage.c (working copy) @@ -781,6 +781,11 @@ FreeAllocations--; if (FreeAllocations < LeaveOnFreeList) break; + if (FreeAllocations - LeaveOnFreeList > 0x1000 && FreeAllocations % 0x1000 == 0) + { + DPRINT1("Coalesce... %lu\n", FreeAllocations - LeaveOnFreeList); + } + /* Get the next pointer, because it may be changed after following two calls */ Next = Node->pNextAlloc; Index: sdk/lib/rtl/heap.c =================================================================== --- sdk/lib/rtl/heap.c (revision 72759) +++ sdk/lib/rtl/heap.c (working copy) @@ -1236,6 +1236,8 @@ NTSTATUS Status; ULONG MaxBlockSize; + RtlpPageHeapEnabled = TRUE; + /* Check for a special heap */ if (RtlpPageHeapEnabled && !Addr && !Lock) { @@ -1256,6 +1258,8 @@ Flags &= HEAP_CREATE_VALID_MASK; } + if (!Addr) Flags |= HEAP_FLAG_PAGE_ALLOCS; + /* TODO: Capture parameters, once we decide to use SEH */ if (!Parameters) Parameters = &SafeParams; Index: CMakeLists.txt =================================================================== --- boot/bootdata/CMakeLists.txt (revision 72737) +++ boot/bootdata/CMakeLists.txt (working copy) @@ -5,8 +5,13 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd regtest) +add_custom_target(converted_caroots_inf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf) +add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf + COMMAND native-utf16le "${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf" "${CMAKE_CURRENT_BINARY_DIR}/caroots.inf" + DEPENDS native-utf16le ${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf) +add_cd_file(TARGET converted_caroots_inf FILE ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf DESTINATION reactos NO_CAB FOR all) + add_registry_inf( - caroots.inf hivecls.inf hivedef.inf hivesft.inf Index: txtsetup.sif =================================================================== --- boot/bootdata/txtsetup.sif (revision 72737) +++ boot/bootdata/txtsetup.sif (working copy) @@ -522,6 +522,7 @@ 00000455 = kbdbur.dll [HiveInfs.Install] +AddReg=caroots.inf,AddReg AddReg=registry.inf,AddReg ; EOF Index: usetup.c =================================================================== --- base/setup/usetup/interface/usetup.c (revision 72737) +++ base/setup/usetup/interface/usetup.c (working copy) @@ -3866,8 +3866,11 @@ CopyContext->CompletedOperations++; /* SYSREG checkpoint */ - if (CopyContext->TotalOperations >> 1 == CopyContext->CompletedOperations) - DPRINT1("CHECKPOINT:HALF_COPIED\n"); + if (CopyContext->CompletedOperations >= CopyContext->TotalOperations / 2 && + CopyContext->CompletedOperations % 4 == 0) + { + DPRINT1("CHECKPOINT: Copy progress %lu / %lu\n", CopyContext->CompletedOperations, CopyContext->TotalOperations); + } ProgressNextStep(CopyContext->ProgressBar); SetupUpdateMemoryInfo(CopyContext, FALSE);