Piotr Caban : msvcp60: Forward bad_cast functions to msvcrt.

[Alexandre Julliard]

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

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Tue Nov 27 21:11:22 2012 +0000

msvcp60: Forward bad_cast functions to msvcrt.

---

 dlls/msvcp60/exception.c  |    2 ++
 dlls/msvcp60/msvcp60.spec |   26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c
index b8c6921..1dcce4e 100644
--- a/dlls/msvcp60/exception.c
+++ b/dlls/msvcp60/exception.c
@@ -149,6 +149,8 @@ DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor)
 /* ?_Doraise(a)out_of_range@std@@MEBAXXZ */
 /* ?_Doraise(a)runtime_error@std@@MBEXXZ */
 /* ?_Doraise(a)runtime_error@std@@MEBAXXZ */
+/* ?_Doraise(a)bad_cast@std@@MBEXXZ */
+/* ?_Doraise(a)bad_cast@std@@MEBAXXZ */
 DEFINE_THISCALL_WRAPPER(MSVCP_exception__Doraise, 4)
 void __thiscall MSVCP_exception__Doraise(exception *this)
 {
diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec
index 137f09c..27cae4b 100644
--- a/dlls/msvcp60/msvcp60.spec
+++ b/dlls/msvcp60/msvcp60.spec
@@ -845,10 +845,10 @@
 @ cdecl -arch=win64 ??0bad_alloc(a)std@@QEAA(a)PEBD@Z(ptr str) MSVCP_bad_alloc_ctor
 @ thiscall -arch=win32 ??0bad_alloc(a)std@@QAE(a)XZ(ptr) MSVCP_bad_alloc_default_ctor
 @ cdecl -arch=win64 ??0bad_alloc(a)std@@QEAA(a)XZ(ptr) MSVCP_bad_alloc_default_ctor
-@ stub -arch=win32 ??0bad_cast(a)std@@QAE(a)ABV01@@Z
-@ stub -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z
-@ stub -arch=win32 ??0bad_cast(a)std@@QAE(a)PBD@Z
-@ stub -arch=win64 ??0bad_cast(a)std@@QEAA(a)PEBD@Z
+@ thiscall -arch=win32 ??0bad_cast(a)std@@QAE(a)ABV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QAE(a)ABV0@@Z
+@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QEAA(a)AEBV0@@Z
+@ thiscall -arch=win32 ??0bad_cast(a)std@@QAE(a)PBD@Z(ptr str) msvcrt.??0bad_cast@@QAE(a)PBD@Z
+@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)PEBD@Z(ptr str) msvcrt.??0bad_cast@@QEAA(a)PEBD@Z
 @ stub -arch=win32 ??0bad_exception(a)std@@QAE(a)ABV01@@Z
 @ stub -arch=win64 ??0bad_exception(a)std@@QEAA(a)AEBV01@@Z
 @ stub -arch=win32 ??0bad_exception(a)std@@QAE(a)PBD@Z
@@ -1049,8 +1049,8 @@
 @ stub -arch=win64 ??1__non_rtti_object(a)std@@UEAA(a)XZ
 @ thiscall -arch=win32 ??1bad_alloc(a)std@@UAE(a)XZ(ptr) MSVCP_bad_alloc_dtor
 @ cdecl -arch=win64 ??1bad_alloc(a)std@@UEAA(a)XZ(ptr) MSVCP_bad_alloc_dtor
-@ stub -arch=win32 ??1bad_cast(a)std@@UAE(a)XZ
-@ stub -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ
+@ thiscall -arch=win32 ??1bad_cast(a)std@@UAE(a)XZ(ptr) msvcrt.??1bad_cast@@UAE(a)XZ
+@ cdecl -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_cast@@UEAA(a)XZ
 @ stub -arch=win32 ??1bad_exception(a)std@@UAE(a)XZ
 @ stub -arch=win64 ??1bad_exception(a)std@@UEAA(a)XZ
 @ stub -arch=win32 ??1bad_typeid(a)std@@UAE(a)XZ
