[PATCH 0/3] MR7482: Include defines

[PATCH 1/3] include: More sal.h defines

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 include/sal.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/sal.h b/include/sal.h
index d49f6308327..f30633e8a86 100644
--- a/include/sal.h
+++ b/include/sal.h
@@ -21,6 +21,7 @@

#define _Always_(exp)

+#define _Analysis_assume_(x)
 #define _Analysis_noreturn_

#define _At_(a, b)
@@ -111,6 +112,8 @@
 #define _Null_
 #define _Null_terminated_

+#define _On_failure_(d)
+
 #define _Out_
 #define _Outptr_
 #define _Out_bytecap_(count)
@@ -145,6 +148,7 @@
 #define _Out_opt_z_cap_x_(count)
 #define _Out_opt_z_cap_post_count_(count1, count2)
 #define _Out_ptrdiff_cap_(count)
+#define _Out_range_(x, y)
 #define _Out_writes_(count)
 #define _Out_writes_all_(count)
 #define _Out_writes_bytes_(count)
@@ -171,6 +175,7 @@
 #define _Outptr_opt_
 #define _Outptr_opt_result_buffer_(count)
 #define _Outptr_opt_result_maybenull_
+#define _Outptr_opt_result_maybenull_z_
 #define _Outptr_opt_result_z_
 #define _Outptr_result_buffer_(count)
 #define _Outptr_result_buffer_all_maybenull_(ptr)
@@ -219,6 +224,7 @@
 #define _Ret_opt_z_cap_(count)
 #define _Ret_range_(exp,exp2)
 #define _Ret_writes_bytes_maybenull_(count)
+#define _Ret_writes_maybenull_(count)
 #define _Ret_writes_z_(count)
 #define _Ret_z_

[PATCH 2/3] include: Add IID_PPV_ARGS macro

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

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

diff --git a/include/combaseapi.h b/include/combaseapi.h
index 41461f22e98..ede75f592ef 100644
--- a/include/combaseapi.h
+++ b/include/combaseapi.h
@@ -57,4 +57,12 @@ HRESULT WINAPI RoGetAgileReference(enum AgileReferenceOptions options, REFIID ri
 }
 #endif

+#ifdef __cplusplus
+
+template<typename T> void** IID_PPV_ARGS_Helper(T** pp);
+
+#define IID_PPV_ARGS(type) __uuidof(**(type)), IID_PPV_ARGS_Helper(type)
+
+#endif
+
 #endif /* _COMBASEAPI_H_ */

[PATCH 3/3] include: Add sscanf_s define

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 include/tchar.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/tchar.h b/include/tchar.h
index bbf85973b41..f65b2b04e48 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -96,6 +96,7 @@ extern "C" {
 #define _sntprintf    WINE_tchar_routine(snprintf,        snprintf,    _snwprintf)
 #define _stprintf     WINE_tchar_routine(sprintf,         sprintf,     swprintf)
 #define _stscanf      WINE_tchar_routine(sscanf,          sscanf,      swscanf)
+#define _stscanf_s    WINE_tchar_routine(sscanf_s,        sscanf_s,    swscanf_s)
 #define _taccess      WINE_tchar_routine(access,          _access,     _waccess)
 #define _tasctime     WINE_tchar_routine(asctime,         asctime,     _wasctime)
 #define _tccpy        WINE_tchar_routine(WINE_tchar_tccpy,_mbccpy,     WINE_tchar_tccpy)

[Jacek Caban (＠jacek)]

Jacek Caban (@jacek) commented about include/combaseapi.h:
> }
>  #endif
>
> +#ifdef __cplusplus
> -
>
> +template<typename T> void** IID_PPV_ARGS_Helper(T** pp);

This needs an inline implementation to be useful, see https://gitlab.winehq.org/rbernon/wine/-/commit/b37dd56d0dcb6599ced9c5605356....