Module: wine Branch: master Commit: 9b6455359acc2b28a7a61afc67ab0990e5f55ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6455359acc2b28a7a61afc67... Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 18 00:12:16 2017 +0100 msvcrt: Add stub for Concurrency::Free. 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 | 8 ++++++++ 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index d510a3b..855e366 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -239,8 +239,8 @@ @ stub -arch=win64 ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub -arch=win64 ?DisableTracing(a)Concurrency@@YAJXZ @ stub -arch=win64 ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPAX(a)Z +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPEAX(a)Z @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub -arch=win64 ?GetExecutionContextId(a)Concurrency@@YAIXZ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3875304..d60c2c2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -258,8 +258,8 @@ @ stub ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub ?DisableTracing(a)Concurrency@@YAJXZ @ stub ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) Concurrency_Free +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) Concurrency_Free @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub ?GetExecutionContextId(a)Concurrency@@YAIXZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4026b1b..f9b6613 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -418,8 +418,8 @@ @ stub ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub ?DisableTracing(a)Concurrency@@YAJXZ @ stub ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) Concurrency_Free +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) Concurrency_Free @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub ?GetExecutionContextId(a)Concurrency@@YAIXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 27c800b..48129f6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -416,8 +416,8 @@ @ stub ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub ?DisableTracing(a)Concurrency@@YAJXZ @ stub ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) Concurrency_Free +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) Concurrency_Free @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index dcb391c..7242cb9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -412,8 +412,8 @@ @ stub ?Detach(a)CurrentScheduler@Concurrency@@SAXXZ @ stub ?DisableTracing(a)Concurrency@@YAJXZ @ stub ?EnableTracing(a)Concurrency@@YAJXZ -@ stub -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z -@ stub -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?Free(a)Concurrency@@YAXPAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPAX(a)Z +@ cdecl -arch=win64 ?Free(a)Concurrency@@YAXPEAX(a)Z(ptr) msvcr120.?Free(a)Concurrency@@YAXPEAX(a)Z @ stub -arch=win32 ?Get(a)CurrentScheduler@Concurrency@@SAPAVScheduler(a)2@XZ @ stub -arch=win64 ?Get(a)CurrentScheduler@Concurrency@@SAPEAVScheduler(a)2@XZ @ stub ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index f99f9c3..ba07bb0 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -873,3 +873,11 @@ void * CDECL Concurrency_Alloc(MSVCRT_size_t size) FIXME("(%ld) returning %p\n", size, p); return p; } + +/* ?Free(a)Concurrency@@YAXPAX(a)Z */ +/* ?Free(a)Concurrency@@YAXPEAX(a)Z */ +void CDECL Concurrency_Free(void* mem) +{ + FIXME("(%p) stub\n", mem); + MSVCRT_free(mem); +}