- Apply Wine commit b7f6362d (msvcrt: Use the correct object type for __non_rtti_object exceptions.) by Alexandre Julliard
CORE-11794

svn path=/trunk/; revision=72119
This commit is contained in:
Thomas Faber 2016-08-06 06:52:41 +00:00
parent 3e8de0c105
commit 6feaa4a628

View file

@ -1134,7 +1134,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj)
{
__non_rtti_object e;
MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" );
_CxxThrowException( &e, &bad_typeid_exception_type );
_CxxThrowException( &e, &__non_rtti_object_exception_type );
return NULL;
}
__ENDTRY
@ -1219,7 +1219,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown,
{
__non_rtti_object e;
MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" );
_CxxThrowException( &e, &bad_typeid_exception_type );
_CxxThrowException( &e, &__non_rtti_object_exception_type );
return NULL;
}
__ENDTRY
@ -1258,7 +1258,7 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj)
{
__non_rtti_object e;
MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" );
_CxxThrowException( &e, &bad_typeid_exception_type );
_CxxThrowException( &e, &__non_rtti_object_exception_type );
return NULL;
}
__ENDTRY