Torge Matthies : msvcr110: Add _StructuredTaskCollection::_StructuredTaskCollection_ctor stub.
Alexandre Julliard
julliard at winehq.org
Mon Apr 25 16:30:34 CDT 2022
Module: wine
Branch: master
Commit: 881879c658c6b1bfed41beb5da87b6cf1ee31936
URL: https://source.winehq.org/git/wine.git/?a=commit;h=881879c658c6b1bfed41beb5da87b6cf1ee31936
Author: Torge Matthies <tmatthies at codeweavers.com>
Date: Mon Apr 25 19:35:02 2022 +0200
msvcr110: Add _StructuredTaskCollection::_StructuredTaskCollection_ctor stub.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/concrt140/concrt140.spec | 6 +++---
dlls/msvcr110/msvcr110.spec | 6 +++---
dlls/msvcr120/msvcr120.spec | 6 +++---
dlls/msvcr120_app/msvcr120_app.spec | 6 +++---
dlls/msvcrt/concurrency.c | 19 +++++++++++++++++++
5 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec
index 50db9348327..3257d61bb37 100644
--- a/dlls/concrt140/concrt140.spec
+++ b/dlls/concrt140/concrt140.spec
@@ -63,9 +63,9 @@
@ stub -arch=arm ??0_SpinLock at details@Concurrency@@QAA at ACJ@Z
@ stub -arch=i386 ??0_SpinLock at details@Concurrency@@QAE at ACJ@Z
@ stub -arch=win64 ??0_SpinLock at details@Concurrency@@QEAA at AECJ@Z
-@ stub -arch=arm ??0_StructuredTaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z
-@ stub -arch=i386 ??0_StructuredTaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z
-@ stub -arch=win64 ??0_StructuredTaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z
+@ cdecl -arch=arm ??0_StructuredTaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor
+@ thiscall -arch=i386 ??0_StructuredTaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor
+@ cdecl -arch=win64 ??0_StructuredTaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor
@ stub -arch=arm ??0_TaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z
@ stub -arch=i386 ??0_TaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z
@ stub -arch=win64 ??0_TaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 23840f85eda..64b634b582e 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -62,9 +62,9 @@
@ stub -arch=arm ??0_SpinLock at details@Concurrency@@QAA at ACJ@Z
@ stub -arch=i386 ??0_SpinLock at details@Concurrency@@QAE at ACJ@Z
@ stub -arch=win64 ??0_SpinLock at details@Concurrency@@QEAA at AECJ@Z
-@ stub -arch=arm ??0_StructuredTaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z
-@ stub -arch=i386 ??0_StructuredTaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z
-@ stub -arch=win64 ??0_StructuredTaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z
+@ cdecl -arch=arm ??0_StructuredTaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor
+@ thiscall -arch=i386 ??0_StructuredTaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor
+@ cdecl -arch=win64 ??0_StructuredTaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor
@ stub -arch=arm ??0_TaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z
@ stub -arch=i386 ??0_TaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z
@ stub -arch=win64 ??0_TaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 64ddeed42f4..68855b90096 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -59,9 +59,9 @@
@ stub -arch=arm ??0_SpinLock at details@Concurrency@@QAA at ACJ@Z
@ stub -arch=i386 ??0_SpinLock at details@Concurrency@@QAE at ACJ@Z
@ stub -arch=win64 ??0_SpinLock at details@Concurrency@@QEAA at AECJ@Z
-@ stub -arch=arm ??0_StructuredTaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z
-@ stub -arch=i386 ??0_StructuredTaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z
-@ stub -arch=win64 ??0_StructuredTaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z
+@ cdecl -arch=arm ??0_StructuredTaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor
+@ thiscall -arch=i386 ??0_StructuredTaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor
+@ cdecl -arch=win64 ??0_StructuredTaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z(ptr ptr) _StructuredTaskCollection_ctor
@ stub -arch=arm ??0_TaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z
@ stub -arch=i386 ??0_TaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z
@ stub -arch=win64 ??0_TaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 05f408d6884..eabb304dd6d 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -57,9 +57,9 @@
@ stub -arch=arm ??0_SpinLock at details@Concurrency@@QAA at ACJ@Z
@ stub -arch=i386 ??0_SpinLock at details@Concurrency@@QAE at ACJ@Z
@ stub -arch=win64 ??0_SpinLock at details@Concurrency@@QEAA at AECJ@Z
-@ stub -arch=arm ??0_StructuredTaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z
-@ stub -arch=i386 ??0_StructuredTaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z
-@ stub -arch=win64 ??0_StructuredTaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z
+@ cdecl -arch=arm ??0_StructuredTaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z(ptr ptr) msvcr120.??0_StructuredTaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z
+@ thiscall -arch=i386 ??0_StructuredTaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z(ptr ptr) msvcr120.??0_StructuredTaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z
+@ cdecl -arch=win64 ??0_StructuredTaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z(ptr ptr) msvcr120.??0_StructuredTaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z
@ stub -arch=arm ??0_TaskCollection at details@Concurrency@@QAA at PAV_CancellationTokenState@12@@Z
@ stub -arch=i386 ??0_TaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z
@ stub -arch=win64 ??0_TaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z
diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c
index 2ca6421b0e7..f9a7f489ceb 100644
--- a/dlls/msvcrt/concurrency.c
+++ b/dlls/msvcrt/concurrency.c
@@ -164,6 +164,11 @@ typedef struct
yield_func yield_func;
} SpinWait;
+typedef struct
+{
+ char dummy;
+} _StructuredTaskCollection;
+
/* keep in sync with msvcp90/msvcp90.h */
typedef struct cs_queue
{
@@ -1741,6 +1746,20 @@ bool __thiscall SpinWait__SpinOnce(SpinWait *this)
}
}
+#if _MSVCR_VER >= 110
+
+/* ??0_StructuredTaskCollection at details@Concurrency@@QAE at PAV_CancellationTokenState@12@@Z */
+/* ??0_StructuredTaskCollection at details@Concurrency@@QEAA at PEAV_CancellationTokenState@12@@Z */
+DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_ctor, 8)
+_StructuredTaskCollection* __thiscall _StructuredTaskCollection_ctor(
+ _StructuredTaskCollection *this, /*_CancellationTokenState*/void *token)
+{
+ FIXME("(%p): stub\n", this);
+ return NULL;
+}
+
+#endif /* _MSVCR_VER >= 110 */
+
/* ??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