@@ -1235,8 +1235,8 @@
 @ stub -arch=win64 ??4__non_rtti_object(a)std@@QEAAAEAV01(a)AEBV01@@Z
 @ thiscall -arch=win32 ??4bad_alloc(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_bad_alloc_assign
 @ cdecl -arch=win64 ??4bad_alloc(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_bad_alloc_assign
-@ stub -arch=win32 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z
-@ stub -arch=win64 ??4bad_cast(a)std@@QEAAAEAV01(a)AEBV01@@Z
+@ thiscall -arch=win32 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0(a)ABV0@@Z
+@ cdecl -arch=win64 ??4bad_cast(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QEAAAEAV0(a)AEBV0@@Z
 @ stub -arch=win32 ??4bad_exception(a)std@@QAEAAV01(a)ABV01@@Z
 @ stub -arch=win64 ??4bad_exception(a)std@@QEAAAEAV01(a)AEBV01@@Z
 @ stub -arch=win32 ??4bad_typeid(a)std@@QAEAAV01(a)ABV01@@Z
@@ -1815,7 +1815,7 @@
 # extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@
 # extern ??_7__non_rtti_object(a)std@@6B@
 @ extern ??_7bad_alloc(a)std@@6B@ MSVCP_bad_alloc_vtable
-# extern ??_7bad_cast(a)std@@6B@
+@ extern ??_7bad_cast(a)std@@6B@ msvcrt.??_7bad_cast@@6B@
 # extern ??_7bad_exception(a)std@@6B@
 # extern ??_7bad_typeid(a)std@@6B@
 @ extern ??_7codecvt_base(a)std@@6B@ MSVCP_codecvt_base_vtable
@@ -1979,8 +1979,8 @@
 @ cdecl -arch=win64 ??_F_Locinfo(a)std@@QEAAXXZ(ptr) _Locinfo_ctor
 @ thiscall -arch=win32 ??_F_Timevec(a)std@@QAEXXZ(ptr) _Timevec_ctor
 @ cdecl -arch=win64 ??_F_Timevec(a)std@@QEAAXXZ(ptr) _Timevec_ctor
-@ stub -arch=win32 ??_Fbad_cast(a)std@@QAEXXZ
-@ stub -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ
+@ thiscall -arch=win32 ??_Fbad_cast(a)std@@QAEXXZ(ptr) msvcrt.??_Fbad_cast@@QAEXXZ
+@ cdecl -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ(ptr) msvcrt.??_Fbad_cast@@QEAAXXZ
 @ stub -arch=win32 ??_Fbad_exception(a)std@@QAEXXZ
 @ stub -arch=win64 ??_Fbad_exception(a)std@@QEAAXXZ
 @ stub -arch=win32 ??_Fbad_typeid(a)std@@QAEXXZ
@@ -2029,8 +2029,8 @@
 @ cdecl -arch=win64 ?_Decref(a)facet@locale(a)std@@QEAAPEAV123(a)XZ(ptr) locale_facet__Decref
 @ thiscall -arch=win32 ?_Doraise(a)bad_alloc@std@@MBEXXZ(ptr) MSVCP_exception__Doraise
 @ cdecl -arch=win64 ?_Doraise(a)bad_alloc@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise
-@ stub -arch=win32 ?_Doraise(a)bad_cast@std@@MBEXXZ
-@ stub -arch=win64 ?_Doraise(a)bad_cast@std@@MEBAXXZ
+@ thiscall -arch=win32 ?_Doraise(a)bad_cast@std@@MBEXXZ(ptr) MSVCP_exception__Doraise
+@ cdecl -arch=win64 ?_Doraise(a)bad_cast@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise
 @ stub -arch=win32 ?_Doraise(a)bad_exception@std@@MBEXXZ
 @ stub -arch=win64 ?_Doraise(a)bad_exception@std@@MEBAXXZ
 @ stub -arch=win32 ?_Doraise(a)bad_typeid@std@@MBEXXZ