From b7f6362ddc0fd0bc04b6689a4772e8e39b06fd84 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 4 Mar 2015 13:57:29 +0900 Subject: [PATCH] msvcrt: Use the correct object type for __non_rtti_object exceptions. --- dlls/msvcrt/cpp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index de9a9b4b436..8f7fdf2f960 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -904,7 +904,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 @@ -941,7 +941,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 @@ -1028,7 +1028,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 @@ -1091,7 +1091,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 @@ -1131,7 +1131,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 -- 2.11.4.GIT