[PATCH 0/2] MR10100: include: Add missing exception macros.

[Jacek Caban (＠jacek)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10100

[PATCH 1/2] include: Add missing extern C to rtlsupportapi.h.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

---
 include/rtlsupportapi.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/rtlsupportapi.h b/include/rtlsupportapi.h
index f74c19a4478..720170283ef 100644
--- a/include/rtlsupportapi.h
+++ b/include/rtlsupportapi.h
@@ -23,6 +23,10 @@
 
 #include <apisetcconv.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 NTSYSAPI void   WINAPI RtlCaptureContext(CONTEXT*);
 NTSYSAPI void   WINAPI RtlCaptureContext2(CONTEXT*);
 NTSYSAPI USHORT WINAPI RtlCaptureStackBackTrace(ULONG,ULONG,void**,ULONG*);
@@ -76,4 +80,8 @@ NTSYSAPI BOOLEAN            WINAPI RtlIsEcCode(ULONG_PTR);
 
 #endif  /* __i386__ */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* _APISETRTLSUPPORT_ */
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10100

[PATCH 2/2] include: Add missing exception macros.

[Jacek Caban]

From: Jacek Caban <[e-mail]>

---
 include/winnt.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/winnt.h b/include/winnt.h
index 5d7f893dcae..373fd7705a9 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -2399,6 +2399,13 @@ typedef void (CALLBACK *PTERMINATION_HANDLER)(BOOLEAN,DWORD64);
 #define EXCEPTION_COLLIDED_UNWIND    0x40
 #define EXCEPTION_SOFTWARE_ORIGINATE 0x80
 
+#define EXCEPTION_UNWIND (EXCEPTION_UNWINDING |EXCEPTION_EXIT_UNWIND \
+                          | EXCEPTION_TARGET_UNWIND | EXCEPTION_COLLIDED_UNWIND)
+
+#define IS_UNWINDING(flags)     ((flags & EXCEPTION_UNWIND) != 0)
+#define IS_DISPATCHING(flags)   ((flags & EXCEPTION_UNWIND) == 0)
+#define IS_TARGET_UNWIND(flags) (flags & EXCEPTION_TARGET_UNWIND)
+
 /*
  * The exception record used by Win32 to give additional information
  * about exception to exception handlers.
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10100