Skip to content

Commit a39fe0f

Browse files
author
Git for Windows Build Agent
committed
Update 6 packages
mingw-w64-i686-crt-git (12.0.0.r369.g0d4221712-2 -> 12.0.0.r386.gc6857dc97-1) mingw-w64-i686-headers-git (12.0.0.r369.g0d4221712-2 -> 12.0.0.r386.gc6857dc97-1) mingw-w64-i686-libmangle-git (12.0.0.r369.g0d4221712-1 -> 12.0.0.r386.gc6857dc97-1) mingw-w64-i686-libwinpthread-git (12.0.0.r369.g0d4221712-1 -> 12.0.0.r386.gc6857dc97-1) mingw-w64-i686-tools-git (12.0.0.r369.g0d4221712-1 -> 12.0.0.r386.gc6857dc97-1) mingw-w64-i686-winpthreads-git (12.0.0.r369.g0d4221712-1 -> 12.0.0.r386.gc6857dc97-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
1 parent c26c4d3 commit a39fe0f

File tree

152 files changed

+19151
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+19151
-302
lines changed

mingw32/bin/gendef.exe

-617 Bytes
Binary file not shown.

mingw32/bin/genidl.exe

-105 Bytes
Binary file not shown.

mingw32/bin/genpeimg.exe

-617 Bytes
Binary file not shown.

mingw32/bin/libwinpthread-1.dll

0 Bytes
Binary file not shown.

mingw32/bin/widl.exe

-105 Bytes
Binary file not shown.

mingw32/include/_mingw.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,20 @@ limitations in handling dllimport attribute. */
9797
#endif
9898
#endif
9999

100+
/* Recent MSVC supports C++14 but it doesn't define __cplusplus accordingly. */
101+
#define __MINGW_CXX11_CONSTEXPR
102+
#define __MINGW_CXX14_CONSTEXPR
103+
#ifdef __cplusplus
104+
# if __cplusplus >= 201103L || defined(_MSC_VER)
105+
# undef __MINGW_CXX11_CONSTEXPR
106+
# define __MINGW_CXX11_CONSTEXPR constexpr
107+
# endif
108+
# if __cplusplus >= 201402L || defined(_MSC_VER)
109+
# undef __MINGW_CXX14_CONSTEXPR
110+
# define __MINGW_CXX14_CONSTEXPR constexpr
111+
# endif
112+
#endif
113+
100114
#ifdef __cplusplus
101115
# define __UNUSED_PARAM(x)
102116
#else

mingw32/include/fwptypes.h

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ extern "C" {
3535

3636
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
3737

38+
#define FWP_BYTEMAP_ARRAY64_SIZE 8
3839
#define FWP_BYTE_ARRAY6_SIZE 6
3940
#define FWP_V6_ADDR_SIZE (16)
4041
#define FWP_ACTRL_MATCH_FILTER (1)
@@ -101,6 +102,9 @@ extern "C" {
101102
#define FWP_CONDITION_REAUTHORIZE_REASON_MID_STREAM_INSPECTION (0x00000040)
102103
#define FWP_CONDITION_REAUTHORIZE_REASON_SOCKET_PROPERTY_CHANGED (0x00000080)
103104
#define FWP_CONDITION_REAUTHORIZE_REASON_NEW_INBOUND_MCAST_BCAST_PACKET (0x00000100)
105+
#define FWP_CONDITION_REAUTHORIZE_REASON_EDP_POLICY_CHANGED (0x00000200)
106+
#define FWP_CONDITION_REAUTHORIZE_REASON_PROXY_HANDLE_CHANGED (0x00004000)
107+
#define FWP_CONDITION_REAUTHORIZE_REASON_CHECK_OFFLOAD (0x00010000)
104108

105109
#define FWP_CONDITION_SOCKET_PROPERTY_FLAG_IS_SYSTEM_PORT_RPC (0x00000001)
106110
#define FWP_CONDITION_SOCKET_PROPERTY_FLAG_ALLOW_EDGE_TRAFFIC (0x00000002)
@@ -130,7 +134,7 @@ extern "C" {
130134
#define FWP_FILTER_ENUM_FLAG_RESERVED1 (0x00000020)
131135
#endif
132136

133-
#define FWP_CALLOUT_FLAG_CONDITIONAL_ON_FLOW (0x00000001)
137+
#define FWP_CALLOUT_FLAG_CONDITIONAL_ON_FLOW (0x00000001)
134138
#define FWP_CALLOUT_FLAG_ALLOW_OFFLOAD (0x00000002)
135139
#if (NTDDI_VERSION >= NTDDI_WIN7)
136140
#define FWP_CALLOUT_FLAG_ENABLE_COMMIT_ADD_NOTIFY (0x00000004)
@@ -140,9 +144,18 @@ extern "C" {
140144
#define FWP_CALLOUT_FLAG_RESERVED1 (0x00000020)
141145
#define FWP_CALLOUT_FLAG_ALLOW_RSC (0x00000040)
142146
#define FWP_CALLOUT_FLAG_ALLOW_L2_BATCH_CLASSIFY (0x00000080)
143-
#endif
144-
#endif
145-
#ifdef __midl
147+
#if (NTDDI_VERSION >= NTDDI_WIN10_19H1)
148+
#define FWP_CALLOUT_FLAG_ALLOW_USO (0x00000100)
149+
#if (NTDDI_VERSION >= NTDDI_WIN10_VB)
150+
#define FWP_CALLOUT_FLAG_ALLOW_URO (0x00000200)
151+
#if (NTDDI_VERSION >= NTDDI_WIN10_CO)
152+
#define FWP_CALLOUT_FLAG_RESERVED2 (0x00000400)
153+
#endif /* (NTDDI_VERSION >= NTDDI_WIN10_CO) */
154+
#endif /* (NTDDI_VERSION >= NTDDI_WIN10_VB) */
155+
#endif /* (NTDDI_VERSION >= NTDDI_WIN10_19H1) */
156+
#endif /* (NTDDI_VERSION >= NTDDI_WIN8) */
157+
#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
158+
#ifdef __WIDL__
146159
typedef struct _LUID {
147160
DWORD LowPart;
148161
LONG HighPart;
@@ -218,7 +231,9 @@ typedef enum FWP_MATCH_TYPE_ {
218231
FWP_MATCH_FLAGS_NONE_SET = 8,
219232
FWP_MATCH_EQUAL_CASE_INSENSITIVE = 9,
220233
FWP_MATCH_NOT_EQUAL = 10,
221-
FWP_MATCH_TYPE_MAX = 11
234+
FWP_MATCH_PREFIX = 11,
235+
FWP_MATCH_NOT_PREFIX = 12,
236+
FWP_MATCH_TYPE_MAX = 13
222237
} FWP_MATCH_TYPE;
223238

224239
#if (NTDDI_VERSION >= NTDDI_WIN8)
@@ -334,6 +349,12 @@ typedef struct FWP_CONDITION_VALUE0_ {
334349
} __C89_NAMELESSUNIONNAME;
335350
} FWP_CONDITION_VALUE0;
336351

352+
typedef enum FWP_NETWORK_CONNECTION_POLICY_SETTING_TYPE_ {
353+
FWP_NETWORK_CONNECTION_POLICY_SOURCE_ADDRESS = 0,
354+
FWP_NETWORK_CONNECTION_POLICY_NEXT_HOP_INTERFACE = 1,
355+
FWP_NETWORK_CONNECTION_POLICY_NEXT_HOP = 2,
356+
FWP_NETWORK_CONNECTION_POLICY_MAX = 3
357+
} FWP_NETWORK_CONNECTION_POLICY_SETTING_TYPE;
337358
#endif /* WINAPI_PARTITION_DESKTOP. */
338359
/* Begin additional prototypes for all interfaces */
339360

mingw32/include/fwptypes.idl

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import "wtypes.idl";
1313
#define FWP_BYTE_ARRAY6_SIZE 6
1414
#define FWP_V6_ADDR_SIZE (16)
1515

16+
cpp_quote("#define FWP_BYTEMAP_ARRAY64_SIZE 8")
1617
cpp_quote("#define FWP_BYTE_ARRAY6_SIZE 6")
1718
cpp_quote("#define FWP_V6_ADDR_SIZE (16)")
1819
cpp_quote("#define FWP_ACTRL_MATCH_FILTER (1)")
@@ -91,6 +92,9 @@ cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_IPSEC_PROPERTIES_CHANGED (0
9192
cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_MID_STREAM_INSPECTION (0x00000040)")
9293
cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_SOCKET_PROPERTY_CHANGED (0x00000080)")
9394
cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_NEW_INBOUND_MCAST_BCAST_PACKET (0x00000100)")
95+
cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_EDP_POLICY_CHANGED (0x00000200)")
96+
cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_PROXY_HANDLE_CHANGED (0x00004000)")
97+
cpp_quote("#define FWP_CONDITION_REAUTHORIZE_REASON_CHECK_OFFLOAD (0x00010000)")
9498
cpp_quote("")
9599
cpp_quote("#define FWP_CONDITION_SOCKET_PROPERTY_FLAG_IS_SYSTEM_PORT_RPC (0x00000001)")
96100
cpp_quote("#define FWP_CONDITION_SOCKET_PROPERTY_FLAG_ALLOW_EDGE_TRAFFIC (0x00000002)")
@@ -126,7 +130,7 @@ cpp_quote("#endif")
126130

127131
cpp_quote("")
128132

129-
cpp_quote("#define FWP_CALLOUT_FLAG_CONDITIONAL_ON_FLOW (0x00000001)")
133+
cpp_quote("#define FWP_CALLOUT_FLAG_CONDITIONAL_ON_FLOW (0x00000001)")
130134
cpp_quote("#define FWP_CALLOUT_FLAG_ALLOW_OFFLOAD (0x00000002)")
131135
cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN7)")
132136
cpp_quote("#define FWP_CALLOUT_FLAG_ENABLE_COMMIT_ADD_NOTIFY (0x00000004)")
@@ -136,10 +140,19 @@ cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN8)")
136140
cpp_quote("#define FWP_CALLOUT_FLAG_RESERVED1 (0x00000020)")
137141
cpp_quote("#define FWP_CALLOUT_FLAG_ALLOW_RSC (0x00000040)")
138142
cpp_quote("#define FWP_CALLOUT_FLAG_ALLOW_L2_BATCH_CLASSIFY (0x00000080)")
139-
cpp_quote("#endif")
140-
cpp_quote("#endif")
141-
142-
cpp_quote("#ifdef __midl")
143+
cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN10_19H1)")
144+
cpp_quote("#define FWP_CALLOUT_FLAG_ALLOW_USO (0x00000100)")
145+
cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN10_VB)")
146+
cpp_quote("#define FWP_CALLOUT_FLAG_ALLOW_URO (0x00000200)")
147+
cpp_quote("#if (NTDDI_VERSION >= NTDDI_WIN10_CO)")
148+
cpp_quote("#define FWP_CALLOUT_FLAG_RESERVED2 (0x00000400)")
149+
cpp_quote("#endif /* (NTDDI_VERSION >= NTDDI_WIN10_CO) */")
150+
cpp_quote("#endif /* (NTDDI_VERSION >= NTDDI_WIN10_VB) */")
151+
cpp_quote("#endif /* (NTDDI_VERSION >= NTDDI_WIN10_19H1) */")
152+
cpp_quote("#endif /* (NTDDI_VERSION >= NTDDI_WIN8) */")
153+
cpp_quote("#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */")
154+
155+
cpp_quote("#ifdef __WIDL__")
143156
typedef struct _LUID {
144157
DWORD LowPart;
145158
LONG HighPart;
@@ -198,7 +211,8 @@ typedef [v1_enum] enum FWP_MATCH_TYPE_ {
198211
FWP_MATCH_LESS_OR_EQUAL, FWP_MATCH_RANGE,
199212
FWP_MATCH_FLAGS_ALL_SET, FWP_MATCH_FLAGS_ANY_SET,
200213
FWP_MATCH_FLAGS_NONE_SET, FWP_MATCH_EQUAL_CASE_INSENSITIVE,
201-
FWP_MATCH_NOT_EQUAL, FWP_MATCH_TYPE_MAX
214+
FWP_MATCH_NOT_EQUAL, FWP_MATCH_PREFIX,
215+
FWP_MATCH_NOT_PREFIX, FWP_MATCH_TYPE_MAX
202216
} FWP_MATCH_TYPE;
203217

204218
cpp_quote("")
@@ -375,4 +389,11 @@ typedef struct FWP_CONDITION_VALUE0_ {
375389

376390
cpp_quote("")
377391

392+
typedef [v1_enum] enum FWP_NETWORK_CONNECTION_POLICY_SETTING_TYPE_ {
393+
FWP_NETWORK_CONNECTION_POLICY_SOURCE_ADDRESS,
394+
FWP_NETWORK_CONNECTION_POLICY_NEXT_HOP_INTERFACE,
395+
FWP_NETWORK_CONNECTION_POLICY_NEXT_HOP,
396+
FWP_NETWORK_CONNECTION_POLICY_MAX
397+
} FWP_NETWORK_CONNECTION_POLICY_SETTING_TYPE;
398+
378399
cpp_quote("#endif /* WINAPI_PARTITION_DESKTOP. */")

0 commit comments

Comments
 (0)