Alexandre Julliard : ntdll: Merge HEAP_InitSubHeap and HEAP_CreateSubHeap.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bb98004249cfed7db9722e35a81bcc74edf949e7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bb98004249cfed7db9722e35a81bcc74edf949e7

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Oct 31 13:00:15 2008 +0100

ntdll: Merge HEAP_InitSubHeap and HEAP_CreateSubHeap.

---

 dlls/ntdll/heap.c |   74 +++++++++++++++++-----------------------------------
 1 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index fdd7946..7abe85d 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -755,24 +755,37 @@ static BOOL validate_large_arena( HEAP *heap, const ARENA_LARGE *arena, BOOL qui
 
 
 /***********************************************************************
- *           HEAP_InitSubHeap
+ *           HEAP_CreateSubHeap
  */
-static SUBHEAP *HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags,
-                                  SIZE_T commitSize, SIZE_T totalSize )
+static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags,
+                                    SIZE_T commitSize, SIZE_T totalSize )
 {
     SUBHEAP *subheap;
     FREE_LIST_ENTRY *pEntry;
     unsigned int i;
 
-    /* Commit memory */
-
-    if (flags & HEAP_SHARED)
-        commitSize = totalSize;  /* always commit everything in a shared heap */
-    if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0,
-                                 &commitSize, MEM_COMMIT, get_protection_type( flags ) ))
+    if (!address)
     {
-        WARN("Could not commit %08lx bytes for sub-heap %p\n", commitSize, address );
-        return NULL;
+        /* round-up sizes on a 64K boundary */
+        totalSize  = (totalSize + 0xffff) & 0xffff0000;
+        commitSize = (commitSize + 0xffff) & 0xffff0000;
+        if (!commitSize) commitSize = 0x10000;
+        if (totalSize < commitSize) totalSize = commitSize;
+        if (flags & HEAP_SHARED) commitSize = totalSize;  /* always commit everything in a shared heap */
+
+        /* allocate the memory block */
+        if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize,
+                                     MEM_RESERVE, get_protection_type( flags ) ))
+        {
+            WARN("Could not allocate %08lx bytes\n", totalSize );
+            return NULL;
+        }
+        if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0,
+                                     &commitSize, MEM_COMMIT, get_protection_type( flags ) ))
+        {
+            WARN("Could not commit %08lx bytes for sub-heap %p\n", commitSize, address );
+            return NULL;
+        }
     }
 
     if (heap)
@@ -857,45 +870,6 @@ static SUBHEAP *HEAP_InitSubHeap( HEAP *heap, LPVOID address, DWORD flags,
     return subheap;
 }
 
-/***********************************************************************
- *           HEAP_CreateSubHeap
- *
- * Create a sub-heap of the given size.
- * If heap == NULL, creates a main heap.
- */
-static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, void *base, DWORD flags,
-                                    SIZE_T commitSize, SIZE_T totalSize )
-{
-    LPVOID address = base;
-    SUBHEAP *ret;
-
-    /* round-up sizes on a 64K boundary */
-    totalSize  = (totalSize + 0xffff) & 0xffff0000;
-    commitSize = (commitSize + 0xffff) & 0xffff0000;
-    if (!commitSize) commitSize = 0x10000;
-    if (totalSize < commitSize) totalSize = commitSize;
-
-    if (!address)
-    {
-        /* allocate the memory block */
-        if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize,
-                                     MEM_RESERVE, get_protection_type( flags ) ))
-        {
-            WARN("Could not allocate %08lx bytes\n", totalSize );
-            return NULL;
-        }
-    }
-
-    /* Initialize subheap */
-
-    if (!(ret = HEAP_InitSubHeap( heap, address, flags, commitSize, totalSize )))
-    {
-        SIZE_T size = 0;
-        if (!base) NtFreeVirtualMemory( NtCurrentProcess(), &address, &size, MEM_RELEASE );
-    }
-    return ret;
-}
-
 
 /***********************************************************************
  *           HEAP_FindFreeBlock