[Mingw-w64-public] [PATCH] headers: Add missing names in winevt.h
From b513617123950018bf75f0cae790b0576e9ad157 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath
Date: Sat, 26 Jun 2021 19:04:26 +0530
Subject: [PATCH] headers: Add missing names in winevt.h
Signed-off-by: Biswapriyo Nath
---
mingw-w64-headers/include/winevt.h | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/mingw-w64-headers/include/winevt.h
b/mingw-w64-headers/include/winevt.h
index 90be0cd..add920b 100644
--- a/mingw-w64-headers/include/winevt.h
+++ b/mingw-w64-headers/include/winevt.h
@@ -3,14 +3,24 @@
* This file is part of the mingw-w64 runtime package.
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
-#ifndef _INC_WINEVT
-#define _INC_WINEVT
+#ifndef __WINEVT_H__
+#define __WINEVT_H__
+
+#include
+
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+
#if (_WIN32_WINNT >= 0x0600)
#ifdef __cplusplus
extern "C" {
#endif
+#define EVT_READ_ACCESS 0x1
+#define EVT_WRITE_ACCESS 0x2
+#define EVT_CLEAR_ACCESS 0x4
+#define EVT_ALL_ACCESS 0x7
+
typedef enum _EVT_CHANNEL_CLOCK_TYPE {
EvtChannelClockTypeSystemTime = 0,
EvtChannelClockTypeQPC = 1
@@ -266,6 +276,9 @@ typedef enum _EVT_VARIANT_TYPE {
EvtVarTypeEvtXml = 35
} EVT_VARIANT_TYPE;
+#define EVT_VARIANT_TYPE_MASK 0x7f
+#define EVT_VARIANT_TYPE_ARRAY 128
+
typedef HANDLE EVT_HANDLE;
typedef HANDLE EVT_OBJECT_ARRAY_PROPERTY_HANDLE;
@@ -572,5 +585,7 @@ WINBOOL WINAPI EvtUpdateBookmark(
#ifdef __cplusplus
}
#endif
+
#endif /*(_WIN32_WINNT >= 0x0600)*/
-#endif /*_INC_TDH*/
+#endif /* WINAPI_PARTITION_DESKTOP */
+#endif /*__WINEVT_H__ */
--
2.32.0
___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
Re: [Mingw-w64-public] [PATCH] Revert "headers: Move IP_MREQ from _ip_mreq1.h to ws2ipdef.h."
在 6/26/21 6:10 PM, Biswapriyo Nath 写道: Thanks for the explanation. Two questions. 1. If I include winsock.h for ip_mreq it compiles. But if I include winsock2.h for ip_mreq it does not compile. Does winsock2.h need _ip_mreq1.h to be included? It is necessary to include ws2ipdef.h after winsock2.h. At least this is the case with MSVC. #include #include 2. If I include winsock.h or winsock2.h for ipv6_mreq neither works. Does ipv6_mreq need same treatment as ip_mreq? My presumption is that winsock is too old to support IPv6 (note it even predates Windows 95). But according to MS docs[1][2] ws2tcpip.h should be include for ip_mreq and ipv6_mreq both. I was just testing the aforementioned cases. [1]: https://docs.microsoft.com/en-us/windows/win32/api/ws2ipdef/ns-ws2ipdef-ip_mreq [2]: https://docs.microsoft.com/en-us/windows/win32/api/ws2ipdef/ns-ws2ipdef-ipv6_mreq -- Best regards, Liu Hao OpenPGP_signature Description: OpenPGP digital signature ___ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
Re: [Mingw-w64-public] [PATCH] Revert "headers: Move IP_MREQ from _ip_mreq1.h to ws2ipdef.h."
Thanks for the explanation. Two questions. 1. If I include winsock.h for ip_mreq it compiles. But if I include winsock2.h for ip_mreq it does not compile. Does winsock2.h need _ip_mreq1.h to be included? 2. If I include winsock.h or winsock2.h for ipv6_mreq neither works. Does ipv6_mreq need same treatment as ip_mreq? But according to MS docs[1][2] ws2tcpip.h should be include for ip_mreq and ipv6_mreq both. I was just testing the aforementioned cases. [1]: https://docs.microsoft.com/en-us/windows/win32/api/ws2ipdef/ns-ws2ipdef-ip_mreq [2]: https://docs.microsoft.com/en-us/windows/win32/api/ws2ipdef/ns-ws2ipdef-ipv6_mreq ___ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
Re: [Mingw-w64-public] [PATCH] Revert "headers: Move IP_MREQ from _ip_mreq1.h to ws2ipdef.h."
在 6/26/21 1:10 PM, Biswapriyo Nath 写道: Forgot the patch file. Thanks. Pushed to master. The Windows 8 SDK actually duplicates the definition of `struct ip_mreq` in both and , so I think it is not valid to remove it there. We have the '_ip_mreq1.h' which is nothing but duplication. This also means that if one includes both and , they will get multiple definition errors about `struct ip_mreq`, but that is MS behavior too. -- Best regards, Liu Hao OpenPGP_signature Description: OpenPGP digital signature ___ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
