[PATCH] msvcrt: Don't include MSVC 7.0+ exception functions in SOs for older DLLs
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- 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 8d13e7fbef..13698f8364 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 */ -- 2.15.1
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/exit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index d0e93d7b98..7e1805569c 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -204,6 +204,7 @@ void CDECL MSVCRT_abort(void) MSVCRT__exit(3); } +#if _MSVCR_VER>=80 /********************************************************************* * _set_abort_behavior (MSVCR80.@) */ @@ -218,6 +219,7 @@ unsigned int CDECL MSVCRT__set_abort_behavior(unsigned int flags, unsigned int m MSVCRT_abort_behavior = (MSVCRT_abort_behavior & ~mask) | (flags & mask); return old; } +#endif /********************************************************************* * _wassert (MSVCRT.@) @@ -346,6 +348,8 @@ int CDECL MSVCRT_atexit(void (*func)(void)) return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; } +#if _MSVCR_VER>=140 + /********************************************************************* * _crt_atexit (UCRTBASE.@) */ @@ -462,6 +466,8 @@ void CDECL _register_thread_local_exe_atexit_callback(_tls_callback_type callbac tls_atexit_callback = callback; } +#endif /* _MSVCR_VER>=140 */ + #if _MSVCR_VER>=71 /********************************************************************* * _set_purecall_handler (MSVCR71.@) -- 2.15.1
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/locale.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6d5ceb581b..c37989d770 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1641,8 +1641,9 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) return loc; } +#if _MSVCR_VER >= 110 /********************************************************************* - * _wcreate_locale (MSVCRT.@) + * _wcreate_locale (MSVCR110.@) */ MSVCRT__locale_t CDECL MSVCRT__wcreate_locale(int category, const MSVCRT_wchar_t *locale) { @@ -1665,6 +1666,7 @@ MSVCRT__locale_t CDECL MSVCRT__wcreate_locale(int category, const MSVCRT_wchar_t MSVCRT_free(str); return loc; } +#endif /********************************************************************* * setlocale (MSVCRT.@) -- 2.15.1
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
--- dlls/msvcrt/misc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index d784dec18e..8f18aa4cc0 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -457,7 +457,6 @@ void * CDECL _encoded_null(void) #endif /* _MSVCR_VER>=80 */ #if _MSVCR_VER>=70 - /********************************************************************* * _CRT_RTC_INIT (MSVCR70.@) */ @@ -466,9 +465,12 @@ void* CDECL _CRT_RTC_INIT(void *unk1, void *unk2, int unk3, int unk4, int unk5) TRACE("%p %p %x %x %x\n", unk1, unk2, unk3, unk4, unk5); return NULL; } +#endif + +#if _MSVCR_VER>=80 /********************************************************************* - * _CRT_RTC_INITW (MSVCR70.@) + * _CRT_RTC_INITW (MSVCR80.@) */ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) { @@ -476,10 +478,6 @@ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) return NULL; } -#endif /* _MSVCR_VER>=70 */ - -#if _MSVCR_VER>=80 - /********************************************************************* * _byteswap_ushort (MSVCR80.@) */ -- 2.15.1
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/math.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index c37989d770..088e1b784b 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -451,7 +451,7 @@ char* CDECL _Getdays(void) #if _MSVCR_VER >= 110 /********************************************************************* - * _W_Getdays (MSVCR100.@) + * _W_Getdays (MSVCR110.@) */ MSVCRT_wchar_t* CDECL _W_Getdays(void) { @@ -519,7 +519,7 @@ char* CDECL _Getmonths(void) #if _MSVCR_VER >= 110 /********************************************************************* - * _W_Getmonths (MSVCR100.@) + * _W_Getmonths (MSVCR110.@) */ MSVCRT_wchar_t* CDECL _W_Getmonths(void) { diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 89400f833c..9b480117fc 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1040,7 +1040,7 @@ double CDECL MSVCRT__chgsign(double num) } /********************************************************************* - * __control87_2 (MSVCRT.@) + * __control87_2 (MSVCR80.@) * * Not exported by native msvcrt, added in msvcr80. */ -- 2.15.1
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
participants (2)
-
Alex Henrie -
Piotr Caban