[PATCH 6/7] msvcr100: Add _StructuredTaskCollection::_Cancel stub.

[Torge Matthies]

Signed-off-by: Torge Matthies <tmatthies at codeweavers.com>
---
 dlls/concrt140/concrt140.spec       |  6 +++---
 dlls/msvcr100/msvcr100.spec         |  4 ++--
 dlls/msvcr110/msvcr110.spec         |  6 +++---
 dlls/msvcr120/msvcr120.spec         |  6 +++---
 dlls/msvcr120_app/msvcr120_app.spec |  6 +++---
 dlls/msvcrt/concurrency.c           | 10 ++++++++++
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec
index 2f26a39a5fad..77092cfb65dc 100644
--- a/dlls/concrt140/concrt140.spec
+++ b/dlls/concrt140/concrt140.spec
@@ -434,9 +434,9 @@
 @ stub -arch=i386 ?_Assign at _Concurrent_queue_iterator_base_v4@details at Concurrency@@IAEXABV123@@Z
 @ stub -arch=win64 ?_Assign at _Concurrent_queue_iterator_base_v4@details at Concurrency@@IEAAXAEBV123@@Z
 @ extern ?_Byte_reverse_table at details@Concurrency@@3QBEB byte_reverse_table
-@ stub -arch=arm ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAAXXZ
-@ stub -arch=i386 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAEXXZ
-@ stub -arch=win64 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QEAAXXZ
+@ cdecl -arch=arm ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAAXXZ(ptr) _StructuredTaskCollection__Cancel
+@ thiscall -arch=i386 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAEXXZ(ptr) _StructuredTaskCollection__Cancel
+@ cdecl -arch=win64 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QEAAXXZ(ptr) _StructuredTaskCollection__Cancel
 @ stub -arch=arm ?_Cancel at _TaskCollection@details at Concurrency@@QAAXXZ
 @ stub -arch=i386 ?_Cancel at _TaskCollection@details at Concurrency@@QAEXXZ
 @ stub -arch=win64 ?_Cancel at _TaskCollection@details at Concurrency@@QEAAXXZ
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index d77aca6a2c24..29a5d4910e1d 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -309,8 +309,8 @@
 @ stub -arch=win64 ?_AcquireRead at _ReaderWriterLock@details at Concurrency@@QEAAXXZ
 @ stub -arch=win32 ?_AcquireWrite at _ReaderWriterLock@details at Concurrency@@QAEXXZ
 @ stub -arch=win64 ?_AcquireWrite at _ReaderWriterLock@details at Concurrency@@QEAAXXZ
-@ stub -arch=win32 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAEXXZ
-@ stub -arch=win64 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QEAAXXZ
+@ thiscall -arch=win32 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAEXXZ(ptr) _StructuredTaskCollection__Cancel
+@ cdecl -arch=win64 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QEAAXXZ(ptr) _StructuredTaskCollection__Cancel
 @ stub -arch=win32 ?_Cancel at _TaskCollection@details at Concurrency@@QAEXXZ
 @ stub -arch=win64 ?_Cancel at _TaskCollection@details at Concurrency@@QEAAXXZ
 @ stub -arch=win32 ?_CheckTaskCollection at _UnrealizedChore@details at Concurrency@@IAEXXZ
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 70c857a73da9..7e06ab8693f6 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -487,9 +487,9 @@
 @ stub -arch=arm ?_Cancel at _CancellationTokenState@details at Concurrency@@QAAXXZ
 @ stub -arch=i386 ?_Cancel at _CancellationTokenState@details at Concurrency@@QAEXXZ
 @ stub -arch=win64 ?_Cancel at _CancellationTokenState@details at Concurrency@@QEAAXXZ
