[DNSAPI_APITEST] Fix dnsapi:DnsQuery on Server 2003 x86, 8.1 x86, 8.1 x64, 10 x86, 10 x64 #8043
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -61,11 +61,14 @@ void TestHostName(void) | |||
| dp = InvalidPointer; | |||
| dns_status = DnsQuery_A(NULL, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); | |||
| ok(dns_status == ERROR_INVALID_PARAMETER, "DnsQuery_A failed with error %lu\n", dns_status); | |||
| ok(dp == InvalidPointer, "dp = %p\n", dp); | |||
| ok(dp == InvalidPointer || dp == 0, "dp = %p\n", dp); | |||
There was a problem hiding this comment.
Here and elsewhere/everywhere,
do we have to accept all/any different values, or could we match Windows versions?
There was a problem hiding this comment.
Why match a specific Windows version if both represent a valid implementation?
There was a problem hiding this comment.
You wrote, in PR description, that
Windows 8+ sets the query to a null pointer [...] while earlier Windows versions don't change the query pointer.
but your code implies that any Windows version can return any of the values.
That seems contradictory/wrong. (Instead of checking the Windows version.)
HBelusca
approved these changes
May 29, 2025
whindsaks
approved these changes
May 29, 2025
| @@ -61,11 +61,14 @@ void TestHostName(void) | |||
| dp = InvalidPointer; | |||
| dns_status = DnsQuery_A(NULL, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); | |||
| ok(dns_status == ERROR_INVALID_PARAMETER, "DnsQuery_A failed with error %lu\n", dns_status); | |||
| ok(dp == InvalidPointer, "dp = %p\n", dp); | |||
| ok(dp == InvalidPointer || dp == 0, "dp = %p\n", dp); | |||
There was a problem hiding this comment.
Suggested change
| ok(dp == InvalidPointer || dp == 0, "dp = %p\n", dp); | |
| ok(dp == InvalidPointer || dp == NULL, "dp = %p\n", dp); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Fixes the dnsapi:DnsQuery test on Server 2003 x86, 8.1 x86, 8.1 x64, 10 x86, and 10 x64.
Windows Server 2003 x64 does not handle the hostname tests properly; however there is some discussion regarding abandoning our Server 2003 x64 testbot and using a Vista x64 testbot instead, so I felt it appropriate to PR this now.
Proposed changes
DNS_ERROR_RCODE_NAME_ERRORin some tests where other versions of Windows may returnERROR_INVALID_NAME,ERROR_TIMEOUT, orDNS_ERROR_INVALID_NAME_CHAR. Pass this behavior.Testbot runs (Filled in by Devs)