Piotr Caban : msvcrt: Add __security_error_handler stub.

Alexandre Julliard julliard at winehq.org
Fri Oct 25 10:57:56 CDT 2013


Module: wine
Branch: master
Commit: e3592d041a42f4e8365825ab3dab5c2addbe1fc0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e3592d041a42f4e8365825ab3dab5c2addbe1fc0

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Fri Oct 25 14:12:43 2013 +0200

msvcrt: Add __security_error_handler stub.

---

 dlls/msvcr70/msvcr70.spec |    2 +-
 dlls/msvcr71/msvcr71.spec |    2 +-
 dlls/msvcrt/except.c      |   11 +++++++++++
 dlls/msvcrt/msvcrt.spec   |    1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index 49b2dff..fbd4506 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -194,7 +194,7 @@
 @ extern __pioinfo msvcrt.__pioinfo
 @ stub __pwctype_func
 @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
-@ stub __security_error_handler
+@ cdecl __security_error_handler(long ptr) msvcrt.__security_error_handler
 @ cdecl __set_app_type(long) msvcrt.__set_app_type
 @ stub __set_buffer_overrun_handler
 @ extern __setlc_active msvcrt.__setlc_active
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index b0602b8..5f536c0 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -189,7 +189,7 @@
 @ extern __pioinfo msvcrt.__pioinfo
 @ stub __pwctype_func
 @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
-@ stub __security_error_handler
+@ cdecl __security_error_handler(long ptr) msvcrt.__security_error_handler
 @ cdecl __set_app_type(long) msvcrt.__set_app_type
 @ stub __set_buffer_overrun_handler
 @ extern __setlc_active msvcrt.__setlc_active
diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c
index b77daa1..8cafba6 100644
--- a/dlls/msvcrt/except.c
+++ b/dlls/msvcrt/except.c
@@ -303,3 +303,14 @@ MSVCRT_security_error_handler CDECL _set_security_error_handler(
     security_error_handler = handler;
     return old;
 }
+
+/* __security_error_handler - not exported in native msvcrt */
+void CDECL __security_error_handler(int code, void *data)
+{
+    if(security_error_handler)
+        security_error_handler(code, data);
+    else
+        FIXME("(%d, %p) stub\n", code, data);
+
+    MSVCRT__exit(3);
+}
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 43daf0f..5e57aae 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -1528,6 +1528,7 @@
 @ cdecl _set_invalid_parameter_handler(ptr)
 @ cdecl _set_purecall_handler(ptr)
 @ cdecl _set_security_error_handler(ptr)
+@ cdecl __security_error_handler(long ptr)
 @ cdecl -arch=i386 _statusfp2(ptr ptr)
 @ cdecl _wdupenv_s(ptr ptr wstr)
 @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output




More information about the wine-cvs mailing list