From e6e0da609da495e739f5123d5bb3bb8327c13b43 Mon Sep 17 00:00:00 2001
From: Piotr Caban <piotr@codeweavers.com>
Date: Tue, 27 Nov 2012 21:11:22 +0000
Subject: [PATCH] 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 b8c6921309d..1dcce4e4e19 100644
--- a/dlls/msvcp60/exception.c
+++ b/dlls/msvcp60/exception.c
@@ -149,6 +149,8 @@ DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor)
 /* ?_Doraise@out_of_range@std@@MEBAXXZ */
 /* ?_Doraise@runtime_error@std@@MBEXXZ */
 /* ?_Doraise@runtime_error@std@@MEBAXXZ */
+/* ?_Doraise@bad_cast@std@@MBEXXZ */
+/* ?_Doraise@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 137f09cfebb..27cae4b6d6e 100644
--- a/dlls/msvcp60/msvcp60.spec
+++ b/dlls/msvcp60/msvcp60.spec
@@ -845,10 +845,10 @@
 @ cdecl -arch=win64 ??0bad_alloc@std@@QEAA@PEBD@Z(ptr str) MSVCP_bad_alloc_ctor
 @ thiscall -arch=win32 ??0bad_alloc@std@@QAE@XZ(ptr) MSVCP_bad_alloc_default_ctor
 @ cdecl -arch=win64 ??0bad_alloc@std@@QEAA@XZ(ptr) MSVCP_bad_alloc_default_ctor
-@ stub -arch=win32 ??0bad_cast@std@@QAE@ABV01@@Z
-@ stub -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z
-@ stub -arch=win32 ??0bad_cast@std@@QAE@PBD@Z
-@ stub -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z
+@ thiscall -arch=win32 ??0bad_cast@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QAE@ABV0@@Z
+@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QEAA@AEBV0@@Z
+@ thiscall -arch=win32 ??0bad_cast@std@@QAE@PBD@Z(ptr str) msvcrt.??0bad_cast@@QAE@PBD@Z
+@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z(ptr str) msvcrt.??0bad_cast@@QEAA@PEBD@Z
 @ stub -arch=win32 ??0bad_exception@std@@QAE@ABV01@@Z
 @ stub -arch=win64 ??0bad_exception@std@@QEAA@AEBV01@@Z
 @ stub -arch=win32 ??0bad_exception@std@@QAE@PBD@Z
@@ -1049,8 +1049,8 @@
 @ stub -arch=win64 ??1__non_rtti_object@std@@UEAA@XZ
 @ thiscall -arch=win32 ??1bad_alloc@std@@UAE@XZ(ptr) MSVCP_bad_alloc_dtor
 @ cdecl -arch=win64 ??1bad_alloc@std@@UEAA@XZ(ptr) MSVCP_bad_alloc_dtor
-@ stub -arch=win32 ??1bad_cast@std@@UAE@XZ
-@ stub -arch=win64 ??1bad_cast@std@@UEAA@XZ
+@ thiscall -arch=win32 ??1bad_cast@std@@UAE@XZ(ptr) msvcrt.??1bad_cast@@UAE@XZ
+@ cdecl -arch=win64 ??1bad_cast@std@@UEAA@XZ(ptr) msvcrt.??1bad_cast@@UEAA@XZ
 @ stub -arch=win32 ??1bad_exception@std@@UAE@XZ
 @ stub -arch=win64 ??1bad_exception@std@@UEAA@XZ
 @ stub -arch=win32 ??1bad_typeid@std@@UAE@XZ
@@ -1235,8 +1235,8 @@
 @ stub -arch=win64 ??4__non_rtti_object@std@@QEAAAEAV01@AEBV01@@Z
 @ thiscall -arch=win32 ??4bad_alloc@std@@QAEAAV01@ABV01@@Z(ptr ptr) MSVCP_bad_alloc_assign
 @ cdecl -arch=win64 ??4bad_alloc@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_bad_alloc_assign
-@ stub -arch=win32 ??4bad_cast@std@@QAEAAV01@ABV01@@Z
-@ stub -arch=win64 ??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z
+@ thiscall -arch=win32 ??4bad_cast@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0@ABV0@@Z
+@ cdecl -arch=win64 ??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QEAAAEAV0@AEBV0@@Z
 @ stub -arch=win32 ??4bad_exception@std@@QAEAAV01@ABV01@@Z
 @ stub -arch=win64 ??4bad_exception@std@@QEAAAEAV01@AEBV01@@Z
 @ stub -arch=win32 ??4bad_typeid@std@@QAEAAV01@ABV01@@Z
@@ -1815,7 +1815,7 @@
 # extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
 # extern ??_7__non_rtti_object@std@@6B@
 @ extern ??_7bad_alloc@std@@6B@ MSVCP_bad_alloc_vtable
-# extern ??_7bad_cast@std@@6B@
+@ extern ??_7bad_cast@std@@6B@ msvcrt.??_7bad_cast@@6B@
 # extern ??_7bad_exception@std@@6B@
 # extern ??_7bad_typeid@std@@6B@
 @ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
@@ -1979,8 +1979,8 @@
 @ cdecl -arch=win64 ??_F_Locinfo@std@@QEAAXXZ(ptr) _Locinfo_ctor
 @ thiscall -arch=win32 ??_F_Timevec@std@@QAEXXZ(ptr) _Timevec_ctor
 @ cdecl -arch=win64 ??_F_Timevec@std@@QEAAXXZ(ptr) _Timevec_ctor
-@ stub -arch=win32 ??_Fbad_cast@std@@QAEXXZ
-@ stub -arch=win64 ??_Fbad_cast@std@@QEAAXXZ
+@ thiscall -arch=win32 ??_Fbad_cast@std@@QAEXXZ(ptr) msvcrt.??_Fbad_cast@@QAEXXZ
+@ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) msvcrt.??_Fbad_cast@@QEAAXXZ
 @ stub -arch=win32 ??_Fbad_exception@std@@QAEXXZ
 @ stub -arch=win64 ??_Fbad_exception@std@@QEAAXXZ
 @ stub -arch=win32 ??_Fbad_typeid@std@@QAEXXZ
@@ -2029,8 +2029,8 @@
 @ cdecl -arch=win64 ?_Decref@facet@locale@std@@QEAAPEAV123@XZ(ptr) locale_facet__Decref
 @ thiscall -arch=win32 ?_Doraise@bad_alloc@std@@MBEXXZ(ptr) MSVCP_exception__Doraise
 @ cdecl -arch=win64 ?_Doraise@bad_alloc@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise
-@ stub -arch=win32 ?_Doraise@bad_cast@std@@MBEXXZ
-@ stub -arch=win64 ?_Doraise@bad_cast@std@@MEBAXXZ
+@ thiscall -arch=win32 ?_Doraise@bad_cast@std@@MBEXXZ(ptr) MSVCP_exception__Doraise
+@ cdecl -arch=win64 ?_Doraise@bad_cast@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise
 @ stub -arch=win32 ?_Doraise@bad_exception@std@@MBEXXZ
 @ stub -arch=win64 ?_Doraise@bad_exception@std@@MEBAXXZ
 @ stub -arch=win32 ?_Doraise@bad_typeid@std@@MBEXXZ
-- 
2.11.4.GIT