[PATCH v4 0/2] MR2429: msvcrt100: Add stub implementation for _UnrealizedChore::CheckTaskCollection
Add stub implementation for _UnrealizedChore::CheckTaskCollection https://bugs.winehq.org/show_bug.cgi?id=53794 -- v4: Update dlls/concrt140/concrt140.spec, dlls/msvcr100/msvcr100.spec, dlls/msvcr110/msvcr110.spec, dlls/msvcr120/msvcr120.spec, dlls/msvcr120_app/msvcr120_app.spec https://gitlab.winehq.org/wine/wine/-/merge_requests/2429
From: Vijay Kiran Kamuju <infyquest(a)gmail.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 | 8 ++++++++ 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 8ddf2255f31..02c54bee2aa 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -440,9 +440,9 @@ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ stub -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ() UnrealizedChore_CheckTaskCollection +@ cdecl -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() UnrealizedChore_CheckTaskCollection +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ() UnrealizedChore_CheckTaskCollection @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e2107055c24..71af5667291 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -313,8 +313,8 @@ @ cdecl -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ(ptr) _StructuredTaskCollection__Cancel @ stub -arch=win32 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=win32 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=win32 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() UnrealizedChore_CheckTaskCollection +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ() UnrealizedChore_CheckTaskCollection @ stub -arch=win32 ?_ConcRT_Assert(a)details@Concurrency@@YAXPBD0H(a)Z @ stub -arch=win64 ?_ConcRT_Assert(a)details@Concurrency@@YAXPEBD0H(a)Z @ stub -arch=win32 ?_ConcRT_CoreAssert(a)details@Concurrency@@YAXPBD0H(a)Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4fc5a069fbb..6996ebf4f8f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -493,9 +493,9 @@ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ stub -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ() UnrealizedChore_CheckTaskCollection +@ cdecl -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() UnrealizedChore_CheckTaskCollection +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ() UnrealizedChore_CheckTaskCollection @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7b379830d4b..d5d37346504 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -490,9 +490,9 @@ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ stub -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ() UnrealizedChore_CheckTaskCollection +@ cdecl -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() UnrealizedChore_CheckTaskCollection +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ() UnrealizedChore_CheckTaskCollection @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 37282fc54f8..db61d30c31b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -487,9 +487,9 @@ @ stub -arch=arm ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ stub -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ -@ stub -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ +@ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ() msvcrt120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ +@ cdecl -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() msvcrt120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ +@ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ() msvcrt120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index fe156938e3a..7f1392e6e55 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -2224,6 +2224,14 @@ bool __thiscall _StructuredTaskCollection__IsCanceling( return FALSE; } +/* ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ */ +/* ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ */ +/* ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ */ +void __cdecl UnrealizedChore_CheckTaskCollection(void) +{ + FIXME("() stub\n"); +} + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2429
From: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 02c54bee2aa..142a7dd9094 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -441,7 +441,7 @@ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ @ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ() UnrealizedChore_CheckTaskCollection -@ cdecl -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() UnrealizedChore_CheckTaskCollection +@ thiscall -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() UnrealizedChore_CheckTaskCollection @ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ() UnrealizedChore_CheckTaskCollection @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 71af5667291..bef17adea9a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -313,7 +313,7 @@ @ cdecl -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ(ptr) _StructuredTaskCollection__Cancel @ stub -arch=win32 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ -@ cdecl -arch=win32 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() UnrealizedChore_CheckTaskCollection +@ thiscall -arch=win32 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() UnrealizedChore_CheckTaskCollection @ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ() UnrealizedChore_CheckTaskCollection @ stub -arch=win32 ?_ConcRT_Assert(a)details@Concurrency@@YAXPBD0H(a)Z @ stub -arch=win64 ?_ConcRT_Assert(a)details@Concurrency@@YAXPEBD0H(a)Z diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 6996ebf4f8f..914fd8fbdf5 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -494,7 +494,7 @@ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ @ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ() UnrealizedChore_CheckTaskCollection -@ cdecl -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() UnrealizedChore_CheckTaskCollection +@ thiscall -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() UnrealizedChore_CheckTaskCollection @ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ() UnrealizedChore_CheckTaskCollection @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d5d37346504..5c6716dd104 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -491,7 +491,7 @@ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ @ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ() UnrealizedChore_CheckTaskCollection -@ cdecl -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() UnrealizedChore_CheckTaskCollection +@ thiscall -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() UnrealizedChore_CheckTaskCollection @ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ() UnrealizedChore_CheckTaskCollection @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index db61d30c31b..f38def42493 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -488,7 +488,7 @@ @ stub -arch=i386 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_TaskCollection@details(a)Concurrency@@QEAAXXZ @ cdecl -arch=arm ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ() msvcrt120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAAXXZ -@ cdecl -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() msvcrt120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ +@ thiscall -arch=i386 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ() msvcrt120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ @ cdecl -arch=win64 ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ() msvcrt120.?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IEAAXXZ @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2429
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=130918 Your paranoid android. === debian11 (build log) === Task: The win32 Wine build failed === debian11b (build log) === Task: The wow64 Wine build failed
participants (3)
-
Marvin -
Vijay Kiran Kamuju -
Vijay Kiran Kamuju (＠infyquest)