Piotr Caban : msvcr: Add __crtUnhandledException implementation.

Alexandre Julliard julliard at winehq.org
Thu Jul 20 12:11:28 CDT 2017


Module: wine
Branch: stable
Commit: 79a049d6cd03c483fc59957a7641d70f3a12f3a9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=79a049d6cd03c483fc59957a7641d70f3a12f3a9

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu Mar 16 17:44:52 2017 +0100

msvcr: Add __crtUnhandledException implementation.

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit a5031391f40c6196b9baccbf69f5ccbe3b59e17c)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/msvcr110/msvcr110.spec |  2 +-
 dlls/msvcr120/msvcr120.spec |  2 +-
 dlls/msvcrt/misc.c          | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 9e1dc05..25811f3 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -930,7 +930,7 @@
 @ stub -arch=i386,win64 __crtSetThreadStackGuarantee
 @ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter
 @ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess
-@ stub -arch=i386,win64 __crtUnhandledException
+@ cdecl -arch=i386,win64 __crtUnhandledException(ptr) MSVCRT__crtUnhandledException
 @ cdecl __daylight() MSVCRT___p__daylight
 @ cdecl __dllonexit(ptr ptr ptr)
 @ cdecl __doserrno() MSVCRT___doserrno
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 91bb3c1..2a9c42c 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -920,7 +920,7 @@
 @ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter
 @ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess
 @ stub __crtSleep
-@ stub -arch=i386,win64 __crtUnhandledException
+@ cdecl -arch=i386,win64 __crtUnhandledException(ptr) MSVCRT__crtUnhandledException
 @ cdecl __daylight() MSVCRT___p__daylight
 @ cdecl __dllonexit(ptr ptr ptr)
 @ cdecl __doserrno() MSVCRT___doserrno
diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c
index 23a089a..767972f 100644
--- a/dlls/msvcrt/misc.c
+++ b/dlls/msvcrt/misc.c
@@ -532,3 +532,13 @@ void CDECL MSVCRT__crt_debugger_hook(int reserved)
 {
     WARN("(%x)\n", reserved);
 }
+
+/*********************************************************************
+ *  __crtUnhandledException (MSVCR110.@)
+ */
+LONG CDECL MSVCRT__crtUnhandledException(EXCEPTION_POINTERS *ep)
+{
+    TRACE("(%p)\n", ep);
+    SetUnhandledExceptionFilter(NULL);
+    return UnhandledExceptionFilter(ep);
+}




More information about the wine-cvs mailing list