Module: wine Branch: master Commit: d04d2efacf2fb4e134a6a971540547a6376016d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04d2efacf2fb4e134a6a97154...
Author: Hans Leidekker hans@codeweavers.com Date: Wed Aug 24 10:22:48 2011 +0200
dnsapi: Mark some test results as broken and conform to the more recent behavior.
---
dlls/dnsapi/name.c | 6 ------ dlls/dnsapi/tests/name.c | 15 ++++++++------- 2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/dlls/dnsapi/name.c b/dlls/dnsapi/name.c index 3262050..c14c8a0 100644 --- a/dlls/dnsapi/name.c +++ b/dlls/dnsapi/name.c @@ -193,8 +193,6 @@ DNS_STATUS WINAPI DnsValidateName_W( PCWSTR name, DNS_NAME_FORMAT format ) { case DnsNameDomain: { - if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) - return DNS_ERROR_NUMERIC_NAME; if ((state & HAS_EXTENDED) || (state & HAS_UNDERSCORE)) return DNS_ERROR_NON_RFC_NAME; if ((state & HAS_SPACE) || @@ -214,8 +212,6 @@ DNS_STATUS WINAPI DnsValidateName_W( PCWSTR name, DNS_NAME_FORMAT format ) } case DnsNameHostnameFull: { - if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) - return DNS_ERROR_NUMERIC_NAME; if ((state & HAS_EXTENDED) || (state & HAS_UNDERSCORE)) return DNS_ERROR_NON_RFC_NAME; if ((state & HAS_SPACE) || @@ -226,8 +222,6 @@ DNS_STATUS WINAPI DnsValidateName_W( PCWSTR name, DNS_NAME_FORMAT format ) case DnsNameHostnameLabel: { if (state & HAS_DOT) return ERROR_INVALID_NAME; - if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) - return DNS_ERROR_NUMERIC_NAME; if ((state & HAS_EXTENDED) || (state & HAS_UNDERSCORE)) return DNS_ERROR_NON_RFC_NAME; if ((state & HAS_SPACE) || diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index d472687..2872c35 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -32,6 +32,7 @@ static const struct LPCSTR name; DNS_NAME_FORMAT format; DNS_STATUS status; + DNS_STATUS status_broken; } test_data[] = { @@ -47,8 +48,8 @@ test_data[] = { "a.*", DnsNameDomain, DNS_ERROR_INVALID_NAME_CHAR }, { "a ", DnsNameDomain, DNS_ERROR_INVALID_NAME_CHAR }, { "a._b", DnsNameDomain, DNS_ERROR_NON_RFC_NAME }, - { "123", DnsNameDomain, DNS_ERROR_NUMERIC_NAME }, - { "123.456", DnsNameDomain, DNS_ERROR_NUMERIC_NAME }, + { "123", DnsNameDomain, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, + { "123.456", DnsNameDomain, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, { "a.b", DnsNameDomain, ERROR_SUCCESS },
{ "", DnsNameDomainLabel, ERROR_INVALID_NAME }, @@ -79,8 +80,8 @@ test_data[] = { "e.*", DnsNameHostnameFull, DNS_ERROR_INVALID_NAME_CHAR }, { "e ", DnsNameHostnameFull, DNS_ERROR_INVALID_NAME_CHAR }, { "e._f", DnsNameHostnameFull, DNS_ERROR_NON_RFC_NAME }, - { "789", DnsNameHostnameFull, DNS_ERROR_NUMERIC_NAME }, - { "789.456", DnsNameHostnameFull, DNS_ERROR_NUMERIC_NAME }, + { "789", DnsNameHostnameFull, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, + { "789.456", DnsNameHostnameFull, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, { "e.f", DnsNameHostnameFull, ERROR_SUCCESS },
{ "", DnsNameHostnameLabel, ERROR_INVALID_NAME }, @@ -93,7 +94,7 @@ test_data[] = { "*", DnsNameHostnameLabel, DNS_ERROR_INVALID_NAME_CHAR }, { "g ", DnsNameHostnameLabel, DNS_ERROR_INVALID_NAME_CHAR }, { "_g", DnsNameHostnameLabel, DNS_ERROR_NON_RFC_NAME }, - { "123", DnsNameHostnameLabel, DNS_ERROR_NUMERIC_NAME }, + { "123", DnsNameHostnameLabel, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, { "123.456", DnsNameHostnameLabel, ERROR_INVALID_NAME }, { "g.h", DnsNameHostnameLabel, ERROR_INVALID_NAME },
@@ -146,8 +147,8 @@ static void test_DnsValidateName_A( void ) for (i = 0; i < sizeof(test_data) / sizeof(test_data[0]); i++) { status = DnsValidateName_A( test_data[i].name, test_data[i].format ); - ok( status == test_data[i].status, "%d: '%s': got %d, expected %d\n", - i, test_data[i].name, status, test_data[i].status ); + ok( status == test_data[i].status || broken(status == test_data[i].status_broken), + "%d: '%s': got %d, expected %d\n", i, test_data[i].name, status, test_data[i].status ); } }