mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-15 02:19:47 +00:00
msvcrt: Rename exception::what() implementation to exception_what.
Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
8ca5afa430
commit
f1fa214b9f
|
@ -501,8 +501,8 @@
|
||||||
@ cdecl -arch=win64 ?wait@event@Concurrency@@QEAA_KI@Z(ptr long) event_wait
|
@ cdecl -arch=win64 ?wait@event@Concurrency@@QEAA_KI@Z(ptr long) event_wait
|
||||||
@ cdecl -arch=win32 ?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z(ptr long long long) event_wait_for_multiple
|
@ cdecl -arch=win32 ?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z(ptr long long long) event_wait_for_multiple
|
||||||
@ cdecl -arch=win64 ?wait_for_multiple@event@Concurrency@@SA_KPEAPEAV12@_K_NI@Z(ptr long long long) event_wait_for_multiple
|
@ cdecl -arch=win64 ?wait_for_multiple@event@Concurrency@@SA_KPEAPEAV12@_K_NI@Z(ptr long long long) event_wait_for_multiple
|
||||||
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
|
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
|
||||||
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
|
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
|
||||||
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
|
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
|
||||||
@ cdecl -arch=i386 _CIacos()
|
@ cdecl -arch=i386 _CIacos()
|
||||||
@ cdecl -arch=i386 _CIasin()
|
@ cdecl -arch=i386 _CIasin()
|
||||||
|
|
|
@ -820,9 +820,9 @@
|
||||||
@ cdecl -arch=win64 ?wait_for@_Condition_variable@details@Concurrency@@QEAA_NAEAVcritical_section@3@I@Z(ptr ptr long) _Condition_variable_wait_for
|
@ cdecl -arch=win64 ?wait_for@_Condition_variable@details@Concurrency@@QEAA_NAEAVcritical_section@3@I@Z(ptr ptr long) _Condition_variable_wait_for
|
||||||
@ cdecl -arch=win32 ?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z(ptr long long long) event_wait_for_multiple
|
@ cdecl -arch=win32 ?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z(ptr long long long) event_wait_for_multiple
|
||||||
@ cdecl -arch=win64 ?wait_for_multiple@event@Concurrency@@SA_KPEAPEAV12@_K_NI@Z(ptr long long long) event_wait_for_multiple
|
@ cdecl -arch=win64 ?wait_for_multiple@event@Concurrency@@SA_KPEAPEAV12@_K_NI@Z(ptr long long long) event_wait_for_multiple
|
||||||
@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) what_exception
|
@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) exception_what
|
||||||
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
|
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
|
||||||
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
|
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
|
||||||
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
|
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
|
||||||
@ cdecl -arch=i386 _CIacos()
|
@ cdecl -arch=i386 _CIacos()
|
||||||
@ cdecl -arch=i386 _CIasin()
|
@ cdecl -arch=i386 _CIasin()
|
||||||
|
|
|
@ -802,9 +802,9 @@
|
||||||
@ cdecl -arch=win64 ?wait_for@_Condition_variable@details@Concurrency@@QEAA_NAEAVcritical_section@3@I@Z(ptr ptr long) _Condition_variable_wait_for
|
@ cdecl -arch=win64 ?wait_for@_Condition_variable@details@Concurrency@@QEAA_NAEAVcritical_section@3@I@Z(ptr ptr long) _Condition_variable_wait_for
|
||||||
@ cdecl -arch=win32 ?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z(ptr long long long) event_wait_for_multiple
|
@ cdecl -arch=win32 ?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z(ptr long long long) event_wait_for_multiple
|
||||||
@ cdecl -arch=win64 ?wait_for_multiple@event@Concurrency@@SA_KPEAPEAV12@_K_NI@Z(ptr long long long) event_wait_for_multiple
|
@ cdecl -arch=win64 ?wait_for_multiple@event@Concurrency@@SA_KPEAPEAV12@_K_NI@Z(ptr long long long) event_wait_for_multiple
|
||||||
@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) what_exception
|
@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) exception_what
|
||||||
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
|
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
|
||||||
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
|
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
|
||||||
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
|
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
|
||||||
@ cdecl -arch=i386 _CIacos()
|
@ cdecl -arch=i386 _CIacos()
|
||||||
@ cdecl -arch=i386 _CIasin()
|
@ cdecl -arch=i386 _CIasin()
|
||||||
|
|
|
@ -88,8 +88,8 @@
|
||||||
@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
|
@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
|
||||||
@ cdecl ?terminate@@YAXXZ() terminate
|
@ cdecl ?terminate@@YAXXZ() terminate
|
||||||
@ cdecl ?unexpected@@YAXXZ() unexpected
|
@ cdecl ?unexpected@@YAXXZ() unexpected
|
||||||
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception
|
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) exception_what
|
||||||
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
|
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) exception_what
|
||||||
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
|
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
|
||||||
@ cdecl -arch=i386 _CIacos()
|
@ cdecl -arch=i386 _CIacos()
|
||||||
@ cdecl -arch=i386 _CIasin()
|
@ cdecl -arch=i386 _CIasin()
|
||||||
|
|
|
@ -82,8 +82,8 @@
|
||||||
@ cdecl ?unexpected@@YAXXZ() unexpected
|
@ cdecl ?unexpected@@YAXXZ() unexpected
|
||||||
@ cdecl ?vswprintf@@YAHPAGIPBGPAD@Z(ptr long wstr ptr) _vsnwprintf
|
@ cdecl ?vswprintf@@YAHPAGIPBGPAD@Z(ptr long wstr ptr) _vsnwprintf
|
||||||
@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) _vsnwprintf
|
@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) _vsnwprintf
|
||||||
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception
|
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) exception_what
|
||||||
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
|
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) exception_what
|
||||||
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
|
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
|
||||||
@ cdecl -arch=i386 _CIacos()
|
@ cdecl -arch=i386 _CIacos()
|
||||||
@ cdecl -arch=i386 _CIasin()
|
@ cdecl -arch=i386 _CIasin()
|
||||||
|
|
|
@ -128,8 +128,8 @@
|
||||||
@ cdecl ?terminate@@YAXXZ() terminate
|
@ cdecl ?terminate@@YAXXZ() terminate
|
||||||
@ cdecl ?unexpected@@YAXXZ() unexpected
|
@ cdecl ?unexpected@@YAXXZ() unexpected
|
||||||
@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) _vsnwprintf
|
@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) _vsnwprintf
|
||||||
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
|
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
|
||||||
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
|
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
|
||||||
@ stub @_calloc_crt@8
|
@ stub @_calloc_crt@8
|
||||||
@ cdecl @_malloc_crt@4(long) malloc
|
@ cdecl @_malloc_crt@4(long) malloc
|
||||||
@ stub @_realloc_crt@8
|
@ stub @_realloc_crt@8
|
||||||
|
|
|
@ -128,8 +128,8 @@
|
||||||
@ cdecl ?terminate@@YAXXZ() terminate
|
@ cdecl ?terminate@@YAXXZ() terminate
|
||||||
@ cdecl ?unexpected@@YAXXZ() unexpected
|
@ cdecl ?unexpected@@YAXXZ() unexpected
|
||||||
@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) _vsnwprintf
|
@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) _vsnwprintf
|
||||||
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
|
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
|
||||||
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
|
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
|
||||||
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
|
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
|
||||||
@ cdecl -arch=i386 _CIacos()
|
@ cdecl -arch=i386 _CIacos()
|
||||||
@ cdecl -arch=i386 _CIasin()
|
@ cdecl -arch=i386 _CIasin()
|
||||||
|
|
|
@ -259,8 +259,8 @@ void * __thiscall exception_scalar_dtor(exception * _this, unsigned int flags)
|
||||||
/******************************************************************
|
/******************************************************************
|
||||||
* ?what@exception@@UBEPBDXZ (MSVCRT.@)
|
* ?what@exception@@UBEPBDXZ (MSVCRT.@)
|
||||||
*/
|
*/
|
||||||
DEFINE_THISCALL_WRAPPER(what_exception,4)
|
DEFINE_THISCALL_WRAPPER(exception_what,4)
|
||||||
const char * __thiscall what_exception(exception * _this)
|
const char * __thiscall exception_what(exception * _this)
|
||||||
{
|
{
|
||||||
TRACE("(%p) returning %s\n", _this, _this->name);
|
TRACE("(%p) returning %s\n", _this, _this->name);
|
||||||
return _this->name ? _this->name : "Unknown exception";
|
return _this->name ? _this->name : "Unknown exception";
|
||||||
|
@ -918,46 +918,46 @@ __ASM_BLOCK_BEGIN(vtables)
|
||||||
|
|
||||||
__ASM_VTABLE(exception,
|
__ASM_VTABLE(exception,
|
||||||
VTABLE_ADD_FUNC(exception_vector_dtor)
|
VTABLE_ADD_FUNC(exception_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
#if _MSVCR_VER >= 80
|
#if _MSVCR_VER >= 80
|
||||||
__ASM_VTABLE(exception_old,
|
__ASM_VTABLE(exception_old,
|
||||||
VTABLE_ADD_FUNC(exception_vector_dtor)
|
VTABLE_ADD_FUNC(exception_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
__ASM_VTABLE(bad_alloc,
|
__ASM_VTABLE(bad_alloc,
|
||||||
VTABLE_ADD_FUNC(exception_vector_dtor)
|
VTABLE_ADD_FUNC(exception_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
#endif
|
#endif
|
||||||
__ASM_VTABLE(bad_typeid,
|
__ASM_VTABLE(bad_typeid,
|
||||||
VTABLE_ADD_FUNC(bad_typeid_vector_dtor)
|
VTABLE_ADD_FUNC(bad_typeid_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
__ASM_VTABLE(bad_cast,
|
__ASM_VTABLE(bad_cast,
|
||||||
VTABLE_ADD_FUNC(bad_cast_vector_dtor)
|
VTABLE_ADD_FUNC(bad_cast_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
__ASM_VTABLE(__non_rtti_object,
|
__ASM_VTABLE(__non_rtti_object,
|
||||||
VTABLE_ADD_FUNC(__non_rtti_object_vector_dtor)
|
VTABLE_ADD_FUNC(__non_rtti_object_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
#if _MSVCR_VER >= 100
|
#if _MSVCR_VER >= 100
|
||||||
__ASM_VTABLE(scheduler_resource_allocation_error,
|
__ASM_VTABLE(scheduler_resource_allocation_error,
|
||||||
VTABLE_ADD_FUNC(exception_vector_dtor)
|
VTABLE_ADD_FUNC(exception_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
__ASM_VTABLE(improper_lock,
|
__ASM_VTABLE(improper_lock,
|
||||||
VTABLE_ADD_FUNC(exception_vector_dtor)
|
VTABLE_ADD_FUNC(exception_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
__ASM_VTABLE(invalid_scheduler_policy_key,
|
__ASM_VTABLE(invalid_scheduler_policy_key,
|
||||||
VTABLE_ADD_FUNC(exception_vector_dtor)
|
VTABLE_ADD_FUNC(exception_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
__ASM_VTABLE(invalid_scheduler_policy_value,
|
__ASM_VTABLE(invalid_scheduler_policy_value,
|
||||||
VTABLE_ADD_FUNC(exception_vector_dtor)
|
VTABLE_ADD_FUNC(exception_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
__ASM_VTABLE(invalid_scheduler_policy_thread_specification,
|
__ASM_VTABLE(invalid_scheduler_policy_thread_specification,
|
||||||
VTABLE_ADD_FUNC(exception_vector_dtor)
|
VTABLE_ADD_FUNC(exception_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
__ASM_VTABLE(improper_scheduler_attach,
|
__ASM_VTABLE(improper_scheduler_attach,
|
||||||
VTABLE_ADD_FUNC(exception_vector_dtor)
|
VTABLE_ADD_FUNC(exception_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
__ASM_VTABLE(improper_scheduler_detach,
|
__ASM_VTABLE(improper_scheduler_detach,
|
||||||
VTABLE_ADD_FUNC(exception_vector_dtor)
|
VTABLE_ADD_FUNC(exception_vector_dtor)
|
||||||
VTABLE_ADD_FUNC(what_exception));
|
VTABLE_ADD_FUNC(exception_what));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
__ASM_BLOCK_END
|
__ASM_BLOCK_END
|
||||||
|
|
|
@ -120,9 +120,9 @@
|
||||||
@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
|
@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
|
||||||
@ cdecl ?terminate@@YAXXZ() terminate
|
@ cdecl ?terminate@@YAXXZ() terminate
|
||||||
@ cdecl ?unexpected@@YAXXZ() unexpected
|
@ cdecl ?unexpected@@YAXXZ() unexpected
|
||||||
@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) what_exception
|
@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) exception_what
|
||||||
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception
|
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) exception_what
|
||||||
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
|
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) exception_what
|
||||||
@ cdecl -arch=i386 _CIacos()
|
@ cdecl -arch=i386 _CIacos()
|
||||||
@ cdecl -arch=i386 _CIasin()
|
@ cdecl -arch=i386 _CIasin()
|
||||||
@ cdecl -arch=i386 _CIatan()
|
@ cdecl -arch=i386 _CIatan()
|
||||||
|
|
|
@ -78,8 +78,8 @@
|
||||||
@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
|
@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
|
||||||
@ cdecl ?terminate@@YAXXZ() terminate
|
@ cdecl ?terminate@@YAXXZ() terminate
|
||||||
@ cdecl ?unexpected@@YAXXZ() unexpected
|
@ cdecl ?unexpected@@YAXXZ() unexpected
|
||||||
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception
|
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) exception_what
|
||||||
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
|
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) exception_what
|
||||||
@ cdecl -arch=i386 _CIacos()
|
@ cdecl -arch=i386 _CIacos()
|
||||||
@ cdecl -arch=i386 _CIasin()
|
@ cdecl -arch=i386 _CIasin()
|
||||||
@ cdecl -arch=i386 _CIatan()
|
@ cdecl -arch=i386 _CIatan()
|
||||||
|
|
Loading…
Reference in a new issue