October 2022 - Wine-commits

Francisco Casas : vkd3d-shader/hlsl: Support implicit casts between component-wise equal types.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: vkd3d Branch: master Commit: d21fd584b1e68dee8ab2c543ae0178a6857e86a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d21fd584b1e68dee8ab2c543ae017… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 19 13:14:51 2022 -0300 vkd3d-shader/hlsl: Support implicit casts between component-wise equal types. --- libs/vkd3d-shader/hlsl.y | 79 ++++++++++++++++++------------ tests/cast-componentwise-equal.shader_test | 16 +++--- 2 files changed, 55 insertions(+), 40 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d0bbee9e..3cc00f95 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -153,6 +153,27 @@ static bool convertible_data_type(struct hlsl_type *type) return type->type != HLSL_CLASS_OBJECT; } +static bool hlsl_types_are_componentwise_equal(struct hlsl_ctx *ctx, struct hlsl_type *src, + struct hlsl_type *dst) +{ + unsigned int k, count = hlsl_type_component_count(src); + + if (count != hlsl_type_component_count(dst)) + return false; + + for (k = 0; k < count; ++k) + { + struct hlsl_type *src_comp_type, *dst_comp_type; + + src_comp_type = hlsl_type_get_component_type(ctx, src, k); + dst_comp_type = hlsl_type_get_component_type(ctx, dst, k); + + if (!hlsl_types_are_equal(src_comp_type, dst_comp_type)) + return false; + } + return true; +} + static bool compatible_data_types(struct hlsl_type *src, struct hlsl_type *dst) { if (!convertible_data_type(src) || !convertible_data_type(dst)) @@ -207,53 +228,47 @@ static bool compatible_data_types(struct hlsl_type *src, struct hlsl_type *dst) return false; } -static bool implicit_compatible_data_types(struct hlsl_type *src, struct hlsl_type *dst) +static bool implicit_compatible_data_types(struct hlsl_ctx *ctx, struct hlsl_type *src, struct hlsl_type *dst) { - if (!convertible_data_type(src) || !convertible_data_type(dst)) + if ((src->type <= HLSL_CLASS_LAST_NUMERIC) != (dst->type <= HLSL_CLASS_LAST_NUMERIC)) return false; if (src->type <= HLSL_CLASS_LAST_NUMERIC) { /* Scalar vars can be converted to any other numeric data type */ - if (src->dimx == 1 && src->dimy == 1 && dst->type <= HLSL_CLASS_LAST_NUMERIC) + if (src->dimx == 1 && src->dimy == 1) return true; /* The other way around is true too */ - if (dst->dimx == 1 && dst->dimy == 1 && dst->type <= HLSL_CLASS_LAST_NUMERIC) + if (dst->dimx == 1 && dst->dimy == 1) return true; - } - if (src->type <= HLSL_CLASS_VECTOR && dst->type <= HLSL_CLASS_VECTOR) - { - if (src->dimx >= dst->dimx) - return true; - return false; - } + if (src->type == HLSL_CLASS_MATRIX || dst->type == HLSL_CLASS_MATRIX) + { + if (src->type == HLSL_CLASS_MATRIX && dst->type == HLSL_CLASS_MATRIX) + return src->dimx >= dst->dimx && src->dimy >= dst->dimy; - if (src->type == HLSL_CLASS_MATRIX || dst->type == HLSL_CLASS_MATRIX) - { - if (src->type == HLSL_CLASS_MATRIX && dst->type == HLSL_CLASS_MATRIX) - return src->dimx >= dst->dimx && src->dimy >= dst->dimy; + /* Matrix-vector conversion is apparently allowed if they have + * the same components count, or if the matrix is 1xN or Nx1 + * and we are reducing the component count */ + if (src->type == HLSL_CLASS_VECTOR || dst->type == HLSL_CLASS_VECTOR) + { + if (hlsl_type_component_count(src) == hlsl_type_component_count(dst)) + return true; - /* Matrix-vector conversion is apparently allowed if they have - * the same components count, or if the matrix is 1xN or Nx1 - * and we are reducing the component count */ - if (src->type == HLSL_CLASS_VECTOR || dst->type == HLSL_CLASS_VECTOR) - { - if (hlsl_type_component_count(src) == hlsl_type_component_count(dst)) - return true; + if ((src->type == HLSL_CLASS_VECTOR || src->dimx == 1 || src->dimy == 1) && + (dst->type == HLSL_CLASS_VECTOR || dst->dimx == 1 || dst->dimy == 1)) + return hlsl_type_component_count(src) >= hlsl_type_component_count(dst); + } - if ((src->type == HLSL_CLASS_VECTOR || src->dimx == 1 || src->dimy == 1) && - (dst->type == HLSL_CLASS_VECTOR || dst->dimx == 1 || dst->dimy == 1)) - return hlsl_type_component_count(src) >= hlsl_type_component_count(dst); + return false; + } + else + { + return src->dimx >= dst->dimx; } - - return false; } - if (src->type == HLSL_CLASS_STRUCT && dst->type == HLSL_CLASS_STRUCT) - return hlsl_types_are_equal(src, dst); - - return false; + return hlsl_types_are_componentwise_equal(ctx, src, dst); } static struct hlsl_ir_load *add_load_component(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *var_instr, @@ -351,7 +366,7 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct if (hlsl_types_are_equal(src_type, dst_type)) return node; - if (!implicit_compatible_data_types(src_type, dst_type)) + if (!implicit_compatible_data_types(ctx, src_type, dst_type)) { struct vkd3d_string_buffer *src_string, *dst_string; diff --git a/tests/cast-componentwise-equal.shader_test b/tests/cast-componentwise-equal.shader_test index 30c26c63..4c85b9ed 100644 --- a/tests/cast-componentwise-equal.shader_test +++ b/tests/cast-componentwise-equal.shader_test @@ -50,8 +50,8 @@ float4 main() : sv_target [test] -todo draw quad -todo probe all rgba (1.0, 2.0, 3.0, 1.0) +draw quad +probe all rgba (1.0, 2.0, 3.0, 1.0) [pixel shader fail] @@ -89,8 +89,8 @@ float4 main() : sv_target [test] -todo draw quad -todo probe all rgba (5.0, 6.0, 7.0, 8.0) +draw quad +probe all rgba (5.0, 6.0, 7.0, 8.0) [pixel shader] @@ -120,8 +120,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (4.0, 4.0, 4.0, 4.0) +draw quad +probe all rgba (4.0, 4.0, 4.0, 4.0) [pixel shader] @@ -199,8 +199,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (71.0, 73.0, 73.0, 74.0) +draw quad +probe all rgba (71.0, 73.0, 73.0, 74.0) [pixel shader fail]

1 0

Francisco Casas : vkd3d-shader/hlsl: Support explicit cast between component-wise compatible types.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: vkd3d Branch: master Commit: 5af7316a1251d0310dcfc8f225f695539b3eab8b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5af7316a1251d0310dcfc8f225f69… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 19 19:29:22 2022 -0300 vkd3d-shader/hlsl: Support explicit cast between component-wise compatible types. --- libs/vkd3d-shader/hlsl.y | 89 +++++++++++++------------ tests/cast-componentwise-compatible.shader_test | 8 +-- 2 files changed, 49 insertions(+), 48 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3cc00f95..7ada218c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -148,9 +148,26 @@ static void check_invalid_matrix_modifiers(struct hlsl_ctx *ctx, DWORD modifiers "'row_major' and 'column_major' modifiers are only allowed for matrices."); } -static bool convertible_data_type(struct hlsl_type *type) +static bool hlsl_types_are_componentwise_compatible(struct hlsl_ctx *ctx, struct hlsl_type *src, + struct hlsl_type *dst) { - return type->type != HLSL_CLASS_OBJECT; + unsigned int k, count = hlsl_type_component_count(dst); + + if (count > hlsl_type_component_count(src)) + return false; + + for (k = 0; k < count; ++k) + { + struct hlsl_type *src_comp_type, *dst_comp_type; + + src_comp_type = hlsl_type_get_component_type(ctx, src, k); + dst_comp_type = hlsl_type_get_component_type(ctx, dst, k); + + if ((src_comp_type->type != HLSL_CLASS_SCALAR || dst_comp_type->type != HLSL_CLASS_SCALAR) + && !hlsl_types_are_equal(src_comp_type, dst_comp_type)) + return false; + } + return true; } static bool hlsl_types_are_componentwise_equal(struct hlsl_ctx *ctx, struct hlsl_type *src, @@ -174,58 +191,42 @@ static bool hlsl_types_are_componentwise_equal(struct hlsl_ctx *ctx, struct hlsl return true; } -static bool compatible_data_types(struct hlsl_type *src, struct hlsl_type *dst) +static bool type_contains_only_numerics(struct hlsl_type *type) { - if (!convertible_data_type(src) || !convertible_data_type(dst)) - return false; + unsigned int i; - if (src->type <= HLSL_CLASS_LAST_NUMERIC) + if (type->type == HLSL_CLASS_ARRAY) + return type_contains_only_numerics(type->e.array.type); + if (type->type == HLSL_CLASS_STRUCT) { - /* Scalar vars can be cast to pretty much everything */ - if (src->dimx == 1 && src->dimy == 1) - return true; - - if (src->type == HLSL_CLASS_VECTOR && dst->type == HLSL_CLASS_VECTOR) - return src->dimx >= dst->dimx; - } - - /* The other way around is true too i.e. whatever to scalar */ - if (dst->type <= HLSL_CLASS_LAST_NUMERIC && dst->dimx == 1 && dst->dimy == 1) + for (i = 0; i < type->e.record.field_count; ++i) + { + if (!type_contains_only_numerics(type->e.record.fields[i].type)) + return false; + } return true; - - if (src->type == HLSL_CLASS_ARRAY) - { - if (hlsl_types_are_equal(src->e.array.type, dst)) - /* e.g. float4[3] to float4 is allowed */ - return true; - - if (dst->type == HLSL_CLASS_ARRAY || dst->type == HLSL_CLASS_STRUCT) - return hlsl_type_component_count(src) >= hlsl_type_component_count(dst); - else - return hlsl_type_component_count(src) == hlsl_type_component_count(dst); } + return type->type <= HLSL_CLASS_LAST_NUMERIC; +} - if (src->type == HLSL_CLASS_STRUCT) - return hlsl_type_component_count(src) >= hlsl_type_component_count(dst); +static bool compatible_data_types(struct hlsl_ctx *ctx, struct hlsl_type *src, struct hlsl_type *dst) +{ + if (src->type <= HLSL_CLASS_LAST_NUMERIC && src->dimx == 1 && src->dimy == 1 && type_contains_only_numerics(dst)) + return true; - if (dst->type == HLSL_CLASS_ARRAY || dst->type == HLSL_CLASS_STRUCT) - return hlsl_type_component_count(src) == hlsl_type_component_count(dst); + if (src->type == HLSL_CLASS_MATRIX && dst->type == HLSL_CLASS_MATRIX + && src->dimx >= dst->dimx && src->dimy >= dst->dimy) + return true; - if (src->type == HLSL_CLASS_MATRIX || dst->type == HLSL_CLASS_MATRIX) - { - if (src->type == HLSL_CLASS_MATRIX && dst->type == HLSL_CLASS_MATRIX && src->dimx >= dst->dimx && src->dimy >= dst->dimy) - return true; + if ((src->type == HLSL_CLASS_MATRIX && src->dimx > 1 && src->dimy > 1) + && hlsl_type_component_count(src) != hlsl_type_component_count(dst)) + return false; - /* Matrix-vector conversion is apparently allowed if they have the same components count */ - if ((src->type == HLSL_CLASS_VECTOR || dst->type == HLSL_CLASS_VECTOR) - && hlsl_type_component_count(src) == hlsl_type_component_count(dst)) - return true; + if ((dst->type == HLSL_CLASS_MATRIX && dst->dimy > 1) + && hlsl_type_component_count(src) != hlsl_type_component_count(dst)) return false; - } - if (hlsl_type_component_count(src) >= hlsl_type_component_count(dst)) - return true; - return false; + return hlsl_types_are_componentwise_compatible(ctx, src, dst); } static bool implicit_compatible_data_types(struct hlsl_ctx *ctx, struct hlsl_type *src, struct hlsl_type *dst) @@ -4450,7 +4451,7 @@ unary_expr: dst_type = hlsl_new_array_type(ctx, dst_type, $4.sizes[i]); } - if (!compatible_data_types(src_type, dst_type)) + if (!compatible_data_types(ctx, src_type, dst_type)) { struct vkd3d_string_buffer *src_string, *dst_string; diff --git a/tests/cast-componentwise-compatible.shader_test b/tests/cast-componentwise-compatible.shader_test index 286c180b..4b342efb 100644 --- a/tests/cast-componentwise-compatible.shader_test +++ b/tests/cast-componentwise-compatible.shader_test @@ -159,8 +159,8 @@ float4 main() : sv_target [test] -todo draw quad -todo probe all rgba (10.0, 20.0, 30.0, 30.0) +draw quad +probe all rgba (10.0, 20.0, 30.0, 30.0) [pixel shader] @@ -181,5 +181,5 @@ float4 main() : sv_target [test] -todo draw quad -todo probe all rgba (10.0, 10.0, 11.4, 12.4) +draw quad +probe all rgba (10.0, 10.0, 11.4, 12.4)

1 0

Francois Gouget : testbot/LogUtils: Old test reports may not have the flaky count.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: tools Branch: master Commit: aaee0f1b914d4ba99ccaa819a1597b1c3a0a2e3d URL: https://gitlab.winehq.org/winehq/tools/-/commit/aaee0f1b914d4ba99ccaa819a15… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 19 17:23:24 2022 +0200 testbot/LogUtils: Old test reports may not have the flaky count. --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 922a25c0..a9c893a3 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -713,7 +713,7 @@ sub ParseWineTestReport($$$) # There may be more than one summary line due to child processes $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures} += $Failures; - $Cur->{SummaryFlaky} += $Flaky; + $Cur->{SummaryFlaky} += ($Flaky || 0); $Cur->{SummaryTodos} += $Todos; $Cur->{SummarySkips} += $Skips; $LogInfo->{IsWineTest} = 1;

1 0

Francois Gouget : winetest: Old WineTest reports may not have the flaky count.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: tools Branch: master Commit: 6cb546e49db740c3e1f8661264fd8662cdd2648e URL: https://gitlab.winehq.org/winehq/tools/-/commit/6cb546e49db740c3e1f8661264f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 25 18:40:40 2022 +0200 winetest: Old WineTest reports may not have the flaky count. --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 728b749d..ceef81a1 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -829,7 +829,7 @@ while ($line = <IN>) { $pids{$l_pid || 0} = 1; $s_total += $l_total; $s_failures += $l_failures; - $s_flaky += $l_flaky; + $s_flaky += ($l_flaky || 0); $s_todo += $l_todo; $s_skipped += $l_skipped; add_test_line($class, escapeHTML($line));

1 0

Rémi Bernon : win32u: Write display modes to registry as binary blobs.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: ffbe1e6229d8bbb9209ec1da6b1382293e5bb263 URL: https://gitlab.winehq.org/wine/wine/-/commit/ffbe1e6229d8bbb9209ec1da6b1382… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 30 15:31:01 2022 +0200 win32u: Write display modes to registry as binary blobs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53484 --- dlls/win32u/sysparams.c | 83 ++++++------------------------------------------- 1 file changed, 10 insertions(+), 73 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 9f0812b843e..b09c55b3d66 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -169,15 +169,6 @@ static const WCHAR displayW[] = {'D','i','s','p','l','a','y',0}; static const WCHAR monitorW[] = {'M','o','n','i','t','o','r',0}; static const WCHAR yesW[] = {'Y','e','s',0}; static const WCHAR noW[] = {'N','o',0}; -static const WCHAR bits_per_pelW[] = {'B','i','t','s','P','e','r','P','e','l',0}; -static const WCHAR x_resolutionW[] = {'X','R','e','s','o','l','u','t','i','o','n',0}; -static const WCHAR y_resolutionW[] = {'Y','R','e','s','o','l','u','t','i','o','n',0}; -static const WCHAR v_refreshW[] = {'V','R','e','f','r','e','s','h',0}; -static const WCHAR flagsW[] = {'F','l','a','g','s',0}; -static const WCHAR x_panningW[] = {'X','P','a','n','n','i','n','g',0}; -static const WCHAR y_panningW[] = {'Y','P','a','n','n','i','n','g',0}; -static const WCHAR orientationW[] = {'O','r','i','e','n','t','a','t','i','o','n',0}; -static const WCHAR fixed_outputW[] = {'F','i','x','e','d','O','u','t','p','u','t',0}; static const WCHAR mode_countW[] = {'M','o','d','e','C','o','u','n','t',0}; static const char guid_devclass_displayA[] = "{4D36E968-E325-11CE-BFC1-08002BE10318}"; @@ -443,84 +434,30 @@ static void adapter_release( struct adapter *adapter ) } } +C_ASSERT(sizeof(DEVMODEW) - offsetof(DEVMODEW, dmFields) == 0x94); + static BOOL write_adapter_mode( HKEY adapter_key, DWORD index, const DEVMODEW *mode ) { - WCHAR bufferW[MAX_PATH]; + WCHAR bufferW[MAX_PATH] = {0}; char buffer[MAX_PATH]; - BOOL ret = TRUE; - HKEY hkey; sprintf( buffer, "Modes\\%08X", index ); - reg_delete_tree( adapter_key, bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR) ); - if (!(hkey = reg_create_key( adapter_key, bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR), - REG_OPTION_VOLATILE, NULL ))) - return FALSE; - -#define set_mode_field( name, field, flag ) \ - if ((mode->dmFields & (flag)) && \ - !(ret = set_reg_value( hkey, (name), REG_DWORD, &mode->field, \ - sizeof(mode->field) ))) \ - goto done - - set_mode_field( bits_per_pelW, dmBitsPerPel, DM_BITSPERPEL ); - set_mode_field( x_resolutionW, dmPelsWidth, DM_PELSWIDTH ); - set_mode_field( y_resolutionW, dmPelsHeight, DM_PELSHEIGHT ); - set_mode_field( v_refreshW, dmDisplayFrequency, DM_DISPLAYFREQUENCY ); - set_mode_field( flagsW, dmDisplayFlags, DM_DISPLAYFLAGS ); - set_mode_field( orientationW, dmDisplayOrientation, DM_DISPLAYORIENTATION ); - set_mode_field( fixed_outputW, dmDisplayFixedOutput, DM_DISPLAYFIXEDOUTPUT ); - if (index == ENUM_CURRENT_SETTINGS || index == ENUM_REGISTRY_SETTINGS) - { - set_mode_field( x_panningW, dmPosition.x, DM_POSITION ); - set_mode_field( y_panningW, dmPosition.y, DM_POSITION ); - } - -#undef set_mode_field - -done: - NtClose( hkey ); - return ret; + asciiz_to_unicode( bufferW, buffer ); + return set_reg_value( adapter_key, bufferW, REG_BINARY, &mode->dmFields, sizeof(*mode) - offsetof(DEVMODEW, dmFields) ); } static BOOL read_adapter_mode( HKEY adapter_key, DWORD index, DEVMODEW *mode ) { - char value_buf[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; + char value_buf[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(*mode)])]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)value_buf; - WCHAR bufferW[MAX_PATH]; + WCHAR bufferW[MAX_PATH] = {0}; char buffer[MAX_PATH]; - HKEY hkey; sprintf( buffer, "Modes\\%08X", index ); - if (!(hkey = reg_open_key( adapter_key, bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR) ))) - return FALSE; - -#define query_mode_field( name, field, flag ) \ - do \ - { \ - if (query_reg_value( hkey, (name), value, sizeof(value_buf) ) && \ - value->Type == REG_DWORD) \ - { \ - mode->field = *(const DWORD *)value->Data; \ - mode->dmFields |= (flag); \ - } \ - } while (0) + asciiz_to_unicode( bufferW, buffer ); + if (!query_reg_value( adapter_key, bufferW, value, sizeof(value_buf) )) return FALSE; - query_mode_field( bits_per_pelW, dmBitsPerPel, DM_BITSPERPEL ); - query_mode_field( x_resolutionW, dmPelsWidth, DM_PELSWIDTH ); - query_mode_field( y_resolutionW, dmPelsHeight, DM_PELSHEIGHT ); - query_mode_field( v_refreshW, dmDisplayFrequency, DM_DISPLAYFREQUENCY ); - query_mode_field( flagsW, dmDisplayFlags, DM_DISPLAYFLAGS ); - query_mode_field( orientationW, dmDisplayOrientation, DM_DISPLAYORIENTATION ); - query_mode_field( fixed_outputW, dmDisplayFixedOutput, DM_DISPLAYFIXEDOUTPUT ); - if (index == ENUM_CURRENT_SETTINGS || index == ENUM_REGISTRY_SETTINGS) - { - query_mode_field( x_panningW, dmPosition.x, DM_POSITION ); - query_mode_field( y_panningW, dmPosition.y, DM_POSITION ); - } - -#undef query_mode_field - - NtClose( hkey ); + memcpy( &mode->dmFields, value->Data, sizeof(*mode) - offsetof(DEVMODEW, dmFields) ); return TRUE; }

1 0

Brendan Shanks : vkd3d-common: Add a Windows implementation of vkd3d_set_thread_name().
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: vkd3d Branch: master Commit: 963ea98a52148cbfa1a05e74cb42c61ea12c8573 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/963ea98a52148cbfa1a05e74cb42c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Sep 15 12:07:40 2022 -0700 vkd3d-common: Add a Windows implementation of vkd3d_set_thread_name(). --- Makefile.am | 1 + include/private/vkd3d_debug.h | 1 + libs/vkd3d-common/debug.c | 55 +++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 9 ------- 4 files changed, 57 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1340be10..3787389b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -179,6 +179,7 @@ libvkd3d_common_la_SOURCES = \ libs/vkd3d-common/error.c \ libs/vkd3d-common/memory.c \ libs/vkd3d-common/utf8.c +libvkd3d_common_la_LIBADD = @PTHREAD_LIBS@ lib_LTLIBRARIES = libvkd3d-shader.la libvkd3d.la libvkd3d-utils.la diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 579c33d3..4f6d43af 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -115,5 +115,6 @@ struct vkd3d_debug_option bool vkd3d_debug_list_has_member(const char *string, const char *member); uint64_t vkd3d_parse_debug_options(const char *string, const struct vkd3d_debug_option *options, unsigned int option_count); +void vkd3d_set_thread_name(const char *name); #endif /* __VKD3D_DEBUG_H */ diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 0b9e765a..e07ed366 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef _WIN32 +# define _WIN32_WINNT 0x0600 /* For InitOnceExecuteOnce(). */ +#endif + #include "vkd3d_debug.h" #include <assert.h> @@ -27,6 +31,11 @@ #include <stdlib.h> #include <stdbool.h> #include <string.h> +#ifdef HAVE_PTHREAD_H +#include <pthread.h> +#endif + +#include "vkd3d_memory.h" #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 @@ -369,3 +378,49 @@ uint64_t vkd3d_parse_debug_options(const char *string, return flags; } + +#ifdef _WIN32 + +static HRESULT (WINAPI *pfn_SetThreadDescription)(HANDLE, const WCHAR *); +static BOOL WINAPI resolve_SetThreadDescription(INIT_ONCE *once, void *param, void **context) +{ + HMODULE kernelbase; + + if (!(kernelbase = LoadLibraryA("kernelbase.dll"))) + return TRUE; + + if (!(pfn_SetThreadDescription = (void *)GetProcAddress(kernelbase, "SetThreadDescription"))) + FreeLibrary(kernelbase); + + return TRUE; +} + +#endif + +void vkd3d_set_thread_name(const char *name) +{ +#ifdef _WIN32 + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + WCHAR *wname; + int ret; + + InitOnceExecuteOnce(&init_once, resolve_SetThreadDescription, NULL, NULL); + if (!pfn_SetThreadDescription) + return; + + if ((ret = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0)) <= 0) + return; + + if (!(wname = vkd3d_malloc(ret * sizeof(*wname)))) + return; + + if ((ret = MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, ret)) > 0) + pfn_SetThreadDescription(GetCurrentThread(), wname); + + vkd3d_free(wname); +#elif defined(HAVE_PTHREAD_SETNAME_NP_2) + pthread_setname_np(pthread_self(), name); +#elif defined(HAVE_PTHREAD_SETNAME_NP_1) + pthread_setname_np(name); +#endif +} diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c9b70d9c..2da1ab5d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1685,15 +1685,6 @@ extern const char vkd3d_build[]; bool vkd3d_get_program_name(char program_name[PATH_MAX]); -static inline void vkd3d_set_thread_name(const char *name) -{ -#if defined(HAVE_PTHREAD_SETNAME_NP_2) - pthread_setname_np(pthread_self(), name); -#elif defined(HAVE_PTHREAD_SETNAME_NP_1) - pthread_setname_np(name); -#endif -} - VkResult vkd3d_set_vk_object_name_utf8(struct d3d12_device *device, uint64_t vk_object, VkDebugReportObjectTypeEXT vk_object_type, const char *name); HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object,

1 0

Francois Gouget : testbot: Improve quoting when running wineserver.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: tools Branch: master Commit: 5c5c547924c159670d3202b7e73f3a7aaf1fdd13 URL: https://gitlab.winehq.org/winehq/tools/-/commit/5c5c547924c159670d3202b7e73… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 26 12:58:17 2021 +0100 testbot: Improve quoting when running wineserver. --- testbot/lib/Build/Utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 8a84f5e6..689df28a 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -609,7 +609,7 @@ sub CreateWinePrefix($;$) # Ensure the WinePrefix has been fully created and the registry files # saved before returning. my $WineDir = "$DataDir/wine-$Mission->{Build}"; - system("'$WineDir/server/wineserver' -w"); + system("$WineDir/server/wineserver", "-w"); } return undef;

1 0

Francois Gouget : testbot: Remove support for building with -Werror.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: tools Branch: master Commit: 12c7aabbd2c150b7da2f961ec39d37132880ec73 URL: https://gitlab.winehq.org/winehq/tools/-/commit/12c7aabbd2c150b7da2f961ec39… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Apr 4 16:42:52 2020 +0200 testbot: Remove support for building with -Werror. This feature is not used because compilation warnings should not get in the way of testing how Windows (or Wine) behaves. --- testbot/lib/Build/Utils.pm | 18 +++--------------- testbot/lib/WineTestBot/LogUtils.pm | 4 ---- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 689df28a..c1a02ac2 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -325,7 +325,6 @@ sub BuildTestLauncher() } our $FROM_SCRATCH = 1; -our $TRY_WERROR = 2; sub BuildWine($$$$;$) { @@ -339,20 +338,9 @@ sub BuildWine($$$$;$) InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); - my $Rc = 1; - if (defined $Configure and ($Flags & $TRY_WERROR)) - { - $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". - "time ../wine/configure $Configure --enable-werror && ". - join(" && ", map { "time make -j$CPUCount $_" } @$Targets)); - LogMsg "With -Werror the $Build Wine build fails\n" if ($Rc); - } - if ($Rc) - { - $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". - (defined $Configure ? "time ../wine/configure $Configure && " : ""). - join(" && ", map { "time make -j$CPUCount $_" } @$Targets)); - } + my $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". + (defined $Configure ? "time ../wine/configure $Configure && " : ""). + join(" && ", map { "time make -j$CPUCount $_" } @$Targets)); if ($Rc) { LogMsg "The $Build Wine build failed\n"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index fd850f8a..1e0ff38c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -291,10 +291,6 @@ sub ParseTaskLog($) { $LogInfo->{$1} = "updated"; } - elsif ($Line =~ /^Task: With -Werror the .* Wine build fails/) - { - ; # Show these non-fatal build errors - } elsif ($Line =~ /^Task: / or _IsPerlError($Line)) { $LogInfo->{Task} = "failed";

1 0

Francois Gouget : testbot/LogUtils: Remove a redundant return in LoadLogErrors().
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: tools Branch: master Commit: e5c8222769b191314e529900277eb0086032b174 URL: https://gitlab.winehq.org/winehq/tools/-/commit/e5c8222769b191314e529900277… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 23 00:07:13 2022 +0200 testbot/LogUtils: Remove a redundant return in LoadLogErrors(). --- testbot/lib/WineTestBot/LogUtils.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1e0ff38c..922a25c0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1054,7 +1054,6 @@ sub LoadLogErrors($) else { $LogInfo->{BadLog} = "Unable to open '$LogInfo->{LogName}.errors' for reading: $!"; - return $LogInfo; } return $LogInfo;

1 0

Joel Holdsworth : ntdll/tests: Add initial tests for reparse points.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: ed8161883a6a9f4391371a84b1b7921095ba2839 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed8161883a6a9f4391371a84b1b792… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Oct 20 11:07:48 2022 +0100 ntdll/tests: Add initial tests for reparse points. --- dlls/ntdll/tests/file.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index c011733626f..8157848e41d 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -5326,6 +5326,37 @@ static void test_mailslot_name(void) CloseHandle( device ); } +static void test_reparse_points(void) +{ + OBJECT_ATTRIBUTES attr; + HANDLE handle; + IO_STATUS_BLOCK io; + NTSTATUS status; + UNICODE_STRING nameW; + unsigned char reparse_data[1]; + + pRtlInitUnicodeString( &nameW, L"\\??\\C:\\" ); + InitializeObjectAttributes( &attr, &nameW, 0, NULL, NULL ); + + status = pNtOpenFile( &handle, READ_CONTROL, &attr, &io, 0, 0 ); + ok( !status, "open %s failed %#lx\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, NULL, 0 ); + todo_wine + ok( status == STATUS_INVALID_USER_BUFFER, "expected %#lx, got %#lx\n", STATUS_INVALID_USER_BUFFER, status ); + + status = pNtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, reparse_data, 0 ); + todo_wine + ok( status == STATUS_INVALID_USER_BUFFER, "expected %#lx, got %#lx\n", STATUS_INVALID_USER_BUFFER, status ); + + /* a volume cannot be a reparse point by definition */ + status = pNtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, reparse_data, 1 ); + todo_wine + ok( status == STATUS_NOT_A_REPARSE_POINT, "expected %#lx, got %#lx\n", STATUS_NOT_A_REPARSE_POINT, status ); + + CloseHandle( handle ); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -5399,4 +5430,5 @@ START_TEST(file) test_query_ea(); test_flush_buffers_file(); test_mailslot_name(); + test_reparse_points(); }

1 0