msvcrt: Don't lock the heap in operator_new.

The native msvcrt/msvcp allow two threads to be calling the new handler simultaneously. Signed-off-by: Martin Storsjo <martin@martin.st> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Don't lock the heap in operator_new.
91ed0d79 · Martin Storsjo · Alexandre Julliard · e66758dd · 91ed0d79
Commit 91ed0d79 authored Nov 06, 2015 by Martin Storsjo Committed by Alexandre Julliard Nov 09, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

heap.c dlls/msvcrt/heap.c +4 -4

No files found.
--- a/dlls/msvcrt/heap.c
+++ b/dlls/msvcrt/heap.c
@@ -131,6 +131,7 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size)
 {
  void *retval;
  int freed;
+  MSVCRT_new_handler_func handler;

  do
  {
@@ -141,12 +142,11 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size)
      return retval;
    }

-    LOCK_HEAP;
-    if(MSVCRT_new_handler)
-      freed = (*MSVCRT_new_handler)(size);
+    handler = MSVCRT_new_handler;
+    if(handler)
+      freed = (*handler)(size);
    else
      freed = 0;
-    UNLOCK_HEAP;
  } while(freed);

  TRACE("(%ld) out of memory\n", size);