Author: tkreuzer Date: Mon Feb 14 14:28:07 2011 New Revision: 50693
URL: http://svn.reactos.org/svn/reactos?rev=50693&view=rev Log: [MSVCRT] _CxxThrowException is stdcall, not cdecl. Someone please forward this to wine
Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec branches/cmake-bringup/dll/win32/msvcrt20/msvcrt20.spec branches/cmake-bringup/dll/win32/msvcrt40/msvcrt40.spec branches/cmake-bringup/lib/sdk/crt/except/cppexcept.c branches/cmake-bringup/lib/sdk/crt/include/internal/wine/cppexcept.h
Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/m... ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -99,7 +99,7 @@ # stub _CrtSetReportHook # stub _CrtSetReportHook2 # stub _CrtSetReportMode -@ cdecl _CxxThrowException(long long) +@ stdcall _CxxThrowException(long long) @ cdecl -i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths()
Modified: branches/cmake-bringup/dll/win32/msvcrt20/msvcrt20.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt20... ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -453,7 +453,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 __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
Modified: branches/cmake-bringup/dll/win32/msvcrt40/msvcrt40.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt40... ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt40/msvcrt40.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt40/msvcrt40.spec [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -497,7 +497,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 _EH_prolog() msvcrt._EH_prolog @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter
Modified: branches/cmake-bringup/lib/sdk/crt/except/cppexcept.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/except... ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -490,7 +490,7 @@ /********************************************************************* * _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];
Modified: branches/cmake-bringup/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/includ... ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -150,7 +150,7 @@ 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);