Module: wine Branch: master Commit: ccde147084d64e9a7a96d2b0b383d3b911abd527 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccde147084d64e9a7a96d2b0b... Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jul 4 20:28:53 2022 +0200 msvcr120: Add _StructuredTaskCollection::_StructuredTaskCollection_dtor stub. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 4 +++- dlls/msvcrt/concurrency.c | 13 +++++++++++++ 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 3257d61bb37..ad6e90d725c 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -267,9 +267,9 @@ @ stub -arch=arm ??1_SpinLock(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ(ptr) _StructuredTaskCollection_dtor +@ thiscall -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ(ptr) _StructuredTaskCollection_dtor +@ cdecl -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ(ptr) _StructuredTaskCollection_dtor @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_TaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_TaskCollection(a)details@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index aa00853d5cd..8afab0cecae 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -290,9 +290,9 @@ @ stub -arch=arm ??1_SpinLock(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ(ptr) _StructuredTaskCollection_dtor +@ thiscall -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ(ptr) _StructuredTaskCollection_dtor +@ cdecl -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ(ptr) _StructuredTaskCollection_dtor @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_TaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_TaskCollection(a)details@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d964de1fb36..c45965d8acd 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -288,7 +288,9 @@ @ stub -arch=arm ??1_SpinLock(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_SpinLock(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_SpinLock(a)details@Concurrency@@QEAA(a)XZ -@ stub -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ +@ cdecl -arch=arm ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ(ptr) msvcr120.??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ +@ thiscall -arch=i386 ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ(ptr) msvcr120.??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ +@ cdecl -arch=win64 ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcr120.??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ @ stub -arch=arm ??1_TaskCollection(a)details@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1_TaskCollection(a)details@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1_TaskCollection(a)details@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index c26478f36cd..05ed0ef876f 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1760,6 +1760,19 @@ _StructuredTaskCollection* __thiscall _StructuredTaskCollection_ctor( #endif /* _MSVCR_VER >= 110 */ +#if _MSVCR_VER >= 120 + +/* ??1_StructuredTaskCollection(a)details@Concurrency@@QAA(a)XZ */ +/* ??1_StructuredTaskCollection(a)details@Concurrency@@QAE(a)XZ */ +/* ??1_StructuredTaskCollection(a)details@Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_dtor, 4) +void __thiscall _StructuredTaskCollection_dtor(_StructuredTaskCollection *this) +{ + FIXME("(%p): stub!\n", this); +} + +#endif /* _MSVCR_VER >= 120 */ + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4)