[PATCH 4/5] ntdll: Increase heap default size.

[Rémi Bernon]

From: Rémi Bernon <rbernon at codeweavers.com>

Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 dlls/kernel32/tests/heap.c | 7 +++----
 dlls/ntdll/heap.c          | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c
index 795d758a4f2..7b350119a2d 100644
--- a/dlls/kernel32/tests/heap.c
+++ b/dlls/kernel32/tests/heap.c
@@ -2175,10 +2175,9 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags
         expect_size = max( alloc_size, 2 * sizeof(void *) );
         expect_size = ALIGN_BLOCK_SIZE( expect_size + extra_size );
         diff = min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) );
-        todo_wine_if( (heap_flags & (HEAP_VALIDATE_PARAMS|HEAP_VALIDATE_ALL)) ||
-                      ((global_flags & ~FLG_HEAP_ENABLE_TAIL_CHECK) && alloc_size < 0x10000) ||
-                      (!global_flags && alloc_size < 2 * sizeof(void *)) ||
-                      (alloc_size == 0xfd000 && sizeof(void *) == 8) )
+        todo_wine_if( ((heap_flags & (HEAP_VALIDATE_ALL|HEAP_VALIDATE_PARAMS)) && alloc_size == 0x20000 * sizeof(void *) - 0x3000) ||
+                      (!(global_flags & ~FLG_HEAP_ENABLE_FREE_CHECK) && alloc_size < 2 * sizeof(void *)) ||
+                      (alloc_size == 0x7e8 && sizeof(void *) == 8) )
         ok( diff == expect_size, "got diff %#Ix exp %#Ix\n", diff, expect_size );
 
         ok( !memcmp( ptr0 + alloc_size, tail_buf, tail_size ), "missing block tail\n" );
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index e33fa0c76b3..f8f7a83dad3 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -208,7 +208,7 @@ C_ASSERT( offsetof(HEAP, subheap) <= COMMIT_MASK );
 
 #define HEAP_MAGIC       ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24)))
 
-#define HEAP_DEF_SIZE        0x110000   /* Default heap size = 1Mb + 64Kb */
+#define HEAP_DEF_SIZE        0x400000
 #define MAX_FREE_PENDING     1024    /* max number of free requests to delay */
 
 /* some undocumented flags (names are made up) */
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/151