msvcp140: Don't forward __ExceptionPtrCreate to msvcr120.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46583Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcp140: Don't forward __ExceptionPtrCreate to msvcr120.
a91c1e05 · Piotr Caban · Alexandre Julliard · c525d7ab · a91c1e05 · a91c1e05
Commit a91c1e05 authored Feb 28, 2019 by Piotr Caban Committed by Alexandre Julliard Feb 28, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 2 deletions

msvcp140.spec dlls/msvcp140/msvcp140.spec +2 -2

exception.c dlls/msvcp90/exception.c +14 -0

No files found.
--- a/dlls/msvcp140/msvcp140.spec
+++ b/dlls/msvcp140/msvcp140.spec
@@ -1697,8 +1697,8 @@
 @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX@Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX@Z
 @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1@Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1@Z
 @ cdecl -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1@Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPEAXPEBX1@Z
-@ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX@Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPAX@Z
-@ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX@Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPEAX@Z
+@ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX@Z(ptr) __ExceptionPtrCreate
+@ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX@Z(ptr) __ExceptionPtrCreate
 @ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX@Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPAX@Z
 @ cdecl -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX@Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPEAX@Z
 @ cdecl -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX@Z(ptr) msvcr120.?__ExceptionPtrDestroy@@YAXPAX@Z

--- a/dlls/msvcp90/exception.c
+++ b/dlls/msvcp90/exception.c
@@ -949,6 +949,20 @@ int __cdecl __uncaught_exceptions(void)
 {
    return *UCRTBASE___processing_throw();
 }
+
+typedef struct
+{
+    EXCEPTION_RECORD *rec;
+    int *ref; /* not binary compatible with native */
+} exception_ptr;
+
+void __cdecl __ExceptionPtrCreate(exception_ptr *ep)
+{
+    TRACE("(%p)\n", ep);
+
+    ep->rec = NULL;
+    ep->ref = NULL;
+}
 #endif

 #if _MSVCP_VER >= 70 || defined(_MSVCIRT)