Piotr Caban : vcruntime140: Add __uncaught_exceptions implementation.

Alexandre Julliard julliard at winehq.org
Wed Sep 12 16:40:34 CDT 2018


Module: wine
Branch: master
Commit: 7090d74750dc32064557e09421a468145049691f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7090d74750dc32064557e09421a468145049691f

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Wed Sep 12 14:45:56 2018 +0200

vcruntime140: Add __uncaught_exceptions implementation.

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/vcruntime140/Makefile.in       | 1 +
 dlls/vcruntime140/misc.c            | 7 +++++++
 dlls/vcruntime140/vcruntime140.spec | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/vcruntime140/Makefile.in b/dlls/vcruntime140/Makefile.in
index 2b4d6af..828330a 100644
--- a/dlls/vcruntime140/Makefile.in
+++ b/dlls/vcruntime140/Makefile.in
@@ -1,4 +1,5 @@
 MODULE    = vcruntime140.dll
+IMPORTS   = ucrtbase
 
 C_SRCS = \
 	misc.c
diff --git a/dlls/vcruntime140/misc.c b/dlls/vcruntime140/misc.c
index 86101a9..cc64175 100644
--- a/dlls/vcruntime140/misc.c
+++ b/dlls/vcruntime140/misc.c
@@ -22,6 +22,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(vcruntime);
 
+int* CDECL __processing_throw(void);
+
 /*********************************************************************
  *              __telemetry_main_invoke_trigger
  */
@@ -47,3 +49,8 @@ BOOL CDECL __vcrt_InitializeCriticalSectionEx(
     TRACE("(%p %x %x)\n", cs, spin_count, flags);
     return InitializeCriticalSectionEx(cs, spin_count, flags);
 }
+
+int __cdecl __uncaught_exceptions(void)
+{
+    return *__processing_throw();
+}
diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec
index bca405e..45d9370 100644
--- a/dlls/vcruntime140/vcruntime140.spec
+++ b/dlls/vcruntime140/vcruntime140.spec
@@ -48,7 +48,7 @@
 @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) ucrtbase.__unDNameEx
 @ cdecl __uncaught_exception() ucrtbase.__uncaught_exception
-@ stub __uncaught_exceptions
+@ cdecl __uncaught_exceptions()
 @ stub __vcrt_GetModuleFileNameW
 @ stub __vcrt_GetModuleHandleW
 @ cdecl __vcrt_InitializeCriticalSectionEx(ptr long long)




More information about the wine-cvs mailing list