March 2020 - Wine-commits - list.winehq.org

Henri Verbeet : d3drm/tests: Introduce compare_uint().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 83666361c9b83f739558533ae9a02a7834682f1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=83666361c9b83f739558533a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 20:48:14 2020 +0430 d3drm/tests: Introduce compare_uint(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 6821bca50f..25e9b4e0ac 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -103,6 +103,21 @@ static void vector_eq_(unsigned int line, const D3DVECTOR *left, const D3DVECTOR expect_vector_(line, left, U1(*right).x, U2(*right).y, U3(*right).z, 0); } +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + +static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) +{ + return compare_uint(c1 & 0xff, c2 & 0xff, max_diff) + && compare_uint((c1 >> 8) & 0xff, (c2 >> 8) & 0xff, max_diff) + && compare_uint((c1 >> 16) & 0xff, (c2 >> 16) & 0xff, max_diff) + && compare_uint((c1 >> 24) & 0xff, (c2 >> 24) & 0xff, max_diff); +} + static D3DRMMATRIX4D identity = { { 1.0f, 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f, 0.0f }, @@ -6714,18 +6729,6 @@ static IDirect3DDevice2 *create_device2_without_ds(IDirectDraw2 *ddraw, HWND win return device; } -static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) -{ - if ((c1 & 0xff) - (c2 & 0xff) > max_diff) return FALSE; - c1 >>= 8; c2 >>= 8; - if ((c1 & 0xff) - (c2 & 0xff) > max_diff) return FALSE; - c1 >>= 8; c2 >>= 8; - if ((c1 & 0xff) - (c2 & 0xff) > max_diff) return FALSE; - c1 >>= 8; c2 >>= 8; - if ((c1 & 0xff) - (c2 & 0xff) > max_diff) return FALSE; - return TRUE; -} - static void clear_depth_surface(IDirectDrawSurface *surface, DWORD value) { HRESULT hr;

1 0

Henri Verbeet : d3dx9/tests: Introduce compare_uint().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 9bcb1f5195d1e65e0e7afb288d36fee716fe3a60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bcb1f5195d1e65e0e7afb28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 20:48:15 2020 +0430 d3dx9/tests: Introduce compare_uint(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 2688559c2c..bec7ba4827 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -146,20 +146,19 @@ static inline void expect_vec4_(unsigned int line, const D3DXVECTOR4 *expected, got->x, got->y, got->z, got->w); } +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return FALSE; - c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return FALSE; - c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return FALSE; - c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return FALSE; - return TRUE; + return compare_uint(c1 & 0xff, c2 & 0xff, max_diff) + && compare_uint((c1 >> 8) & 0xff, (c2 >> 8) & 0xff, max_diff) + && compare_uint((c1 >> 16) & 0xff, (c2 >> 16) & 0xff, max_diff) + && compare_uint((c1 >> 24) & 0xff, (c2 >> 24) & 0xff, max_diff); } static BOOL is_autogenmipmap_supported(IDirect3DDevice9 *device, D3DRESOURCETYPE resource_type)

1 0

Serge Gautherie : ntdll/tests: Fix 'path' copypastas.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: fc75a22afa880f80c440d6bb44e512f865ddea01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc75a22afa880f80c440d6bb… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon Mar 30 11:31:01 2020 +0200 ntdll/tests: Fix 'path' copypastas. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 2 +- dlls/ntdll/tests/ntdll_test.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 4e2ef8222d..48c9ed809e 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -1,5 +1,5 @@ /* - * Unit test suite for ntdll path functions + * Unit test suite for ntdll env functions * * Copyright 2003 Eric Pouech * diff --git a/dlls/ntdll/tests/ntdll_test.h b/dlls/ntdll/tests/ntdll_test.h index d403a744aa..67278358b2 100644 --- a/dlls/ntdll/tests/ntdll_test.h +++ b/dlls/ntdll/tests/ntdll_test.h @@ -1,5 +1,5 @@ /* - * Unit test suite for ntdll path functions + * Unit test suite for ntdll functions * * Copyright 2003 Eric Pouech *

1 0

Dmitry Timoshkov : wldap32: Fix compilation without LDAP installed.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 02d266adfd35c5e3550e533c3bd1b1f2cecc6fbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d266adfd35c5e3550e533c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 09:55:38 2020 +0800 wldap32: Fix compilation without LDAP installed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48838 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/bind.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 63d4208eef..46b866fd31 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -179,7 +179,7 @@ exit: return ret; } -#ifdef HAVE_LDAP_H +#ifdef HAVE_LDAP static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *interact ) { @@ -219,7 +219,7 @@ static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *intera #endif /* HAVE_SASL_SASL_H */ } -#endif /* HAVE_LDAP_H */ +#endif /* HAVE_LDAP */ /*********************************************************************** * ldap_bind_sW (WLDAP32.@)

1 0

