From 389b039fe41c840a0ab1f023360eee4c9502bcb6 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 4 Mar 2001 01:06:07 +0000 Subject: [PATCH] We need to create the system heap at startup even though we don't use it, since some Win95 native dlls depend on that. --- dlls/kernel/kernel_main.c | 3 +++ memory/heap.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c index 1cbd81441a9..0a69fa97ab5 100644 --- a/dlls/kernel/kernel_main.c +++ b/dlls/kernel/kernel_main.c @@ -83,6 +83,9 @@ static BOOL process_attach(void) /* Create 16-bit task */ TASK_CreateMainTask(); + /* Create the shared heap for broken win95 native dlls */ + HeapCreate( HEAP_SHARED, 0, 0 ); + return TRUE; } diff --git a/memory/heap.c b/memory/heap.c index f17e52eefc5..66e1f45146b 100644 --- a/memory/heap.c +++ b/memory/heap.c @@ -1074,8 +1074,8 @@ HANDLE WINAPI HeapCreate( SUBHEAP *subheap; if ( flags & HEAP_SHARED ) { - WARN( "Shared Heap requested, returning system heap.\n" ); if (!systemHeap) HEAP_CreateSystemHeap(); + else WARN( "Shared Heap requested, returning system heap.\n" ); return (HANDLE)systemHeap; }