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

Gijs Vermeulen gijsvrm at gmail.com
Fri Mar 17 18:12:16 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/heap.c                  | 8 ++++++++
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec
index 6adab4b..87a7638 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 3875304..d60c2c2 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) Concurrency_Free
+@ cdecl -arch=win64 ?Free at Concurrency@@YAXPEAX at Z(ptr) Concurrency_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 4026b1b..f9b6613 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) Concurrency_Free
+@ cdecl -arch=win64 ?Free at Concurrency@@YAXPEAX at Z(ptr) Concurrency_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 27c800b..48129f6 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) Concurrency_Free
+@ cdecl -arch=win64 ?Free at Concurrency@@YAXPEAX at Z(ptr) Concurrency_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 dcb391c..7242cb9 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/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 at Concurrency@@YAXPAX at Z */
+/* ?Free at Concurrency@@YAXPEAX at Z */
+void CDECL Concurrency_Free(void* mem)
+{
+    FIXME("(%p) stub\n", mem);
+    MSVCRT_free(mem);
+}
-- 
1.7.12.4 (Apple Git-37)




More information about the wine-patches mailing list