[ros-diffs] [reactos] 02/07: [CRT] reduce diff to wine of heap code

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf40758d76c5f5130678a3...

commit cf40758d76c5f5130678a3c1b2d86c3266bb58d8
Author:     Timo Kreuzer [e-mail]
AuthorDate: Tue Jan 10 10:33:07 2023 +0200
Commit:     Timo Kreuzer [e-mail]
CommitDate: Tue Jan 24 18:53:13 2023 +0100

[CRT] reduce diff to wine of heap code

No functional changes intended.
---
 sdk/lib/crt/wine/heap.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/sdk/lib/crt/wine/heap.c b/sdk/lib/crt/wine/heap.c
index 43c321fb9c9..8f31f3e30cf 100644
--- a/sdk/lib/crt/wine/heap.c
+++ b/sdk/lib/crt/wine/heap.c
@@ -62,7 +62,7 @@ typedef int (CDECL *MSVCRT_new_handler_func)(MSVCRT_size_t size);
 static MSVCRT_new_handler_func MSVCRT_new_handler;
 static int MSVCRT_new_mode;

-/* FIXME - According to documentation it should be 8*1024, at runtime it returns 16 */
+/* FIXME - According to documentation it should be 8*1024, at runtime it returns 16 */ 
 static unsigned int MSVCRT_amblksiz = 16;
 /* FIXME - According to documentation it should be 480 bytes, at runtime default is 0 */
 static MSVCRT_size_t MSVCRT_sbh_threshold = 0;
@@ -74,6 +74,7 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size)
 {
   void *retval;
   int freed;
+  MSVCRT_new_handler_func handler;

do
   {
@@ -85,14 +86,18 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size)
     }

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);
+#if _MSVCR_VER >= 80
+  throw_bad_alloc("bad allocation");
+#endif
   return NULL;
 }

@@ -174,9 +179,11 @@ int CDECL MSVCRT__set_new_mode(int mode)
  */
 int CDECL _callnewh(MSVCRT_size_t size)
 {
-  if(MSVCRT_new_handler)
-    (*MSVCRT_new_handler)(size);
-  return 0;
+  int ret = 0;
+  MSVCRT_new_handler_func handler = MSVCRT_new_handler;
+  if(handler)
+    ret = (*handler)(size) ? 1 : 0;
+  return ret;
 }

/*********************************************************************
@@ -285,7 +292,7 @@ int CDECL _heapadd(void* mem, MSVCRT_size_t size)
 }

/*********************************************************************
- *		_heapadd (MSVCRT.@)
+ *		_get_heap_handle (MSVCRT.@)
  */
 MSVCRT_intptr_t CDECL _get_heap_handle(void)
 {