Piotr Caban : msvcr90/tests: Fix swscanf tests compilation on arm.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 05ca9185284757c55926feccde1e3a4bca4d3afe URL: https://source.winehq.org/git/wine.git/?a=commit;h=05ca9185284757c55926fecc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 30 13:46:15 2020 +0200 msvcr90/tests: Fix swscanf tests compilation on arm. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48846 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index c8a49f2549..eb0970f4c1 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -135,7 +135,7 @@ static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); static size_t (__cdecl *p___strncnt)(const char *str, size_t count); -static int (__cdecl *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); +static int (WINAPIV *p_swscanf)(const wchar_t *str, const wchar_t* format, ...); static int (__cdecl *p____mb_cur_max_l_func)(_locale_t locale); static _locale_t (__cdecl *p__create_locale)(int, const char*); static void (__cdecl *p__free_locale)(_locale_t);

1 0

Dmitry Timoshkov : adsldp: Recognize and skip not supported schema tokens.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 1a27b6e527d0ffd75701f003d8029894a14e5b18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a27b6e527d0ffd75701f003… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:57:39 2020 +0800 adsldp: Recognize and skip not supported schema tokens. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/schema.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index fa03d63edc..32b11a361a 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -143,8 +143,30 @@ static WCHAR *parse_name(WCHAR **str) return name; } +static void skip_token(WCHAR **str) +{ + WCHAR *p = *str; + + while (is_space(*p)) p++; + + if (*p == '\'') + { + p++; + while (*p && *p != '\'') p++; + } + else + { + while (*p && !is_space(*p)) p++; + } + + *str = *p ? p + 1 : p; +} + static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) { + static const WCHAR * const not_supported[] = { L"DESC", L"EQUALITY", + L"ORDERING", L"SUBSTR", L"SUP", L"USAGE", L"X-ORDERED" }; + int i; WCHAR *p = str; at->oid = NULL; @@ -184,9 +206,25 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) } else { - FIXME("not supported token at %s\n", debugstr_w(p)); - free_attribute_type(at); - return FALSE; + BOOL recognized = FALSE; + + for (i = 0; i < ARRAY_SIZE(not_supported); i++) + { + if (!wcsnicmp(p, not_supported[i], wcslen(not_supported[i]))) + { + p += wcslen(not_supported[i]); + skip_token(&p); + recognized = TRUE; + break; + } + } + + if (!recognized) + { + FIXME("not supported token at %s\n", debugstr_w(p)); + free_attribute_type(at); + return FALSE; + } } } @@ -251,8 +289,8 @@ struct attribute_type *load_schema(LDAP *ld, ULONG *at_count) continue; } - TRACE("oid %s, name %s, syntax %s, single-value %d\n", debugstr_w(at[i].oid), - debugstr_w(at[i].name), debugstr_w(at[i].syntax), at[i].single_value); + TRACE("oid %s, name %s, syntax %s, single-value %d\n", debugstr_w(at[count].oid), + debugstr_w(at[count].name), debugstr_w(at[count].syntax), at[count].single_value); count++; }

1 0

Dmitry Timoshkov : adsldp: Require attribute definition to be properly terminated.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 2c86658e6ab04f6a61f6970558b3c37c6daf4611 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c86658e6ab04f6a61f69705… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:57:43 2020 +0800 adsldp: Require attribute definition to be properly terminated. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/schema.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 32b11a361a..06e61f258a 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -183,7 +183,7 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) while (*p) { while (is_space(*p)) p++; - if (*p == ')') break; + if (*p == ')') return TRUE; if (!wcsnicmp(p, L"NAME", 4)) { @@ -228,7 +228,10 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) } } - return TRUE; + WARN("attribute definition is not terminated\n"); + + free_attribute_type(at); + return FALSE; } struct attribute_type *load_schema(LDAP *ld, ULONG *at_count)

1 0

