[PATCH 1/7] ntdll: Split heap region memory allocation to allocate_region helper.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/ntdll/heap.c | 58 +++++++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index 1de9fe6a4b6..af95e78d7e9 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -832,22 +832,44 @@ static inline void shrink_used_block( struct heap *heap, ULONG flags, struct blo
 }

+static NTSTATUS allocate_region( ULONG flags, SIZE_T *commit_size, SIZE_T *reserve_size, void **addr )
+{
+    NTSTATUS status;
+
+    if (!(flags & HEAP_GROWABLE)) return STATUS_NO_MEMORY;
+
+    if (reserve_size) *commit_size = min( *commit_size, *reserve_size );
+    *addr = NULL;
+
+    /* allocate the memory block */
+    if (reserve_size && *reserve_size != *commit_size &&
+        (status = NtAllocateVirtualMemory( NtCurrentProcess(), addr, 0, reserve_size, MEM_RESERVE,
+                                           get_protection_type( flags ) )))
+    {
+        WARN( "Could not allocate %#Ix bytes, status %#lx\n", *reserve_size, status );
+        return status;
+    }
+    if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), addr, 0, commit_size, MEM_COMMIT,
+                                           get_protection_type( flags ) )))
+    {
+        WARN( "Could not commit %#Ix bytes, status %#lx\n", *commit_size, status );
+        return status;
+    }
+
+    return status;
+}
+
+
 static NTSTATUS heap_allocate_large( struct heap *heap, ULONG flags, SIZE_T block_size,
                                      SIZE_T size, void **ret )
 {
     ARENA_LARGE *arena;
     SIZE_T total_size = ROUND_SIZE( sizeof(*arena) + size, REGION_ALIGN - 1 );
-    LPVOID address = NULL;
     struct block *block;
+    void *address;

-    if (!(flags & HEAP_GROWABLE)) return STATUS_NO_MEMORY;
     if (total_size < size) return STATUS_NO_MEMORY;  /* overflow */
-    if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &total_size, MEM_COMMIT,
-                                 get_protection_type( heap->flags ) ))
-    {
-        WARN( "Could not allocate block for %#Ix bytes\n", size );
-        return STATUS_NO_MEMORY;
-    }
+    if (allocate_region( flags, &total_size, NULL, &address )) return STATUS_NO_MEMORY;

arena = address;
     block = &arena->block;
@@ -937,24 +959,12 @@ static SUBHEAP *HEAP_CreateSubHeap( struct heap **heap_ptr, LPVOID address, DWOR

if (!address)
     {
-        if (!commitSize) commitSize = REGION_ALIGN;
-        totalSize = min( totalSize, 0xffff0000 );  /* don't allow a heap larger than 4GB */
-        if (totalSize < commitSize) totalSize = commitSize;
-        commitSize = min( totalSize, (SIZE_T)ROUND_ADDR( commitSize + REGION_ALIGN - 1, REGION_ALIGN - 1 ) );
+        commitSize = ROUND_SIZE( max( commitSize, REGION_ALIGN ), REGION_ALIGN - 1 );
+        totalSize = min( max( commitSize, totalSize ), 0xffff0000 );  /* don't allow a heap larger than 4GB */

/* allocate the memory block */
-        if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize, MEM_RESERVE,
-                                     get_protection_type( flags ) ))
-        {
-            WARN( "Could not allocate %#Ix bytes\n", totalSize );
-            return NULL;
-        }
-        if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &commitSize, MEM_COMMIT,
-                                     get_protection_type( flags ) ))
-        {
-            WARN( "Could not commit %#Ix bytes for sub-heap %p\n", commitSize, address );
-            return NULL;
-        }
+        if (!heap) flags |= HEAP_GROWABLE;
+        if (allocate_region( flags, &commitSize, &totalSize, &address )) return NULL;
     }

if (heap)