This patch does some updates and bug-fixes required for iphlpapi.h,
netioapi.h, ntddndis.h, and windot11.h updates on pipeline.
Ok for apply?
Regards,
Kai
From c0f2525ac5acf95e50aa762ab1ecfc7c20330ff1 Mon Sep 17 00:00:00 2001
From: Kai Tietz <[email protected]>
Date: Mon, 22 Dec 2014 14:51:35 +0100
Subject: Add new header for NDK information
---
mingw-w64-headers/include/ndkinfo.h | 50 +++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 mingw-w64-headers/include/ndkinfo.h
diff --git a/mingw-w64-headers/include/ndkinfo.h
b/mingw-w64-headers/include/ndkinfo.h
new file mode 100644
index 0000000..bb462d7
--- /dev/null
+++ b/mingw-w64-headers/include/ndkinfo.h
@@ -0,0 +1,50 @@
+/**
+ * This file is part of the mingw-w64 runtime package.
+ * No warranty is given; refer to the file DISCLAIMER within this package.
+ */
+
+#ifndef _NDKINFO_H_
+#define _NDKINFO_H_
+
+#include <winapifamily.h>
+
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+
+#define NDK_ADAPTER_FLAG_IN_ORDER_DMA_SUPPORTED 0x1
+#define NDK_ADAPTER_FLAG_RDMA_READ_SINK_NOT_REQUIRED 0x2
+#define NDK_ADAPTER_FLAG_CQ_INTERRUPT_MODERATION_SUPPORTED 0x4
+#define NDK_ADAPTER_FLAG_MULTI_ENGINE_SUPPORTED 0x8
+#define NDK_ADAPTER_FLAG_CQ_RESIZE_SUPPORTED 0x100
+#define NDK_ADAPTER_FLAG_LOOPBACK_CONNECTIONS_SUPPORTED 0x10000
+
+typedef struct {
+ USHORT Major;
+ USHORT Minor;
+} NDK_VERSION;
+
+typedef struct _NDK_ADAPTER_INFO {
+ NDK_VERSION Version;
+ UINT32 VendorId;
+ UINT32 DeviceId;
+ SIZE_T MaxRegistrationSize;
+ SIZE_T MaxWindowSize;
+ ULONG FRMRPageCount;
+ ULONG MaxInitiatorRequestSge;
+ ULONG MaxReceiveRequestSge;
+ ULONG MaxReadRequestSge;
+ ULONG MaxTransferLength;
+ ULONG MaxInlineDataSize;
+ ULONG MaxInboundReadLimit;
+ ULONG MaxOutboundReadLimit;
+ ULONG MaxReceiveQueueDepth;
+ ULONG MaxInitiatorQueueDepth;
+ ULONG MaxSrqDepth;
+ ULONG MaxCqDepth;
+ ULONG LargeRequestThreshold;
+ ULONG MaxCallerData;
+ ULONG MaxCalleeData;
+ ULONG AdapterFlags;
+} NDK_ADAPTER_INFO;
+
+#endif
+#endif
--
2.1.1
From 57b57bf2731b4182cf7d38992f80304dffdc2f5b Mon Sep 17 00:00:00 2001
From: Kai Tietz <[email protected]>
Date: Tue, 6 Jan 2015 13:17:42 +0100
Subject: Update nldef for winapi-family, and further 8.x version
---
mingw-w64-headers/include/nldef.h | 257 +++++++++++++++++++++-----------------
1 file changed, 144 insertions(+), 113 deletions(-)
diff --git a/mingw-w64-headers/include/nldef.h
b/mingw-w64-headers/include/nldef.h
index 44519a6..5a6a767 100644
--- a/mingw-w64-headers/include/nldef.h
+++ b/mingw-w64-headers/include/nldef.h
@@ -1,155 +1,186 @@
/**
- * This file has no copyright assigned and is placed in the Public Domain.
* This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ * No warranty is given; refer to the file DISCLAIMER within this package.
*/
-#ifndef _INC_NLDEF
-#define _INC_NLDEF
-typedef enum _NL_ADDRESS_TYPE {
- NlatUnspecified,
- NlatUnicast,
- NlatAnycast,
- NlatMulticast,
- NlatBroadcast,
- NlatInvalid
-} NL_ADDRESS_TYPE, *PNL_ADDRESS_TYPE;
+#ifndef _NLDEF_
+#define _NLDEF_
+#include <winapifamily.h>
+
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
-typedef enum _NL_DAD_STATE {
- NldsInvalid = 0,
+typedef enum {
+ NldsInvalid,
NldsTentative,
NldsDuplicate,
NldsDeprecated,
NldsPreferred,
-
- IpDadStateInvalid = 0,
+ IpDadStateInvalid = 0,
IpDadStateTentative,
IpDadStateDuplicate,
IpDadStateDeprecated,
- IpDadStatePreferred
+ IpDadStatePreferred,
} NL_DAD_STATE;
-typedef enum _NL_LINK_LOCAL_ADDRESS_BEHAVIOR {
- LinkLocalAlwaysOff = 0,
- LinkLocalDelayed,
- LinkLocalAlwaysOn,
- LinkLocalUnchanged = -1
-} NL_LINK_LOCAL_ADDRESS_BEHAVIOR;
+#define MAKE_ROUTE_PROTOCOL(N, V) MIB_IPPROTO_ ## N = V, PROTO_IP_ ## N = V
-typedef enum _NL_NEIGHBOR_STATE {
- NlnsUnreachable,
- NlnsIncomplete,
- NlnsProbe,
- NlnsDelay,
- NlnsStale,
- NlnsReachable,
- NlnsPermanent,
- NlnsMaximum
-} NL_NEIGHBOR_STATE, *PNL_NEIGHBOR_STATE;
+typedef enum {
+ RouteProtocolOther = 1,
+ RouteProtocolLocal = 2,
+ RouteProtocolNetMgmt = 3,
+ RouteProtocolIcmp = 4,
+ RouteProtocolEgp = 5,
+ RouteProtocolGgp = 6,
+ RouteProtocolHello = 7,
+ RouteProtocolRip = 8,
+ RouteProtocolIsIs = 9,
+ RouteProtocolEsIs = 10,
+ RouteProtocolCisco = 11,
+ RouteProtocolBbn = 12,
+ RouteProtocolOspf = 13,
+ RouteProtocolBgp = 14,
-typedef enum _tag_NL_PREFIX_ORIGIN {
- IpPrefixOriginOther = 0,
+ MAKE_ROUTE_PROTOCOL (OTHER, 1),
+ MAKE_ROUTE_PROTOCOL (LOCAL, 2),
+ MAKE_ROUTE_PROTOCOL (NETMGMT, 3),
+ MAKE_ROUTE_PROTOCOL (ICMP, 4),
+ MAKE_ROUTE_PROTOCOL (EGP, 5),
+ MAKE_ROUTE_PROTOCOL (GGP, 6),
+ MAKE_ROUTE_PROTOCOL (HELLO, 7),
+ MAKE_ROUTE_PROTOCOL (RIP, 8),
+ MAKE_ROUTE_PROTOCOL (IS_IS, 9),
+ MAKE_ROUTE_PROTOCOL (ES_IS, 10),
+ MAKE_ROUTE_PROTOCOL (CISCO, 11),
+ MAKE_ROUTE_PROTOCOL (BBN, 12),
+ MAKE_ROUTE_PROTOCOL (OSPF, 13),
+ MAKE_ROUTE_PROTOCOL (BGP, 14),
+ MAKE_ROUTE_PROTOCOL (NT_AUTOSTATIC, 10002),
+ MAKE_ROUTE_PROTOCOL (NT_STATIC, 10006),
+ MAKE_ROUTE_PROTOCOL (NT_STATIC_NON_DOD, 10007)
+} NL_ROUTE_PROTOCOL,*PNL_ROUTE_PROTOCOL;
+
+typedef enum {
+ IpPrefixOriginOther = 0,
IpPrefixOriginManual,
IpPrefixOriginWellKnown,
IpPrefixOriginDhcp,
IpPrefixOriginRouterAdvertisement,
- IpPrefixOriginUnchanged = 1 << 4
+ IpPrefixOriginUnchanged = 16
} NL_PREFIX_ORIGIN;
+typedef enum {
+ NlsoOther = 0,
+ NlsoManual,
+ NlsoWellKnown,
+ NlsoDhcp,
+ NlsoLinkLayerAddress,
+ NlsoRandom,
+ IpSuffixOriginOther = 0,
+ IpSuffixOriginManual,
+ IpSuffixOriginWellKnown,
+ IpSuffixOriginDhcp,
+ IpSuffixOriginLinkLayerAddress,
+ IpSuffixOriginRandom,
+ IpSuffixOriginUnchanged = 16
+} NL_SUFFIX_ORIGIN;
+
+typedef enum {
+ NlatUnspecified,
+ NlatUnicast,
+ NlatAnycast,
+ NlatMulticast,
+ NlatBroadcast,
+ NlatInvalid
+} NL_ADDRESS_TYPE, *PNL_ADDRESS_TYPE;
+
typedef enum _NL_ROUTE_ORIGIN {
NlroManual,
NlroWellKnown,
NlroDHCP,
NlroRouterAdvertisement,
- Nlro6to4
+ Nlro6to4,
} NL_ROUTE_ORIGIN, *PNL_ROUTE_ORIGIN;
-typedef enum _NL_ROUTE_PROTOCOL {
- RouteProtocolOther = 1,
- RouteProtocolLocal,
- RouteProtocolNetMgmt,
- RouteProtocolIcmp,
- RouteProtocolEgp,
- RouteProtocolGgp,
- RouteProtocolHello,
- RouteProtocolRip,
- RouteProtocolIsIs,
- RouteProtocolEsIs,
- RouteProtocolCisco,
- RouteProtocolBbn,
- RouteProtocolOspf,
- RouteProtocolBgp,
-
- MIB_IPPROTO_OTHER = 1,
- PROTO_IP_OTHER = 1,
- MIB_IPPROTO_LOCAL = 2,
- PROTO_IP_LOCAL = 2,
- MIB_IPPROTO_NETMGMT = 3,
- PROTO_IP_NETMGMT = 3,
- MIB_IPPROTO_ICMP = 4,
- PROTO_IP_ICMP = 4,
- MIB_IPPROTO_EGP = 5,
- PROTO_IP_EGP = 5,
- MIB_IPPROTO_GGP = 6,
- PROTO_IP_GGP = 6,
- MIB_IPPROTO_HELLO = 7,
- PROTO_IP_HELLO = 7,
- MIB_IPPROTO_RIP = 8,
- PROTO_IP_RIP = 8,
- MIB_IPPROTO_IS_IS = 9,
- PROTO_IP_IS_IS = 9,
- MIB_IPPROTO_ES_IS = 10,
- PROTO_IP_ES_IS = 10,
- MIB_IPPROTO_CISCO = 11,
- PROTO_IP_CISCO = 11,
- MIB_IPPROTO_BBN = 12,
- PROTO_IP_BBN = 12,
- MIB_IPPROTO_OSPF = 13,
- PROTO_IP_OSPF = 13,
- MIB_IPPROTO_BGP = 14,
- PROTO_IP_BGP = 14,
- MIB_IPPROTO_NT_AUTOSTATIC = 10002,
- PROTO_IP_NT_AUTOSTATIC = 10002,
- MIB_IPPROTO_NT_STATIC = 10006,
- PROTO_IP_NT_STATIC = 10006,
- MIB_IPPROTO_NT_STATIC_NON_DOD = 10007,
- PROTO_IP_NT_STATIC_NON_DOD = 10007
-} NL_ROUTE_PROTOCOL, *PNL_ROUTE_PROTOCOL;
+typedef enum _NL_NEIGHBOR_STATE {
+ NlnsUnreachable,
+ NlnsIncomplete,
+ NlnsProbe,
+ NlnsDelay,
+ NlnsStale,
+ NlnsReachable,
+ NlnsPermanent,
+ NlnsMaximum,
+} NL_NEIGHBOR_STATE, *PNL_NEIGHBOR_STATE;
+
+typedef enum _NL_LINK_LOCAL_ADDRESS_BEHAVIOR {
+ LinkLocalAlwaysOff = 0,
+ LinkLocalDelayed,
+ LinkLocalAlwaysOn,
+ LinkLocalUnchanged = -1
+} NL_LINK_LOCAL_ADDRESS_BEHAVIOR;
typedef enum _NL_ROUTER_DISCOVERY_BEHAVIOR {
- RouterDiscoveryDisabled = 0,
+ RouterDiscoveryDisabled = 0,
RouterDiscoveryEnabled,
RouterDiscoveryDhcp,
- RouterDiscoveryUnchanged = -1
+ RouterDiscoveryUnchanged = -1
} NL_ROUTER_DISCOVERY_BEHAVIOR;
-typedef enum _tag_NL_SUFFIX_ORIGIN {
- NlsoOther = 0,
- NlsoManual,
- NlsoWellKnown,
- NlsoDhcp,
- NlsoLinkLayerAddress,
- NlsoRandom,
+typedef enum _NL_BANDWIDTH_FLAG {
+ NlbwDisabled = 0,
+ NlbwEnabled,
+ NlbwUnchanged = -1
+} NL_BANDWIDTH_FLAG, *PNL_BANDWIDTH_FLAG;
- IpSuffixOriginOther = 0,
- IpSuffixOriginManual,
- IpSuffixOriginWellKnown,
- IpSuffixOriginDhcp,
- IpSuffixOriginLinkLayerAddress,
- IpSuffixOriginRandom,
- IpSuffixOriginUnchanged = 1 << 4
-} NL_SUFFIX_ORIGIN;
+typedef enum _NL_INTERFACE_NETWORK_CATEGORY_STATE {
+ NlincCategoryUnknown = 0,
+ NlincPublic = 1,
+ NlincPrivate = 2,
+ NlincDomainAuthenticated = 3,
+ NlincCategoryStateMax
+} NL_INTERFACE_NETWORK_CATEGORY_STATE, *PNL_INTERFACE_NETWORK_CATEGORY_STATE;
typedef struct _NL_INTERFACE_OFFLOAD_ROD {
- BOOLEAN NlChecksumSupported :1;
- BOOLEAN NlOptionsSupported :1;
- BOOLEAN TlDatagramChecksumSupported :1;
- BOOLEAN TlStreamChecksumSupported :1;
- BOOLEAN TlStreamOptionsSupported :1;
+ BOOLEAN NlChecksumSupported : 1;
+ BOOLEAN NlOptionsSupported : 1;
+ BOOLEAN TlDatagramChecksumSupported : 1;
+ BOOLEAN TlStreamChecksumSupported : 1;
+ BOOLEAN TlStreamOptionsSupported : 1;
BOOLEAN FastPathCompatible : 1;
- BOOLEAN TlLargeSendOffloadSupported :1;
- BOOLEAN TlGiantSendOffloadSupported :1;
+ BOOLEAN TlLargeSendOffloadSupported : 1;
+ BOOLEAN TlGiantSendOffloadSupported : 1;
} NL_INTERFACE_OFFLOAD_ROD, *PNL_INTERFACE_OFFLOAD_ROD;
-#endif /*_INC_NLDEF*/
+typedef struct _NL_PATH_BANDWIDTH_ROD {
+ ULONG64 Bandwidth;
+ ULONG64 Instability;
+ BOOLEAN BandwidthPeaked;
+} NL_PATH_BANDWIDTH_ROD, *PNL_PATH_BANDWIDTH_ROD;
+
+typedef enum _NL_NETWORK_CATEGORY {
+ NetworkCategoryPublic,
+ NetworkCategoryPrivate,
+ NetworkCategoryDomainAuthenticated,
+ NetworkCategoryUnchanged = -1,
+ NetworkCategoryUnknown = -1
+} NL_NETWORK_CATEGORY,*PNL_NETWORK_CATEGORY;
+
+typedef struct _NL_BANDWIDTH_INFORMATION {
+ ULONG64 Bandwidth;
+ ULONG64 Instability;
+ BOOLEAN BandwidthPeaked;
+} NL_BANDWIDTH_INFORMATION, *PNL_BANDWIDTH_INFORMATION;
+
+#define NlpoOther IpPrefixOriginOther
+#define NlpoManual IpPrefixOriginManual
+#define NlpoWellKnown IpPrefixOriginWellKnown
+#define NlpoDhcp IpPrefixOriginDhcp
+#define NlpoRouterAdvertisement IpPrefixOriginRouterAdvertisement
+
+#define NL_MAX_METRIC_COMPONENT ((((ULONG) 1) << 31) - 1)
+
+#define NET_IF_CURRENT_SESSION ((ULONG)-1)
+
+#endif
+#endif
--
2.1.1
From 6a108d855ea19685ec90f68b4d74239c74e5b3c2 Mon Sep 17 00:00:00 2001
From: Kai Tietz <[email protected]>
Date: Tue, 6 Jan 2015 16:01:27 +0100
Subject: Fix widl-usage for enumarator-types for non-enumerator pointer-types.
---
mingw-w64-headers/include/wlantypes.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/mingw-w64-headers/include/wlantypes.h
b/mingw-w64-headers/include/wlantypes.h
index 437a77e..65bf630 100644
--- a/mingw-w64-headers/include/wlantypes.h
+++ b/mingw-w64-headers/include/wlantypes.h
@@ -38,7 +38,9 @@ typedef enum _DOT11_AUTH_ALGORITHM {
DOT11_AUTH_ALGO_RSNA_PSK = 7,
DOT11_AUTH_ALGO_IHV_START = 0x80000000,
DOT11_AUTH_ALGO_IHV_END = 0xffffffff
-} DOT11_AUTH_ALGORITHM, *PDOT11_AUTH_ALGORITHM;
+} DOT11_AUTH_ALGORITHM;
+
+typedef DOT11_AUTH_ALGORITHM *PDOT11_AUTH_ALGORITHM;
#ifdef __WIDL__
typedef [v1_enum] enum _DOT11_CIPHER_ALGORITHM {
@@ -55,7 +57,9 @@ typedef enum _DOT11_CIPHER_ALGORITHM {
DOT11_CIPHER_ALGO_WEP = 0x101,
DOT11_CIPHER_ALGO_IHV_START = 0x80000000,
DOT11_CIPHER_ALGO_IHV_END = 0xffffffff
-} DOT11_CIPHER_ALGORITHM, *PDOT11_CIPHER_ALGORITHM;
+} DOT11_CIPHER_ALGORITHM;
+
+typedef DOT11_CIPHER_ALGORITHM *PDOT11_CIPHER_ALGORITHM;
typedef enum _DOT11_BSS_TYPE {
dot11_BSS_type_infrastructure = 1,
--
2.1.1
From ff99433181681b5d0d5f00da898bf2be64ba839d Mon Sep 17 00:00:00 2001
From: Kai Tietz <[email protected]>
Date: Tue, 6 Jan 2015 16:04:38 +0100
Subject: Add new wlan-ihv API types.
---
mingw-w64-headers/include/wlanihvtypes.h | 56 ++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
create mode 100644 mingw-w64-headers/include/wlanihvtypes.h
diff --git a/mingw-w64-headers/include/wlanihvtypes.h
b/mingw-w64-headers/include/wlanihvtypes.h
new file mode 100644
index 0000000..8164255
--- /dev/null
+++ b/mingw-w64-headers/include/wlanihvtypes.h
@@ -0,0 +1,56 @@
+/**
+ * This file is part of the mingw-w64 runtime package.
+ * No warranty is given; refer to the file DISCLAIMER within this package.
+ */
+
+#ifndef __WLANIHVTYPES_H__
+#define __WLANIHVTYPES_H__
+
+#include <winapifamily.h>
+
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+
+#include <eaptypes.h>
+#include <wlantypes.h>
+
+#define MS_MAX_PROFILE_NAME_LENGTH 256
+
+#define MS_PROFILE_GROUP_POLICY 0x1
+#define MS_PROFILE_USER 0x2
+
+typedef struct _DOT11_MSSECURITY_SETTINGS {
+ DOT11_AUTH_ALGORITHM dot11AuthAlgorithm;
+ DOT11_CIPHER_ALGORITHM dot11CipherAlgorithm;
+ WINBOOL fOneXEnabled;
+ EAP_METHOD_TYPE eapMethodType;
+ DWORD dwEapConnectionDataLen;
+#ifdef __WIDL__
+ [size_is (dwEapConnectionDataLen)]
+#endif
+ BYTE *pEapConnectionData;
+} DOT11_MSSECURITY_SETTINGS, *PDOT11_MSSECURITY_SETTINGS;
+
+typedef struct _DOT11EXT_IHV_SSID_LIST {
+ ULONG ulCount;
+#ifdef __WIDL__
+ [unique, size_is (ulCount)] DOT11_SSID SSIDs[*];
+#else
+ DOT11_SSID SSIDs[1];
+#endif
+} DOT11EXT_IHV_SSID_LIST, *PDOT11EXT_IHV_SSID_LIST;
+
+typedef struct _DOT11EXT_IHV_PROFILE_PARAMS {
+ PDOT11EXT_IHV_SSID_LIST pSsidList;
+ DOT11_BSS_TYPE BssType;
+ PDOT11_MSSECURITY_SETTINGS pMSSecuritySettings;
+} DOT11EXT_IHV_PROFILE_PARAMS, *PDOT11EXT_IHV_PROFILE_PARAMS;
+
+typedef struct _DOT11EXT_IHV_PARAMS {
+ DOT11EXT_IHV_PROFILE_PARAMS dot11ExtIhvProfileParams;
+ WCHAR wstrProfileName[MS_MAX_PROFILE_NAME_LENGTH];
+ DWORD dwProfileTypeFlags;
+ GUID interfaceGuid;
+} DOT11EXT_IHV_PARAMS, *PDOT11EXT_IHV_PARAMS;
+#endif
+
+#endif
--
2.1.1
From 9d926b20537754a8e73b04bbac0b8852e53e9c5f Mon Sep 17 00:00:00 2001
From: Kai Tietz <[email protected]>
Date: Tue, 6 Jan 2015 15:20:17 +0100
Subject: Fix double definition of type EAP_CRED_EXPIRY_REQ.
---
mingw-w64-headers/include/eaptypes.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mingw-w64-headers/include/eaptypes.h
b/mingw-w64-headers/include/eaptypes.h
index 544543d..6ee6f05 100644
--- a/mingw-w64-headers/include/eaptypes.h
+++ b/mingw-w64-headers/include/eaptypes.h
@@ -296,7 +296,7 @@ typedef struct _EAP_METHOD_INFO_ARRAY_EX {
typedef struct _EAP_CRED_EXPIRY_REQ {
EAP_CONFIG_INPUT_FIELD_ARRAY curCreds;
EAP_CONFIG_INPUT_FIELD_ARRAY newCreds;
-} EAP_CRED_EXPIRY_REQ, *PEAP_CRED_EXPIRY_REQ;
+} /* EAP_CRED_EXPIRY_REQ, */ *PEAP_CRED_EXPIRY_REQ;
typedef struct _EAP_CRED_EXPIRY_RESP {
EAP_CONFIG_INPUT_FIELD_ARRAY curCreds;
--
2.1.1
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
