[PATCH 0/1] MR4863: concrt140: Add stub for _Cancellation_beacon::_Confirm_cancel().

[Vijay Kiran Kamuju (＠infyquest)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56174

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4863

[PATCH 1/1] concrt140: Add stub for _Cancellation_beacon::_Confirm_cancel().

[Vijay Kiran Kamuju]

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..67c2a94557d 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) _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/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

[PATCH 1/1] concrt140: Add stub for _Cancellation_beacon::_Confirm_cancel().

[Marvin]

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=142011

Your paranoid android.


=== debian11 (build log) ===

/usr/bin/i686-w64-mingw32-ld: tmp65c0e092/msvcr120_app-00000000.spec.o:fake:(.edata+0x330): undefined reference to `_Cancellation_beacon__Confirm_cancel'
collect2: error: ld returned 1 exit status
Task: The win32 Wine build failed

=== debian11b (build log) ===

/usr/bin/x86_64-w64-mingw32-ld: tmp65e44f01/msvcr120_app-00000000.spec.o:fake:(.edata+0x330): undefined reference to `_Cancellation_beacon__Confirm_cancel'
collect2: error: ld returned 1 exit status
Task: The wow64 Wine build failed