* fwpmtypes.h: move the FWP_ACTION_TYPE from here ...
* fwptypes.h: ... to here. Initialized first members of the enums to 0.
Removed trailing spaces. Moved FWP_TOKEN_INFORMATION and FWP_VALUE0 to
earlier places so that their users can actually use them.
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@3329 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/fwpmtypes.h b/mingw-w64-headers/include/fwpmtypes.h
index a487df4..4c2f88b 100644
--- a/mingw-w64-headers/include/fwpmtypes.h
+++ b/mingw-w64-headers/include/fwpmtypes.h
@@ -14,8 +14,6 @@
extern "C" {
#endif
-typedef UINT32 FWP_ACTION_TYPE;
-
typedef enum FWPM_PROVIDER_CONTEXT_TYPE_ {
FWPM_IPSEC_KEYING_CONTEXT,
FWPM_IPSEC_IKE_QM_TRANSPORT_CONTEXT,
diff --git a/mingw-w64-headers/include/fwptypes.h b/mingw-w64-headers/include/fwptypes.h
index 121e7ca..6a9f2a5 100644
--- a/mingw-w64-headers/include/fwptypes.h
+++ b/mingw-w64-headers/include/fwptypes.h
@@ -5,28 +5,31 @@
*/
#ifndef _INC_FWTYPES
#define _INC_FWTYPES
+
#if (_WIN32_WINNT >= 0x0600)
-#define SOCKET_SETTINGS_GUARANTEE_ENCRYPTION 0x00000001
+#define SOCKET_SETTINGS_GUARANTEE_ENCRYPTION 0x00000001
#define SOCKET_SETTINGS_ALLOW_INSECURE 0x00000002
#ifdef __cplusplus
extern "C" {
#endif
+typedef UINT32 FWP_ACTION_TYPE;
+
typedef enum FWP_CLASSIFY_OPTION_TYPE_ {
- FWP_CLASSIFY_OPTION_MULTICAST_STATE,
+ FWP_CLASSIFY_OPTION_MULTICAST_STATE = 0,
FWP_CLASSIFY_OPTION_LOOSE_SOURCE_MAPPING,
FWP_CLASSIFY_OPTION_UNICAST_LIFETIME,
FWP_CLASSIFY_OPTION_MCAST_BCAST_LIFETIME,
FWP_CLASSIFY_OPTION_SECURE_SOCKET_SECURITY_FLAGS,
FWP_CLASSIFY_OPTION_SECURE_SOCKET_AUTHIP_MM_POLICY_KEY,
FWP_CLASSIFY_OPTION_SECURE_SOCKET_AUTHIP_QM_POLICY_KEY,
- FWP_CLASSIFY_OPTION_MAX
+ FWP_CLASSIFY_OPTION_MAX
} FWP_CLASSIFY_OPTION_TYPE;
typedef enum FWP_DATA_TYPE_ {
- FWP_EMPTY,
+ FWP_EMPTY = 0,
FWP_UINT8,
FWP_UINT16,
FWP_UINT32,
@@ -49,30 +52,30 @@
FWP_V4_ADDR_MASK,
FWP_V6_ADDR_MASK,
FWP_RANGE_TYPE,
- FWP_DATA_TYPE_MAX
+ FWP_DATA_TYPE_MAX
} FWP_DATA_TYPE;
typedef enum FWP_DIRECTION_ {
- FWP_DIRECTION_OUTBOUND,
+ FWP_DIRECTION_OUTBOUND = 0,
FWP_DIRECTION_INBOUND,
- FWP_DIRECTION_MAX
+ FWP_DIRECTION_MAX
} FWP_DIRECTION;
typedef enum FWP_FILTER_ENUM_TYPE_ {
- FWP_FILTER_ENUM_FULLY_CONTAINED,
+ FWP_FILTER_ENUM_FULLY_CONTAINED = 0,
FWP_FILTER_ENUM_OVERLAPPING,
- FWP_FILTER_ENUM_TYPE_MAX
+ FWP_FILTER_ENUM_TYPE_MAX
} FWP_FILTER_ENUM_TYPE;
typedef enum FWP_IP_VERSION_ {
- FWP_IP_VERSION_V4,
+ FWP_IP_VERSION_V4 = 0,
FWP_IP_VERSION_V6,
FWP_IP_VERSION_NONE,
- FWP_IP_VERSION_MAX
+ FWP_IP_VERSION_MAX
} FWP_IP_VERSION;
typedef enum FWP_MATCH_TYPE_ {
- FWP_MATCH_EQUAL,
+ FWP_MATCH_EQUAL = 0,
FWP_MATCH_GREATER,
FWP_MATCH_LESS,
FWP_MATCH_GREATER_OR_EQUAL,
@@ -83,7 +86,7 @@
FWP_MATCH_FLAGS_NONE_SET,
FWP_MATCH_EQUAL_CASE_INSENSITIVE,
FWP_MATCH_NOT_EQUAL,
- FWP_MATCH_TYPE_MAX
+ FWP_MATCH_TYPE_MAX
} FWP_MATCH_TYPE;
typedef struct FWP_BYTE_ARRAY16_ {
@@ -111,38 +114,6 @@
UINT8 prefixLength;
} FWP_V6_ADDR_AND_MASK;
-typedef struct FWP_RANGE0_ {
- FWP_VALUE0 valueLow;
- FWP_VALUE0 valueHigh;
-} FWP_RANGE0;
-
-typedef struct FWP_CONDITION_VALUE0_ {
- FWP_DATA_TYPE type;
- __MINGW_EXTENSION union {
- UINT8 uint8;
- UINT16 uint16;
- UINT32 uint32;
- UINT64 *uint64;
- INT8 int8;
- INT16 int16;
- INT32 int32;
- INT64 *int64;
- float float32;
- double *double64;
- FWP_BYTE_ARRAY16 *byteArray16;
- FWP_BYTE_BLOB *byteBlob;
- SID *sid;
- FWP_BYTE_BLOB *sd;
- FWP_BYTE_BLOB *tokenInformation;
- FWP_BYTE_BLOB *tokenAccessInformation;
- LPWSTR unicodeString;
- FWP_BYTE_ARRAY6 *byteArray6;
- FWP_V4_ADDR_AND_MASK *v4AddrMask;
- FWP_V6_ADDR_AND_MASK *v6AddrMask;
- FWP_RANGE0 *rangeValue;
- };
-} FWP_CONDITION_VALUE0;
-
typedef struct _FWP_TOKEN_INFORMATION {
ULONG sidCount;
PSID_AND_ATTRIBUTES sids;
@@ -175,9 +146,42 @@
};
} FWP_VALUE0;
+typedef struct FWP_RANGE0_ {
+ FWP_VALUE0 valueLow;
+ FWP_VALUE0 valueHigh;
+} FWP_RANGE0;
+
+typedef struct FWP_CONDITION_VALUE0_ {
+ FWP_DATA_TYPE type;
+ __MINGW_EXTENSION union {
+ UINT8 uint8;
+ UINT16 uint16;
+ UINT32 uint32;
+ UINT64 *uint64;
+ INT8 int8;
+ INT16 int16;
+ INT32 int32;
+ INT64 *int64;
+ float float32;
+ double *double64;
+ FWP_BYTE_ARRAY16 *byteArray16;
+ FWP_BYTE_BLOB *byteBlob;
+ SID *sid;
+ FWP_BYTE_BLOB *sd;
+ FWP_BYTE_BLOB *tokenInformation;
+ FWP_BYTE_BLOB *tokenAccessInformation;
+ LPWSTR unicodeString;
+ FWP_BYTE_ARRAY6 *byteArray6;
+ FWP_V4_ADDR_AND_MASK *v4AddrMask;
+ FWP_V6_ADDR_AND_MASK *v6AddrMask;
+ FWP_RANGE0 *rangeValue;
+ };
+} FWP_CONDITION_VALUE0;
+
#ifdef __cplusplus
}
#endif
#endif /*(_WIN32_WINNT >= 0x0600)*/
+
#endif /*_INC_FWTYPES*/
