[PATCH v5 3/8] msvcr120: Add _StructuredTaskCollection::_StructuredTaskCollection_dtor stub.
Torge Matthies
tmatthies at codeweavers.com
Wed Apr 20 09:33:18 CDT 2022
Signed-off-by: Torge Matthies <tmatthies at codeweavers.com>
---
v4 -> v5:
Split patch into stub + implementation (in "msvcr100: Implement
_StructuredTaskCollection::_RunAndWait and _Schedule.")
dlls/concrt140/concrt140.spec | 6 +++---
dlls/msvcr120/msvcr120.spec | 4 ++--
dlls/msvcr120_app/msvcr120_app.spec | 2 +-
dlls/msvcrt/concurrency.c | 13 +++++++++++++
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec
index 3d1c3b399d2..ba0f85f0788 100644
--- a/dlls/concrt140/concrt140.spec
+++ b/dlls/concrt140/concrt140.spec
@@ -267,9 +267,9 @@
@ stub -arch=arm ??1_SpinLock at details@Concurrency@@QAA at XZ
@ stub -arch=i386 ??1_SpinLock at details@Concurrency@@QAE at XZ
@ stub -arch=win64 ??1_SpinLock at details@Concurrency@@QEAA at XZ
-@ stub -arch=arm ??1_StructuredTaskCollection at details@Concurrency@@QAA at XZ
-@ stub -arch=i386 ??1_StructuredTaskCollection at details@Concurrency@@QAE at XZ
-@ stub -arch=win64 ??1_StructuredTaskCollection at details@Concurrency@@QEAA at XZ
+@ thiscall -arch=arm ??1_StructuredTaskCollection at details@Concurrency@@QAA at XZ(ptr) StructuredTaskCollection_dtor
+@ thiscall -arch=i386 ??1_StructuredTaskCollection at details@Concurrency@@QAE at XZ(ptr) StructuredTaskCollection_dtor
+@ thiscall -arch=win64 ??1_StructuredTaskCollection at details@Concurrency@@QEAA at XZ(ptr) StructuredTaskCollection_dtor
@ stub -arch=arm ??1_TaskCollection at details@Concurrency@@QAA at XZ
@ stub -arch=i386 ??1_TaskCollection at details@Concurrency@@QAE at XZ
@ stub -arch=win64 ??1_TaskCollection at details@Concurrency@@QEAA at XZ
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index d32a0d6c47e..1b6e2cd8270 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -290,8 +290,8 @@
@ stub -arch=arm ??1_SpinLock at details@Concurrency@@QAA at XZ
@ stub -arch=i386 ??1_SpinLock at details@Concurrency@@QAE at XZ
@ stub -arch=win64 ??1_SpinLock at details@Concurrency@@QEAA at XZ
-@ stub -arch=i386 ??1_StructuredTaskCollection at details@Concurrency@@QAE at XZ
-@ stub -arch=win64 ??1_StructuredTaskCollection at details@Concurrency@@QEAA at XZ
+@ thiscall -arch=i386 ??1_StructuredTaskCollection at details@Concurrency@@QAE at XZ(ptr) StructuredTaskCollection_dtor
+@ thiscall -arch=win64 ??1_StructuredTaskCollection at details@Concurrency@@QEAA at XZ(ptr) StructuredTaskCollection_dtor
@ stub -arch=arm ??1_TaskCollection at details@Concurrency@@QAA at XZ
@ stub -arch=i386 ??1_TaskCollection at details@Concurrency@@QAE at XZ
@ stub -arch=win64 ??1_TaskCollection at details@Concurrency@@QEAA at XZ
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 52777eff90b..1e04dc50ad8 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -288,7 +288,7 @@
@ stub -arch=arm ??1_SpinLock at details@Concurrency@@QAA at XZ
@ stub -arch=i386 ??1_SpinLock at details@Concurrency@@QAE at XZ
@ stub -arch=win64 ??1_SpinLock at details@Concurrency@@QEAA at XZ
-@ stub -arch=i386 ??1_StructuredTaskCollection at details@Concurrency@@QAE at XZ
+@ thiscall -arch=i386 ??1_StructuredTaskCollection at details@Concurrency@@QAE at XZ(ptr) msvcr120.??1_StructuredTaskCollection at details@Concurrency@@QAE at XZ
@ stub -arch=arm ??1_TaskCollection at details@Concurrency@@QAA at XZ
@ stub -arch=i386 ??1_TaskCollection at details@Concurrency@@QAE at XZ
@ stub -arch=win64 ??1_TaskCollection at details@Concurrency@@QEAA at XZ
diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c
index 7eb89d59b18..f0cedbf08a6 100644
--- a/dlls/msvcrt/concurrency.c
+++ b/dlls/msvcrt/concurrency.c
@@ -1755,6 +1755,19 @@ bool __thiscall SpinWait__SpinOnce(SpinWait *this)
}
}
+#if _MSVCR_VER >= 120
+
+/* ??1_StructuredTaskCollection at details@Concurrency@@QAA at XZ */
+/* ??1_StructuredTaskCollection at details@Concurrency@@QAE at XZ */
+/* ??1_StructuredTaskCollection at details@Concurrency@@QEAA at XZ */
+DEFINE_THISCALL_WRAPPER(StructuredTaskCollection_dtor, 4)
+void __thiscall StructuredTaskCollection_dtor(StructuredTaskCollection *this)
+{
+ FIXME("(%p): stub!\n", this);
+}
+
+#endif /* _MSVCR_VER >= 120 */
+
#if _MSVCR_VER >= 100
/* ?_RunAndWait at _StructuredTaskCollection@details at Concurrency@@QAA?AW4_TaskCollectionStatus at 23@PAV_UnrealizedChore at 23@@Z */
--
2.36.0
More information about the wine-devel
mailing list