May 2006 - Wine-commits - list.winehq.org

Dmitry Timoshkov : comctl32: psInfo->proppage[index]. pszText is always initialized to a
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 34cf29efbb1d71c2fc59988bb1c25a7a5ee8f49c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34cf29efbb1d71c2fc59988… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 5 22:58:26 2006 +0900 comctl32: psInfo->proppage[index].pszText is always initialized to a proper value regardless of PSP_USETITLE, use it unconditionally. --- dlls/comctl32/propsheet.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 141b794..f9d5a48 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1606,8 +1606,7 @@ static BOOL PROPSHEET_ShowPage(HWND hwnd PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage); } - if ((psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) && - (ppshpage->dwFlags & PSP_USETITLE)) + if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) { PROPSHEET_SetTitleW(hwndDlg, psInfo->ppshheader.dwFlags, psInfo->proppage[index].pszText);

1 0

James Hawkins : advpack: The only flag we don' t handle is RSC_FLAG_UPDHLPDLLS.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 8e111502ade2d655b4e0fe0d53f60e9a4c4a0ff5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e111502ade2d655b4e0fe0… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 4 00:22:45 2006 -0500 advpack: The only flag we don't handle is RSC_FLAG_UPDHLPDLLS. --- dlls/advpack/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index efbf185..544915d 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -871,8 +871,8 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn debugstr_w(szDir), debugstr_w(lpszTitle), phEXE, dwFlags, pvReserved); - if (dwFlags) - FIXME("Unhandled flags: 0x%08lx\n", dwFlags); + if (dwFlags & RSC_FLAG_UPDHLPDLLS) + FIXME("Unhandled flag: RSC_FLAG_UPDHLPDLLS\n"); if (!szCmdName || !szDir) return E_INVALIDARG;

1 0

James Hawkins : advpack: DelDirs should only remove a directory if it' s empty.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 5f875b09123342d230d3db47251661084655d067 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f875b09123342d230d3db4… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 4 00:23:17 2006 -0500 advpack: DelDirs should only remove a directory if it's empty. --- dlls/advpack/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 544915d..2feadee 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -87,7 +87,7 @@ static HRESULT del_dirs_callback(HINF hi MAX_INF_STRING_LENGTH, &size)) continue; - if (DelNodeW(directory, 0)) + if (DelNodeW(directory, ADN_DEL_IF_EMPTY)) hr = E_FAIL; }

1 0

Ivan Gyurdiev : wined3d: Separate pshader/vshader tables.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: aea0b5d0f81630549eb63d65aecdc2d9c217edbf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aea0b5d0f81630549eb63d6… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed Apr 26 22:24:07 2006 -0400 wined3d: Separate pshader/vshader tables. --- dlls/wined3d/pixelshader.c | 25 -------- dlls/wined3d/vertexshader.c | 140 ------------------------------------------- 2 files changed, 1 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=aea0b5d0f81630549eb…

1 0

Mike Hearn : ntdll: Fix heap corruption in RtlDeleteAce.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 0154704f9f8a2f13d2e654c074391ab008c7573f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0154704f9f8a2f13d2e654c… Author: Mike Hearn <mike(a)plan99.net> Date: Mon May 1 09:08:58 2006 +0100 ntdll: Fix heap corruption in RtlDeleteAce. --- dlls/ntdll/sec.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 8fd21f7..620588b 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1132,15 +1132,20 @@ NTSTATUS WINAPI RtlDeleteAce(PACL pAcl, PACE_HEADER pcAce; DWORD len = 0; + /* skip over the ACE we are deleting */ pcAce = (PACE_HEADER)(((BYTE*)pAce)+pAce->AceSize); + dwAceIndex++; + + /* calculate the length of the rest */ for (; dwAceIndex < pAcl->AceCount; dwAceIndex++) { len += pcAce->AceSize; pcAce = (PACE_HEADER)(((BYTE*)pcAce) + pcAce->AceSize); } - memcpy(pAce, ((BYTE*)pAce)+pAce->AceSize, len); - pAcl->AceCount--; + /* slide them all backwards */ + memmove(pAce, ((BYTE*)pAce)+pAce->AceSize, len); + pAcl->AceCount--; } TRACE("pAcl=%p dwAceIndex=%ld status=0x%08lx\n", pAcl, dwAceIndex, status);

