From: Gijs Vermeulen Subject: [v2 1/2] msvcrt: Add stub for Concurrency::Alloc Message-Id: <1489702375-436-1-git-send-email-gijsvrm@gmail.com> Date: Thu, 16 Mar 2017 23:12:54 +0100 Signed-off-by: Gijs Vermeulen --- 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/lock.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@details@Concurrency@@QAEXXZ @ stub -arch=win64 ??_F_Scheduler@details@Concurrency@@QEAAXXZ # extern ?AgentEventGuid@Concurrency@@3U_GUID@@B -@ stub -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z -@ stub -arch=win64 ?Alloc@Concurrency@@YAPEAX_K@Z +@ cdecl -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z(long) msvcr120.?Alloc@Concurrency@@YAPAXI@Z +@ cdecl -arch=win64 ?Alloc@Concurrency@@YAPEAX_K@Z(long) msvcr120.?Alloc@Concurrency@@YAPEAX_K@Z @ stub -arch=win64 ?Block@Context@Concurrency@@SAXXZ # extern ?ChoreEventGuid@Concurrency@@3U_GUID@@B # extern ?ConcRTEventGuid@Concurrency@@3U_GUID@@B diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 729d16f..82b0c63 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -242,8 +242,8 @@ @ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg @ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete @ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete -@ stub -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z -@ stub -arch=win64 ?Alloc@Concurrency@@YAPEAX_K@Z +@ cdecl -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z(long) Alloc +@ cdecl -arch=win64 ?Alloc@Concurrency@@YAPEAX_K@Z(long) Alloc @ stub ?Block@Context@Concurrency@@SAXXZ @ stub -arch=win32 ?Create@CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy@2@@Z @ stub -arch=win64 ?Create@CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy@2@@Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1cb8281..26ad442 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -400,8 +400,8 @@ @ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete @ stub -arch=win32 ??_V@YAXPAXHPBDH@Z @ stub -arch=win64 ??_V@YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z -@ stub -arch=win64 ?Alloc@Concurrency@@YAPEAX_K@Z +@ cdecl -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z(long) Alloc +@ cdecl -arch=win64 ?Alloc@Concurrency@@YAPEAX_K@Z(long) Alloc @ stub ?Block@Context@Concurrency@@SAXXZ @ stub -arch=win32 ?Create@CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy@2@@Z @ stub -arch=win64 ?Create@CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy@2@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4b744eb..6a105fb 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -396,8 +396,8 @@ @ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete @ stub -arch=win32 ??_V@YAXPAXHPBDH@Z @ stub -arch=win64 ??_V@YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z -@ stub -arch=win64 ?Alloc@Concurrency@@YAPEAX_K@Z +@ cdecl -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z(long) Alloc +@ cdecl -arch=win64 ?Alloc@Concurrency@@YAPEAX_K@Z(long) Alloc @ stub ?Block@Context@Concurrency@@SAXXZ @ stub -arch=win32 ?CaptureCallstack@platform@details@Concurrency@@YAIPAPAXII@Z @ stub -arch=win64 ?CaptureCallstack@platform@details@Concurrency@@YA_KPEAPEAX_K1@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 46a76da..435d989 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -393,8 +393,8 @@ @ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) msvcr120.??_V@YAXPEAX@Z @ stub -arch=win32 ??_V@YAXPAXHPBDH@Z @ stub -arch=win64 ??_V@YAXPEAXHPEBDH@Z -@ stub -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z -@ stub -arch=win64 ?Alloc@Concurrency@@YAPEAX_K@Z +@ cdecl -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z(long) msvcr120.?Alloc@Concurrency@@YAPAXI@Z +@ cdecl -arch=win64 ?Alloc@Concurrency@@YAPEAX_K@Z(long) msvcr120.?Alloc@Concurrency@@YAPAXI@Z @ stub ?Block@Context@Concurrency@@SAXXZ @ stub ?CaptureCallstack@platform@details@Concurrency@@YAIPAPAXII@Z @ stub -arch=win32 ?Create@CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy@2@@Z diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index d9fe05d..a25d9cd 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -607,6 +607,15 @@ int __cdecl event_wait_for_multiple(event **events, MSVCRT_size_t count, MSVCRT_ return COOPERATIVE_WAIT_TIMEOUT; } +/* ?Alloc@Concurrency@@YAPAXI@Z */ +/* ?Alloc@Concurrency@@YAPEAX_K@Z */ +void * __cdecl Alloc(MSVCRT_size_t _NumBytes) +{ + void *p = MSVCRT_malloc(_NumBytes); + FIXME("(%ld, %p) stub\n", _NumBytes, p); + return p; +} + #endif #if _MSVCR_VER >= 110 -- 1.7.12.4 (Apple Git-37)