[v2 1/2] msvcrt: Add stub for Concurrency::Alloc
Gijs Vermeulen
gijsvrm at gmail.com
Thu Mar 16 17:12:54 CDT 2017
Signed-off-by: Gijs Vermeulen <gijsvrm at gmail.com>
---
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 at details@Concurrency@@QAEXXZ
@ stub -arch=win64 ??_F_Scheduler at details@Concurrency@@QEAAXXZ
# extern ?AgentEventGuid at Concurrency@@3U_GUID@@B
-@ stub -arch=win32 ?Alloc at Concurrency@@YAPAXI at Z
-@ stub -arch=win64 ?Alloc at Concurrency@@YAPEAX_K at Z
+@ cdecl -arch=win32 ?Alloc at Concurrency@@YAPAXI at Z(long) msvcr120.?Alloc at Concurrency@@YAPAXI at Z
+@ cdecl -arch=win64 ?Alloc at Concurrency@@YAPEAX_K at Z(long) msvcr120.?Alloc at Concurrency@@YAPEAX_K at Z
@ stub -arch=win64 ?Block at Context@Concurrency@@SAXXZ
# extern ?ChoreEventGuid at Concurrency@@3U_GUID@@B
# extern ?ConcRTEventGuid at 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 at YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
@ cdecl -arch=win32 ??_V at YAXPAX@Z(ptr) MSVCRT_operator_delete
@ cdecl -arch=win64 ??_V at YAXPEAX@Z(ptr) MSVCRT_operator_delete
-@ stub -arch=win32 ?Alloc at Concurrency@@YAPAXI at Z
-@ stub -arch=win64 ?Alloc at Concurrency@@YAPEAX_K at Z
+@ cdecl -arch=win32 ?Alloc at Concurrency@@YAPAXI at Z(long) Alloc
+@ cdecl -arch=win64 ?Alloc at Concurrency@@YAPEAX_K at Z(long) Alloc
@ stub ?Block at Context@Concurrency@@SAXXZ
@ stub -arch=win32 ?Create at CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy at 2@@Z
@ stub -arch=win64 ?Create at CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy at 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 at YAXPEAX@Z(ptr) MSVCRT_operator_delete
@ stub -arch=win32 ??_V at YAXPAXHPBDH@Z
@ stub -arch=win64 ??_V at YAXPEAXHPEBDH@Z
-@ stub -arch=win32 ?Alloc at Concurrency@@YAPAXI at Z
-@ stub -arch=win64 ?Alloc at Concurrency@@YAPEAX_K at Z
+@ cdecl -arch=win32 ?Alloc at Concurrency@@YAPAXI at Z(long) Alloc
+@ cdecl -arch=win64 ?Alloc at Concurrency@@YAPEAX_K at Z(long) Alloc
@ stub ?Block at Context@Concurrency@@SAXXZ
@ stub -arch=win32 ?Create at CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy at 2@@Z
@ stub -arch=win64 ?Create at CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy at 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 at YAXPEAX@Z(ptr) MSVCRT_operator_delete
@ stub -arch=win32 ??_V at YAXPAXHPBDH@Z
@ stub -arch=win64 ??_V at YAXPEAXHPEBDH@Z
-@ stub -arch=win32 ?Alloc at Concurrency@@YAPAXI at Z
-@ stub -arch=win64 ?Alloc at Concurrency@@YAPEAX_K at Z
+@ cdecl -arch=win32 ?Alloc at Concurrency@@YAPAXI at Z(long) Alloc
+@ cdecl -arch=win64 ?Alloc at Concurrency@@YAPEAX_K at Z(long) Alloc
@ stub ?Block at Context@Concurrency@@SAXXZ
@ stub -arch=win32 ?CaptureCallstack at platform@details at Concurrency@@YAIPAPAXII at Z
@ stub -arch=win64 ?CaptureCallstack at platform@details at Concurrency@@YA_KPEAPEAX_K1 at 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 at YAXPEAX@Z(ptr) msvcr120.??_V at YAXPEAX@Z
@ stub -arch=win32 ??_V at YAXPAXHPBDH@Z
@ stub -arch=win64 ??_V at YAXPEAXHPEBDH@Z
-@ stub -arch=win32 ?Alloc at Concurrency@@YAPAXI at Z
-@ stub -arch=win64 ?Alloc at Concurrency@@YAPEAX_K at Z
+@ cdecl -arch=win32 ?Alloc at Concurrency@@YAPAXI at Z(long) msvcr120.?Alloc at Concurrency@@YAPAXI at Z
+@ cdecl -arch=win64 ?Alloc at Concurrency@@YAPEAX_K at Z(long) msvcr120.?Alloc at Concurrency@@YAPAXI at Z
@ stub ?Block at Context@Concurrency@@SAXXZ
@ stub ?CaptureCallstack at platform@details at Concurrency@@YAIPAPAXII at Z
@ stub -arch=win32 ?Create at CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy at 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 at Concurrency@@YAPAXI at Z */
+/* ?Alloc at Concurrency@@YAPEAX_K at 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)
More information about the wine-patches
mailing list