diff --git a/base/setup/usetup/interface/usetup.c b/base/setup/usetup/interface/usetup.c index 38085569d7..09f445b0d4 100644 --- a/base/setup/usetup/interface/usetup.c +++ b/base/setup/usetup/interface/usetup.c @@ -3869,8 +3869,11 @@ FileCopyCallback(PVOID Context, 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); diff --git a/boot/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt index 42dbfff18b..fd5696b46f 100644 --- a/boot/bootdata/CMakeLists.txt +++ b/boot/bootdata/CMakeLists.txt @@ -5,8 +5,13 @@ add_subdirectory(packages) 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 diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 7a86befd28..fc2aa63284 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -523,6 +523,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 0000048F = kbdeo.dll [HiveInfs.Install] +AddReg=caroots.inf,AddReg AddReg=registry.inf,AddReg ; EOF diff --git a/sdk/lib/rtl/heap.c b/sdk/lib/rtl/heap.c index 1c6df2996f..2f9aca2531 100644 --- a/sdk/lib/rtl/heap.c +++ b/sdk/lib/rtl/heap.c @@ -1236,6 +1236,8 @@ RtlCreateHeap(ULONG Flags, NTSTATUS Status; ULONG MaxBlockSize; + RtlpPageHeapEnabled = TRUE; + /* Check for a special heap */ if (RtlpPageHeapEnabled && !Addr && !Lock) { @@ -1256,6 +1258,11 @@ RtlCreateHeap(ULONG Flags, Flags &= HEAP_CREATE_VALID_MASK; } + if (!Addr) + { + Flags |= HEAP_FLAG_PAGE_ALLOCS; + } + /* Capture parameters */ if (Parameters) { diff --git a/sdk/lib/rtl/heappage.c b/sdk/lib/rtl/heappage.c index 08857e7d6b..b19cadda80 100644 --- a/sdk/lib/rtl/heappage.c +++ b/sdk/lib/rtl/heappage.c @@ -781,6 +781,11 @@ RtlpDphCoalesceFreeIntoAvailable(PDPH_HEAP_ROOT DphRoot, 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;