1 0

Detlef Riekenberg : winspool/tests: Fix failures in test_DEVMODE.
by Alexandre Julliard 07 May '06

07 May '06

Module: wine Branch: refs/heads/master Commit: 72d6d425270d995dea1d48361e293768b1b2489f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72d6d425270d995dea1d483… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 2 00:03:51 2006 +0200 winspool/tests: Fix failures in test_DEVMODE. --- dlls/winspool/tests/info.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index b6b15a1..aaeba2a 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -1096,8 +1096,16 @@ static void test_GetPrinterDriver(void) static void test_DEVMODE(const DEVMODE *dm, LONG dmSize, LPCSTR exp_prn_name) { - ok(!strcmp(exp_prn_name, (LPCSTR)dm->dmDeviceName), "expected %s, got %s\n", exp_prn_name, dm->dmDeviceName); - ok(dm->dmSize + dm->dmDriverExtra == dmSize, "%u != %ld\n", dm->dmSize + dm->dmDriverExtra, dmSize); + /* On NT3.51, some fields in DEVMODE are empty/zero + (dmDeviceName, dmSpecVersion, dmDriverVersion and dmDriverExtra) + We skip the Tests on this Platform */ + if (dm->dmSpecVersion || dm->dmDriverVersion || dm->dmDriverExtra) { + /* The Printername can be larger (MAX_PATH) than CCHDEVICENAME */ + ok(!strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME), + "expected '%s', got '%s'\n", exp_prn_name, dm->dmDeviceName); + ok(dm->dmSize + dm->dmDriverExtra == dmSize, + "%u != %ld\n", dm->dmSize + dm->dmDriverExtra, dmSize); + } trace("dmFields %08lx\n", dm->dmFields); }

1 0

Huw Davies : oleaut32: Fix VARIANT_UserFree.
by Alexandre Julliard 07 May '06

07 May '06

