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

Alexandre Julliard : ntdll: Use wcschr() instead of strchrW().
by Alexandre Julliard March 31, 2020

March 31, 2020

Module: wine Branch: master Commit: 6de0ab276b3b79db4331993316f529a43f67c29a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de0ab276b3b79db43319933… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:43:50 2020 +0200 ntdll: Use wcschr() instead of strchrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 8 ++++---- dlls/ntdll/directory.c | 8 ++++---- dlls/ntdll/env.c | 12 ++++++------ dlls/ntdll/loader.c | 8 ++++---- dlls/ntdll/loadorder.c | 6 +++--- dlls/ntdll/locale.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/path.c | 2 +- dlls/ntdll/printf.c | 2 +- dlls/ntdll/relay.c | 4 ++-- dlls/ntdll/rtlstr.c | 4 ++-- dlls/ntdll/version.c | 6 +++--- 12 files changed, 33 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6de0ab276b3b79db4331…

1 0

Alexandre Julliard : ntdll: Use wcscat() instead of strcatW().
by Alexandre Julliard March 31, 2020

March 31, 2020

Module: wine Branch: master Commit: 80005ee016aeed42967adfe5b3042803d008c50d URL: https://source.winehq.org/git/wine.git/?a=commit;h=80005ee016aeed42967adfe5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 11:41:22 2020 +0200 ntdll: Use wcscat() instead of strcatW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 28 ++++++++++++++-------------- dlls/ntdll/env.c | 6 +++--- dlls/ntdll/loader.c | 8 ++++---- dlls/ntdll/loadorder.c | 4 ++-- dlls/ntdll/locale.c | 6 +++--- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/path.c | 6 +++--- dlls/ntdll/reg.c | 2 +- dlls/ntdll/version.c | 2 +- 9 files changed, 32 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 03a18a1928..e52710565c 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1099,17 +1099,17 @@ static WCHAR *build_assembly_dir(struct assembly_identity* ai) if (!(ret = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return NULL; wcscpy( ret, arch ); - strcatW( ret, undW ); - strcatW( ret, name ); - strcatW( ret, undW ); - strcatW( ret, key ); - strcatW( ret, undW ); + wcscat( ret, undW ); + wcscat( ret, name ); + wcscat( ret, undW ); + wcscat( ret, key ); + wcscat( ret, undW ); NTDLL_swprintf( ret + strlenW(ret), version_formatW, ai->version.major, ai->version.minor, ai->version.build, ai->version.revision ); - strcatW( ret, undW ); - strcatW( ret, lang ); - strcatW( ret, undW ); - strcatW( ret, mskeyW ); + wcscat( ret, undW ); + wcscat( ret, lang ); + wcscat( ret, undW ); + wcscat( ret, mskeyW ); return ret; } @@ -1118,7 +1118,7 @@ static inline void append_string( WCHAR *buffer, const WCHAR *prefix, const WCHA WCHAR *p = buffer; if (!str) return; - strcatW( buffer, prefix ); + wcscat( buffer, prefix ); p += strlenW(p); *p++ = '"'; wcscpy( p, str ); @@ -3062,7 +3062,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, if (!(status = get_module_filename( module, &name, sizeof(dotManifestW) + 10*sizeof(WCHAR) ))) { if (resid != 1) NTDLL_swprintf( name.Buffer + strlenW(name.Buffer), fmtW, resid ); - strcatW( name.Buffer, dotManifestW ); + wcscat( name.Buffer, dotManifestW ); if (!RtlDosPathNameToNtPathName_U( name.Buffer, &nameW, NULL, NULL )) status = STATUS_RESOURCE_DATA_NOT_FOUND; RtlFreeUnicodeString( &name ); @@ -3076,7 +3076,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, return STATUS_NO_MEMORY; wcscpy( buffer, filename ); if (resid != 1) NTDLL_swprintf( buffer + strlenW(buffer), fmtW, resid ); - strcatW( buffer, dotManifestW ); + wcscat( buffer, dotManifestW ); RtlInitUnicodeString( &nameW, buffer ); } @@ -3700,8 +3700,8 @@ static NTSTATUS build_wndclass_section(ACTIVATION_CONTEXT* actctx, struct strsec if (entity->u.class.versioned) { get_assembly_version(assembly, ptrW); - strcatW(ptrW, exclW); - strcatW(ptrW, entity->u.class.name); + wcscat(ptrW, exclW); + wcscat(ptrW, entity->u.class.name); } else { diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index ecc2c38abb..f587bdef7e 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -689,7 +689,7 @@ static void get_image_path( const char *argv0, UNICODE_STRING *path ) if (RtlDoesFileExists_U( full_name )) goto done; if (len < (MAX_PATH - 4) * sizeof(WCHAR) && !strchrW( file_part, '.' )) { - strcatW( file_part, exeW ); + wcscat( file_part, exeW ); if (RtlDoesFileExists_U( full_name )) goto done; } /* check for builtin path inside system directory */ @@ -710,8 +710,8 @@ static void get_image_path( const char *argv0, UNICODE_STRING *path ) len = strlenW( system_dir ); if (strlenW( name ) >= MAX_PATH - 4 - len) goto failed; wcscpy( full_name, system_dir ); - strcatW( full_name, name ); - if (!strchrW( name, '.' )) strcatW( full_name, exeW ); + wcscat( full_name, name ); + if (!strchrW( name, '.' )) wcscat( full_name, exeW ); } } done: diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f67e1357ad..da19e74a76 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1775,8 +1775,8 @@ static BOOL get_builtin_fullname( UNICODE_STRING *nt_name, const UNICODE_STRING (strlenW(system_dir) + len + 5) * sizeof(WCHAR) ))) return FALSE; wcscpy( fullname, nt_prefixW ); - strcatW( fullname, system_dir ); - strcatW( fullname, filenameW ); + wcscat( fullname, system_dir ); + wcscat( fullname, filenameW ); done: RtlInitUnicodeString( nt_name, fullname ); return TRUE; @@ -2860,7 +2860,7 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * { /* not found, return file in the system dir to be loaded as builtin */ wcscpy( name, system_dir ); - strcatW( name, search ); + wcscat( name, search ); if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) status = STATUS_NO_MEMORY; } else status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; @@ -2896,7 +2896,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, con (strlenW(libname)+strlenW(default_ext)+1) * sizeof(WCHAR)))) return STATUS_NO_MEMORY; wcscpy( dllname, libname ); - strcatW( dllname, default_ext ); + wcscat( dllname, default_ext ); libname = dllname; } } diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 35dd321e99..1a3c579dee 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -344,8 +344,8 @@ static HANDLE get_app_key( const WCHAR *app_name ) strlenW(app_name) * sizeof(WCHAR) ); if (!str) return 0; wcscpy( str, AppDefaultsW ); - strcatW( str, app_name ); - strcatW( str, DllOverridesW ); + wcscat( str, app_name ); + wcscat( str, DllOverridesW ); RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 1487338cfa..88cfb08a6b 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -679,8 +679,8 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) return STATUS_NO_MEMORY; if (!RtlQueryEnvironmentVariable_U( NULL, &nameW, &valueW )) { - strcatW( valueW.Buffer, dataprefixW ); - strcatW( valueW.Buffer, name ); + wcscat( valueW.Buffer, dataprefixW ); + wcscat( valueW.Buffer, name ); valueW.Length = strlenW(valueW.Buffer) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &valueW, 0, 0, NULL ); status = NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); @@ -877,7 +877,7 @@ static LCID unix_locale_to_lcid( const char *unix_name ) wcscpy( win_name, buffer ); if (modifier) { - if (!strcmpW( modifier, latinW )) strcatW( win_name, latnW ); + if (!strcmpW( modifier, latinW )) wcscat( win_name, latnW ); else if (!strcmpW( modifier, euroW )) {} /* ignore */ else return 0; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 37128521dc..2a32660e72 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -303,6 +303,7 @@ int WINAPIV NTDLL_swprintf( WCHAR *str, const WCHAR *format, ... ); #define wcslwr(s) NTDLL__wcslwr(s) #define wcsupr(s) NTDLL__wcsupr(s) #define wcscpy(d,s) NTDLL_wcscpy(d,s) +#define wcscat(d,s) NTDLL_wcscat(d,s) #define wcstoul(s,e,b) NTDLL_wcstoul(s,e,b) /* convert from straight ASCII to Unicode without depending on the current codepage */ diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 5804f8f53f..1666166181 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -399,7 +399,7 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U { case UNC_PATH: /* \\foo */ offset = 2; - strcatW(ntpath->Buffer, UncPfxW); + wcscat(ntpath->Buffer, UncPfxW); break; case DEVICE_PATH: /* \\.\foo */ offset = 4; @@ -409,7 +409,7 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U break; } - strcatW(ntpath->Buffer, ptr + offset); + wcscat(ntpath->Buffer, ptr + offset); ntpath->Length = strlenW(ntpath->Buffer) * sizeof(WCHAR); if (file_part && *file_part) @@ -514,7 +514,7 @@ ULONG WINAPI RtlDosSearchPath_U(LPCWSTR paths, LPCWSTR search, LPCWSTR ext, /* append '\\' if none is present */ if (needed > 0 && name[needed - 1] != '\\') name[needed++] = '\\'; wcscpy(&name[needed], search); - if (ext) strcatW(&name[needed], ext); + if (ext) wcscat(&name[needed], ext); if (RtlDoesFileExists_U(name)) { len = RtlGetFullPathName_U(name, buffer_size, buffer, file_part); diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 3ac66fb1c6..3170524884 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -1193,7 +1193,7 @@ static NTSTATUS RTL_KeyHandleCreateObject(ULONG RelativeTo, PCWSTR Path, POBJECT return STATUS_NO_MEMORY; wcscpy(str->Buffer, base); - strcatW(str->Buffer, Path); + wcscat(str->Buffer, Path); str->Length = len - sizeof(WCHAR); str->MaximumLength = len; InitializeObjectAttributes(regkey, str, OBJ_CASE_INSENSITIVE, NULL, NULL); diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 8570a2fd51..87765d5562 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -505,7 +505,7 @@ void version_init(void) if ((p = strrchrW( appname, '\\' ))) appname = p + 1; wcscpy( appversion, appdefaultsW ); - strcatW( appversion, appname ); + wcscat( appversion, appname ); RtlInitUnicodeString( &nameW, appversion ); attr.RootDirectory = config_key;

1 0

Chip Davis : include: Use the correct type for the tessellator partitioning compile argument.
by Alexandre Julliard March 31, 2020

March 31, 2020

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

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

March 30, 2020

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

Chip Davis : ddraw/tests: Introduce compare_uint().
by Alexandre Julliard March 30, 2020

March 30, 2020

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

March 30, 2020

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 : d3d11/tests: Introduce compare_uint().
by Alexandre Julliard March 30, 2020

March 30, 2020

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 : d3dx9/tests: Introduce compare_uint().
by Alexandre Julliard March 30, 2020

March 30, 2020

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

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

March 30, 2020

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

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

March 30, 2020

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