Dmitry Timoshkov : adsldp: Add support for NAME token with multiple entries.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: fd3ef3f545b61bdec75dbd3ef6026b3ba458f1dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd3ef3f545b61bdec75dbd3e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:57:47 2020 +0800 adsldp: Add support for NAME token with multiple entries. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp_private.h | 1 + dlls/adsldp/schema.c | 76 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 6 deletions(-) diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h index bf24de2385..a0d3a977a2 100644 --- a/dlls/adsldp/adsldp_private.h +++ b/dlls/adsldp/adsldp_private.h @@ -50,6 +50,7 @@ struct attribute_type { WCHAR *oid; WCHAR *name; + ULONG name_count; WCHAR *syntax; int single_value; }; diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 06e61f258a..1f02916496 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -32,10 +32,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(adsldp); static const struct attribute_type *find_schema_type(const WCHAR *name, const struct attribute_type *at, ULONG count) { - ULONG i; + ULONG i, n, off; for (i = 0; i < count; i++) - if (at[i].name && !wcsicmp(at[i].name, name)) return &at[i]; + { + if (!at[i].name) continue; + + off = 0; + + for (n = 0; n < at[i].name_count; n++) + { + if (!wcsicmp(at[i].name + off, name)) return &at[i]; + off += wcslen(at[i].name + off) + 1; + } + } return NULL; } @@ -114,13 +124,64 @@ static WCHAR *parse_oid(WCHAR **str) return oid; } -static WCHAR *parse_name(WCHAR **str) +static WCHAR *parse_name(WCHAR **str, ULONG *name_count) { WCHAR *name, *p = *str, *end; int count; + *name_count = 0; + while (is_space(*p)) p++; + if (*p == '(') + { + int total_count = 0; + + p++; + name = NULL; + + while (*p) + { + WCHAR *tmp_name, *new_name; + ULONG dummy; + + while (is_space(*p)) p++; + if (*p == ')') + { + *str = p + 1; + return name; + } + + tmp_name = parse_name(&p, &dummy); + if (!tmp_name) break; + + TRACE("NAME[%u] %s\n", *name_count, debugstr_w(tmp_name)); + + count = wcslen(tmp_name); + + if (!name) + new_name = heap_alloc((count + 1) * sizeof(WCHAR)); + else + new_name = heap_realloc(name, (total_count + count + 1) * sizeof(WCHAR)); + + if (!new_name) break; + + memcpy(new_name + total_count, tmp_name, (count + 1) * sizeof(WCHAR)); + + name = new_name; + heap_free(tmp_name); + total_count += count + 1; + + *name_count += 1; + *str = p; + } + + *str = *p ? p + 1 : p; + + heap_free(name); + return NULL; + } + if (*p != '\'') { FIXME("not suported NAME start at %s\n", debugstr_w(p)); @@ -138,6 +199,8 @@ static WCHAR *parse_name(WCHAR **str) memcpy(name, p, count * sizeof(WCHAR)); name[count] = 0; + *name_count = 1; + *str = end + 1; return name; @@ -171,6 +234,7 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) at->oid = NULL; at->name = NULL; + at->name_count = 0; at->syntax = NULL; at->single_value = 0; @@ -188,7 +252,7 @@ static BOOL parse_attribute_type(WCHAR *str, struct attribute_type *at) if (!wcsnicmp(p, L"NAME", 4)) { p += 4; - at->name = parse_name(&p); + at->name = parse_name(&p, &at->name_count); } else if (!wcsnicmp(p, L"SYNTAX", 6)) { @@ -292,8 +356,8 @@ struct attribute_type *load_schema(LDAP *ld, ULONG *at_count) continue; } - TRACE("oid %s, name %s, syntax %s, single-value %d\n", debugstr_w(at[count].oid), - debugstr_w(at[count].name), debugstr_w(at[count].syntax), at[count].single_value); + TRACE("oid %s, name %s, name_count %u, syntax %s, single-value %d\n", debugstr_w(at[count].oid), + debugstr_w(at[count].name), at[count].name_count, debugstr_w(at[count].syntax), at[count].single_value); count++; }

1 0

Dmitry Timoshkov : adsldp: Map 1.3.6.1.4.1.1466.115.121.1.38 to ADSTYPE_CASE_IGNORE_STRING.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 12d1d8aaf4a5a1f197df980a2a70a70b96a1886b URL: https://source.winehq.org/git/wine.git/?a=commit;h=12d1d8aaf4a5a1f197df980a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:57:49 2020 +0800 adsldp: Map 1.3.6.1.4.1.1466.115.121.1.38 to ADSTYPE_CASE_IGNORE_STRING. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/schema.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 1f02916496..412902f25e 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -64,6 +64,8 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, return ADSTYPE_NT_SECURITY_DESCRIPTOR; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.27")) return ADSTYPE_INTEGER; + if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.38")) + return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.40")) return ADSTYPE_OCTET_STRING;

1 0

Dmitry Timoshkov : adsldp: Map 1.3.6.1.4.1.1466.115.121.1.15 to ADSTYPE_CASE_IGNORE_STRING.
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 5a6c8359c92d3fa402b7bb711ca07bcd125122d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a6c8359c92d3fa402b7bb71… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:57:58 2020 +0800 adsldp: Map 1.3.6.1.4.1.1466.115.121.1.15 to ADSTYPE_CASE_IGNORE_STRING. According to RFC4517 1.3.6.1.4.1.1466.115.121.1.15 is a Directory string which should map to one of TeletextString, PrintableString or UniversalString. Something else should map to ADSTYPE_NT_SECURITY_DESCRIPTOR. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 1 - dlls/adsldp/schema.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index d3feb89a05..e27e641eb0 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1337,7 +1337,6 @@ static HRESULT add_column_values(LDAP_namespace *ldap, ADS_SEARCH_COLUMN *col, case ADSTYPE_CASE_EXACT_STRING: case ADSTYPE_CASE_IGNORE_STRING: case ADSTYPE_PRINTABLE_STRING: - case ADSTYPE_NT_SECURITY_DESCRIPTOR: { DWORD outlen; TRACE("=> %s\n", debugstr_an(values[i]->bv_val, values[i]->bv_len)); diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 412902f25e..234a76dfa9 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -61,7 +61,7 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.12")) return ADSTYPE_DN_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.15")) - return ADSTYPE_NT_SECURITY_DESCRIPTOR; + return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.27")) return ADSTYPE_INTEGER; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.38"))

1 0