[PATCH v2 3/8] ntdll: Introduce a new heap free_list_init helper.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/ntdll/heap.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index 474b8da6ec4..8f3c549b7ab 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -502,7 +502,7 @@ static inline struct entry *find_free_list( struct heap *heap, SIZE_T block_size

if (block_size <= HEAP_MAX_SMALL_FREE_LIST)
         i = (block_size - HEAP_MIN_BLOCK_SIZE) / BLOCK_ALIGN;
-    else for (i = HEAP_NB_SMALL_FREE_LISTS; i < HEAP_NB_FREE_LISTS - 1; i++)
+    else for (i = HEAP_NB_SMALL_FREE_LISTS; i < ARRAY_SIZE(heap->free_lists) - 1; i++)
         if (block_size <= free_list_sizes[i - HEAP_NB_SMALL_FREE_LISTS]) break;

list = heap->free_lists + i;
@@ -510,6 +510,15 @@ static inline struct entry *find_free_list( struct heap *heap, SIZE_T block_size
     return list;
 }

+static void free_list_init( struct entry *entry )
+{
+    list_init( &entry->entry );
+    block_set_flags( &entry->block, ~0, BLOCK_FLAG_FREE_LINK );
+    block_set_size( &entry->block, 0 );
+    block_set_base( &entry->block, &entry );
+    block_set_type( &entry->block, BLOCK_TYPE_FREE );
+}
+
 /* get the memory protection type to use for a given heap */
 static inline ULONG get_protection_type( DWORD flags )
 {
@@ -565,10 +574,13 @@ static void heap_dump( const struct heap *heap )
     TRACE( "  next %p\n", LIST_ENTRY( heap->entry.next, struct heap, entry ) );

TRACE( "  free_lists: %p\n", heap->free_lists );
-    for (i = 0; i < HEAP_NB_FREE_LISTS; i++)
+    for (i = 0; i < ARRAY_SIZE(heap->free_lists); i++)
+    {
         TRACE( "    %p: size %#8Ix, prev %p, next %p\n", heap->free_lists + i, get_free_list_block_size( i ),
                LIST_ENTRY( heap->free_lists[i].entry.prev, struct entry, entry ),
                LIST_ENTRY( heap->free_lists[i].entry.next, struct entry, entry ) );
+    }
+

TRACE( "  subheaps: %p\n", &heap->subheap_list );
     LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry )
@@ -1042,7 +1054,9 @@ static BOOL is_valid_free_block( const struct heap *heap, const struct block *bl
     unsigned int i;

if ((subheap = find_subheap( heap, block, FALSE ))) return TRUE;
-    for (i = 0; i < HEAP_NB_FREE_LISTS; i++) if (block == &heap->free_lists[i].block) return TRUE;
+    for (i = 0; i < ARRAY_SIZE(heap->free_lists); i++)
+        if (block == &heap->free_lists[i].block) return TRUE;
+
     return FALSE;
 }

@@ -1382,13 +1396,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, void *addr, SIZE_T total_size, SIZE_T
     list_init( &heap->subheap_list );
     list_init( &heap->large_list );

-    list_init( &heap->free_lists[0].entry );
     for (i = 0, entry = heap->free_lists; i < HEAP_NB_FREE_LISTS; i++, entry++)
     {
-        block_set_flags( &entry->block, ~0, BLOCK_FLAG_FREE_LINK );
-        block_set_size( &entry->block, 0 );
-        block_set_type( &entry->block, BLOCK_TYPE_FREE );
-        block_set_base( &entry->block, heap );
+        free_list_init( entry );
         if (i) list_add_after( &entry[-1].entry, &entry->entry );
     }