Piotr Caban : msvcrt: Use _invalid_parameter_handler from public header.
Alexandre Julliard
julliard at winehq.org
Fri Dec 4 14:36:03 CST 2020
Module: wine
Branch: master
Commit: 264ba46bcdcd2119c2f9712ba52bb74c35bd369b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=264ba46bcdcd2119c2f9712ba52bb74c35bd369b
Author: Piotr Caban <piotr at codeweavers.com>
Date: Fri Dec 4 15:49:53 2020 +0100
msvcrt: Use _invalid_parameter_handler from public header.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcrt/errno.c | 18 +++++++++---------
dlls/msvcrt/msvcrt.h | 3 +--
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c
index 592d37ced8a..85752e52df7 100644
--- a/dlls/msvcrt/errno.c
+++ b/dlls/msvcrt/errno.c
@@ -126,7 +126,7 @@ char *MSVCRT__sys_errlist[] =
unsigned int MSVCRT__sys_nerr = ARRAY_SIZE(MSVCRT__sys_errlist) - 1;
-static MSVCRT_invalid_parameter_handler invalid_parameter_handler = NULL;
+static _invalid_parameter_handler invalid_parameter_handler = NULL;
/* INTERNAL: Set the crt and dos errno's from the OS error given. */
void msvcrt_set_errno(int err)
@@ -503,7 +503,7 @@ void CDECL _invalid_parameter_noinfo_noreturn(void)
/*********************************************************************
* _get_invalid_parameter_handler (MSVCR80.@)
*/
-MSVCRT_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void)
+_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void)
{
TRACE("\n");
return invalid_parameter_handler;
@@ -512,10 +512,10 @@ MSVCRT_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void)
/*********************************************************************
* _set_invalid_parameter_handler (MSVCR80.@)
*/
-MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler(
- MSVCRT_invalid_parameter_handler handler)
+_invalid_parameter_handler CDECL _set_invalid_parameter_handler(
+ _invalid_parameter_handler handler)
{
- MSVCRT_invalid_parameter_handler old = invalid_parameter_handler;
+ _invalid_parameter_handler old = invalid_parameter_handler;
TRACE("(%p)\n", handler);
@@ -530,7 +530,7 @@ MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler(
/*********************************************************************
* _get_thread_local_invalid_parameter_handler (UCRTBASE.@)
*/
-MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handler(void)
+_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handler(void)
{
TRACE("\n");
return msvcrt_get_thread_data()->invalid_parameter_handler;
@@ -539,11 +539,11 @@ MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handl
/*********************************************************************
* _set_thread_local_invalid_parameter_handler (UCRTBASE.@)
*/
-MSVCRT_invalid_parameter_handler CDECL _set_thread_local_invalid_parameter_handler(
- MSVCRT_invalid_parameter_handler handler)
+_invalid_parameter_handler CDECL _set_thread_local_invalid_parameter_handler(
+ _invalid_parameter_handler handler)
{
thread_data_t *data = msvcrt_get_thread_data();
- MSVCRT_invalid_parameter_handler old = data->invalid_parameter_handler;
+ _invalid_parameter_handler old = data->invalid_parameter_handler;
TRACE("(%p)\n", handler);
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 257497b72a2..a8bb25132e5 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -40,7 +40,6 @@ typedef void (__cdecl *unexpected_function)(void);
typedef void (__cdecl *_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info);
void __cdecl terminate(void);
-typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t);
typedef void (__cdecl *MSVCRT_purecall_handler)(void);
typedef void (__cdecl *MSVCRT_security_error_handler)(int, void *);
@@ -164,7 +163,7 @@ struct __thread_data {
char cached_locale[131];
void *unk10[100];
#if _MSVCR_VER >= 140
- MSVCRT_invalid_parameter_handler invalid_parameter_handler;
+ _invalid_parameter_handler invalid_parameter_handler;
#endif
};
More information about the wine-cvs
mailing list