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

Alexandre Julliard : ntdll: Use wcsspn() instead of strspnW().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 0d1b7737e37e67389f51bae3bf820b90f109f329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d1b7737e37e67389f51bae3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:53:34 2020 +0200 ntdll: Use wcsspn() instead of strspnW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loadorder.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index f4a92fda49..291cc76031 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -130,7 +130,7 @@ static enum loadorder parse_load_order( const WCHAR *order ) while (*order) { - order += strspnW( order, separatorsW ); + order += wcsspn( order, separatorsW ); switch(*order) { case 'N': /* native */ @@ -207,7 +207,7 @@ static void add_load_order_set( WCHAR *entry ) while (*entry) { - entry += strspnW( entry, separatorsW ); + entry += wcsspn( entry, separatorsW ); end = entry + wcscspn( entry, separatorsW ); if (*end) *end++ = 0; if (*entry) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 845efbbdbd..1249acbcdd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -310,6 +310,7 @@ int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ); #define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b) #define wcslen(s) NTDLL_wcslen(s) #define wcscspn(s,r) NTDLL_wcscspn(s,r) +#define wcsspn(s,a) NTDLL_wcsspn(s,a) /* convert from straight ASCII to Unicode without depending on the current codepage */ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len )

1 0

Alexandre Julliard : ntdll: Use wcscmp() instead of strcmpW().
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: wine Branch: master Commit: 4501ab0a7c80e31e602c540a446809e8ae3ebade URL: https://source.winehq.org/git/wine.git/?a=commit;h=4501ab0a7c80e31e602c540a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:54:39 2020 +0200 ntdll: Use wcscmp() instead of strcmpW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 20 ++++++++++---------- dlls/ntdll/directory.c | 2 +- dlls/ntdll/locale.c | 6 +++--- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/time.c | 3 +-- dlls/ntdll/version.c | 3 +-- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 0c0d0f41a8..6612e33cee 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -779,12 +779,12 @@ static inline BOOL xml_elem_cmp(const struct xml_elem *elem, const WCHAR *str, c { if (!xmlstr_cmp( &elem->name, str )) return FALSE; if (xmlstr_cmp( &elem->ns, namespace )) return TRUE; - if (!strcmpW( namespace, asmv1W )) + if (!wcscmp( namespace, asmv1W )) { if (xmlstr_cmp( &elem->ns, asmv2W )) return TRUE; if (xmlstr_cmp( &elem->ns, asmv3W )) return TRUE; } - else if (!strcmpW( namespace, asmv2W )) + else if (!wcscmp( namespace, asmv2W )) { if (xmlstr_cmp( &elem->ns, asmv3W )) return TRUE; } @@ -1014,7 +1014,7 @@ static BOOL is_matching_identity( const struct assembly_identity *id1, if (id1->language && id2->language && !is_matching_string( id1->language, id2->language )) { - if (strcmpW( wildcardW, id1->language ) && strcmpW( wildcardW, id2->language )) + if (wcscmp( wildcardW, id1->language ) && wcscmp( wildcardW, id2->language )) return FALSE; } if (id1->version.major != id2->version.major) return FALSE; @@ -2235,7 +2235,7 @@ static void parse_dependent_assembly_elem( xmlbuf_t *xmlbuf, struct actctx_loade { parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai, &elem); /* store the newly found identity for later loading */ - if (ai.arch && !strcmpW(ai.arch, wildcardW)) ai.arch = strdupW( current_archW ); + if (ai.arch && !wcscmp(ai.arch, wildcardW)) ai.arch = strdupW( current_archW ); TRACE( "adding name=%s version=%s arch=%s\n", debugstr_w(ai.name), debugstr_version(&ai.version), debugstr_w(ai.arch) ); if (!add_dependent_assembly_id(acl, &ai)) set_error( xmlbuf ); @@ -4926,8 +4926,8 @@ static const WCHAR *find_app_settings( ACTIVATION_CONTEXT *actctx, const WCHAR * { struct entity *entity = &assembly->entities.base[j]; if (entity->kind == ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS && - !strcmpW( entity->u.settings.name, settings ) && - !strcmpW( entity->u.settings.ns, ns )) + !wcscmp( entity->u.settings.name, settings ) && + !wcscmp( entity->u.settings.ns, ns )) return entity->u.settings.value; } } @@ -5589,10 +5589,10 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL if (ns) { - if (strcmpW( ns, windowsSettings2005NSW ) && - strcmpW( ns, windowsSettings2011NSW ) && - strcmpW( ns, windowsSettings2016NSW ) && - strcmpW( ns, windowsSettings2017NSW )) + if (wcscmp( ns, windowsSettings2005NSW ) && + wcscmp( ns, windowsSettings2011NSW ) && + wcscmp( ns, windowsSettings2016NSW ) && + wcscmp( ns, windowsSettings2017NSW )) return STATUS_INVALID_PARAMETER; } else ns = windowsSettings2005NSW; diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index f41b11ec76..436ddf5366 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1820,7 +1820,7 @@ static int name_compare( const void *a, const void *b ) const struct dir_data_names *file_b = (const struct dir_data_names *)b; int ret = RtlCompareUnicodeStrings( file_a->long_name, wcslen(file_a->long_name), file_b->long_name, wcslen(file_b->long_name), TRUE ); - if (!ret) ret = strcmpW( file_a->long_name, file_b->long_name ); + if (!ret) ret = wcscmp( file_a->long_name, file_b->long_name ); return ret; } diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 1611a52f1a..9773284f63 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -847,7 +847,7 @@ static LCID unix_locale_to_lcid( const char *unix_name ) if (!(p = wcspbrk( buffer, sepW ))) { - if (!strcmpW( buffer, posixW ) || !strcmpW( buffer, cW )) + if (!wcscmp( buffer, posixW ) || !wcscmp( buffer, cW )) return MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); wcscpy( win_name, buffer ); } @@ -877,8 +877,8 @@ static LCID unix_locale_to_lcid( const char *unix_name ) wcscpy( win_name, buffer ); if (modifier) { - if (!strcmpW( modifier, latinW )) wcscat( win_name, latnW ); - else if (!strcmpW( modifier, euroW )) {} /* ignore */ + if (!wcscmp( modifier, latinW )) wcscat( win_name, latnW ); + else if (!wcscmp( modifier, euroW )) {} /* ignore */ else return 0; } if (country) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1249acbcdd..a81e13659e 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -311,6 +311,7 @@ int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ); #define wcslen(s) NTDLL_wcslen(s) #define wcscspn(s,r) NTDLL_wcscspn(s,r) #define wcsspn(s,a) NTDLL_wcsspn(s,a) +#define wcscmp(s1,s2) NTDLL_wcscmp(s1,s2) /* convert from straight ASCII to Unicode without depending on the current codepage */ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 21b25df3f3..b42a621aa2 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -47,7 +47,6 @@ #include "windef.h" #include "winternl.h" #include "wine/exception.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "ntdll_misc.h" @@ -662,7 +661,7 @@ static int compare_tz_key(const void *a, const void *b) const struct tz_name_map *map_a, *map_b; map_a = (const struct tz_name_map *)a; map_b = (const struct tz_name_map *)b; - return strcmpW(map_a->key_name, map_b->key_name); + return wcscmp(map_a->key_name, map_b->key_name); } static BOOL match_tz_name(const char* tz_name, diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 3eb16a092e..bb47e39f58 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -31,7 +31,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "ntdll_misc.h" #include "ddk/wdm.h" @@ -458,7 +457,7 @@ static BOOL parse_win_version( HANDLE hkey ) for (i = 0; i < ARRAY_SIZE(version_names); i++) { - if (strcmpW( version_names[i].name, name )) continue; + if (wcscmp( version_names[i].name, name )) continue; current_version = &VersionData[version_names[i].ver]; TRACE( "got win version %s\n", debugstr_w(version_names[i].name) ); return TRUE;

1 0

Chip Davis : include: Use the correct type for the tessellator partitioning compile argument.
by Alexandre Julliard 31 Mar '20

31 Mar '20

Module: vkd3d Branch: master Commit: e57ad512ffda1d49f0a5ef1be1da7b215bc308e7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e57ad512ffda1d49f0a5ef1… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Mar 31 18:07:07 2020 +0430 include: Use the correct type for the tessellator partitioning compile argument. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6b4d3f5..327b788 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -272,7 +272,7 @@ struct vkd3d_shader_domain_shader_compile_arguments const void *next; enum vkd3d_tessellator_output_primitive output_primitive; - enum vkd3d_tessellator_output_primitive partitioning; + enum vkd3d_tessellator_partitioning partitioning; }; /* root signature 1.0 */

1 0

Chip Davis : ddraw/tests: Introduce compare_uint().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: d5f25c2cd7c8a83354c8b64de180f7703b90db57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5f25c2cd7c8a83354c8b64d… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Mar 30 20:48:07 2020 +0430 ddraw/tests: Introduce compare_uint(). Analogous to compare_float(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 29 ++++++++++++++++------------- dlls/ddraw/tests/ddraw2.c | 31 +++++++++++++++++-------------- dlls/ddraw/tests/ddraw4.c | 23 +++++++++++++---------- dlls/ddraw/tests/ddraw7.c | 23 +++++++++++++---------- dlls/ddraw/tests/visual.c | 19 +++++++++++-------- 5 files changed, 70 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5f25c2cd7c8a83354c8…

1 0

Chip Davis : d3d8/tests: Introduce compare_uint().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 67af6800a285058bb436eafc31d231a97490bb78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67af6800a285058bb436eafc… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Mar 30 20:48:08 2020 +0430 d3d8/tests: Introduce compare_uint(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ab194b9ced..fc8a05a3c4 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -51,16 +51,19 @@ static HWND create_window(void) 0, 0, rect.right - rect.left, rect.bottom - rect.top, 0, 0, 0, 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 color_match(D3DCOLOR c1, D3DCOLOR 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 compare_float(float f, float g, unsigned int ulps)

1 0

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

30 Mar '20

Module: wine Branch: master Commit: 2e9ff8bc756838096116f1cc788dd13fe2dfbe65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e9ff8bc756838096116f1cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 20:48:09 2020 +0430 d3d9/tests: Introduce compare_uint(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 21 +++++++++++---------- dlls/d3d9/tests/visual.c | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 17dd3c5c12..5b24f6b05e 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -48,18 +48,19 @@ static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) return !strcmp(identifier->Driver, "d3d10warp.dll"); } -static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) { - unsigned int i; + unsigned int diff = x > y ? x - y : y - x; - for (i = 0; i < 4; ++i) - { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return FALSE; - c1 >>= 8; - c2 >>= 8; - } - return TRUE; + return diff <= max_diff; +} + +static BOOL color_match(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 DWORD get_pixel_color(IDirect3DDevice9Ex *device, unsigned int x, unsigned int y) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9ceb758c60..92116b3eb8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -63,16 +63,19 @@ static HWND create_window(void) return hwnd; } +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 color_match(D3DCOLOR c1, D3DCOLOR 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); } static BOOL compare_float(float f, float g, unsigned int ulps)

1 0

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

30 Mar '20

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

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

30 Mar '20

Module: wine Branch: master Commit: 6d195ad98646b4cf9e3848110716a3a3229cee06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d195ad98646b4cf9e384811… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 20:48:11 2020 +0430 d3d11/tests: Introduce compare_uint(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index dcde0d1c10..37ec829cd7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -260,6 +260,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; @@ -267,18 +274,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((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); } struct srv_desc

1 0

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

30 Mar '20

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 : d2d1/tests: Introduce compare_uint().
by Alexandre Julliard 30 Mar '20

30 Mar '20

Module: wine Branch: master Commit: 1cb9a31bdfed9eb79769541a5fb36094bb65d636 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cb9a31bdfed9eb79769541a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 30 20:48:13 2020 +0430 d2d1/tests: Introduce compare_uint(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 8548a0a4aa..7c0ee91099 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -346,20 +346,19 @@ static DWORD get_readback_colour(struct resource_readback *rb, unsigned int x, u return ((DWORD *)((BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch))[x]; } +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_colour(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 compare_float(float f, float g, unsigned int ulps)

1 0