Module: wine Branch: stable Commit: f7f505994adf0762e14748d511da295db17cecec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f505994adf0762e14748d511...
Author: Alex Henrie alexhenrie24@gmail.com Date: Thu Jun 16 18:02:24 2016 -0600
ucrtbase: Implement _malloc_base.
Signed-off-by: Alex Henrie alexhenrie24@gmail.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 5325b8c95112be75f4fa0e2e2e45bcc88434fb5d) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 2 +- dlls/msvcrt/heap.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 10 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/msvcrt/heap.c b/dlls/msvcrt/heap.c index 01f06c8..d7d67cf 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -425,6 +425,14 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) }
/********************************************************************* + * _malloc_base (UCRTBASE.@) + */ +void* CDECL _malloc_base(MSVCRT_size_t size) +{ + return MSVCRT_malloc(size); +} + +/********************************************************************* * realloc (MSVCRT.@) */ void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d2b16c1..5746a7b 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) @ cdecl _mbbtombc(long) @ stub _mbbtombc_l @ cdecl _mbbtype(long long)