-@ stub -arch=arm ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAAXXZ
-@ stub -arch=i386 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAEXXZ
-@ stub -arch=win64 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QEAAXXZ
+@ cdecl -arch=arm ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAAXXZ(ptr) _StructuredTaskCollection__Cancel
+@ thiscall -arch=i386 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAEXXZ(ptr) _StructuredTaskCollection__Cancel
+@ cdecl -arch=win64 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QEAAXXZ(ptr) _StructuredTaskCollection__Cancel
 @ stub -arch=arm ?_Cancel at _TaskCollection@details at Concurrency@@QAAXXZ
 @ stub -arch=i386 ?_Cancel at _TaskCollection@details at Concurrency@@QAEXXZ
 @ stub -arch=win64 ?_Cancel at _TaskCollection@details at Concurrency@@QEAAXXZ
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index c573dfac7137..45641c1fb00c 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -484,9 +484,9 @@
 @ stub -arch=arm ?_AcquireWrite at _ReaderWriterLock@details at Concurrency@@QAAXXZ
 @ stub -arch=i386 ?_AcquireWrite at _ReaderWriterLock@details at Concurrency@@QAEXXZ
 @ stub -arch=win64 ?_AcquireWrite at _ReaderWriterLock@details at Concurrency@@QEAAXXZ
-@ stub -arch=arm ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAAXXZ
-@ stub -arch=i386 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAEXXZ
-@ stub -arch=win64 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QEAAXXZ
+@ cdecl -arch=arm ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAAXXZ(ptr) _StructuredTaskCollection__Cancel
+@ thiscall -arch=i386 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAEXXZ(ptr) _StructuredTaskCollection__Cancel
+@ cdecl -arch=win64 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QEAAXXZ(ptr) _StructuredTaskCollection__Cancel
 @ stub -arch=arm ?_Cancel at _TaskCollection@details at Concurrency@@QAAXXZ
 @ stub -arch=i386 ?_Cancel at _TaskCollection@details at Concurrency@@QAEXXZ
 @ stub -arch=win64 ?_Cancel at _TaskCollection@details at Concurrency@@QEAAXXZ
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 31307819eee9..cf0430df4e43 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -479,9 +479,9 @@
 @ stub -arch=arm ?_AcquireWrite at _ReaderWriterLock@details at Concurrency@@QAAXXZ
 @ stub -arch=i386 ?_AcquireWrite at _ReaderWriterLock@details at Concurrency@@QAEXXZ
 @ stub -arch=win64 ?_AcquireWrite at _ReaderWriterLock@details at Concurrency@@QEAAXXZ
-@ stub -arch=arm ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAAXXZ
-@ stub -arch=i386 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAEXXZ
-@ stub -arch=win64 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QEAAXXZ
+@ cdecl -arch=arm ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAAXXZ(ptr) msvcr120.?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAAXXZ
+@ thiscall -arch=i386 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAEXXZ(ptr) msvcr120.?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAEXXZ
+@ cdecl -arch=win64 ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QEAAXXZ(ptr) msvcr120.?_Cancel at _StructuredTaskCollection@details at Concurrency@@QEAAXXZ
 @ stub -arch=arm ?_Cancel at _TaskCollection@details at Concurrency@@QAAXXZ
 @ stub -arch=i386 ?_Cancel at _TaskCollection@details at Concurrency@@QAEXXZ
 @ stub -arch=win64 ?_Cancel at _TaskCollection@details at Concurrency@@QEAAXXZ
diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c
index c7c1c3c9e530..2ac6a31962d9 100644
--- a/dlls/msvcrt/concurrency.c
+++ b/dlls/msvcrt/concurrency.c
@@ -1816,6 +1816,16 @@ _StructuredTaskCollection__RunAndWait(
     return 1;
 }
 
+/* ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAAXXZ */
+/* ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QAEXXZ */
+/* ?_Cancel at _StructuredTaskCollection@details at Concurrency@@QEAAXXZ */
+DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__Cancel, 4)
+void __thiscall _StructuredTaskCollection__Cancel(
+        _StructuredTaskCollection *this)
+{
+    FIXME("(%p): stub!\n", this);
+}
+
 #endif /* _MSVCR_VER >= 100 */
 
 /* ??0critical_section at Concurrency@@QAE at XZ */
-- 
2.37.0