Alexandre Julliard : msvcrt: Use the correct object type for __non_rtti_object exceptions.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Mar 4 09:22:16 CST 2015


Module: wine
Branch: master
Commit: b7f6362ddc0fd0bc04b6689a4772e8e39b06fd84
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b7f6362ddc0fd0bc04b6689a4772e8e39b06fd84

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Mar  4 13:57:29 2015 +0900

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 de9a9b4..8f7fdf2 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




More information about the wine-cvs mailing list