- Wine-Commits - list.winehq.org

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 89e3be4ee9c5c8cd03dd4b99505e7079295e4bce URL: https://gitlab.winehq.org/wine/wine/-/commit/89e3be4ee9c5c8cd03dd4b99505e70… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Feb 20 00:47:52 2024 +0200 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 000bebd5018..7ce24c8ac65 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2024-02-14 00:13+0200\n" +"PO-Revision-Date: 2024-02-20 00:47+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10150,7 +10150,7 @@ msgstr "Naršy&ti" #: dlls/shell32/shell32.rc:164 msgid "Run as &Administrator" -msgstr "" +msgstr "Paleisti kaip &administratorius" #: dlls/shell32/shell32.rc:186 msgid "Restart"

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic AtomicCompareExchange.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: vkd3d Branch: master Commit: 96a0685ba652f0346b6c919725247670afdb2721 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/96a0685ba652f0346b6c919725247… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 13 15:34:11 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic AtomicCompareExchange. --- libs/vkd3d-shader/dxil.c | 17 ++++++++++++----- tests/hlsl/uav-atomics.shader_test | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index c70ffe1d..9b609168 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -382,6 +382,7 @@ enum dx_intrinsic_opcode DX_TEXTURE_STORE = 67, DX_BUFFER_LOAD = 68, DX_ATOMIC_BINOP = 78, + DX_ATOMIC_CMP_XCHG = 79, DX_DERIV_COARSEX = 83, DX_DERIV_COARSEY = 84, DX_DERIV_FINEX = 85, @@ -3876,22 +3877,25 @@ static void sm6_parser_emit_dx_atomic_binop(struct sm6_parser *sm6, enum dx_intr { struct sm6_value *dst = sm6_parser_get_current_value(sm6); enum vkd3d_shader_resource_type resource_type; + bool is_cmp_xchg = op == DX_ATOMIC_CMP_XCHG; + unsigned int i, coord_idx, coord_count = 1; struct vkd3d_shader_dst_param *dst_params; struct vkd3d_shader_src_param *src_params; enum vkd3d_shader_opcode handler_idx; struct vkd3d_shader_instruction *ins; const struct sm6_value *resource; struct vkd3d_shader_register reg; - const unsigned int coord_idx = 2; - unsigned int i, coord_count = 1; resource = operands[0]; if (!sm6_value_validate_is_handle(resource, sm6)) return; - if ((handler_idx = map_dx_atomic_binop(operands[1], sm6)) == VKD3DSIH_INVALID) + if (is_cmp_xchg) + handler_idx = VKD3DSIH_IMM_ATOMIC_CMP_EXCH; + else if ((handler_idx = map_dx_atomic_binop(operands[1], sm6)) == VKD3DSIH_INVALID) return; + coord_idx = 2 - is_cmp_xchg; resource_type = resource->u.handle.d->resource_type; if (resource_type != VKD3D_SHADER_RESOURCE_BUFFER || resource->u.handle.d->kind == RESOURCE_KIND_STRUCTUREDBUFFER) { @@ -3918,10 +3922,12 @@ static void sm6_parser_emit_dx_atomic_binop(struct sm6_parser *sm6, enum dx_intr ins = state->ins; vsir_instruction_init(ins, &sm6->p.location, handler_idx); - if (!(src_params = instruction_src_params_alloc(ins, 2, sm6))) + if (!(src_params = instruction_src_params_alloc(ins, 2 + is_cmp_xchg, sm6))) return; src_param_init_vector_from_reg(&src_params[0], &reg); - src_param_init_from_value(&src_params[1], operands[5]); + if (is_cmp_xchg) + src_param_init_from_value(&src_params[1], operands[4]); + src_param_init_from_value(&src_params[1 + is_cmp_xchg], operands[5]); dst_params = instruction_dst_params_alloc(ins, 2, sm6); dst_param_init(&dst_params[0]); @@ -4467,6 +4473,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_ASIN ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_ATAN ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_ATOMIC_BINOP ] = {"o", "HciiiR", sm6_parser_emit_dx_atomic_binop}, + [DX_ATOMIC_CMP_XCHG ] = {"o", "HiiiRR", sm6_parser_emit_dx_atomic_binop}, [DX_BFREV ] = {"m", "R", sm6_parser_emit_dx_unary}, [DX_BUFFER_LOAD ] = {"o", "Hii", sm6_parser_emit_dx_buffer_load}, [DX_CBUFFER_LOAD_LEGACY ] = {"o", "Hi", sm6_parser_emit_dx_cbuffer_load}, diff --git a/tests/hlsl/uav-atomics.shader_test b/tests/hlsl/uav-atomics.shader_test index 063ff9e0..549877ec 100644 --- a/tests/hlsl/uav-atomics.shader_test +++ b/tests/hlsl/uav-atomics.shader_test @@ -26,7 +26,7 @@ void main() [test] uniform 0 uint4 3 5 0 0 -todo dispatch 1 1 1 +todo(sm<6) dispatch 1 1 1 probe uav 1 (0) rui (1) probe uav 1 (1) rui (3) probe uav 1 (2) rui (15) @@ -36,7 +36,7 @@ probe uav 1 (5) rui (3) probe uav 1 (6) rui (4) uniform 0 uint4 1 2 0 0 -todo dispatch 2 1 1 +todo(sm<6) dispatch 2 1 1 probe uav 1 (0) rui (1) probe uav 1 (1) rui (3) probe uav 1 (2) rui (21)

1 0

Conor McCarthy : tests/shader-runner: Add tests for UAV atomic ops.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: vkd3d Branch: master Commit: 3906c12476332ae990a374247ac3fa523943703e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3906c12476332ae990a374247ac3f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 13 15:11:57 2024 +1000 tests/shader-runner: Add tests for UAV atomic ops. --- Makefile.am | 1 + tests/hlsl/uav-atomics.shader_test | 76 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/Makefile.am b/Makefile.am index ec942086..cfb225f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -198,6 +198,7 @@ vkd3d_shader_tests = \ tests/hlsl/trigonometry.shader_test \ tests/hlsl/trunc.shader_test \ tests/hlsl/type-names.shader_test \ + tests/hlsl/uav-atomics.shader_test \ tests/hlsl/uav-load.shader_test \ tests/hlsl/uav-out-param.shader_test \ tests/hlsl/uav-rwbuffer.shader_test \ diff --git a/tests/hlsl/uav-atomics.shader_test b/tests/hlsl/uav-atomics.shader_test new file mode 100644 index 00000000..169b4ac2 --- /dev/null +++ b/tests/hlsl/uav-atomics.shader_test @@ -0,0 +1,76 @@ +[require] +shader model >= 5.0 + +[uav 1] +format r32 uint +size (buffer, 7) + +0xd 5 6 0x10 4 4 7 + +[compute shader todo] +RWBuffer<uint> u : register(u1); + +uniform uint4 v; + + [numthreads(3, 1, 1)] +void main() +{ + InterlockedAnd(u[0], v.x); + InterlockedCompareStore(u[1], v.y, v.x); + InterlockedAdd(u[2], v.x); + InterlockedOr(u[3], v.x); + InterlockedMax(u[4], v.x); + InterlockedMin(u[5], v.x); + InterlockedXor(u[6], v.x); +} + +[test] +uniform 0 uint4 3 5 0 0 +todo dispatch 1 1 1 +probe uav 1 (0) rui (1) +probe uav 1 (1) rui (3) +probe uav 1 (2) rui (15) +probe uav 1 (3) rui (0x13) +probe uav 1 (4) rui (4) +probe uav 1 (5) rui (3) +probe uav 1 (6) rui (4) + +uniform 0 uint4 1 2 0 0 +todo dispatch 2 1 1 +probe uav 1 (0) rui (1) +probe uav 1 (1) rui (3) +probe uav 1 (2) rui (21) +probe uav 1 (3) rui (0x13) +probe uav 1 (4) rui (4) +probe uav 1 (5) rui (1) +probe uav 1 (6) rui (4) + + +[uav 2] +format r32 sint +size (buffer, 2) + +-3 1 + +[compute shader todo] +RWBuffer<int> u : register(u2); + +uniform int4 i; + + [numthreads(3, 1, 1)] +void main() +{ + InterlockedMax(u[0], i.x); + InterlockedMin(u[1], i.y); +} + +[test] +uniform 0 int4 1 -3 0 0 +todo dispatch 1 1 1 +probe uav 2 (0) ri (1) +probe uav 2 (1) ri (-3) + +uniform 0 int4 -3 1 0 0 +todo dispatch 1 1 1 +probe uav 2 (0) ri (1) +probe uav 2 (1) ri (-3)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic AtomicBinOp.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: vkd3d Branch: master Commit: 560c9413c3157eacbc0bda98dc208adae8214c00 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/560c9413c3157eacbc0bda98dc208… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 13 15:32:50 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic AtomicBinOp. --- libs/vkd3d-shader/dxil.c | 112 ++++++++++++++++++++++++++++++++++++- tests/hlsl/uav-atomics.shader_test | 4 +- 2 files changed, 113 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 33d30aef..c70ffe1d 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -381,6 +381,7 @@ enum dx_intrinsic_opcode DX_TEXTURE_LOAD = 66, DX_TEXTURE_STORE = 67, DX_BUFFER_LOAD = 68, + DX_ATOMIC_BINOP = 78, DX_DERIV_COARSEX = 83, DX_DERIV_COARSEY = 84, DX_DERIV_FINEX = 85, @@ -438,6 +439,20 @@ enum dxil_predicate ICMP_SLE = 41, }; +enum dxil_atomic_binop_code +{ + ATOMIC_BINOP_ADD, + ATOMIC_BINOP_AND, + ATOMIC_BINOP_OR, + ATOMIC_BINOP_XOR, + ATOMIC_BINOP_IMIN, + ATOMIC_BINOP_IMAX, + ATOMIC_BINOP_UMIN, + ATOMIC_BINOP_UMAX, + ATOMIC_BINOP_XCHG, + ATOMIC_BINOP_INVALID, +}; + struct sm6_pointer_info { const struct sm6_type *type; @@ -2275,7 +2290,7 @@ static void src_param_init_from_value(struct vkd3d_shader_src_param *param, cons static void src_param_init_vector_from_reg(struct vkd3d_shader_src_param *param, const struct vkd3d_shader_register *reg) { - param->swizzle = VKD3D_SHADER_NO_SWIZZLE; + param->swizzle = (reg->dimension == VSIR_DIMENSION_VEC4) ? VKD3D_SHADER_NO_SWIZZLE : VKD3D_SHADER_SWIZZLE(X, X, X, X); param->modifiers = VKD3DSPSM_NONE; param->reg = *reg; } @@ -3823,6 +3838,100 @@ static void sm6_parser_emit_dx_binary(struct sm6_parser *sm6, enum dx_intrinsic_ instruction_dst_param_init_ssa_scalar(ins, sm6); } +static enum vkd3d_shader_opcode map_dx_atomic_binop(const struct sm6_value *operand, struct sm6_parser *sm6) +{ + uint64_t code = sm6_value_get_constant_uint(operand); + + switch (code) + { + case ATOMIC_BINOP_ADD: + return VKD3DSIH_IMM_ATOMIC_IADD; + case ATOMIC_BINOP_AND: + return VKD3DSIH_IMM_ATOMIC_AND; + case ATOMIC_BINOP_IMAX: + return VKD3DSIH_IMM_ATOMIC_IMAX; + case ATOMIC_BINOP_IMIN: + return VKD3DSIH_IMM_ATOMIC_IMIN; + case ATOMIC_BINOP_OR: + return VKD3DSIH_IMM_ATOMIC_OR; + case ATOMIC_BINOP_UMAX: + return VKD3DSIH_IMM_ATOMIC_UMAX; + case ATOMIC_BINOP_UMIN: + return VKD3DSIH_IMM_ATOMIC_UMIN; + case ATOMIC_BINOP_XCHG: + return VKD3DSIH_IMM_ATOMIC_EXCH; + case ATOMIC_BINOP_XOR: + return VKD3DSIH_IMM_ATOMIC_XOR; + /* DXIL currently doesn't use SUB and NAND. */ + default: + FIXME("Unhandled atomic binop %"PRIu64".\n", code); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Operation %"PRIu64" for an atomic binop instruction is unhandled.", code); + return VKD3DSIH_INVALID; + } +} + +static void sm6_parser_emit_dx_atomic_binop(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct sm6_value *dst = sm6_parser_get_current_value(sm6); + enum vkd3d_shader_resource_type resource_type; + struct vkd3d_shader_dst_param *dst_params; + struct vkd3d_shader_src_param *src_params; + enum vkd3d_shader_opcode handler_idx; + struct vkd3d_shader_instruction *ins; + const struct sm6_value *resource; + struct vkd3d_shader_register reg; + const unsigned int coord_idx = 2; + unsigned int i, coord_count = 1; + + resource = operands[0]; + if (!sm6_value_validate_is_handle(resource, sm6)) + return; + + if ((handler_idx = map_dx_atomic_binop(operands[1], sm6)) == VKD3DSIH_INVALID) + return; + + resource_type = resource->u.handle.d->resource_type; + if (resource_type != VKD3D_SHADER_RESOURCE_BUFFER || resource->u.handle.d->kind == RESOURCE_KIND_STRUCTUREDBUFFER) + { + coord_count = 2 + (resource_type != VKD3D_SHADER_RESOURCE_BUFFER); + if (!sm6_parser_emit_coordinate_construct(sm6, &operands[coord_idx], coord_count, NULL, state, &reg)) + return; + } + else + { + reg = operands[coord_idx]->u.reg; + } + + for (i = coord_idx + coord_count; i < coord_idx + 3; ++i) + { + if (!operands[i]->is_undefined) + { + WARN("Ignoring unexpected operand.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring an unexpected defined operand value for atomic instruction %u.", handler_idx); + break; + } + } + + ins = state->ins; + vsir_instruction_init(ins, &sm6->p.location, handler_idx); + + if (!(src_params = instruction_src_params_alloc(ins, 2, sm6))) + return; + src_param_init_vector_from_reg(&src_params[0], &reg); + src_param_init_from_value(&src_params[1], operands[5]); + + dst_params = instruction_dst_params_alloc(ins, 2, sm6); + dst_param_init(&dst_params[0]); + register_init_ssa_scalar(&dst_params[0].reg, dst->type, dst, sm6); + dst_param_init(&dst_params[1]); + dst_params[1].reg = resource->u.handle.reg; + + dst->u.reg = dst_params[0].reg; +} + static void sm6_parser_emit_dx_cbuffer_load(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -4357,6 +4466,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_ACOS ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_ASIN ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_ATAN ] = {"g", "R", sm6_parser_emit_dx_unary}, + [DX_ATOMIC_BINOP ] = {"o", "HciiiR", sm6_parser_emit_dx_atomic_binop}, [DX_BFREV ] = {"m", "R", sm6_parser_emit_dx_unary}, [DX_BUFFER_LOAD ] = {"o", "Hii", sm6_parser_emit_dx_buffer_load}, [DX_CBUFFER_LOAD_LEGACY ] = {"o", "Hi", sm6_parser_emit_dx_cbuffer_load}, diff --git a/tests/hlsl/uav-atomics.shader_test b/tests/hlsl/uav-atomics.shader_test index 169b4ac2..063ff9e0 100644 --- a/tests/hlsl/uav-atomics.shader_test +++ b/tests/hlsl/uav-atomics.shader_test @@ -66,11 +66,11 @@ void main() [test] uniform 0 int4 1 -3 0 0 -todo dispatch 1 1 1 +todo(sm<6) dispatch 1 1 1 probe uav 2 (0) ri (1) probe uav 2 (1) ri (-3) uniform 0 int4 -3 1 0 0 -todo dispatch 1 1 1 +todo(sm<6) dispatch 1 1 1 probe uav 2 (0) ri (1) probe uav 2 (1) ri (-3)

1 0

Conor McCarthy : tests/shader-runner: Support scalar signed int probe values.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: vkd3d Branch: master Commit: a04f16918f66838197488808bd244be87ad223a1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a04f16918f66838197488808bd244… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 13 15:08:03 2024 +1000 tests/shader-runner: Support scalar signed int probe values. --- tests/shader_runner.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 299c4845..85c88d7b 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -579,7 +579,7 @@ static void set_uniforms(struct shader_runner *runner, size_t offset, size_t cou memcpy(runner->uniforms + offset, uniforms, count * sizeof(*runner->uniforms)); } -static void read_int(const char **line, int *i) +static void read_int(const char **line, int *i, bool is_uniform) { char *rest; long val; @@ -587,14 +587,14 @@ static void read_int(const char **line, int *i) errno = 0; val = strtol(*line, &rest, 0); - if (errno != 0 || (*rest != '\0' && !isspace((unsigned char)*rest))) + if (errno != 0 || (is_uniform && *rest != '\0' && !isspace((unsigned char)*rest))) fatal_error("Malformed int constant '%s'.\n", *line); *i = val; if (*i != val) fatal_error("Out of range int constant '%.*s'.\n", (int)(rest - *line), *line); - *line = rest; + *line = rest + (!is_uniform && *rest == ','); } static void read_uint(const char **line, unsigned int *u, bool is_uniform) @@ -617,10 +617,10 @@ static void read_uint(const char **line, unsigned int *u, bool is_uniform) static void read_int4(const char **line, struct ivec4 *v) { - read_int(line, &v->x); - read_int(line, &v->y); - read_int(line, &v->z); - read_int(line, &v->w); + read_int(line, &v->x, true); + read_int(line, &v->y, true); + read_int(line, &v->z, true); + read_int(line, &v->w, true); } static void read_uint4(const char **line, struct uvec4 *v, bool is_uniform) @@ -831,6 +831,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) unsigned int left, top, right, bottom, ulps, slot; struct resource_readback *rb; struct resource *resource; + bool is_signed = false; RECT rect; int len; @@ -910,7 +911,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) ulps = 0; todo_if(runner->is_todo) check_readback_data_vec4(rb, &rect, &v, ulps); } - else if (match_string(line, "rui", &line)) + else if (match_string(line, "rui", &line) || (is_signed = match_string(line, "ri", &line))) { unsigned int expect; D3D12_BOX box; @@ -924,7 +925,10 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (*line != '(') fatal_error("Malformed probe arguments '%s'.\n", line); ++line; - read_uint(&line, &expect, false); + if (is_signed) + read_int(&line, (int *)&expect, false); + else + read_uint(&line, &expect, false); line = close_parentheses(line); todo_if(runner->is_todo) check_readback_data_uint(rb, &box, expect, 0); } @@ -996,7 +1000,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) { int i; - read_int(&line, &i); + read_int(&line, &i, true); set_uniforms(runner, offset, 1, &i); } else if (match_string(line, "uint", &line))

1 0

Kartavya Vashishtha : kernelbase: Implement CopyFile2().
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 1e348427994e5675ded3b1540a15a8af85cc8ebc URL: https://gitlab.winehq.org/wine/wine/-/commit/1e348427994e5675ded3b1540a15a8… Author: Kartavya Vashishtha <sendtokartavya(a)gmail.com> Date: Fri Feb 16 19:14:22 2024 -0500 kernelbase: Implement CopyFile2(). --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/file.c | 50 ++++++++++++++++++++++++++++++++++++----- dlls/kernelbase/kernelbase.spec | 2 +- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9d5dc076acb..28a3f554374 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -257,6 +257,7 @@ @ stdcall -import ConvertThreadToFiberEx(ptr long) @ stdcall ConvertToGlobalHandle(long) @ stdcall -import CopyContext(ptr long ptr) +@ stdcall -import CopyFile2(wstr wstr ptr) @ stdcall CopyFileA(str str long) @ stdcall CopyFileExA (str str ptr ptr ptr long) @ stdcall -import CopyFileExW(wstr wstr ptr ptr ptr long) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 2b59db43041..f425df4263b 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -487,13 +487,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH AreFileApisANSI(void) return !oem_file_apis; } - -/*********************************************************************** - * CopyFileExW (kernelbase.@) +/****************************************************************************** + * copy_file */ -BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress, - void *param, BOOL *cancel_ptr, DWORD flags ) +static BOOL copy_file( const WCHAR *source, const WCHAR *dest, COPYFILE2_EXTENDED_PARAMETERS *params ) { + DWORD flags = params ? params->dwCopyFlags : 0; + BOOL *cancel_ptr = params ? params->pfCancel : NULL; + PCOPYFILE2_PROGRESS_ROUTINE progress = params ? params->pProgressRoutine : NULL; + static const int buffer_size = 65536; HANDLE h1, h2; FILE_BASIC_INFORMATION info; @@ -502,6 +504,11 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT BOOL ret = FALSE; char *buffer; + if (cancel_ptr) + FIXME("pfCancel is not supported\n"); + if (progress) + FIXME("PCOPYFILE2_PROGRESS_ROUTINE is not supported\n"); + if (!source || !dest) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -577,7 +584,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT count -= res; } } - ret = TRUE; + ret = TRUE; done: /* Maintain the timestamp of source file to destination file and read-only attribute */ info.FileAttributes &= FILE_ATTRIBUTE_READONLY; @@ -589,6 +596,37 @@ done: return ret; } +/*********************************************************************** + * CopyFile2 (kernelbase.@) + */ +HRESULT WINAPI CopyFile2( const WCHAR *source, const WCHAR *dest, COPYFILE2_EXTENDED_PARAMETERS *params ) +{ + return copy_file(source, dest, params) ? S_OK : HRESULT_FROM_WIN32(GetLastError()); +} + + +/*********************************************************************** + * CopyFileExW (kernelbase.@) + */ +BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress, + void *param, BOOL *cancel_ptr, DWORD flags ) +{ + COPYFILE2_EXTENDED_PARAMETERS params; + + if (progress) + FIXME("LPPROGRESS_ROUTINE is not supported\n"); + if (cancel_ptr) + FIXME("cancel_ptr is not supported\n"); + + params.dwSize = sizeof(params); + params.dwCopyFlags = flags; + params.pProgressRoutine = NULL; + params.pvCallbackContext = NULL; + params.pfCancel = NULL; + + return copy_file( source, dest, &params ); +} + /************************************************************************** * CopyFileW (kernelbase.@) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index d3bd59a78e3..a133380a27a 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -168,7 +168,7 @@ @ stdcall ConvertThreadToFiberEx(ptr long) @ stdcall ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) @ stdcall CopyContext(ptr long ptr) -# @ stub CopyFile2 +@ stdcall CopyFile2(wstr wstr ptr) @ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) @ stdcall CopyFileW(wstr wstr long) @ stdcall -arch=x86_64 CopyMemoryNonTemporal(ptr ptr long) ntdll.RtlCopyMemoryNonTemporal

1 0

Henri Verbeet : tests/shader_runner: Print information about the run configuration in run_shader_tests().
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: vkd3d Branch: master Commit: 54142eb0bd918f96e729a441257ac40a9c3c5257 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/54142eb0bd918f96e729a441257ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 19 17:01:00 2024 +0100 tests/shader_runner: Print information about the run configuration in run_shader_tests(). --- tests/shader_runner.c | 30 +++++++++++++++++++----------- tests/shader_runner.h | 1 + tests/shader_runner_d3d11.c | 9 +-------- tests/shader_runner_d3d12.c | 15 +++++---------- tests/shader_runner_d3d9.c | 9 +-------- tests/shader_runner_gl.c | 2 +- tests/shader_runner_vulkan.c | 3 +-- 7 files changed, 29 insertions(+), 40 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index bdf639e4..299c4845 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -64,6 +64,22 @@ typedef int HRESULT; struct test_options test_options = {0}; +#ifdef VKD3D_CROSSTEST +static const char HLSL_COMPILER[] = "d3dcompiler47.dll"; +#else +static const char HLSL_COMPILER[] = "vkd3d-shader"; +#endif +static const char *const model_strings[] = +{ + [SHADER_MODEL_2_0] = "2.0", + [SHADER_MODEL_3_0] = "3.0", + [SHADER_MODEL_4_0] = "4.0", + [SHADER_MODEL_4_1] = "4.1", + [SHADER_MODEL_5_0] = "5.0", + [SHADER_MODEL_5_1] = "5.1", + [SHADER_MODEL_6_0] = "6.0", +}; + void fatal_error(const char *format, ...) { va_list args; @@ -248,17 +264,6 @@ static void parse_require_directive(struct shader_runner *runner, const char *li if (match_string(line, "shader model >=", &line) || (less_than = match_string(line, "shader model <", &line))) { - static const char *const model_strings[] = - { - [SHADER_MODEL_2_0] = "2.0", - [SHADER_MODEL_3_0] = "3.0", - [SHADER_MODEL_4_0] = "4.0", - [SHADER_MODEL_4_1] = "4.1", - [SHADER_MODEL_5_0] = "5.0", - [SHADER_MODEL_5_1] = "5.1", - [SHADER_MODEL_6_0] = "6.0", - }; - for (i = 0; i < ARRAY_SIZE(model_strings); ++i) { if (match_string(line, model_strings[i], &line)) @@ -1338,6 +1343,9 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c const char *testname; FILE *f; + trace("Compiling SM%s-SM%s shaders with %s and executing with %s.\n", + model_strings[caps->minimum_shader_model], model_strings[caps->maximum_shader_model], + dxc_compiler ? "dxcompiler" : HLSL_COMPILER, caps->runner); trace(" float64: %u.\n", caps->float64); trace(" int64: %u.\n", caps->int64); trace(" rov: %u.\n", caps->rov); diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 10637368..5ad6a278 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -119,6 +119,7 @@ struct input_element struct shader_runner_caps { + const char *runner; enum shader_model minimum_shader_model; enum shader_model maximum_shader_model; bool float64; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 5cd7340e..0d13fc00 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -32,12 +32,6 @@ #include "shader_runner.h" #include "vkd3d_test.h" -#ifdef VKD3D_CROSSTEST -static const char HLSL_COMPILER[] = "d3dcompiler47.dll"; -#else -static const char HLSL_COMPILER[] = "vkd3d-shader"; -#endif - static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, @@ -275,6 +269,7 @@ static BOOL init_test_context(struct d3d11_shader_runner *runner) return FALSE; } + runner->caps.runner = "d3d11.dll"; runner->caps.minimum_shader_model = SHADER_MODEL_4_0; runner->caps.maximum_shader_model = SHADER_MODEL_5_1; @@ -794,8 +789,6 @@ void run_shader_tests_d3d11(void) struct d3d11_shader_runner runner; HMODULE dxgi_module, d3d11_module; - trace("Compiling SM4-SM5 shaders with %s and executing with d3d11.dll\n", HLSL_COMPILER); - d3d11_module = LoadLibraryA("d3d11.dll"); dxgi_module = LoadLibraryA("dxgi.dll"); if (d3d11_module && dxgi_module) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index da6edbbd..b7a29431 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -25,14 +25,6 @@ #include "shader_runner.h" #include "dxcompiler.h" -#ifdef VKD3D_CROSSTEST -static const char HLSL_COMPILER[] = "d3dcompiler47.dll"; -static const char SHADER_RUNNER[] = "d3d12.dll"; -#else -static const char HLSL_COMPILER[] = "vkd3d-shader"; -static const char SHADER_RUNNER[] = "vkd3d"; -#endif - struct d3d12_resource { struct resource r; @@ -630,6 +622,11 @@ static void d3d12_runner_init_caps(struct d3d12_shader_runner *runner) hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_D3D12_OPTIONS1, &options1, sizeof(options1)); ok(hr == S_OK, "Failed to check feature options1 support, hr %#x.\n", hr); +#ifdef VKD3D_CROSSTEST + runner->caps.runner = "d3d12.dll"; +#else + runner->caps.runner = "vkd3d"; +#endif runner->caps.minimum_shader_model = SHADER_MODEL_4_0; runner->caps.maximum_shader_model = SHADER_MODEL_5_1; runner->caps.float64 = options.DoublePrecisionFloatShaderOps; @@ -671,13 +668,11 @@ void run_shader_tests_d3d12(void *dxc_compiler) runner.compute_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&runner.compute_list); ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); - trace("Compiling SM4-SM5 shaders with %s and executing with %s\n", HLSL_COMPILER, SHADER_RUNNER); run_shader_tests(&runner.r, &runner.caps, &d3d12_runner_ops, NULL); if (dxc_compiler) { runner.caps.minimum_shader_model = SHADER_MODEL_6_0; runner.caps.maximum_shader_model = SHADER_MODEL_6_0; - trace("Compiling SM6 shaders with dxcompiler and executing with %s\n", SHADER_RUNNER); run_shader_tests(&runner.r, &runner.caps, &d3d12_runner_ops, dxc_compiler); } diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index 7bad3dc2..4ddb8ffe 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -27,12 +27,6 @@ #include "shader_runner.h" #include "vkd3d_test.h" -#ifdef VKD3D_CROSSTEST -static const char HLSL_COMPILER[] = "d3dcompiler47.dll"; -#else -static const char HLSL_COMPILER[] = "vkd3d-shader"; -#endif - struct d3d9_resource { struct resource r; @@ -155,6 +149,7 @@ static bool init_test_context(struct d3d9_shader_runner *runner) return false; } + runner->caps.runner = "d3d9.dll"; runner->caps.minimum_shader_model = SHADER_MODEL_2_0; runner->caps.maximum_shader_model = SHADER_MODEL_3_0; @@ -539,8 +534,6 @@ void run_shader_tests_d3d9(void) struct d3d9_shader_runner runner; HMODULE d3d9_module; - trace("Compiling SM2-SM3 shaders with %s and executing with d3d9.dll\n", HLSL_COMPILER); - if (!(d3d9_module = LoadLibraryA("d3d9.dll"))) return; diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index 906a70aa..f4e4fa75 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -225,6 +225,7 @@ static bool gl_runner_init(struct gl_runner *runner) eglTerminate(display); continue; } + runner->caps.runner = "OpenGL"; runner->caps.minimum_shader_model = SHADER_MODEL_4_0; runner->caps.maximum_shader_model = SHADER_MODEL_5_1; @@ -1031,7 +1032,6 @@ void run_shader_tests_gl(void) if (!gl_runner_init(&runner)) goto done; - trace("Compiling SM4-SM5 shaders with vkd3d-shader and executing with OpenGL\n"); run_shader_tests(&runner.r, &runner.caps, &gl_runner_ops, NULL); gl_runner_cleanup(&runner); done: diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 56407fbf..f9ab204f 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -1356,6 +1356,7 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) goto out_destroy_instance; } + runner->caps.runner = "Vulkan"; VK_CALL(vkGetPhysicalDeviceFeatures(runner->phys_device, &ret_features)); device_desc.pEnabledFeatures = &features; @@ -1453,12 +1454,10 @@ void run_shader_tests_vulkan(void) runner.caps.minimum_shader_model = SHADER_MODEL_2_0; runner.caps.maximum_shader_model = SHADER_MODEL_3_0; - trace("Compiling SM2-SM3 shaders with vkd3d-shader and executing with Vulkan\n"); run_shader_tests(&runner.r, &runner.caps, &vulkan_runner_ops, NULL); runner.caps.minimum_shader_model = SHADER_MODEL_4_0; runner.caps.maximum_shader_model = SHADER_MODEL_5_1; - trace("Compiling SM4-SM5 shaders with vkd3d-shader and executing with Vulkan\n"); run_shader_tests(&runner.r, &runner.caps, &vulkan_runner_ops, NULL); cleanup_vulkan_runner(&runner);

1 0

Henri Verbeet : tests/shader_runner: Pass the runner capabilities to run_shader_tests().
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: vkd3d Branch: master Commit: 930fbcbb26522341757fb78c8b9d5e276d053929 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/930fbcbb26522341757fb78c8b9d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 19 16:47:11 2024 +0100 tests/shader_runner: Pass the runner capabilities to run_shader_tests(). Allowing these to be checked by run_shader_tests() itself, instead of reimplementing those checks in each individual runner. --- tests/shader_runner.c | 29 ++++++++++++++------ tests/shader_runner.h | 16 +++++++---- tests/shader_runner_d3d11.c | 26 +++++------------- tests/shader_runner_d3d12.c | 64 ++++++++++++++++++++------------------------ tests/shader_runner_d3d9.c | 34 +++++++++-------------- tests/shader_runner_gl.c | 26 +++--------------- tests/shader_runner_vulkan.c | 31 +++++++-------------- 7 files changed, 94 insertions(+), 132 deletions(-)

1 0

Evan Tang : vkd3d-shader/hlsl: Support SV_PrimitiveID in pixel shaders.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: vkd3d Branch: master Commit: 7b41abaa1b041bc8501b8771db37f935561f19a6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b41abaa1b041bc8501b8771db37f… Author: Evan Tang <etang(a)codeweavers.com> Date: Fri Oct 13 16:25:49 2023 -0500 vkd3d-shader/hlsl: Support SV_PrimitiveID in pixel shaders. --- libs/vkd3d-shader/tpf.c | 1 + tests/hlsl/rasteriser-ordered-views.shader_test | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index d4a00a69..492e5ec0 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2810,6 +2810,7 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant {"position", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_POSITION}, {"sv_position", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_POSITION}, + {"sv_primitiveid", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_PRIMITIVE_ID}, {"sv_isfrontface", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_IS_FRONT_FACE}, {"sv_rendertargetarrayindex", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_RENDER_TARGET_ARRAY_INDEX}, {"sv_viewportarrayindex", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_VIEWPORT_ARRAY_INDEX}, diff --git a/tests/hlsl/rasteriser-ordered-views.shader_test b/tests/hlsl/rasteriser-ordered-views.shader_test index 12af779c..d273b05b 100644 --- a/tests/hlsl/rasteriser-ordered-views.shader_test +++ b/tests/hlsl/rasteriser-ordered-views.shader_test @@ -36,7 +36,7 @@ draw triangle list 3 probe all rui(0xaaaaaaaa) probe uav 1 all rui(0x55555555) -[pixel shader todo] +[pixel shader] RasterizerOrderedTexture2D<uint4> tex : register(u1); Texture2D<uint4> spin : register(t0);

1 0

Henri Verbeet : tests/shader_runner: Print a summary of the runner capabilities in run_shader_tests().
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: vkd3d Branch: master Commit: f15a0ace3efabe85441514dde3eb00824c2f24c1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f15a0ace3efabe85441514dde3eb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 19 16:57:32 2024 +0100 tests/shader_runner: Print a summary of the runner capabilities in run_shader_tests(). --- tests/shader_runner.c | 4 ++++ tests/shader_runner_d3d11.c | 2 -- tests/shader_runner_d3d12.c | 3 --- tests/shader_runner_gl.c | 3 --- tests/shader_runner_vulkan.c | 2 -- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 4f5a04ef..bdf639e4 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1338,6 +1338,10 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c const char *testname; FILE *f; + trace(" float64: %u.\n", caps->float64); + trace(" int64: %u.\n", caps->int64); + trace(" rov: %u.\n", caps->rov); + if (!test_options.filename) fatal_error("No filename specified.\n"); diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 7ca61109..5cd7340e 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -281,13 +281,11 @@ static BOOL init_test_context(struct d3d11_shader_runner *runner) hr = ID3D11Device_CheckFeatureSupport(runner->device, D3D11_FEATURE_DOUBLES, &doubles, sizeof(doubles)); ok(hr == S_OK, "Failed to check double precision feature support, hr %#lx.\n", hr); - trace("DoublePrecisionFloatShaderOps: %u.\n", doubles.DoublePrecisionFloatShaderOps); runner->caps.float64 = doubles.DoublePrecisionFloatShaderOps; hr = ID3D11Device_CheckFeatureSupport(runner->device, D3D11_FEATURE_D3D11_OPTIONS2, &options2, sizeof(options2)); ok(hr == S_OK, "Got hr %#lx.\n", hr); - trace("ROVsSupported: %u.\n", options2.ROVsSupported); runner->caps.rov = options2.ROVsSupported; rt_width = RENDER_TARGET_WIDTH; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 74ca9492..da6edbbd 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -627,11 +627,8 @@ static void d3d12_runner_init_caps(struct d3d12_shader_runner *runner) hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)); ok(hr == S_OK, "Failed to check feature options support, hr %#x.\n", hr); - trace("DoublePrecisionFloatShaderOps: %u.\n", options.DoublePrecisionFloatShaderOps); - trace("ROVsSupported: %u.\n", options.ROVsSupported); hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_D3D12_OPTIONS1, &options1, sizeof(options1)); ok(hr == S_OK, "Failed to check feature options1 support, hr %#x.\n", hr); - trace("Int64ShaderOps: %u.\n", options1.Int64ShaderOps); runner->caps.minimum_shader_model = SHADER_MODEL_4_0; runner->caps.maximum_shader_model = SHADER_MODEL_5_1; diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index fedb20e7..906a70aa 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -246,9 +246,6 @@ static bool gl_runner_init(struct gl_runner *runner) trace("GL_RENDERER: %s\n", glGetString(GL_RENDERER)); trace(" GL_VERSION: %s\n", glGetString(GL_VERSION)); - trace(" float64: %u.\n", runner->caps.float64); - trace(" int64: %u.\n", runner->caps.int64); - p_glSpecializeShader = (void *)eglGetProcAddress("glSpecializeShader"); glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_NOTIFICATION, 0, NULL, GL_FALSE); diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index c1b167eb..56407fbf 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -1375,13 +1375,11 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) ENABLE_FEATURE(shaderImageGatherExtended); ENABLE_FEATURE(shaderStorageImageWriteWithoutFormat); - trace("shaderFloat64: %u.\n", ret_features.shaderFloat64); if (ret_features.shaderFloat64) { features.shaderFloat64 = VK_TRUE; runner->caps.float64 = true; } - trace("shaderInt64: %u.\n", ret_features.shaderInt64); if (ret_features.shaderInt64) { features.shaderInt64 = VK_TRUE;

1 0