[PATCH 3/4] ucrtbase: Forward _malloc_base to MSVCRT_malloc.

Alex Henrie alexhenrie24 at gmail.com
Tue Jun 14 13:28:14 CDT 2016


Cc: Piotr Caban <piotr at codeweavers.com>

For https://bugs.winehq.org/show_bug.cgi?id=40796

The Windows 10 SDK helpfully explains that malloc simply wraps
_malloc_dbg if _DEBUG is defined and _malloc_base if _DEBUG is not
defined. Since Wine will not be implementing _malloc_dbg because it is
only available in debug builds of the C runtime library, we can make
_malloc_base wrap malloc instead.

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 2 +-
 dlls/ucrtbase/ucrtbase.spec                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec
index 85b2b83..6dbd207 100644
--- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec
+++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec
@@ -14,7 +14,7 @@
 @ cdecl _heapchk() ucrtbase._heapchk
 @ cdecl _heapmin() ucrtbase._heapmin
 @ cdecl _heapwalk(ptr) ucrtbase._heapwalk
-@ stub _malloc_base
+@ cdecl _malloc_base(long) ucrtbase._malloc_base
 @ cdecl _msize(ptr) ucrtbase._msize
 @ stub _query_new_handler
 @ stub _query_new_mode
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 365674b..4d9b25a 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -580,7 +580,7 @@
 @ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s
 @ cdecl _makepath(ptr str str str str) MSVCRT__makepath
 @ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s
-@ stub _malloc_base
+@ cdecl _malloc_base(long) MSVCRT_malloc
 @ cdecl _mbbtombc(long)
 @ stub _mbbtombc_l
 @ cdecl _mbbtype(long long)
-- 
2.8.3




More information about the wine-patches mailing list