[v2 2/2] msvcrt: Add stub for Concurrency::Free

Gijs Vermeulen gijsvrm at gmail.com
Thu Mar 16 17:12:55 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                  | 7 +++++++
 6 files changed, 17 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 at CurrentScheduler@Concurrency@@SAXXZ
 @ stub -arch=win64 ?DisableTracing at Concurrency@@YAJXZ
 @ stub -arch=win64 ?EnableTracing at Concurrency@@YAJXZ
-@ stub -arch=win32 ?Free at Concurrency@@YAXPAX at Z
-@ stub -arch=win64 ?Free at Concurrency@@YAXPEAX at Z
+@ cdecl -arch=win32 ?Free at Concurrency@@YAXPAX at Z(ptr) msvcr120.?Free at Concurrency@@YAXPAX at Z
+@ cdecl -arch=win64 ?Free at Concurrency@@YAXPEAX at Z(ptr) msvcr120.?Free at Concurrency@@YAXPEAX at Z
 @ stub -arch=win32 ?Get at CurrentScheduler@Concurrency@@SAPAVScheduler at 2@XZ
 @ stub -arch=win64 ?Get at CurrentScheduler@Concurrency@@SAPEAVScheduler at 2@XZ
 @ stub -arch=win64 ?GetExecutionContextId at Concurrency@@YAIXZ
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 82b0c63..261f30b 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -258,8 +258,8 @@
 @ stub ?Detach at CurrentScheduler@Concurrency@@SAXXZ
 @ stub ?DisableTracing at Concurrency@@YAJXZ
 @ stub ?EnableTracing at Concurrency@@YAJXZ
-@ stub -arch=win32 ?Free at Concurrency@@YAXPAX at Z
-@ stub -arch=win64 ?Free at Concurrency@@YAXPEAX at Z
+@ cdecl -arch=win32 ?Free at Concurrency@@YAXPAX at Z(ptr) Free
+@ cdecl -arch=win64 ?Free at Concurrency@@YAXPEAX at Z(ptr) Free
 @ stub -arch=win32 ?Get at CurrentScheduler@Concurrency@@SAPAVScheduler at 2@XZ
 @ stub -arch=win64 ?Get at CurrentScheduler@Concurrency@@SAPEAVScheduler at 2@XZ
 @ stub ?GetExecutionContextId at Concurrency@@YAIXZ
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 26ad442..07dfc4a 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -418,8 +418,8 @@
 @ stub ?Detach at CurrentScheduler@Concurrency@@SAXXZ
 @ stub ?DisableTracing at Concurrency@@YAJXZ
 @ stub ?EnableTracing at Concurrency@@YAJXZ
-@ stub -arch=win32 ?Free at Concurrency@@YAXPAX at Z
-@ stub -arch=win64 ?Free at Concurrency@@YAXPEAX at Z
+@ cdecl -arch=win32 ?Free at Concurrency@@YAXPAX at Z(ptr) Free
+@ cdecl -arch=win64 ?Free at Concurrency@@YAXPEAX at Z(ptr) Free
 @ stub -arch=win32 ?Get at CurrentScheduler@Concurrency@@SAPAVScheduler at 2@XZ
 @ stub -arch=win64 ?Get at CurrentScheduler@Concurrency@@SAPEAVScheduler at 2@XZ
 @ stub ?GetExecutionContextId at Concurrency@@YAIXZ
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 6a105fb..fb7def3 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -416,8 +416,8 @@
 @ stub ?Detach at CurrentScheduler@Concurrency@@SAXXZ
 @ stub ?DisableTracing at Concurrency@@YAJXZ
 @ stub ?EnableTracing at Concurrency@@YAJXZ
-@ stub -arch=win32 ?Free at Concurrency@@YAXPAX at Z
-@ stub -arch=win64 ?Free at Concurrency@@YAXPEAX at Z
+@ cdecl -arch=win32 ?Free at Concurrency@@YAXPAX at Z(ptr) Free
+@ cdecl -arch=win64 ?Free at Concurrency@@YAXPEAX at Z(ptr) Free
 @ stub -arch=win32 ?Get at CurrentScheduler@Concurrency@@SAPAVScheduler at 2@XZ
 @ stub -arch=win64 ?Get at CurrentScheduler@Concurrency@@SAPEAVScheduler at 2@XZ
 @ stub ?GetCurrentThreadId at platform@details at Concurrency@@YAJXZ
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 435d989..5a636da 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -412,8 +412,8 @@
 @ stub ?Detach at CurrentScheduler@Concurrency@@SAXXZ
 @ stub ?DisableTracing at Concurrency@@YAJXZ
 @ stub ?EnableTracing at Concurrency@@YAJXZ
-@ stub -arch=win32 ?Free at Concurrency@@YAXPAX at Z
-@ stub -arch=win64 ?Free at Concurrency@@YAXPEAX at Z
+@ cdecl -arch=win32 ?Free at Concurrency@@YAXPAX at Z(ptr) msvcr120.?Free at Concurrency@@YAXPAX at Z
+@ cdecl -arch=win64 ?Free at Concurrency@@YAXPEAX at Z(ptr) msvcr120.?Free at Concurrency@@YAXPEAX at Z
 @ stub -arch=win32 ?Get at CurrentScheduler@Concurrency@@SAPAVScheduler at 2@XZ
 @ stub -arch=win64 ?Get at CurrentScheduler@Concurrency@@SAPEAVScheduler at 2@XZ
 @ stub ?GetCurrentThreadId at platform@details at Concurrency@@YAJXZ
diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c
index a25d9cd..e3b538b 100644
--- a/dlls/msvcrt/lock.c
+++ b/dlls/msvcrt/lock.c
@@ -616,6 +616,13 @@ void * __cdecl Alloc(MSVCRT_size_t _NumBytes)
     return p;
 }
 
+/* ?Free at Concurrency@@YAXPAX at Z */
+/* ?Free at Concurrency@@YAXPEAX at Z */
+void __cdecl Free(void * _PAllocation)
+{
+    FIXME("(%p) stub\n", _PAllocation);
+}
+
 #endif
 
 #if _MSVCR_VER >= 110
-- 
1.7.12.4 (Apple Git-37)




More information about the wine-patches mailing list