From 521604ffce8f87a90aee48652b9b0a48141f8f8a Mon Sep 17 00:00:00 2001 From: Igor Paliychuk Date: Sat, 14 May 2011 11:40:16 +0300 Subject: [PATCH] msvcrt: _CxxThrowException is stdcall, not cdecl. --- dlls/msvcp90/exception.c | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/cppexcept.c | 2 +- dlls/msvcrt/cppexcept.h | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index cef4980b99b..e6b1692c3d2 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -58,7 +58,7 @@ typedef struct __cxx_exception_type const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; -void CDECL _CxxThrowException(exception*,const cxx_exception_type*); +void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); /* vtables */ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0d6587726b7..a6cfaa39a77 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -337,7 +337,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT @ cdecl _CRT_RTC_INITW(ptr ptr long long long) msvcr90._CRT_RTC_INITW @ stub _CreateFrameInfo -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ stub _FindAndUnlinkFrame @ cdecl _Getdays() msvcrt._Getdays diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index f728300e36a..98f9ebd9c3c 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -108,7 +108,7 @@ @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 47a2c17e3dd..f5a60bc5a7b 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -102,7 +102,7 @@ @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e0b11bc276f..c9f62f0f423 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -148,7 +148,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT @ cdecl _CRT_RTC_INITW(ptr ptr long long long) msvcr90._CRT_RTC_INITW @ stub _CreateFrameInfo -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ stub _FindAndUnlinkFrame @ cdecl _Getdays() msvcrt._Getdays diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b2a620c2597..5f09767b701 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -145,7 +145,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ stub _CreateFrameInfo -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ stub _FindAndUnlinkFrame @ cdecl _Getdays() msvcrt._Getdays diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index a07d544ab6a..18e5aa0ce8e 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -471,7 +471,7 @@ int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) /********************************************************************* * _CxxThrowException (MSVCRT.@) */ -void CDECL _CxxThrowException( exception *object, const cxx_exception_type *type ) +void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) { ULONG_PTR args[3]; diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index a46f222e34d..705364bd09d 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -140,7 +140,7 @@ typedef struct __cxx_exception_type const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; -void CDECL _CxxThrowException(exception*,const cxx_exception_type*); +void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS); int CDECL __CppXcptFilter(NTSTATUS, PEXCEPTION_POINTERS); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8957e4226a4..3b36d77201a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -137,7 +137,7 @@ # stub _CrtSetReportHook # stub _CrtSetReportHook2 # stub _CrtSetReportMode -@ cdecl _CxxThrowException(long long) +@ stdcall _CxxThrowException(long long) @ cdecl -i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 29071026584..b98cd05dd80 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -790,7 +790,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index f9a6956b072..4815e2ff2fe 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -864,7 +864,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index f598742aeb7..ff83f8ea0af 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -116,7 +116,7 @@ @ stub _CrtSetReportFile @ cdecl _CrtSetReportHook(ptr) @ cdecl _CrtSetReportMode(long long) -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths