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

Henri Verbeet : d3d12/tests: Introduce compare_uint().
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: c635f95518d50ed4e85ddf3fd4b283a7c6853d58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c635f95518d50ed4e85ddf3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 20:48:12 2020 +0430 d3d12/tests: Introduce compare_uint(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 33f5288a8c..0200047fd1 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -24,20 +24,19 @@ #include "dxgi1_6.h" #include "wine/test.h" +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, unsigned int 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 equal_luid(LUID a, LUID b)

1 0

Henri Verbeet : d3d10core/tests: Introduce compare_uint().
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 689e00c7857dfb31135aa067ea56c4ac2da380df URL: https://source.winehq.org/git/wine.git/?a=commit;h=689e00c7857dfb31135aa067… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 20:48:10 2020 +0430 d3d10core/tests: Introduce compare_uint(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index f29ebf97f2..8332257d37 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -204,6 +204,13 @@ static BOOL compare_vec4(const struct vec4 *v1, const struct vec4 *v2, unsigned && compare_float(v1->w, v2->w, ulps); } +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_uvec4(const struct uvec4* v1, const struct uvec4 *v2) { return v1->x == v2->x && v1->y == v2->y && v1->z == v2->z && v1->w == v2->w; @@ -211,18 +218,10 @@ static BOOL compare_uvec4(const struct uvec4* v1, const struct uvec4 *v2) static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) { - if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) - return FALSE; - c1 >>= 8; c2 >>= 8; - if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) - return FALSE; - c1 >>= 8; c2 >>= 8; - if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) - return FALSE; - c1 >>= 8; c2 >>= 8; - if (abs((int)(c1 & 0xff) - (int)(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); } struct srv_desc

1 0

Serge Gautherie : ntdll/tests: Fix 'path' copypastas.
by Alexandre Julliard March 30, 2020

March 30, 2020

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 : adsldp: Fix IDirectorySearch::GetColumn() behaviour for not found case.
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 57f3d503c42138a41cfd2b7ba69cb2369faf9c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57f3d503c42138a41cfd2b7b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:58:06 2020 +0800 adsldp: Fix IDirectorySearch::GetColumn() behaviour for not found case. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 6 +++++- dlls/adsldp/tests/ldap.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 61162f08a3..5ab7948b1f 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1434,7 +1434,11 @@ exit: } values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); - if (!values) return ERROR_DS_NO_ATTRIBUTE_OR_VALUE; + if (!values) + { + memset(col, 0, sizeof(*col)); + return E_ADS_COLUMN_NOT_SET; + } count = ldap_count_values_len(values); diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 3abbbdadb0..aec5bf89ee 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -417,6 +417,18 @@ todo_wine ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); } + hr = IDirectorySearch_GetFirstRow(ds, sh); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&col, 0x55, sizeof(col)); + hr = IDirectorySearch_GetColumn(ds, sh, (WCHAR *)L"deadbeef", &col); + ok(hr == E_ADS_COLUMN_NOT_SET, "got %#x\n", hr); + ok(!col.pszAttrName, "got %p\n", col.pszAttrName); + ok(col.dwADsType == ADSTYPE_INVALID || broken(col.dwADsType != ADSTYPE_INVALID) /* XP */, "got %d\n", col.dwADsType); + ok(!col.pADsValues, "got %p\n", col.pADsValues); + ok(!col.dwNumValues, "got %u\n", col.dwNumValues); + ok(!col.hReserved, "got %p\n", col.hReserved); + hr = IDirectorySearch_CloseSearchHandle(ds, sh); ok(hr == S_OK, "got %#x\n", hr);

1 0

Dmitry Timoshkov : adsldp/tests: Handle more cases of ERROR_DS_SERVER_DOWN.
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: efe7c309cdec2f5ab0bb5985ad980fe64da400bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=efe7c309cdec2f5ab0bb5985… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:58:12 2020 +0800 adsldp/tests: Handle more cases of ERROR_DS_SERVER_DOWN. Probably server protects itself from quick successive connections from the same client and returns LDAP_SERVER_DOWN. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/ldap.c | 2 +- dlls/adsldp/tests/ldap.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/ldap.c b/dlls/adsldp/ldap.c index c23f46267e..37a990ad81 100644 --- a/dlls/adsldp/ldap.c +++ b/dlls/adsldp/ldap.c @@ -69,7 +69,7 @@ DWORD map_ldap_error(DWORD err) case LDAP_NO_OBJECT_CLASS_MODS: return ERROR_DS_CANT_MOD_OBJ_CLASS; case LDAP_RESULTS_TOO_LARGE: return ERROR_DS_OBJECT_RESULTS_TOO_LARGE; case LDAP_AFFECTS_MULTIPLE_DSAS: return ERROR_DS_AFFECTS_MULTIPLE_DSAS; - case LDAP_SERVER_DOWN: return ERROR_DS_SERVER_DOWN; + case LDAP_SERVER_DOWN: return ERROR_DS_SERVER_DOWN; case LDAP_LOCAL_ERROR: return ERROR_DS_LOCAL_ERROR; case LDAP_ENCODING_ERROR: return ERROR_DS_ENCODING_ERROR; case LDAP_DECODING_ERROR: return ERROR_DS_DECODING_ERROR; diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index aec5bf89ee..b3cb489d58 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -106,11 +106,23 @@ static void test_LDAP(void) IDispatch_Release(disp); hr = ADsOpenObject(path, user, password, test[i].flags, &IID_IADs, (void **)&ads); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + SysFreeString(path); + skip("server is down\n"); + break; + } ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) IADs_Release(ads); hr = ADsGetObject(path, &IID_IDispatch, (void **)&disp); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + SysFreeString(path); + skip("server is down\n"); + break; + } ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) IDispatch_Release(disp); @@ -337,8 +349,12 @@ todo_wine ok(hr == E_NOINTERFACE, "got %#x\n", hr); hr = ADsGetObject(L"LDAP://ldap.forumsys.com", &IID_IDirectorySearch, (void **)&ds); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + skip("server is down\n"); + return; + } ok(hr == S_OK, "got %#x\n", hr); - if (hr != S_OK) return; pref.dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; pref.vValue.dwType = ADSTYPE_INTEGER;

1 0

Dmitry Timoshkov : adsldp: Implement IDirectorySearch::FreeColumn().
by Alexandre Julliard March 30, 2020

March 30, 2020

Module: wine Branch: master Commit: 21959bf00a40c2daed3c47078d0181f17f2d3c77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21959bf00a40c2daed3c4707… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 30 15:58:04 2020 +0800 adsldp: Implement IDirectorySearch::FreeColumn(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 9 +++++++-- dlls/adsldp/tests/ldap.c | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 8fe7bfd18c..61162f08a3 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1446,8 +1446,13 @@ exit: static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COLUMN col) { - FIXME("%p,%p: stub\n", iface, col); - return E_NOTIMPL; + TRACE("%p,%p\n", iface, col); + + if (!col) return E_ADS_BAD_PARAMETER; + + heap_free(col->pADsValues); + + return S_OK; } static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index bd22be8e61..3abbbdadb0 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -386,7 +386,6 @@ todo_wine } hr = IDirectorySearch_FreeColumn(ds, &col); -todo_wine ok(hr == S_OK, "got %#x\n", hr); }

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 March 30, 2020

March 30, 2020

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

Dmitry Timoshkov : adsldp: Map 1.3.6.1.4.1.1466.115.121.1.38 to ADSTYPE_CASE_IGNORE_STRING.
by Alexandre Julliard March 30, 2020

March 30, 2020

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

Piotr Caban : msvcr90/tests: Fix swscanf tests compilation on arm.
by Alexandre Julliard March 30, 2020

March 30, 2020

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: Require attribute definition to be properly terminated.
by Alexandre Julliard March 30, 2020

March 30, 2020

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