Skip to content

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

msvcrt: Fix 64-bit _CxxThrowException implementation.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent ede38f4f
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
dlls/msvcrt/cpp.c
View file @ 97b9ff81
...@@ -1152,6 +1152,7 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj) ...@@ -1152,6 +1152,7 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj)
/********************************************************************* /*********************************************************************
* _CxxThrowException (MSVCRT.@) * _CxxThrowException (MSVCRT.@)
*/ */
#ifndef __x86_64__
void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type )
{ {
ULONG_PTR args[3]; ULONG_PTR args[3];
...@@ -1161,6 +1162,18 @@ void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *typ ...@@ -1161,6 +1162,18 @@ void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *typ
args[2] = (ULONG_PTR)type; args[2] = (ULONG_PTR)type;
RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args ); RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args );
} }
#else
void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type )
{
ULONG_PTR args[4];
args[0] = CXX_FRAME_MAGIC_VC6;
args[1] = (ULONG_PTR)object;
args[2] = (ULONG_PTR)type;
RtlPcToFileHeader( (void*)type, (void**)&args[3]);
RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 4, args );
}
#endif
/********************************************************************* /*********************************************************************
* ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z
......
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