include: Add COM_DECLSPEC_NOTHROW define.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

include: Add COM_DECLSPEC_NOTHROW define.
2ef00173 · Alistair Leslie-Hughes · Alexandre Julliard · aaaaec86 · 2ef00173 · 2ef00173
Commit 2ef00173 authored Oct 18, 2019 by Alistair Leslie-Hughes Committed by Alexandre Julliard Oct 18, 2019
Show whitespace changes
Inline Side-by-side

Showing with 29 additions and 6 deletions

basetyps.h include/basetyps.h +9 -2

objbase.h include/objbase.h +10 -4

winnt.h include/winnt.h +10 -0

No files found.
--- a/include/basetyps.h
+++ b/include/basetyps.h
@@ -40,9 +40,16 @@
 #define STDMETHODIMPV_(t)  t STDMETHODVCALLTYPE

 #if defined(__cplusplus) && !defined(CINTERFACE)
+
+#ifdef COM_STDMETHOD_CAN_THROW
+# define COM_DECLSPEC_NOTHROW
+#else
+# define COM_DECLSPEC_NOTHROW DECLSPEC_NOTHROW
+#endif
+
 # define interface struct
-# define STDMETHOD(m) virtual HRESULT STDMETHODCALLTYPE m
-# define STDMETHOD_(t,m) virtual t STDMETHODCALLTYPE m
+# define STDMETHOD(m)    virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE m
+# define STDMETHOD_(t,m) virtual COM_DECLSPEC_NOTHROW t STDMETHODCALLTYPE m
 # define PURE =0
 # define THIS_
 # define THIS void

--- a/include/objbase.h
+++ b/include/objbase.h
@@ -172,12 +172,18 @@

 #if defined(__cplusplus) && !defined(CINTERFACE)

+#ifdef COM_STDMETHOD_CAN_THROW
+# define COM_DECLSPEC_NOTHROW
+#else
+# define COM_DECLSPEC_NOTHROW DECLSPEC_NOTHROW
+#endif
+
 /* C++ interface */

-#define STDMETHOD(method)        virtual HRESULT STDMETHODCALLTYPE method
-#define STDMETHOD_(type,method)  virtual type STDMETHODCALLTYPE method
-#define STDMETHODV(method)       virtual HRESULT STDMETHODVCALLTYPE method
-#define STDMETHODV_(type,method) virtual type STDMETHODVCALLTYPE method
+#define STDMETHOD(method)        virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE method
+#define STDMETHOD_(type,method)  virtual COM_DECLSPEC_NOTHROW type STDMETHODCALLTYPE method
+#define STDMETHODV(method)       virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODVCALLTYPE method
+#define STDMETHODV_(type,method) virtual COM_DECLSPEC_NOTHROW type STDMETHODVCALLTYPE method

 #define PURE   = 0
 #define THIS_

--- a/include/winnt.h
+++ b/include/winnt.h
@@ -76,6 +76,16 @@ extern "C" {
 # endif
 #endif

+#ifndef DECLSPEC_NOTHROW
+# if defined(_MSC_VER) && (_MSC_VER >= 1200) && !defined(MIDL_PASS)
+#  define DECLSPEC_NOTHROW __declspec(nothrow)
+# elif defined(__GNUC__)
+#  define DECLSPEC_NOTHROW __attribute__((nothrow))
+# else
+#  define DECLSPEC_NOTHROW
+# endif
+#endif
+
 #ifndef DECLSPEC_CACHEALIGN
 # define DECLSPEC_CACHEALIGN DECLSPEC_ALIGN(128)
 #endif