Piotr Caban : msvcrt: Use _purecall_handler from public header.
Alexandre Julliard
julliard at winehq.org
Fri Dec 4 14:36:03 CST 2020
Module: wine
Branch: master
Commit: 200fe8ac42ff0800c784ec686ccf494391f6907b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=200fe8ac42ff0800c784ec686ccf494391f6907b
Author: Piotr Caban <piotr at codeweavers.com>
Date: Fri Dec 4 15:49:58 2020 +0100
msvcrt: Use _purecall_handler from public header.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcrt/exit.c | 8 ++++----
dlls/msvcrt/msvcrt.h | 1 -
include/msvcrt/stdlib.h | 4 ++++
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c
index ee6c30356fd..bb977f7c957 100644
--- a/dlls/msvcrt/exit.c
+++ b/dlls/msvcrt/exit.c
@@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
#define LOCK_EXIT _lock(_EXIT_LOCK1)
#define UNLOCK_EXIT _unlock(_EXIT_LOCK1)
-static MSVCRT_purecall_handler purecall_handler = NULL;
+static _purecall_handler purecall_handler = NULL;
static _onexit_table_t MSVCRT_atexit_table;
@@ -461,9 +461,9 @@ void CDECL _register_thread_local_exe_atexit_callback(_tls_callback_type callbac
/*********************************************************************
* _set_purecall_handler (MSVCR71.@)
*/
-MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler function)
+_purecall_handler CDECL _set_purecall_handler(_purecall_handler function)
{
- MSVCRT_purecall_handler ret = purecall_handler;
+ _purecall_handler ret = purecall_handler;
TRACE("(%p)\n", function);
purecall_handler = function;
@@ -475,7 +475,7 @@ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler func
/*********************************************************************
* _get_purecall_handler (MSVCR80.@)
*/
-MSVCRT_purecall_handler CDECL _get_purecall_handler(void)
+_purecall_handler CDECL _get_purecall_handler(void)
{
TRACE("\n");
return purecall_handler;
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index a8bb25132e5..26cb5fee996 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_purecall_handler)(void);
typedef void (__cdecl *MSVCRT_security_error_handler)(int, void *);
typedef struct {ULONG x80[3];} MSVCRT__LDOUBLE; /* Intel 80 bit FP format has sizeof() 12 */
diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h
index cdfe3e4b742..ed6560bc318 100644
--- a/include/msvcrt/stdlib.h
+++ b/include/msvcrt/stdlib.h
@@ -230,6 +230,10 @@ _ACRTIMP int __cdecl system(const char*);
_ACRTIMP void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (__cdecl *)(const void*,const void*));
_ACRTIMP void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,const void*));
+typedef void (__cdecl *_purecall_handler)(void);
+_ACRTIMP _purecall_handler __cdecl _set_purecall_handler(_purecall_handler);
+_ACRTIMP _purecall_handler __cdecl _get_purecall_handler(void);
+
typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t);
_ACRTIMP _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler);
_ACRTIMP _invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void);
More information about the wine-cvs
mailing list