| windns.h (6.3.9600.17415-Windows 8.1) | | windns.h (10.0.10586.212-Windows 10 1511 10586.494) |
| | |
| skipping to change at line 27 | | skipping to change at line 27 |
| Jim Gilroy (jamesg) December 7, 1996 | | Jim Gilroy (jamesg) December 7, 1996 |
| | |
| Revision History: | | Revision History: |
| | |
| --*/ | | --*/ |
| | |
| #ifndef _WINDNS_INCLUDED_ | | #ifndef _WINDNS_INCLUDED_ |
| #define _WINDNS_INCLUDED_ | | #define _WINDNS_INCLUDED_ |
| #include <winapifamily.h> | | #include <winapifamily.h> |
| | |
|
| #pragma region Desktop Family | | #pragma region Desktop Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C" | | extern "C" |
| { | | { |
| #endif // __cplusplus | | #endif // __cplusplus |
| | |
| // | | // |
| // Define QWORD -- not yet defined globally | | // Define QWORD -- not yet defined globally |
| // | | // |
| | |
| | |
| skipping to change at line 486 | | skipping to change at line 486 |
| // Generally we'll avoid byte flip and test class in net byte order. | | // Generally we'll avoid byte flip and test class in net byte order. |
| // | | // |
| | |
| #define DNS_CLASS_INTERNET 0x0001 // 1 | | #define DNS_CLASS_INTERNET 0x0001 // 1 |
| #define DNS_CLASS_CSNET 0x0002 // 2 | | #define DNS_CLASS_CSNET 0x0002 // 2 |
| #define DNS_CLASS_CHAOS 0x0003 // 3 | | #define DNS_CLASS_CHAOS 0x0003 // 3 |
| #define DNS_CLASS_HESIOD 0x0004 // 4 | | #define DNS_CLASS_HESIOD 0x0004 // 4 |
| #define DNS_CLASS_NONE 0x00fe // 254 | | #define DNS_CLASS_NONE 0x00fe // 254 |
| #define DNS_CLASS_ALL 0x00ff // 255 | | #define DNS_CLASS_ALL 0x00ff // 255 |
| #define DNS_CLASS_ANY 0x00ff // 255 | | #define DNS_CLASS_ANY 0x00ff // 255 |
|
| | #define DNS_CLASS_UNICAST_RESPONSE 0x8000 // Set the top-bit of the field to
one |
| | |
| #define DNS_RCLASS_INTERNET 0x0100 // 1 | | #define DNS_RCLASS_INTERNET 0x0100 // 1 |
| #define DNS_RCLASS_CSNET 0x0200 // 2 | | #define DNS_RCLASS_CSNET 0x0200 // 2 |
| #define DNS_RCLASS_CHAOS 0x0300 // 3 | | #define DNS_RCLASS_CHAOS 0x0300 // 3 |
| #define DNS_RCLASS_HESIOD 0x0400 // 4 | | #define DNS_RCLASS_HESIOD 0x0400 // 4 |
| #define DNS_RCLASS_NONE 0xfe00 // 254 | | #define DNS_RCLASS_NONE 0xfe00 // 254 |
| #define DNS_RCLASS_ALL 0xff00 // 255 | | #define DNS_RCLASS_ALL 0xff00 // 255 |
| #define DNS_RCLASS_ANY 0xff00 // 255 | | #define DNS_RCLASS_ANY 0xff00 // 255 |
|
| | #define DNS_RCLASS_UNICAST_RESPONSE 0x0080 // Set the top-bit of the field to
one, in net order! |
| // | | // |
| // DNS Record Types | | // DNS Record Types |
| // | | // |
| // _TYPE_ defines are in host byte order. | | // _TYPE_ defines are in host byte order. |
| // _RTYPE_ defines are in net byte order. | | // _RTYPE_ defines are in net byte order. |
| // | | // |
| // Generally always deal with types in host byte order as we index | | // Generally always deal with types in host byte order as we index |
| // resource record functions by type. | | // resource record functions by type. |
| // | | // |
| | |
| | |
| skipping to change at line 608 | | skipping to change at line 610 |
| | |
| // RFC 4701 (DHCID) | | // RFC 4701 (DHCID) |
| #define DNS_TYPE_DHCID 0x0031 // 49 | | #define DNS_TYPE_DHCID 0x0031 // 49 |
| | |
| // RFC 5155 (DNSSEC NSEC3) | | // RFC 5155 (DNSSEC NSEC3) |
| #define DNS_TYPE_NSEC3 0x0032 // 50 | | #define DNS_TYPE_NSEC3 0x0032 // 50 |
| | |
| // RFC 5155 (DNSSEC NSEC3PARAM) | | // RFC 5155 (DNSSEC NSEC3PARAM) |
| #define DNS_TYPE_NSEC3PARAM 0x0033 // 51 | | #define DNS_TYPE_NSEC3PARAM 0x0033 // 51 |
| | |
|
| | //RFC 6698 (TLSA) |
| | #define DNS_TYPE_TLSA 0x0034 // 52 |
| | |
| // | | // |
| // IANA Reserved | | // IANA Reserved |
| // | | // |
| | |
| #define DNS_TYPE_UINFO 0x0064 // 100 | | #define DNS_TYPE_UINFO 0x0064 // 100 |
| #define DNS_TYPE_UID 0x0065 // 101 | | #define DNS_TYPE_UID 0x0065 // 101 |
| #define DNS_TYPE_GID 0x0066 // 102 | | #define DNS_TYPE_GID 0x0066 // 102 |
| #define DNS_TYPE_UNSPEC 0x0067 // 103 | | #define DNS_TYPE_UNSPEC 0x0067 // 103 |
| | |
| // | | // |
| | |
| skipping to change at line 697 | | skipping to change at line 702 |
| #define DNS_RTYPE_SINK 0x2800 // 40 | | #define DNS_RTYPE_SINK 0x2800 // 40 |
| #define DNS_RTYPE_OPT 0x2900 // 41 | | #define DNS_RTYPE_OPT 0x2900 // 41 |
| | |
| #define DNS_RTYPE_DS 0x2b00 // 43 | | #define DNS_RTYPE_DS 0x2b00 // 43 |
| #define DNS_RTYPE_RRSIG 0x2e00 // 46 | | #define DNS_RTYPE_RRSIG 0x2e00 // 46 |
| #define DNS_RTYPE_NSEC 0x2f00 // 47 | | #define DNS_RTYPE_NSEC 0x2f00 // 47 |
| #define DNS_RTYPE_DNSKEY 0x3000 // 48 | | #define DNS_RTYPE_DNSKEY 0x3000 // 48 |
| #define DNS_RTYPE_DHCID 0x3100 // 49 | | #define DNS_RTYPE_DHCID 0x3100 // 49 |
| #define DNS_RTYPE_NSEC3 0x3200 // 50 | | #define DNS_RTYPE_NSEC3 0x3200 // 50 |
| #define DNS_RTYPE_NSEC3PARAM 0x3300 // 51 | | #define DNS_RTYPE_NSEC3PARAM 0x3300 // 51 |
|
| | #define DNS_RTYPE_TLSA 0x3400 // 52 |
| | |
| // | | // |
| // IANA Reserved | | // IANA Reserved |
| // | | // |
| | |
| #define DNS_RTYPE_UINFO 0x6400 // 100 | | #define DNS_RTYPE_UINFO 0x6400 // 100 |
| #define DNS_RTYPE_UID 0x6500 // 101 | | #define DNS_RTYPE_UID 0x6500 // 101 |
| #define DNS_RTYPE_GID 0x6600 // 102 | | #define DNS_RTYPE_GID 0x6600 // 102 |
| #define DNS_RTYPE_UNSPEC 0x6700 // 103 | | #define DNS_RTYPE_UNSPEC 0x6700 // 103 |
| | |
| | |
| skipping to change at line 1160 | | skipping to change at line 1166 |
| #ifdef MIDL_PASS | | #ifdef MIDL_PASS |
| [size_is(bSaltLength)] BYTE pbSalt[]; | | [size_is(bSaltLength)] BYTE pbSalt[]; |
| #else | | #else |
| BYTE pbSalt[1]; | | BYTE pbSalt[1]; |
| #endif | | #endif |
| } | | } |
| DNS_NSEC3PARAM_DATA, *PDNS_NSEC3PARAM_DATA; | | DNS_NSEC3PARAM_DATA, *PDNS_NSEC3PARAM_DATA; |
| | |
| typedef struct | | typedef struct |
| { | | { |
|
| | BYTE bCertUsage; |
| | BYTE bSelector; |
| | BYTE bMatchingType; |
| | WORD bCertificateAssociationDataLength; |
| | BYTE bPad[3]; // keep certificate association data field a |
| | ligned |
| | #ifdef MIDL_PASS |
| | [size_is(bCertificateAssociationDataLength)] BYTE bCertificateAssociationDa |
| | ta[]; |
| | #else |
| | BYTE bCertificateAssociationData[1]; |
| | #endif |
| | } |
| | DNS_TLSA_DATA, *PDNS_TLSA_DATA; |
| | |
| | typedef struct |
| | { |
| WORD wKeyTag; | | WORD wKeyTag; |
| BYTE chAlgorithm; | | BYTE chAlgorithm; |
| BYTE chDigestType; | | BYTE chDigestType; |
| WORD wDigestLength; | | WORD wDigestLength; |
| WORD wPad; // keep byte field aligned | | WORD wPad; // keep byte field aligned |
| #ifdef MIDL_PASS | | #ifdef MIDL_PASS |
| [size_is(wDigestLength)] BYTE Digest[]; | | [size_is(wDigestLength)] BYTE Digest[]; |
| #else | | #else |
| BYTE Digest[1]; | | BYTE Digest[1]; |
| #endif | | #endif |
| | |
| skipping to change at line 1344 | | skipping to change at line 1365 |
| WORD wFudgeTime; | | WORD wFudgeTime; |
| WORD wOriginalXid; | | WORD wOriginalXid; |
| WORD wError; | | WORD wError; |
| WORD wSigLength; | | WORD wSigLength; |
| WORD wOtherLength; | | WORD wOtherLength; |
| UCHAR cAlgNameLength; | | UCHAR cAlgNameLength; |
| BOOL bPacketPointers; | | BOOL bPacketPointers; |
| } | | } |
| DNS_TSIG_DATAA, *PDNS_TSIG_DATAA; | | DNS_TSIG_DATAA, *PDNS_TSIG_DATAA; |
| | |
|
| | typedef struct |
| | { |
| | DWORD dwByteCount; |
| | #ifdef MIDL_PASS |
| | [size_is(dwByteCount)] BYTE bData[]; |
| | #else |
| | BYTE bData[1]; |
| | #endif |
| | } |
| | DNS_UNKNOWN_DATA, *PDNS_UNKNOWN_DATA; |
| | |
| // | | // |
| // MS only types -- only hit the wire in MS-MS zone transfer | | // MS only types -- only hit the wire in MS-MS zone transfer |
| // | | // |
| | |
| typedef struct | | typedef struct |
| { | | { |
| DWORD dwMappingFlag; | | DWORD dwMappingFlag; |
| DWORD dwLookupTimeout; | | DWORD dwLookupTimeout; |
| DWORD dwCacheTimeout; | | DWORD dwCacheTimeout; |
| DWORD cWinsServerCount; | | DWORD cWinsServerCount; |
| | |
| skipping to change at line 1452 | | skipping to change at line 1484 |
| | |
| #define DNS_DHCID_RECORD_LENGTH(ByteCount) \ | | #define DNS_DHCID_RECORD_LENGTH(ByteCount) \ |
| (FIELD_OFFSET(DNS_DHCID_DATA, DHCID) + (ByteCount)) | | (FIELD_OFFSET(DNS_DHCID_DATA, DHCID) + (ByteCount)) |
| | |
| #define DNS_NSEC3_RECORD_LENGTH(ByteCount) \ | | #define DNS_NSEC3_RECORD_LENGTH(ByteCount) \ |
| (FIELD_OFFSET(DNS_NSEC3_DATA, chData) + (ByteCount)) | | (FIELD_OFFSET(DNS_NSEC3_DATA, chData) + (ByteCount)) |
| | |
| #define DNS_NSEC3PARAM_RECORD_LENGTH(ByteCount) \ | | #define DNS_NSEC3PARAM_RECORD_LENGTH(ByteCount) \ |
| (FIELD_OFFSET(DNS_NSEC3PARAM_DATA, pbSalt) + (ByteCount)) | | (FIELD_OFFSET(DNS_NSEC3PARAM_DATA, pbSalt) + (ByteCount)) |
| | |
|
| | #define DNS_TLSA_RECORD_LENGTH(ByteCount) \ |
| | (FIELD_OFFSET(DNS_TLSA_DATA, bCertificateAssociationData) |
| | + (ByteCount)) |
| | |
| | #define DNS_UNKNOWN_RECORD_LENGTH(ByteCount) \ |
| | (FIELD_OFFSET(DNS_UNKNOWN_DATA, bData) + (ByteCount)) |
| | |
| // | | // |
| // Record flags | | // Record flags |
| // | | // |
| | |
| typedef struct _DnsRecordFlags | | typedef struct _DnsRecordFlags |
| { | | { |
| DWORD Section : 2; | | DWORD Section : 2; |
| DWORD Delete : 1; | | DWORD Delete : 1; |
| DWORD CharSet : 2; | | DWORD CharSet : 2; |
| DWORD Unused : 3; | | DWORD Unused : 3; |
| | |
| skipping to change at line 1593 | | skipping to change at line 1631 |
| DNS_RRSIG_DATAW RRSIG, Rrsig; | | DNS_RRSIG_DATAW RRSIG, Rrsig; |
| DNS_NSEC_DATAW NSEC, Nsec; | | DNS_NSEC_DATAW NSEC, Nsec; |
| DNS_DNSKEY_DATA DNSKEY, Dnskey; | | DNS_DNSKEY_DATA DNSKEY, Dnskey; |
| DNS_TKEY_DATAW TKEY, Tkey; | | DNS_TKEY_DATAW TKEY, Tkey; |
| DNS_TSIG_DATAW TSIG, Tsig; | | DNS_TSIG_DATAW TSIG, Tsig; |
| DNS_WINS_DATA WINS, Wins; | | DNS_WINS_DATA WINS, Wins; |
| DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat; | | DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat; |
| DNS_DHCID_DATA DHCID; | | DNS_DHCID_DATA DHCID; |
| DNS_NSEC3_DATA NSEC3, Nsec3; | | DNS_NSEC3_DATA NSEC3, Nsec3; |
| DNS_NSEC3PARAM_DATA NSEC3PARAM, Nsec3Param; | | DNS_NSEC3PARAM_DATA NSEC3PARAM, Nsec3Param; |
|
| | DNS_TLSA_DATA TLSA, Tlsa; |
| | DNS_UNKNOWN_DATA UNKNOWN, Unknown; |
| PBYTE pDataPtr; | | PBYTE pDataPtr; |
| | |
| } Data; | | } Data; |
| } | | } |
| DNS_RECORDW, *PDNS_RECORDW; | | DNS_RECORDW, *PDNS_RECORDW; |
| | |
| typedef struct _DnsRecordOptW | | typedef struct _DnsRecordOptW |
| { | | { |
| struct _DnsRecordW * pNext; | | struct _DnsRecordW * pNext; |
| PWSTR pName; | | PWSTR pName; |
| | |
| skipping to change at line 1688 | | skipping to change at line 1728 |
| DNS_RRSIG_DATAA RRSIG, Rrsig; | | DNS_RRSIG_DATAA RRSIG, Rrsig; |
| DNS_NSEC_DATAA NSEC, Nsec; | | DNS_NSEC_DATAA NSEC, Nsec; |
| DNS_DNSKEY_DATA DNSKEY, Dnskey; | | DNS_DNSKEY_DATA DNSKEY, Dnskey; |
| DNS_TKEY_DATAA TKEY, Tkey; | | DNS_TKEY_DATAA TKEY, Tkey; |
| DNS_TSIG_DATAA TSIG, Tsig; | | DNS_TSIG_DATAA TSIG, Tsig; |
| DNS_WINS_DATA WINS, Wins; | | DNS_WINS_DATA WINS, Wins; |
| DNS_WINSR_DATAA WINSR, WinsR, NBSTAT, Nbstat; | | DNS_WINSR_DATAA WINSR, WinsR, NBSTAT, Nbstat; |
| DNS_DHCID_DATA DHCID; | | DNS_DHCID_DATA DHCID; |
| DNS_NSEC3_DATA NSEC3, Nsec3; | | DNS_NSEC3_DATA NSEC3, Nsec3; |
| DNS_NSEC3PARAM_DATA NSEC3PARAM, Nsec3Param; | | DNS_NSEC3PARAM_DATA NSEC3PARAM, Nsec3Param; |
|
| | DNS_TLSA_DATA TLSA, Tlsa; |
| | DNS_UNKNOWN_DATA UNKNOWN, Unknown; |
| PBYTE pDataPtr; | | PBYTE pDataPtr; |
| | |
| } Data; | | } Data; |
| } | | } |
| DNS_RECORDA, *PDNS_RECORDA; | | DNS_RECORDA, *PDNS_RECORDA; |
| | |
| typedef struct _DnsRecordOptA | | typedef struct _DnsRecordOptA |
| { | | { |
| struct _DnsRecordA * pNext; | | struct _DnsRecordA * pNext; |
| PSTR pName; | | PSTR pName; |
| | |
| skipping to change at line 2058 | | skipping to change at line 2100 |
| _In_opt_ PCWSTR QueryName; | | _In_opt_ PCWSTR QueryName; |
| _In_ WORD QueryType; | | _In_ WORD QueryType; |
| _In_ ULONG64 QueryOptions; | | _In_ ULONG64 QueryOptions; |
| _In_opt_ PDNS_ADDR_ARRAY pDnsServerList; | | _In_opt_ PDNS_ADDR_ARRAY pDnsServerList; |
| _In_opt_ ULONG InterfaceIndex; | | _In_opt_ ULONG InterfaceIndex; |
| _In_opt_ PDNS_QUERY_COMPLETION_ROUTINE pQueryCompletionCallback; | | _In_opt_ PDNS_QUERY_COMPLETION_ROUTINE pQueryCompletionCallback; |
| _In_ PVOID pQueryContext; | | _In_ PVOID pQueryContext; |
| } | | } |
| DNS_QUERY_REQUEST, *PDNS_QUERY_REQUEST; | | DNS_QUERY_REQUEST, *PDNS_QUERY_REQUEST; |
| | |
|
| typedef struct _DNS_QUERY_CANCEL | | typedef struct DECLSPEC_ALIGN(8) _DNS_QUERY_CANCEL |
| { | | { |
| CHAR Reserved[32]; | | CHAR Reserved[32]; |
| } | | } |
| DNS_QUERY_CANCEL, *PDNS_QUERY_CANCEL; | | DNS_QUERY_CANCEL, *PDNS_QUERY_CANCEL; |
| | |
| DNS_STATUS | | DNS_STATUS |
| WINAPI | | WINAPI |
| DnsQueryEx( | | DnsQueryEx( |
| _In_ PDNS_QUERY_REQUEST pQueryRequest, | | _In_ PDNS_QUERY_REQUEST pQueryRequest, |
| _Inout_ PDNS_QUERY_RESULT pQueryResults, | | _Inout_ PDNS_QUERY_RESULT pQueryResults, |
| | |
| skipping to change at line 2384 | | skipping to change at line 2426 |
| VOID | | VOID |
| WINAPI | | WINAPI |
| DnsFreeProxyName( | | DnsFreeProxyName( |
| _Frees_ptr_opt_ PWSTR proxyName | | _Frees_ptr_opt_ PWSTR proxyName |
| ); | | ); |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif // __cplusplus | | #endif // __cplusplus |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY
STEM) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif // _WINDNS_INCLUDED_ | | #endif // _WINDNS_INCLUDED_ |
| | |
| End of changes. 12 change blocks. |
| 4 lines changed or deleted | | 49 lines changed or added |
|