Daniel Lehman : msvcp140: Forward __ExceptionPtr* to msvcr120.

[Alexandre Julliard]

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

Author: Daniel Lehman <dlehman at esri.com>
Date:   Thu Jun 16 16:38:08 2016 -0700

msvcp140: Forward __ExceptionPtr* to msvcr120.

Signed-off-by: Daniel Lehman <dlehman at esri.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcp140/msvcp140.spec | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec
index 6e17e0d..f5a0838 100644
--- a/dlls/msvcp140/msvcp140.spec
+++ b/dlls/msvcp140/msvcp140.spec
@@ -1693,22 +1693,22 @@
 @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX at Z
 @ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0 at Z
 @ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0 at Z
-@ stub -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX at Z
-@ stub -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX at Z
+@ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX at Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX at Z
+@ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX at Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX at Z
 @ stub -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1 at Z
 @ stub -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1 at Z
-@ stub -arch=win32 ?__ExceptionPtrCreate@@YAXPAX at Z
-@ stub -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX at Z
-@ stub -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX at Z
-@ stub -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX at Z
-@ stub -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX at Z
-@ stub -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX at Z
-@ stub -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX at Z
-@ stub -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX at Z
+@ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX at Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPAX at Z
+@ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX at Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPEAX at Z
+@ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX at Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPAX at Z
+@ cdecl -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX at Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPEAX at Z
+@ cdecl -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX at Z(ptr) msvcr120.?__ExceptionPtrDestroy@@YAXPAX at Z
+@ cdecl -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX at Z(ptr) msvcr120.?__ExceptionPtrDestroy@@YAXPEAX at Z
+@ cdecl -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX at Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPBX at Z
+@ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX at Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPEBX at Z
 @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0 at Z
 @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0 at Z
-@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX at Z
-@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX at Z
+@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX at Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX at Z
+@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX at Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPEBX at Z
 @ cdecl -arch=arm ?always_noconv at codecvt_base@std@@QBA_NXZ(ptr) codecvt_base_always_noconv
 @ thiscall -arch=i386 ?always_noconv at codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv
 @ cdecl -arch=win64 ?always_noconv at codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv