[PATCH v2 0/1] MR774: msvcp140: Add _ExceptionHolder::ReportUnhandledError stub.

[Gijs Vermeulen (＠gverm)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53614
Signed-off-by: Gijs Vermeulen

--
  v2: msvcp140: Add _ExceptionHolder::ReportUnhandledError stub.

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

[PATCH v2 1/1] msvcp140: Add _ExceptionHolder::ReportUnhandledError stub.

[Gijs Vermeulen]

From: Gijs Vermeulen

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53614
Signed-off-by: Gijs Vermeulen 
---
 dlls/concrt140/details.c      | 9 +++++++++
 dlls/msvcp140/msvcp140.spec   | 6 +++---
 dlls/msvcp90/details.c        | 9 +++++++++
 dlls/msvcp_win/msvcp_win.spec | 6 +++---
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c
index 8fd186eb71d..e6711db6983 100644
--- a/dlls/concrt140/details.c
+++ b/dlls/concrt140/details.c
@@ -1075,6 +1075,15 @@ bool __cdecl _Task_impl_base__IsNonBlockingThread(void)
     return FALSE;
 }

+/* ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ */
+/* ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ */
+/* ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ */
+DEFINE_THISCALL_WRAPPER(_ExceptionHolder__ReportUnhandledError, 4)
+void __thiscall _ExceptionHolder__ReportUnhandledError(void *this)
+{
+    FIXME("(%p) stub\n", this);
+}
+
 __ASM_BLOCK_BEGIN(concurrency_details_vtables)
     __ASM_VTABLE(_Concurrent_queue_base_v4,
             VTABLE_ADD_FUNC(_Concurrent_queue_base_v4_dummy)
diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec
index e7bdcd0378e..232a2b959a2 100644
--- a/dlls/msvcp140/msvcp140.spec
+++ b/dlls/msvcp140/msvcp140.spec
@@ -1085,9 +1085,9 @@
 @ stub -arch=win64 ?CaptureCallstack@platform@details@Concurrency@@YA_KPEAPEAX_K1@Z
 @ cdecl ?GetCurrentThreadId@platform@details@Concurrency@@YAJXZ() kernel32.GetCurrentThreadId
 @ stub ?GetNextAsyncId@platform@details@Concurrency@@YAIXZ
-@ stub -arch=arm ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ
-@ stub -arch=i386 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ
-@ stub -arch=win64 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ
+@ cdecl -arch=arm ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ(ptr) _ExceptionHolder__ReportUnhandledError
+@ thiscall -arch=i386 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ(ptr) _ExceptionHolder__ReportUnhandledError
+@ cdecl -arch=win64 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ(ptr) _ExceptionHolder__ReportUnhandledError
 @ cdecl -arch=arm ?_Addcats@_Locinfo@std@@QAAAAV12@HPBD@Z(ptr long str) _Locinfo__Addcats
 @ thiscall -arch=i386 ?_Addcats@_Locinfo@std@@QAEAAV12@HPBD@Z(ptr long str) _Locinfo__Addcats
 @ cdecl -arch=win64 ?_Addcats@_Locinfo@std@@QEAAAEAV12@HPEBD@Z(ptr long str) _Locinfo__Addcats
diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c
index d2a741b4998..767b20b2334 100644
--- a/dlls/msvcp90/details.c
+++ b/dlls/msvcp90/details.c
@@ -1089,6 +1089,15 @@ bool __cdecl _Task_impl_base__IsNonBlockingThread(void)
     FIXME("() stub\n");
     return FALSE;
 }
+
+/* ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ */
+/* ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ */
+/* ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ */
+DEFINE_THISCALL_WRAPPER(_ExceptionHolder__ReportUnhandledError, 4)
+void __thiscall _ExceptionHolder__ReportUnhandledError(void *this)
+{
+    FIXME("(%p) stub\n", this);
+}
 #endif

__ASM_BLOCK_BEGIN(concurrency_details_vtables)
diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec
index 3ba0ce1dfba..d2fae9f1e14 100644
--- a/dlls/msvcp_win/msvcp_win.spec
+++ b/dlls/msvcp_win/msvcp_win.spec
@@ -1085,9 +1085,9 @@
 @ stub -arch=win64 ?CaptureCallstack@platform@details@Concurrency@@YA_KPEAPEAX_K1@Z
 @ cdecl ?GetCurrentThreadId@platform@details@Concurrency@@YAJXZ() msvcp140.?GetCurrentThreadId@platform@details@Concurrency@@YAJXZ
 @ stub ?GetNextAsyncId@platform@details@Concurrency@@YAIXZ
-@ stub -arch=arm ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ
-@ stub -arch=i386 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ
-@ stub -arch=win64 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ
+@ cdecl -arch=arm ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ(ptr) msvcp140.?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAAXXZ
+@ thiscall -arch=i386 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ(ptr) msvcp140.?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AAEXXZ
+@ cdecl -arch=win64 ?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ(ptr) msvcp140.?ReportUnhandledError@_ExceptionHolder@details@Concurrency@@AEAAXXZ
 @ cdecl -arch=arm ?_Addcats@_Locinfo@std@@QAAAAV12@HPBD@Z(ptr long str) msvcp140.?_Addcats@_Locinfo@std@@QAAAAV12@HPBD@Z
 @ thiscall -arch=i386 ?_Addcats@_Locinfo@std@@QAEAAV12@HPBD@Z(ptr long str) msvcp140.?_Addcats@_Locinfo@std@@QAEAAV12@HPBD@Z
 @ cdecl -arch=win64 ?_Addcats@_Locinfo@std@@QEAAAEAV12@HPEBD@Z(ptr long str) msvcp140.?_Addcats@_Locinfo@std@@QEAAAEAV12@HPEBD@Z

[PATCH v2 0/1] MR774: msvcp140: Add _ExceptionHolder::ReportUnhandledError stub. - approved

[Piotr Caban (＠piotr)]

This merge request was approved by Piotr Caban.