Alex Henrie : msvcrt: Don' t include MSVC 7.0+ exception functions in SOs for older DLLs.

[Alexandre Julliard]

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

Author: Alex Henrie <alexhenrie24 at gmail.com>
Date:   Tue Jan  9 23:21:42 2018 -0700

msvcrt: Don't include MSVC 7.0+ exception functions in SOs for older DLLs.

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

---

 dlls/msvcrt/except.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c
index 8d13e7f..13698f8 100644
--- a/dlls/msvcrt/except.c
+++ b/dlls/msvcrt/except.c
@@ -41,7 +41,9 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(seh);
 
+#if _MSVCR_VER>=70 && _MSVCR_VER<=71
 static MSVCRT_security_error_handler security_error_handler;
+#endif
 
 static MSVCRT___sighandler_t sighandlers[MSVCRT_NSIG] = { MSVCRT_SIG_DFL };
 
@@ -294,6 +296,8 @@ BOOL CDECL MSVCRT___uncaught_exception(void)
     return FALSE;
 }
 
+#if _MSVCR_VER>=70 && _MSVCR_VER<=71
+
 /*********************************************************************
  *		_set_security_error_handler (MSVCR70.@)
  */
@@ -321,6 +325,8 @@ void CDECL __security_error_handler(int code, void *data)
     MSVCRT__exit(3);
 }
 
+#endif /* _MSVCR_VER>=70 && _MSVCR_VER<=71 */
+
 #if _MSVCR_VER>=110
 /*********************************************************************
  *  __crtSetUnhandledExceptionFilter (MSVCR110.@)
@@ -470,8 +476,10 @@ struct __std_exception_data {
     MSVCRT_bool dofree;
 };
 
+#if _MSVCR_VER>=140
+
 /*********************************************************************
- *  __std_exception_copy (MSVCRT.@)
+ *  __std_exception_copy (UCRTBASE.@)
  */
 void CDECL MSVCRT___std_exception_copy(const struct __std_exception_data *src,
                                        struct __std_exception_data *dst)
@@ -488,7 +496,7 @@ void CDECL MSVCRT___std_exception_copy(const struct __std_exception_data *src,
 }
 
 /*********************************************************************
- *  __std_exception_destroy (MSVCRT.@)
+ *  __std_exception_destroy (UCRTBASE.@)
  */
 void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data)
 {
@@ -499,3 +507,5 @@ void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data)
     data->what   = NULL;
     data->dofree = 0;
 }
+
+#endif /* _MSVCR_VER>=140 */