Gijs Vermeulen : msvcrt: Add stub for Concurrency::Alloc.
Module: wine Branch: master Commit: 32a4bec9099676ce1ade3fbd2871195f9596686c URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a4bec9099676ce1ade3fbd28... Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 18 12:27:44 2017 +0100 msvcrt: Add stub for Concurrency::Alloc. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/heap.c | 9 +++++++++ 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index dd8d13a..d510a3b 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -217,8 +217,8 @@ @ stub -arch=i386 ??_F_Scheduler(a)details@Concurrency@@QAEXXZ @ stub -arch=win64 ??_F_Scheduler(a)details@Concurrency@@QEAAXXZ # extern ?AgentEventGuid(a)Concurrency@@3U_GUID@@B -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPAXI(a)Z +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPEAX_K(a)Z @ stub -arch=win64 ?Block(a)Context@Concurrency@@SAXXZ # extern ?ChoreEventGuid(a)Concurrency@@3U_GUID@@B # extern ?ConcRTEventGuid(a)Concurrency@@3U_GUID@@B diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 729d16f..3875304 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -242,8 +242,8 @@ @ cdecl -arch=win64 ??_U(a)YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg @ cdecl -arch=win32 ??_V(a)YAXPAX@Z(ptr) MSVCRT_operator_delete @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCRT_operator_delete -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) Concurrency_Alloc +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) Concurrency_Alloc @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z @ stub -arch=win64 ?Create(a)CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy(a)2@@Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index fa3206d..4026b1b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -400,8 +400,8 @@ @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCRT_operator_delete @ stub -arch=win32 ??_V(a)YAXPAXHPBDH@Z @ stub -arch=win64 ??_V(a)YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) Concurrency_Alloc +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) Concurrency_Alloc @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z @ stub -arch=win64 ?Create(a)CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy(a)2@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 84edf51..27c800b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -396,8 +396,8 @@ @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCRT_operator_delete @ stub -arch=win32 ??_V(a)YAXPAXHPBDH@Z @ stub -arch=win64 ??_V(a)YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) Concurrency_Alloc +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) Concurrency_Alloc @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub -arch=win32 ?CaptureCallstack(a)platform@details(a)Concurrency@@YAIPAPAXII(a)Z @ stub -arch=win64 ?CaptureCallstack(a)platform@details(a)Concurrency@@YA_KPEAPEAX_K1(a)Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 46a76da..dcb391c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -393,8 +393,8 @@ @ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) msvcr120.??_V(a)YAXPEAX@Z @ stub -arch=win32 ??_V(a)YAXPAXHPBDH@Z @ stub -arch=win64 ??_V(a)YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z -@ stub -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z +@ cdecl -arch=win32 ?Alloc(a)Concurrency@@YAPAXI(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPAXI(a)Z +@ cdecl -arch=win64 ?Alloc(a)Concurrency@@YAPEAX_K(a)Z(long) msvcr120.?Alloc(a)Concurrency@@YAPEAX_K(a)Z @ stub ?Block(a)Context@Concurrency@@SAXXZ @ stub ?CaptureCallstack(a)platform@details(a)Concurrency@@YAIPAPAXII(a)Z @ stub -arch=win32 ?Create(a)CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy(a)2@@Z diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 3ae2599..f99f9c3 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -864,3 +864,12 @@ void msvcrt_destroy_heap(void) if(sb_heap) HeapDestroy(sb_heap); } + +/* ?Alloc(a)Concurrency@@YAPAXI(a)Z */ +/* ?Alloc(a)Concurrency@@YAPEAX_K(a)Z */ +void * CDECL Concurrency_Alloc(MSVCRT_size_t size) +{ + void *p = MSVCRT_malloc(size); + FIXME("(%ld) returning %p\n", size, p); + return p; +}
participants (1)
-
Alexandre Julliard