Module: wine Branch: refs/heads/master Commit: 3abd27c624cfbdcb480d4a7ebc711e6c0b9339ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3abd27c624cfbdcb480d4a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 5 15:49:57 2006 +0100 oleaut32: Fix VARIANT_UserFree. --- dlls/oleaut32/usrmarshal.c | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 3177e0b..a26b93d 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -646,23 +646,26 @@ void WINAPI VARIANT_UserFree(unsigned lo VariantClear(pvar); if (!ref) return; - switch (vt) { - case VT_BSTR | VT_BYREF: - BSTR_UserFree(pFlags, ref); - break; - case VT_VARIANT | VT_BYREF: - VARIANT_UserFree(pFlags, ref); - break; - case VT_RECORD | VT_BYREF: - FIXME("handle BRECORD by ref\n"); - break; - case VT_UNKNOWN: - case VT_DISPATCH: - IUnknown_Release(V_UNKNOWN(pvar)); - break; - default: - FIXME("handle unknown complex type\n"); - break; + if(vt & VT_ARRAY) + LPSAFEARRAY_UserFree(pFlags, V_ARRAYREF(pvar)); + else + { + switch (vt) + { + case VT_BSTR | VT_BYREF: + BSTR_UserFree(pFlags, V_BSTRREF(pvar)); + break; + case VT_VARIANT | VT_BYREF: + VARIANT_UserFree(pFlags, V_VARIANTREF(pvar)); + break; + case VT_RECORD | VT_BYREF: + FIXME("handle BRECORD by ref\n"); + break; + case VT_UNKNOWN | VT_BYREF: + case VT_DISPATCH | VT_BYREF: + IUnknown_Release(*V_UNKNOWNREF(pvar)); + break; + } } CoTaskMemFree(ref);

1 0

Huw Davies : oleaut32: Remove weird attempt to clear VT_VARIANT.
by Alexandre Julliard 07 May '06

07 May '06

Module: wine Branch: refs/heads/master Commit: 2898b5d9ad886c0e9077e5ed91b16cd9a8988943 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2898b5d9ad886c0e9077e5e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 5 15:28:22 2006 +0100 oleaut32: Remove weird attempt to clear VT_VARIANT. Add some tests. --- dlls/oleaut32/tests/vartest.c | 111 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.c | 5 -- 2 files changed, 111 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2d60b86..2b6cf1c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -273,11 +273,49 @@ static int IsValidVariantClearVT(VARTYPE return ret; } +typedef struct +{ + const IUnknownVtbl *lpVtbl; + LONG ref; + LONG events; +} test_VariantClearImpl; + +static HRESULT WINAPI VC_QueryInterface(LPUNKNOWN iface,REFIID riid,LPVOID *ppobj) +{ + test_VariantClearImpl *This = (test_VariantClearImpl *)iface; + This->events |= 0x1; + return E_NOINTERFACE; +} + +static ULONG WINAPI VC_AddRef(LPUNKNOWN iface) { + test_VariantClearImpl *This = (test_VariantClearImpl *)iface; + This->events |= 0x2; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI VC_Release(LPUNKNOWN iface) { + test_VariantClearImpl *This = (test_VariantClearImpl *)iface; + /* static class, won't be freed */ + This->events |= 0x4; + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl test_VariantClear_vtbl = { + VC_QueryInterface, + VC_AddRef, + VC_Release, +}; + +static test_VariantClearImpl test_myVariantClearImpl = {&test_VariantClear_vtbl, 1, 0}; + static void test_VariantClear(void) { HRESULT hres; VARIANTARG v; + VARIANT v2; size_t i; + long i4; + IUnknown *punk; #if 0 /* Crashes: Native does not test input for NULL, so neither does Wine */ @@ -319,6 +357,79 @@ #endif hExpected, hres, vt, ExtraFlags[i]); } } + + /* Some BYREF tests with non-NULL ptrs */ + + /* VARIANT BYREF */ + V_VT(&v2) = VT_I4; + V_I4(&v2) = 0x1234; + V_VT(&v) = VT_VARIANT | VT_BYREF; + V_VARIANTREF(&v) = &v2; + + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); + ok(V_VARIANTREF(&v) == &v2, "variant ref %p\n", V_VARIANTREF(&v2)); + ok(V_VT(&v2) == VT_I4, "vt %04x\n", V_VT(&v2)); + ok(V_I4(&v2) == 0x1234, "i4 %04lx\n", V_I4(&v2)); + + /* I4 BYREF */ + i4 = 0x4321; + V_VT(&v) = VT_I4 | VT_BYREF; + V_I4REF(&v) = &i4; + + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); + ok(V_I4REF(&v) == &i4, "i4 ref %p\n", V_I4REF(&v2)); + ok(i4 == 0x4321, "i4 changed %08lx\n", i4); + + + /* UNKNOWN */ + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)&test_myVariantClearImpl; + test_myVariantClearImpl.events = 0; + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); + ok(V_UNKNOWN(&v) == (IUnknown*)&test_myVariantClearImpl, "unknown %p\n", V_UNKNOWN(&v)); + /* Check that Release got called, but nothing else */ + ok(test_myVariantClearImpl.events == 0x4, "Unexpected call. events %08lx\n", test_myVariantClearImpl.events); + + /* UNKNOWN BYREF */ + punk = (IUnknown*)&test_myVariantClearImpl; + V_VT(&v) = VT_UNKNOWN | VT_BYREF; + V_UNKNOWNREF(&v) = &punk; + test_myVariantClearImpl.events = 0; + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); + ok(V_UNKNOWNREF(&v) == &punk, "unknown ref %p\n", V_UNKNOWNREF(&v)); + /* Check that nothing got called */ + ok(test_myVariantClearImpl.events == 0, "Unexpected call. events %08lx\n", test_myVariantClearImpl.events); + + /* DISPATCH */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&test_myVariantClearImpl; + test_myVariantClearImpl.events = 0; + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&test_myVariantClearImpl, "dispatch %p\n", V_DISPATCH(&v)); + /* Check that Release got called, but nothing else */ + ok(test_myVariantClearImpl.events == 0x4, "Unexpected call. events %08lx\n", test_myVariantClearImpl.events); + + /* DISPATCH BYREF */ + punk = (IUnknown*)&test_myVariantClearImpl; + V_VT(&v) = VT_DISPATCH | VT_BYREF; + V_DISPATCHREF(&v) = (IDispatch**)&punk; + test_myVariantClearImpl.events = 0; + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08lx\n", hres); + ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); + ok(V_DISPATCHREF(&v) == (IDispatch**)&punk, "dispatch ref %p\n", V_DISPATCHREF(&v)); + /* Check that nothing got called */ + ok(test_myVariantClearImpl.events == 0, "Unexpected call. events %08lx\n", test_myVariantClearImpl.events); } static void test_VariantCopy(void) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a40f3d0..a21a2b6 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -625,11 +625,6 @@ HRESULT WINAPI VariantClear(VARIANTARG* if (V_UNKNOWN(pVarg)) IUnknown_Release(V_UNKNOWN(pVarg)); } - else if (V_VT(pVarg) == VT_VARIANT) - { - if (V_VARIANTREF(pVarg)) - VariantClear(V_VARIANTREF(pVarg)); - } } V_VT(pVarg) = VT_EMPTY; }

1 0

Huw Davies : oleaut32: Rewrite VARIANT user marshaling.
by Alexandre Julliard 07 May '06

07 May '06

Module: wine Branch: refs/heads/master Commit: 696f73a7f5d3d6df095f63ea7577949165e0b091 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=696f73a7f5d3d6df095f63e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 5 12:18:41 2006 +0100 oleaut32: Rewrite VARIANT user marshaling. --- dlls/oleaut32/tests/usrmarshal.c | 669 ++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/usrmarshal.c | 457 +++++++++++++++----------- 2 files changed, 934 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=696f73a7f5d3d6df095…

1 0

Hans Leidekker : dnsapi: Implement DnsValidateName_{A,UTF8,W}.
by Alexandre Julliard 07 May '06

07 May '06

Module: wine Branch: refs/heads/master Commit: b2c4b2cff6e77376af7ddfa6742f711851a8b333 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b2c4b2cff6e77376af7ddfa… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue May 2 16:37:18 2006 +0200 dnsapi: Implement DnsValidateName_{A,UTF8,W}. --- dlls/dnsapi/dnsapi.spec | 6 +- dlls/dnsapi/name.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 180 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 19c37c2..a2502b8 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -117,9 +117,9 @@ @ stub DnsUpdateTest_UTF8 @ stub DnsUpdateTest_W @ stub DnsUtf8ToUnicode -@ stub DnsValidateName_A -@ stub DnsValidateName_UTF8 -@ stub DnsValidateName_W +@ stdcall DnsValidateName_A(str long) +@ stdcall DnsValidateName_UTF8(str long) +@ stdcall DnsValidateName_W(wstr long) @ stub DnsValidateUtf8Byte @ stub DnsWinsRecordFlagForString @ stub DnsWinsRecordFlagString diff --git a/dlls/dnsapi/name.c b/dlls/dnsapi/name.c index c4da728..49b2ef5 100644 --- a/dlls/dnsapi/name.c +++ b/dlls/dnsapi/name.c @@ -19,10 +19,22 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" #include "wine/debug.h" #include "wine/unicode.h" #include <stdarg.h> +#include <sys/types.h> + +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H +# include <arpa/nameser.h> +#endif +#ifdef HAVE_RESOLV_H +# include <resolv.h> +#endif #include "windef.h" #include "winbase.h" @@ -87,3 +99,168 @@ BOOL WINAPI DnsNameCompare_W( LPWSTR nam } return TRUE; } + +/****************************************************************************** + * DnsValidateName_A [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsValidateName_A( LPCSTR name, DNS_NAME_FORMAT format ) +{ + LPWSTR nameW; + DNS_STATUS ret; + + TRACE( "(%s, %d)\n", debugstr_a(name), format ); + + nameW = dns_strdup_aw( name ); + ret = DnsValidateName_W( nameW, format ); + + dns_free( nameW ); + return ret; +} + +/****************************************************************************** + * DnsValidateName_UTF8 [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsValidateName_UTF8( LPCSTR name, DNS_NAME_FORMAT format ) +{ + LPWSTR nameW; + DNS_STATUS ret; + + TRACE( "(%s, %d)\n", debugstr_a(name), format ); + + nameW = dns_strdup_uw( name ); + ret = DnsValidateName_W( nameW, format ); + + dns_free( nameW ); + return ret; +} + +#define HAS_EXTENDED 0x0001 +#define HAS_NUMERIC 0x0002 +#define HAS_NON_NUMERIC 0x0004 +#define HAS_DOT 0x0008 +#define HAS_DOT_DOT 0x0010 +#define HAS_SPACE 0x0020 +#define HAS_INVALID 0x0040 +#define HAS_ASTERISK 0x0080 +#define HAS_UNDERSCORE 0x0100 +#define HAS_LONG_LABEL 0x0200 + +/****************************************************************************** + * DnsValidateName_W [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsValidateName_W( LPCWSTR name, DNS_NAME_FORMAT format ) +{ + const WCHAR *p; + unsigned int i, j, state = 0; + static const WCHAR invalid[] = { + '{','|','}','~','[','\\',']','^','\'',':',';','<','=','>', + '?','@','!','\"','#','$','%','^','`','(',')','+','/',',',0 }; + + TRACE( "(%s, %d)\n", debugstr_w(name), format ); + + if (!name) return ERROR_INVALID_NAME; + + for (p = name, i = 0, j = 0; *p; p++, i++, j++) + { + if (*p == '.') + { + j = 0; + state |= HAS_DOT; + if (p[1] == '.') state |= HAS_DOT_DOT; + } + else if (*p < '0' || *p > '9') state |= HAS_NON_NUMERIC; + else state |= HAS_NUMERIC; + + if (j > 62) state |= HAS_LONG_LABEL; + + if (strchrW( invalid, *p )) state |= HAS_INVALID; + else if ((unsigned)*p > 127) state |= HAS_EXTENDED; + else if (*p == ' ') state |= HAS_SPACE; + else if (*p == '_') state |= HAS_UNDERSCORE; + else if (*p == '*') state |= HAS_ASTERISK; + } + + if (i == 0 || i > 255 || + (state & HAS_LONG_LABEL) || + (state & HAS_DOT_DOT) || + (name[0] == '.' && name[1])) return ERROR_INVALID_NAME; + + switch (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) || + (state & HAS_INVALID) || + (state & HAS_ASTERISK)) return DNS_ERROR_INVALID_NAME_CHAR; + break; + } + case DnsNameDomainLabel: + { + if (state & HAS_DOT) return ERROR_INVALID_NAME; + if ((state & HAS_EXTENDED) || (state & HAS_UNDERSCORE)) + return DNS_ERROR_NON_RFC_NAME; + if ((state & HAS_SPACE) || + (state & HAS_INVALID) || + (state & HAS_ASTERISK)) return DNS_ERROR_INVALID_NAME_CHAR; + break; + } + 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) || + (state & HAS_INVALID) || + (state & HAS_ASTERISK)) return DNS_ERROR_INVALID_NAME_CHAR; + break; + } + 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) || + (state & HAS_INVALID) || + (state & HAS_ASTERISK)) return DNS_ERROR_INVALID_NAME_CHAR; + break; + } + case DnsNameWildcard: + { + if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) + return ERROR_INVALID_NAME; + if (name[0] != '*') return ERROR_INVALID_NAME; + if (name[1] && name[1] != '.') + return DNS_ERROR_INVALID_NAME_CHAR; + if ((state & HAS_EXTENDED) || + (state & HAS_SPACE) || + (state & HAS_INVALID)) return ERROR_INVALID_NAME; + break; + } + case DnsNameSrvRecord: + { + if (!(state & HAS_NON_NUMERIC) && (state & HAS_NUMERIC)) + return ERROR_INVALID_NAME; + if (name[0] != '_') return ERROR_INVALID_NAME; + if ((state & HAS_UNDERSCORE) && !name[1]) + return DNS_ERROR_NON_RFC_NAME; + if ((state & HAS_EXTENDED) || + (state & HAS_SPACE) || + (state & HAS_INVALID)) return ERROR_INVALID_NAME; + break; + } + default: + WARN( "unknown format: %d\n", format ); + break; + } + return ERROR_SUCCESS; +}

1 0