Skip to content

W
wine-winehq
Commit b7f6362d authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

msvcrt: Use the correct object type for __non_rtti_object exceptions.

parent cdef3287
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
dlls/msvcrt/cpp.c
View file @ b7f6362d
...@@ -904,7 +904,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) ...@@ -904,7 +904,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj)
{ {
__non_rtti_object e; __non_rtti_object e;
MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); 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; return NULL;
} }
__ENDTRY __ENDTRY
...@@ -941,7 +941,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) ...@@ -941,7 +941,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj)
{ {
__non_rtti_object e; __non_rtti_object e;
MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); 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; return NULL;
} }
__ENDTRY __ENDTRY
...@@ -1028,7 +1028,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, ...@@ -1028,7 +1028,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown,
{ {
__non_rtti_object e; __non_rtti_object e;
MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); 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; return NULL;
} }
__ENDTRY __ENDTRY
...@@ -1091,7 +1091,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, ...@@ -1091,7 +1091,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown,
{ {
__non_rtti_object e; __non_rtti_object e;
MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); 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; return NULL;
} }
__ENDTRY __ENDTRY
...@@ -1131,7 +1131,7 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj) ...@@ -1131,7 +1131,7 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj)
{ {
__non_rtti_object e; __non_rtti_object e;
MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); 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; return NULL;
} }
__ENDTRY __ENDTRY
......
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