Piotr Caban : vcruntime140_1: Add __CxxFrameHandler4 stub.

Alexandre Julliard julliard at winehq.org
Tue Apr 21 15:59:47 CDT 2020


Module: wine
Branch: master
Commit: 68bbf86483d88df3442bfb3332b71438f6a508c4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=68bbf86483d88df3442bfb3332b71438f6a508c4

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Tue Apr 21 13:12:04 2020 +0200

vcruntime140_1: Add __CxxFrameHandler4 stub.

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

---

 dlls/vcruntime140_1/Makefile.in         |  5 +++++
 dlls/vcruntime140_1/except_x86_64.c     | 34 +++++++++++++++++++++++++++++++++
 dlls/vcruntime140_1/vcruntime140_1.spec |  2 +-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/dlls/vcruntime140_1/Makefile.in b/dlls/vcruntime140_1/Makefile.in
index b5e20fe92f..ab17b330be 100644
--- a/dlls/vcruntime140_1/Makefile.in
+++ b/dlls/vcruntime140_1/Makefile.in
@@ -1 +1,6 @@
 MODULE = vcruntime140_1.dll
+
+EXTRADLLFLAGS = -mno-cygwin
+
+C_SRCS = \
+	except_x86_64.c
diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c
new file mode 100644
index 0000000000..ff582e44da
--- /dev/null
+++ b/dlls/vcruntime140_1/except_x86_64.c
@@ -0,0 +1,34 @@
+/*
+ * C++ exception handling (ver. 4)
+ *
+ * Copyright 2020 Piotr Caban
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifdef __x86_64__
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(seh);
+
+EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec,
+        ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch)
+{
+    FIXME("%p %lx %p %p\n", rec, frame, context, dispatch);
+    return ExceptionContinueSearch;
+}
+
+#endif
diff --git a/dlls/vcruntime140_1/vcruntime140_1.spec b/dlls/vcruntime140_1/vcruntime140_1.spec
index 5119df9b99..f41c7d2a12 100644
--- a/dlls/vcruntime140_1/vcruntime140_1.spec
+++ b/dlls/vcruntime140_1/vcruntime140_1.spec
@@ -1,3 +1,3 @@
-@ stub -arch=x86_64 __CxxFrameHandler4
+@ cdecl -arch=x86_64 __CxxFrameHandler4(ptr long ptr ptr)
 @ stub -arch=x86_64 __NLG_Dispatch2
 @ stub -arch=x86_64 __NLG_Return2




More information about the wine-cvs mailing list