Alex Henrie : ucrtbase: Implement _calloc_base.
Alexandre Julliard
julliard at winehq.org
Mon Aug 22 07:32:38 CDT 2016
Module: wine
Branch: stable
Commit: df6d1a9aca37300089f6665655f9f4ad0a050c5f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6d1a9aca37300089f6665655f9f4ad0a050c5f
Author: Alex Henrie <alexhenrie24 at gmail.com>
Date: Thu Jun 16 18:02:23 2016 -0600
ucrtbase: Implement _calloc_base.
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit fdc57d497bb305e90680c3b450fa172042fd79cd)
Signed-off-by: Michael Stefaniuc <mstefani at 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 18ca9d4..85b2b83 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
@@ -7,7 +7,7 @@
@ cdecl _aligned_realloc(ptr long long) ucrtbase._aligned_realloc
@ stub _aligned_recalloc
@ cdecl _callnewh(long) ucrtbase._callnewh
-@ stub _calloc_base
+@ cdecl _calloc_base(long long) ucrtbase._calloc_base
@ cdecl _expand(ptr long) ucrtbase._expand
@ stub _free_base
@ cdecl _get_heap_handle() ucrtbase._get_heap_handle
diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c
index a908846..01f06c8 100644
--- a/dlls/msvcrt/heap.c
+++ b/dlls/msvcrt/heap.c
@@ -398,6 +398,14 @@ void* CDECL MSVCRT_calloc(MSVCRT_size_t size, MSVCRT_size_t count)
}
/*********************************************************************
+ * _calloc_base (UCRTBASE.@)
+ */
+void* CDECL _calloc_base(MSVCRT_size_t count, MSVCRT_size_t size)
+{
+ return MSVCRT_calloc(count, size);
+}
+
+/*********************************************************************
* free (MSVCRT.@)
*/
void CDECL MSVCRT_free(void* ptr)
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 159ca79..d2b16c1 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -211,7 +211,7 @@
@ cdecl _c_exit() MSVCRT__c_exit
@ cdecl _cabs(long) MSVCRT__cabs
@ cdecl _callnewh(long)
-@ stub _calloc_base
+@ cdecl _calloc_base(long long)
@ cdecl _cexit() MSVCRT__cexit
@ cdecl _cgets(ptr)
@ stub _cgets_s
More information about the wine-cvs
mailing list