Torge Matthies : msvcr100: Add _StructuredTaskCollection::_IsCanceling stub.
Alexandre Julliard
julliard at winehq.org
Mon Jul 4 16:43:33 CDT 2022
Module: wine
Branch: master
Commit: 3a25d00108966aee2888a94d867c35296b2f00fe
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a25d00108966aee2888a94d867c35296b2f00fe
Author: Torge Matthies <tmatthies at codeweavers.com>
Date: Mon Jul 4 20:29:14 2022 +0200
msvcr100: Add _StructuredTaskCollection::_IsCanceling stub.
Signed-off-by: Torge Matthies <tmatthies at codeweavers.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 | 11 +++++++++++
6 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec
index 77092cfb65d..9370566bb2c 100644
--- a/dlls/concrt140/concrt140.spec
+++ b/dlls/concrt140/concrt140.spec
@@ -537,9 +537,9 @@
@ stub -arch=arm ?_Internal_throw_exception at _Concurrent_vector_base_v4@details at Concurrency@@IBAXI at Z
@ thiscall -arch=i386 ?_Internal_throw_exception at _Concurrent_vector_base_v4@details at Concurrency@@IBEXI at Z(ptr long) _vector_base_v4__Internal_throw_exception
@ cdecl -arch=win64 ?_Internal_throw_exception at _Concurrent_vector_base_v4@details at Concurrency@@IEBAX_K at Z(ptr long) _vector_base_v4__Internal_throw_exception
-@ stub -arch=arm ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAA_NXZ
-@ stub -arch=i386 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAE_NXZ
-@ stub -arch=win64 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QEAA_NXZ
+@ cdecl -arch=arm ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling
+@ thiscall -arch=i386 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAE_NXZ(ptr) _StructuredTaskCollection__IsCanceling
+@ cdecl -arch=win64 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QEAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling
@ stub -arch=arm ?_IsCanceling at _TaskCollection@details at Concurrency@@QAA_NXZ
@ stub -arch=i386 ?_IsCanceling at _TaskCollection@details at Concurrency@@QAE_NXZ
@ stub -arch=win64 ?_IsCanceling at _TaskCollection@details at Concurrency@@QEAA_NXZ
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 29a5d4910e1..0d38005c13a 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -329,8 +329,8 @@
@ cdecl -arch=win64 ?_DoYield@?$_SpinWait@$00 at details@Concurrency@@IEAAXXZ(ptr) SpinWait__DoYield
@ thiscall -arch=win32 ?_DoYield@?$_SpinWait@$0A@@details at Concurrency@@IAEXXZ(ptr) SpinWait__DoYield
@ cdecl -arch=win64 ?_DoYield@?$_SpinWait@$0A@@details at Concurrency@@IEAAXXZ(ptr) SpinWait__DoYield
-@ stub -arch=win32 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAE_NXZ
-@ stub -arch=win64 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QEAA_NXZ
+@ thiscall -arch=win32 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAE_NXZ(ptr) _StructuredTaskCollection__IsCanceling
+@ cdecl -arch=win64 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QEAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling
@ stub -arch=win32 ?_IsCanceling at _TaskCollection@details at Concurrency@@QAE_NXZ
@ stub -arch=win64 ?_IsCanceling at _TaskCollection@details at Concurrency@@QEAA_NXZ
@ stub -arch=win32 ?_Name_base at type_info@@CAPBDPBV1 at PAU__type_info_node@@@Z
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 7e06ab8693f..24e7630194c 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -544,9 +544,9 @@
@ stub -arch=arm ?_Invoke at _CancellationTokenRegistration@details at Concurrency@@AAAXXZ
@ stub -arch=i386 ?_Invoke at _CancellationTokenRegistration@details at Concurrency@@AAEXXZ
@ stub -arch=win64 ?_Invoke at _CancellationTokenRegistration@details at Concurrency@@AEAAXXZ
-@ stub -arch=arm ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAA_NXZ
-@ stub -arch=i386 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAE_NXZ
-@ stub -arch=win64 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QEAA_NXZ
+@ cdecl -arch=arm ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling
+@ thiscall -arch=i386 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAE_NXZ(ptr) _StructuredTaskCollection__IsCanceling
+@ cdecl -arch=win64 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QEAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling
@ stub -arch=arm ?_IsCanceling at _TaskCollection@details at Concurrency@@QAA_NXZ
@ stub -arch=i386 ?_IsCanceling at _TaskCollection@details at Concurrency@@QAE_NXZ
@ stub -arch=win64 ?_IsCanceling at _TaskCollection@details at Concurrency@@QEAA_NXZ
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 45641c1fb00..b1258dad5de 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -535,9 +535,9 @@
@ thiscall -arch=i386 ?_GetScheduler at _Scheduler@details at Concurrency@@QAEPAVScheduler at 3@XZ(ptr) _Scheduler__GetScheduler
@ cdecl -arch=win64 ?_GetScheduler at _Scheduler@details at Concurrency@@QEAAPEAVScheduler at 3@XZ(ptr) _Scheduler__GetScheduler
@ cdecl ?_Id at _CurrentScheduler@details at Concurrency@@SAIXZ() _CurrentScheduler__Id
-@ stub -arch=arm ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAA_NXZ
-@ stub -arch=i386 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAE_NXZ
-@ stub -arch=win64 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QEAA_NXZ
+@ cdecl -arch=arm ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling
+@ thiscall -arch=i386 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAE_NXZ(ptr) _StructuredTaskCollection__IsCanceling
+@ cdecl -arch=win64 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QEAA_NXZ(ptr) _StructuredTaskCollection__IsCanceling
@ stub -arch=arm ?_IsCanceling at _TaskCollection@details at Concurrency@@QAA_NXZ
@ stub -arch=i386 ?_IsCanceling at _TaskCollection@details at Concurrency@@QAE_NXZ
@ stub -arch=win64 ?_IsCanceling at _TaskCollection@details at Concurrency@@QEAA_NXZ
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 7adb0462565..93ce779ea69 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -532,9 +532,9 @@
@ thiscall -arch=i386 ?_GetScheduler at _Scheduler@details at Concurrency@@QAEPAVScheduler at 3@XZ(ptr) msvcr120.?_GetScheduler at _Scheduler@details at Concurrency@@QAEPAVScheduler at 3@XZ
@ cdecl -arch=win64 ?_GetScheduler at _Scheduler@details at Concurrency@@QEAAPEAVScheduler at 3@XZ(ptr) msvcr120.?_GetScheduler at _Scheduler@details at Concurrency@@QEAAPEAVScheduler at 3@XZ
@ cdecl ?_Id at _CurrentScheduler@details at Concurrency@@SAIXZ() msvcr120.?_Id at _CurrentScheduler@details at Concurrency@@SAIXZ
-@ stub -arch=arm ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAA_NXZ
-@ stub -arch=i386 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAE_NXZ
-@ stub -arch=win64 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QEAA_NXZ
+@ cdecl -arch=arm ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAA_NXZ(ptr) msvcr120.?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAA_NXZ
+@ thiscall -arch=i386 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAE_NXZ(ptr) msvcr120.?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAE_NXZ
+@ cdecl -arch=win64 ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QEAA_NXZ(ptr) msvcr120.?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QEAA_NXZ
@ stub -arch=arm ?_IsCanceling at _TaskCollection@details at Concurrency@@QAA_NXZ
@ stub -arch=i386 ?_IsCanceling at _TaskCollection@details at Concurrency@@QAE_NXZ
@ stub -arch=win64 ?_IsCanceling at _TaskCollection@details at Concurrency@@QEAA_NXZ
diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c
index 80351993a58..c982e367749 100644
--- a/dlls/msvcrt/concurrency.c
+++ b/dlls/msvcrt/concurrency.c
@@ -1824,6 +1824,17 @@ void __thiscall _StructuredTaskCollection__Cancel(
FIXME("(%p): stub!\n", this);
}
+/* ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAA_NXZ */
+/* ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QAE_NXZ */
+/* ?_IsCanceling at _StructuredTaskCollection@details at Concurrency@@QEAA_NXZ */
+DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__IsCanceling, 4)
+bool __thiscall _StructuredTaskCollection__IsCanceling(
+ _StructuredTaskCollection *this)
+{
+ FIXME("(%p): stub!\n", this);
+ return FALSE;
+}
+
/* ??0critical_section at Concurrency@@QAE at XZ */
/* ??0critical_section at Concurrency@@QEAA at XZ */
DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)
More information about the wine-cvs
mailing list