Alexandre Julliard : msvcp: Don't forward __uncaught_exception to msvcrt.
Module: wine Branch: master Commit: b2d030a9caeaf14a058c876830c1104073ff9516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d030a9caeaf14a058c876830... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 23:42:03 2013 +0100 msvcp: Don't forward __uncaught_exception to msvcrt. --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/exception.c | 6 ++++++ dlls/msvcp90/msvcp90.spec | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 12463af..e949b98 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2795,7 +2795,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow @ thiscall -arch=win32 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() MSVCP__uncaught_exception @ thiscall -arch=win32 ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_underflow diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index d31f301..db0117d 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3615,7 +3615,7 @@ @ cdecl -arch=arm ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAAGXZ(ptr) msvcp90.?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAAGXZ @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) msvcp90.?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) msvcp90.?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcp90.?uncaught_exception(a)std@@YA_NXZ @ cdecl -arch=arm ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAAHXZ(ptr) msvcp90.?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAAHXZ @ thiscall -arch=i386 ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) msvcp90.?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ @ cdecl -arch=win64 ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) msvcp90.?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 40b959e..648be15 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4192,7 +4192,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_uflow @ thiscall -arch=win32 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcp90.?uncaught_exception(a)std@@YA_NXZ @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index af1b1a0..17e9602 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -4950,7 +4950,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ(ptr) msvcp90.?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) msvcp90.?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) msvcp90.?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcp90.?uncaught_exception(a)std@@YA_NXZ @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) msvcp90.?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ @ cdecl -arch=win64 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) msvcp90.?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) msvcp90.?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 850b112..5acc18b 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5003,7 +5003,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow @ thiscall -arch=win32 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() MSVCP__uncaught_exception @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 96bd8c57..1550cc6 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5610,7 +5610,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() MSVCP__uncaught_exception @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index f0c17e3..dfd35d9 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -493,6 +493,12 @@ void __cdecl _Xruntime_error(const char *str) throw_exception(EXCEPTION_RUNTIME_ERROR, str); } +/* ?uncaught_exception(a)std@@YA_NXZ */ +MSVCP_bool __cdecl MSVCP__uncaught_exception(void) +{ + return __uncaught_exception(); +} + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 935b47a..8017819 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6367,7 +6367,7 @@ @ cdecl -arch=arm ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAAGXZ(ptr) basic_streambuf_wchar_uflow @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() MSVCP__uncaught_exception @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow
participants (1)
-
Alexandre Julliard