From 6bd9ea5be9c1e53d2cf7369c5eb75817b3c80df5 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Wed, 2 Dec 2020 00:53:42 +0100 Subject: [PATCH] msvcrt: Remove MSVCRT_ prefix from except.c functions. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/crtdll/crtdll.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 10 +++++----- dlls/msvcr120/msvcr120.spec | 10 +++++----- dlls/msvcr70/msvcr70.spec | 8 ++++---- dlls/msvcr71/msvcr71.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 8 ++++---- dlls/msvcrt/except.c | 22 +++++++++++----------- dlls/msvcrt/exit.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 18 +++++++++--------- 14 files changed, 62 insertions(+), 63 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 1da1a248447..07e98afb01e 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -34,7 +34,7 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ extern __mb_cur_max_dll MSVCRT___mb_cur_max -@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs +@ cdecl __pxcptinfoptrs() @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) @@ -448,7 +448,7 @@ @ cdecl putchar(long) MSVCRT_putchar @ cdecl puts(str) MSVCRT_puts @ cdecl qsort(ptr long long ptr) MSVCRT_qsort -@ cdecl raise(long) MSVCRT_raise +@ cdecl raise(long) @ cdecl rand() MSVCRT_rand @ cdecl realloc(ptr long) @ cdecl remove(str) MSVCRT_remove @@ -458,7 +458,7 @@ @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf -@ cdecl signal(long long) MSVCRT_signal +@ cdecl signal(long long) @ cdecl sin(double) MSVCRT_sin @ cdecl sinh(double) MSVCRT_sinh @ varargs sprintf(ptr str) MSVCRT_sprintf diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7d699b116c1..b3d1a683ec0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -424,7 +424,7 @@ @ cdecl -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX@Z(ptr) __ExceptionPtrDestroy @ cdecl -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX@Z(ptr) __ExceptionPtrRethrow @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX@Z(ptr) __ExceptionPtrRethrow -@ cdecl __uncaught_exception() MSVCRT___uncaught_exception +@ cdecl __uncaught_exception() @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) _invalid_parameter @ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) _invalid_parameter @@ -650,7 +650,7 @@ @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func -@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs +@ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) @ stub __set_flsgetvalue @@ -1770,7 +1770,7 @@ @ cdecl putwchar(long) MSVCRT__fputwchar @ cdecl qsort(ptr long long ptr) MSVCRT_qsort @ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s -@ cdecl raise(long) MSVCRT_raise +@ cdecl raise(long) @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s @ cdecl realloc(ptr long) @@ -1783,7 +1783,7 @@ @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf -@ cdecl signal(long long) MSVCRT_signal +@ cdecl signal(long long) @ cdecl sin(double) MSVCRT_sin @ cdecl -arch=!i386 sinf(float) MSVCRT_sinf @ cdecl sinh(double) MSVCRT_sinh diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 18bb19b43b0..cdff43fc4f6 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -706,7 +706,7 @@ @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0@Z @ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX@Z(ptr) __ExceptionPtrToBool @ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX@Z(ptr) __ExceptionPtrToBool -@ cdecl __uncaught_exception() MSVCRT___uncaught_exception +@ cdecl __uncaught_exception() @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) _invalid_parameter @ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) _invalid_parameter @@ -928,7 +928,7 @@ @ stub -arch=i386,win64 __crtLCMapStringEx @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) @ stub -arch=i386,win64 __crtSetThreadStackGuarantee -@ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter +@ cdecl __crtSetUnhandledExceptionFilter(ptr) @ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess @ cdecl -arch=i386,win64 __crtUnhandledException(ptr) MSVCRT__crtUnhandledException @ cdecl __daylight() MSVCRT___p__daylight @@ -999,7 +999,7 @@ @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func -@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs +@ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active @@ -2128,7 +2128,7 @@ @ cdecl putwchar(long) MSVCRT__fputwchar @ cdecl qsort(ptr long long ptr) MSVCRT_qsort @ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s -@ cdecl raise(long) MSVCRT_raise +@ cdecl raise(long) @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s @ cdecl realloc(ptr long) @@ -2141,7 +2141,7 @@ @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf -@ cdecl signal(long long) MSVCRT_signal +@ cdecl signal(long long) @ cdecl sin(double) MSVCRT_sin @ cdecl -arch=!i386 sinf(float) MSVCRT_sinf @ cdecl sinh(double) MSVCRT_sinh diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1789d3d8454..fde5c0d50ae 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -688,7 +688,7 @@ @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0@Z @ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX@Z(ptr) __ExceptionPtrToBool @ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX@Z(ptr) __ExceptionPtrToBool -@ cdecl __uncaught_exception() MSVCRT___uncaught_exception +@ cdecl __uncaught_exception() @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) _invalid_parameter @ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) _invalid_parameter @@ -917,7 +917,7 @@ @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) @ stub __crtSetFileInformationByHandle @ stub -arch=i386,win64 __crtSetThreadStackGuarantee -@ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter +@ cdecl __crtSetUnhandledExceptionFilter(ptr) @ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess @ cdecl __crtSleep(long) MSVCRT__crtSleep @ cdecl -arch=i386,win64 __crtUnhandledException(ptr) MSVCRT__crtUnhandledException @@ -989,7 +989,7 @@ @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func -@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs +@ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active @@ -2320,7 +2320,7 @@ @ cdecl putwchar(long) MSVCRT__fputwchar @ cdecl qsort(ptr long long ptr) MSVCRT_qsort @ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s -@ cdecl raise(long) MSVCRT_raise +@ cdecl raise(long) @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s @ cdecl realloc(ptr long) @@ -2351,7 +2351,7 @@ @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf -@ cdecl signal(long long) MSVCRT_signal +@ cdecl signal(long long) @ cdecl sin(double) MSVCRT_sin @ cdecl -arch=!i386 sinf(float) MSVCRT_sinf @ cdecl sinh(double) MSVCRT_sinh diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index df492d5624d..4a9fc162bc5 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -68,7 +68,7 @@ @ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) operator_new @ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) operator_delete @ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) operator_delete -@ cdecl __uncaught_exception() MSVCRT___uncaught_exception +@ cdecl __uncaught_exception() @ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler @ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler @ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode @@ -193,7 +193,7 @@ @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func -@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs +@ cdecl __pxcptinfoptrs() @ cdecl __security_error_handler(long ptr) @ cdecl __set_app_type(long) @ stub __set_buffer_overrun_handler @@ -795,7 +795,7 @@ @ cdecl putwc(long ptr) MSVCRT_fputwc @ cdecl putwchar(long) MSVCRT__fputwchar @ cdecl qsort(ptr long long ptr) MSVCRT_qsort -@ cdecl raise(long) MSVCRT_raise +@ cdecl raise(long) @ cdecl rand() MSVCRT_rand @ cdecl realloc(ptr long) @ cdecl remove(str) MSVCRT_remove @@ -805,7 +805,7 @@ @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf -@ cdecl signal(long long) MSVCRT_signal +@ cdecl signal(long long) @ cdecl sin(double) MSVCRT_sin @ cdecl sinh(double) MSVCRT_sinh @ varargs sprintf(ptr str) MSVCRT_sprintf diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index dc993dfb87a..684e293851b 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -58,7 +58,7 @@ @ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) operator_new @ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) operator_delete @ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) operator_delete -@ cdecl __uncaught_exception() MSVCRT___uncaught_exception +@ cdecl __uncaught_exception() @ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler @ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler @ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode @@ -188,7 +188,7 @@ @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func -@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs +@ cdecl __pxcptinfoptrs() @ cdecl __security_error_handler(long ptr) @ cdecl __set_app_type(long) @ stub __set_buffer_overrun_handler @@ -791,7 +791,7 @@ @ cdecl putwc(long ptr) MSVCRT_fputwc @ cdecl putwchar(long) MSVCRT__fputwchar @ cdecl qsort(ptr long long ptr) MSVCRT_qsort -@ cdecl raise(long) MSVCRT_raise +@ cdecl raise(long) @ cdecl rand() MSVCRT_rand @ cdecl realloc(ptr long) @ cdecl remove(str) MSVCRT_remove @@ -801,7 +801,7 @@ @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf -@ cdecl signal(long long) MSVCRT_signal +@ cdecl signal(long long) @ cdecl sin(double) MSVCRT_sin @ cdecl sinh(double) MSVCRT_sinh @ varargs sprintf(ptr str) MSVCRT_sprintf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ce6965dd38a..685efce8442 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -80,7 +80,7 @@ @ stub -arch=win64 ?_ValidateRead@@YAHPEBXI@Z # int __cdecl _ValidateRead(void const * __ptr64,unsigned int) @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI@Z # int __cdecl _ValidateWrite(void *,unsigned int) @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI@Z # int __cdecl _ValidateWrite(void * __ptr64,unsigned int) -@ cdecl __uncaught_exception() MSVCRT___uncaught_exception +@ cdecl __uncaught_exception() @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) _invalid_parameter @ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) _invalid_parameter @@ -299,7 +299,7 @@ @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func -@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs +@ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) @ stub __set_flsgetvalue @@ -1451,7 +1451,7 @@ @ cdecl putwchar(long) MSVCRT__fputwchar @ cdecl qsort(ptr long long ptr) MSVCRT_qsort @ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s -@ cdecl raise(long) MSVCRT_raise +@ cdecl raise(long) @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s @ cdecl realloc(ptr long) @@ -1464,7 +1464,7 @@ @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf -@ cdecl signal(long long) MSVCRT_signal +@ cdecl signal(long long) @ cdecl sin(double) MSVCRT_sin @ cdecl -arch=!i386 sinf(float) MSVCRT_sinf @ cdecl sinh(double) MSVCRT_sinh diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6c9d055314c..bb79f75b80e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -80,7 +80,7 @@ @ stub -arch=win64 ?_ValidateRead@@YAHPEBXI@Z # int __cdecl _ValidateRead(void const * __ptr64,unsigned int) @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI@Z # int __cdecl _ValidateWrite(void *,unsigned int) @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI@Z # int __cdecl _ValidateWrite(void * __ptr64,unsigned int) -@ cdecl __uncaught_exception() MSVCRT___uncaught_exception +@ cdecl __uncaught_exception() @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) _invalid_parameter @ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) _invalid_parameter @@ -283,7 +283,7 @@ @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func -@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs +@ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __set_app_type(long) @ stub __set_flsgetvalue @@ -1423,7 +1423,7 @@ @ cdecl putwchar(long) MSVCRT__fputwchar @ cdecl qsort(ptr long long ptr) MSVCRT_qsort @ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s -@ cdecl raise(long) MSVCRT_raise +@ cdecl raise(long) @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s @ cdecl realloc(ptr long) @@ -1436,7 +1436,7 @@ @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf -@ cdecl signal(long long) MSVCRT_signal +@ cdecl signal(long long) @ cdecl sin(double) MSVCRT_sin @ cdecl sinh(double) MSVCRT_sinh @ cdecl -arch=!i386 sinf(float) MSVCRT_sinf diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index e2b90d9e0bd..896d4f9b234 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -68,7 +68,7 @@ static BOOL WINAPI msvcrt_console_handler(DWORD ctrlType) /********************************************************************* * __pxcptinfoptrs (MSVCRT.@) */ -void** CDECL MSVCRT___pxcptinfoptrs(void) +void** CDECL __pxcptinfoptrs(void) { return (void**)&msvcrt_get_thread_data()->xcptinfo; } @@ -105,7 +105,7 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { if (handler != SIG_IGN) { - EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; + EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)__pxcptinfoptrs(), *old_ep; old_ep = *ep; *ep = except; @@ -131,7 +131,7 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { if (handler != SIG_IGN) { - EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; + EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)__pxcptinfoptrs(), *old_ep; unsigned int i; int float_signal = _FPE_INVALID; @@ -160,7 +160,7 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { if (handler != SIG_IGN) { - EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; + EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)__pxcptinfoptrs(), *old_ep; old_ep = *ep; *ep = except; @@ -190,7 +190,7 @@ void msvcrt_free_signals(void) * Some signals may never be generated except through an explicit call to * raise. */ -__sighandler_t CDECL MSVCRT_signal(int sig, __sighandler_t func) +__sighandler_t CDECL signal(int sig, __sighandler_t func) { __sighandler_t ret = SIG_ERR; @@ -222,7 +222,7 @@ __sighandler_t CDECL MSVCRT_signal(int sig, __sighandler_t func) /********************************************************************* * raise (MSVCRT.@) */ -int CDECL MSVCRT_raise(int sig) +int CDECL raise(int sig) { __sighandler_t handler; @@ -237,7 +237,7 @@ int CDECL MSVCRT_raise(int sig) if (handler == SIG_DFL) MSVCRT__exit(3); if (handler != SIG_IGN) { - EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)MSVCRT___pxcptinfoptrs(), *old_ep; + EXCEPTION_POINTERS **ep = (EXCEPTION_POINTERS**)__pxcptinfoptrs(), *old_ep; sighandlers[sig] = SIG_DFL; @@ -290,7 +290,7 @@ int CDECL _abnormal_termination(void) /****************************************************************** * __uncaught_exception (MSVCRT.@) */ -BOOL CDECL MSVCRT___uncaught_exception(void) +BOOL CDECL __uncaught_exception(void) { return msvcrt_get_thread_data()->processing_throw != 0; } @@ -330,7 +330,7 @@ void CDECL __security_error_handler(int code, void *data) /********************************************************************* * __crtSetUnhandledExceptionFilter (MSVCR110.@) */ -LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER filter) +LPTOP_LEVEL_EXCEPTION_FILTER CDECL __crtSetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER filter) { return SetUnhandledExceptionFilter(filter); } @@ -482,7 +482,7 @@ struct __std_exception_data { /********************************************************************* * __std_exception_copy (UCRTBASE.@) */ -void CDECL MSVCRT___std_exception_copy(const struct __std_exception_data *src, +void CDECL __std_exception_copy(const struct __std_exception_data *src, struct __std_exception_data *dst) { TRACE("(%p %p)\n", src, dst); @@ -499,7 +499,7 @@ void CDECL MSVCRT___std_exception_copy(const struct __std_exception_data *src, /********************************************************************* * __std_exception_destroy (UCRTBASE.@) */ -void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data) +void CDECL __std_exception_destroy(struct __std_exception_data *data) { TRACE("(%p)\n", data); diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 4444431f94d..37119532b93 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -259,7 +259,7 @@ void CDECL MSVCRT_abort(void) else _cputs("\nabnormal program termination\n"); } - MSVCRT_raise(SIGABRT); + raise(SIGABRT); /* in case raise() returns */ MSVCRT__exit(3); } @@ -298,7 +298,7 @@ void CDECL MSVCRT__wassert(const wchar_t* str, const wchar_t* file, unsigned int else MSVCRT_fwprintf(MSVCRT_stderr, L"Assertion failed: %ls, file %ls, line %d\n\n", str, file, line); - MSVCRT_raise(SIGABRT); + raise(SIGABRT); MSVCRT__exit(3); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 5e6b5180ee8..634aa3c74a7 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -641,7 +641,6 @@ int WINAPIV MSVCRT__snwprintf(wchar_t*, size_t, const wchar_t*, ...); int WINAPIV MSVCRT_sprintf(char*,const char*,...); int WINAPIV MSVCRT__snprintf(char*,size_t,const char*,...); int WINAPIV MSVCRT__scprintf(const char*,...); -int __cdecl MSVCRT_raise(int sig); int __cdecl MSVCRT__set_printf_count_output(int); #define MSVCRT__ENABLE_PER_THREAD_LOCALE 1 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dc30165056d..1401070d76d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -277,7 +277,7 @@ @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo # stub __pwctype_func() -@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs +@ cdecl __pxcptinfoptrs() @ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @@ -285,7 +285,7 @@ @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) -@ cdecl __uncaught_exception() MSVCRT___uncaught_exception +@ cdecl __uncaught_exception() @ cdecl __unDName(ptr str long ptr ptr long) @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) @ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active @@ -1395,7 +1395,7 @@ @ cdecl putwchar(long) MSVCRT__fputwchar @ cdecl qsort(ptr long long ptr) MSVCRT_qsort @ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s -@ cdecl raise(long) MSVCRT_raise +@ cdecl raise(long) @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s @ cdecl realloc(ptr long) @@ -1408,7 +1408,7 @@ @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf -@ cdecl signal(long long) MSVCRT_signal +@ cdecl signal(long long) @ cdecl sin(double) MSVCRT_sin @ cdecl sinh(double) MSVCRT_sinh @ cdecl -arch=!i386 sinf(float) MSVCRT_sinf diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 75da11c8124..d166f6666d0 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -184,7 +184,7 @@ @ cdecl __p__wpgmptr() @ cdecl __pctype_func() @ extern __pioinfo MSVCRT___pioinfo -@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs +@ cdecl __pxcptinfoptrs() @ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @@ -747,7 +747,7 @@ @ cdecl putwc(long ptr) MSVCRT_fputwc @ cdecl putwchar(long) MSVCRT__fputwchar @ cdecl qsort(ptr long long ptr) MSVCRT_qsort -@ cdecl raise(long) MSVCRT_raise +@ cdecl raise(long) @ cdecl rand() MSVCRT_rand @ cdecl realloc(ptr long) @ cdecl remove(str) MSVCRT_remove @@ -757,7 +757,7 @@ @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf -@ cdecl signal(long long) MSVCRT_signal +@ cdecl signal(long long) @ cdecl sin(double) MSVCRT_sin @ cdecl sinh(double) MSVCRT_sinh @ varargs sprintf(ptr str) MSVCRT_sprintf diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ec9b617a810..103dee95478 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -137,11 +137,11 @@ @ cdecl __pctype_func() @ cdecl __processing_throw() @ stub __pwctype_func -@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs +@ cdecl __pxcptinfoptrs() @ stub __report_gsfailure @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ cdecl __std_exception_copy(ptr ptr) MSVCRT___std_exception_copy -@ cdecl __std_exception_destroy(ptr) MSVCRT___std_exception_destroy +@ cdecl __std_exception_copy(ptr ptr) +@ cdecl __std_exception_destroy(ptr) @ cdecl __std_type_info_compare(ptr ptr) @ cdecl __std_type_info_destroy_list(ptr) @ cdecl __std_type_info_hash(ptr) @@ -174,7 +174,7 @@ @ cdecl __tzname() __p__tzname @ cdecl __unDName(ptr str long ptr ptr long) @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) -@ cdecl __uncaught_exception() MSVCRT___uncaught_exception +@ cdecl __uncaught_exception() @ cdecl __wcserror(wstr) @ cdecl __wcserror_s(ptr long wstr) @ stub __wcsncnt @@ -806,8 +806,8 @@ @ cdecl _o___p__wpgmptr() __p__wpgmptr @ cdecl _o___pctype_func() __pctype_func @ stub _o___pwctype_func -@ cdecl _o___std_exception_copy(ptr ptr) MSVCRT___std_exception_copy -@ cdecl _o___std_exception_destroy(ptr) MSVCRT___std_exception_destroy +@ cdecl _o___std_exception_copy(ptr ptr) __std_exception_copy +@ cdecl _o___std_exception_destroy(ptr) __std_exception_destroy @ cdecl _o___std_type_info_destroy_list(ptr) __std_type_info_destroy_list @ cdecl _o___std_type_info_name(ptr ptr) __std_type_info_name @ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @@ -1742,7 +1742,7 @@ @ cdecl _o_putwchar(long) MSVCRT__fputwchar @ cdecl _o_qsort(ptr long long ptr) MSVCRT_qsort @ cdecl _o_qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s -@ cdecl _o_raise(long) MSVCRT_raise +@ cdecl _o_raise(long) raise @ cdecl _o_rand() MSVCRT_rand @ cdecl _o_rand_s(ptr) MSVCRT_rand_s @ cdecl _o_realloc(ptr long) realloc @@ -2455,7 +2455,7 @@ @ cdecl qsort(ptr long long ptr) MSVCRT_qsort @ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s @ cdecl quick_exit(long) MSVCRT_quick_exit -@ cdecl raise(long) MSVCRT_raise +@ cdecl raise(long) @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s @ cdecl realloc(ptr long) @@ -2486,7 +2486,7 @@ @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf -@ cdecl signal(long long) MSVCRT_signal +@ cdecl signal(long long) @ cdecl sin(double) MSVCRT_sin @ cdecl -arch=!i386 sinf(float) MSVCRT_sinf @ cdecl sinh(double) MSVCRT_sinh