Skip to content

W
wine-winehq
Commit f1fa214b authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Rename exception::what() implementation to exception_what.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 8ca5afa4
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
dlls/msvcr100/msvcr100.spec
View file @ f1fa214b
......@@ -501,8 +501,8 @@
@ 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=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
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
@ cdecl -arch=i386 _CIacos()
@ cdecl -arch=i386 _CIasin()
......
dlls/msvcr110/msvcr110.spec
View file @ f1fa214b
......@@ -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=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=arm ?what@exception@std@@UBAPBDXZ(ptr) what_exception
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) exception_what
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
@ cdecl -arch=i386 _CIacos()
@ cdecl -arch=i386 _CIasin()
......
dlls/msvcr120/msvcr120.spec
View file @ f1fa214b
......@@ -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=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=arm ?what@exception@std@@UBAPBDXZ(ptr) what_exception
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) exception_what
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
@ cdecl -arch=i386 _CIacos()
@ cdecl -arch=i386 _CIasin()
......
dlls/msvcr70/msvcr70.spec
View file @ f1fa214b
......@@ -88,8 +88,8 @@
@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
@ cdecl ?terminate@@YAXXZ() terminate
@ cdecl ?unexpected@@YAXXZ() unexpected
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) exception_what
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) exception_what
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
@ cdecl -arch=i386 _CIacos()
@ cdecl -arch=i386 _CIasin()
......
dlls/msvcr71/msvcr71.spec
View file @ f1fa214b
......@@ -82,8 +82,8 @@
@ cdecl ?unexpected@@YAXXZ() unexpected
@ cdecl ?vswprintf@@YAHPAGIPBGPAD@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
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) exception_what
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) exception_what
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
@ cdecl -arch=i386 _CIacos()
@ cdecl -arch=i386 _CIasin()
......
dlls/msvcr80/msvcr80.spec
View file @ f1fa214b
......@@ -128,8 +128,8 @@
@ cdecl ?terminate@@YAXXZ() terminate
@ cdecl ?unexpected@@YAXXZ() unexpected
@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) _vsnwprintf
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
@ stub @_calloc_crt@8
@ cdecl @_malloc_crt@4(long) malloc
@ stub @_realloc_crt@8
......
dlls/msvcr90/msvcr90.spec
View file @ f1fa214b
......@@ -128,8 +128,8 @@
@ cdecl ?terminate@@YAXXZ() terminate
@ cdecl ?unexpected@@YAXXZ() unexpected
@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) _vsnwprintf
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
@ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) exception_what
@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) exception_what
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
@ cdecl -arch=i386 _CIacos()
@ cdecl -arch=i386 _CIasin()
......
dlls/msvcrt/cpp.c
View file @ f1fa214b
......@@ -259,8 +259,8 @@ void * __thiscall exception_scalar_dtor(exception * _this, unsigned int flags)
/******************************************************************
* ?what@exception@@UBEPBDXZ (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(what_exception,4)
const char * __thiscall what_exception(exception * _this)
DEFINE_THISCALL_WRAPPER(exception_what,4)
const char * __thiscall exception_what(exception * _this)
{
TRACE("(%p) returning %s\n", _this, _this->name);
return _this->name ? _this->name : "Unknown exception";
......@@ -918,46 +918,46 @@ __ASM_BLOCK_BEGIN(vtables)
__ASM_VTABLE(exception,
VTABLE_ADD_FUNC(exception_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
#if _MSVCR_VER >= 80
__ASM_VTABLE(exception_old,
VTABLE_ADD_FUNC(exception_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
__ASM_VTABLE(bad_alloc,
VTABLE_ADD_FUNC(exception_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
#endif
__ASM_VTABLE(bad_typeid,
VTABLE_ADD_FUNC(bad_typeid_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
__ASM_VTABLE(bad_cast,
VTABLE_ADD_FUNC(bad_cast_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
__ASM_VTABLE(__non_rtti_object,
VTABLE_ADD_FUNC(__non_rtti_object_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
#if _MSVCR_VER >= 100
__ASM_VTABLE(scheduler_resource_allocation_error,
VTABLE_ADD_FUNC(exception_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
__ASM_VTABLE(improper_lock,
VTABLE_ADD_FUNC(exception_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
__ASM_VTABLE(invalid_scheduler_policy_key,
VTABLE_ADD_FUNC(exception_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
__ASM_VTABLE(invalid_scheduler_policy_value,
VTABLE_ADD_FUNC(exception_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
__ASM_VTABLE(invalid_scheduler_policy_thread_specification,
VTABLE_ADD_FUNC(exception_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
__ASM_VTABLE(improper_scheduler_attach,
VTABLE_ADD_FUNC(exception_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
__ASM_VTABLE(improper_scheduler_detach,
VTABLE_ADD_FUNC(exception_vector_dtor)
VTABLE_ADD_FUNC(what_exception));
VTABLE_ADD_FUNC(exception_what));
#endif
__ASM_BLOCK_END
......
dlls/msvcrt/msvcrt.spec
View file @ f1fa214b
......@@ -120,9 +120,9 @@
@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
@ cdecl ?terminate@@YAXXZ() terminate
@ cdecl ?unexpected@@YAXXZ() unexpected
@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) what_exception
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
@ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) exception_what
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) exception_what
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) exception_what
@ cdecl -arch=i386 _CIacos()
@ cdecl -arch=i386 _CIasin()
@ cdecl -arch=i386 _CIatan()
......
dlls/msvcrtd/msvcrtd.spec
View file @ f1fa214b
......@@ -78,8 +78,8 @@
@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
@ cdecl ?terminate@@YAXXZ() terminate
@ cdecl ?unexpected@@YAXXZ() unexpected
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) exception_what
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) exception_what
@ cdecl -arch=i386 _CIacos()
@ cdecl -arch=i386 _CIasin()
@ cdecl -arch=i386 _CIatan()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment