[PATCH v3 0/1] MR4863: concrt140: Add stub for _Cancellation_beacon::_Confirm_cancel().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56174 -- v3: concrt140: Add stub for _Cancellation_beacon::_Confirm_cancel(). https://gitlab.winehq.org/wine/wine/-/merge_requests/4863
From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56174 --- 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 | 11 +++++++++++ 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 7ce3475df4e..f3a39a30599 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -450,9 +450,9 @@ @ stub -arch=win64 ?_ConcRT_CoreAssert(a)details@Concurrency@@YAXPEBD0H(a)Z @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ -@ stub -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ thiscall -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ cdecl -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel @ cdecl ?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ() _Context__CurrentContext @ stub ?_Current_node(a)location@Concurrency@@SA?AV12(a)XZ @ stub -arch=arm ?_Destroy(a)_AsyncTaskCollection@details(a)Concurrency@@EAAXXZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 6a6d38db187..15ceae906c1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -507,9 +507,9 @@ @ stub -arch=win64 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPEB_WZZ @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ -@ stub -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ thiscall -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ cdecl -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel @ stub -arch=arm ?_Copy_str(a)exception@std@@AAAXPBD(a)Z @ stub -arch=i386 ?_Copy_str(a)exception@std@@AAEXPBD(a)Z @ stub -arch=win64 ?_Copy_str(a)exception@std@@AEAAXPEBD(a)Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 13d7e401133..2d6798a0af2 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -504,9 +504,9 @@ @ stub -arch=win64 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPEB_WZZ @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ -@ stub -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ thiscall -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ cdecl -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel @ stub -arch=arm ?_Copy_str(a)exception@std@@AAAXPBD(a)Z @ stub -arch=i386 ?_Copy_str(a)exception@std@@AAEXPBD(a)Z @ stub -arch=win64 ?_Copy_str(a)exception@std@@AEAAXPEBD(a)Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 561c3774260..6b24361390d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -501,9 +501,9 @@ @ stub -arch=win64 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPEB_WZZ @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ -@ stub -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ(ptr) msvcr120.?_Cancellation_beacon__Confirm_cancel +@ thiscall -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ(ptr) msvcr120?._Cancellation_beacon__Confirm_cancel +@ cdecl -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ(ptr) msvcr120.?_Cancellation_beacon__Confirm_cancel @ stub -arch=arm ?_Copy_str(a)exception@std@@AAAXPBD(a)Z @ stub -arch=i386 ?_Copy_str(a)exception@std@@AAEXPBD(a)Z @ stub -arch=win64 ?_Copy_str(a)exception@std@@AEAAXPEBD(a)Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 2af2f3ff917..3d31f37136c 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -3106,6 +3106,17 @@ void __thiscall _Cancellation_beacon_dtor(_Cancellation_beacon *this) free(this->beacon); } +/* ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ */ +/* ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ */ +/* ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ */ +DEFINE_THISCALL_WRAPPER(_Cancellation_beacon__Confirm_cancel, 4) +bool __thiscall _Cancellation_beacon__Confirm_cancel(_Cancellation_beacon *this) +{ + FIXME("(%p)\n", this); + + return TRUE; +} + /* ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ */ /* ??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(_Condition_variable_ctor, 4) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4863
I've created !4872 that also implements the function. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4863#note_57994
participants (3)
-
Piotr Caban (＠piotr) -
Vijay Kiran Kamuju
-
Vijay Kiran Kamuju (＠infyquest)