April 2024 - Wine-commits - list.winehq.org

Nikolay Sivov : vkd3d-shader/fx: Add an option to include empty buffers in the effect binary.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: e1e6367210b8b32f8063a2c27c4336e18d483379 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e1e6367210b8b32f8063a2c27c433… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 28 11:39:04 2024 +0100 vkd3d-shader/fx: Add an option to include empty buffers in the effect binary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/vkd3d_shader.h | 8 ++++++++ libs/vkd3d-shader/fx.c | 6 +++++- libs/vkd3d-shader/hlsl.c | 4 ++++ libs/vkd3d-shader/hlsl.h | 1 + programs/vkd3d-compiler/main.c | 9 +++++++++ 5 files changed, 27 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 9ac5806c..5cc36e18 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -322,6 +322,14 @@ enum vkd3d_shader_compile_option_name * \since 1.12 */ VKD3D_SHADER_COMPILE_OPTION_WARN_IMPLICIT_TRUNCATION = 0x0000000c, + /** + * If \a value is nonzero, empty constant buffers descriptions are + * written out in the output effect binary. This option applies only + * to fx_4_0 and fx_4_1 profiles and is otherwise ignored. + * + * \since 1.12 + */ + VKD3D_SHADER_COMPILE_OPTION_INCLUDE_EMPTY_BUFFERS_IN_EFFECTS = 0x0000000d, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 5fcd3eac..466908cd 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -90,6 +90,7 @@ struct fx_write_context int status; bool child_effect; + bool include_empty_buffers; const struct fx_write_context_ops *ops; }; @@ -191,6 +192,7 @@ static void fx_write_context_init(struct hlsl_ctx *ctx, const struct fx_write_co list_init(&fx->types); fx->child_effect = fx->ops->are_child_effects_supported && ctx->child_effect; + fx->include_empty_buffers = version == 4 && ctx->include_empty_buffers; hlsl_block_init(&block); hlsl_prepend_global_uniform_copy(fx->ctx, &block); @@ -1065,7 +1067,9 @@ static void write_buffers(struct fx_write_context *fx) LIST_FOR_EACH_ENTRY(buffer, &fx->ctx->buffers, struct hlsl_buffer, entry) { - if (!buffer->size) + if (!buffer->size && !fx->include_empty_buffers) + continue; + if (!strcmp(buffer->name, "$Params")) continue; write_fx_4_buffer(buffer, fx); diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 17458963..5638a03a 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3622,6 +3622,10 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct vkd3d_shader_compil ctx->warn_implicit_truncation = option->value; break; + case VKD3D_SHADER_COMPILE_OPTION_INCLUDE_EMPTY_BUFFERS_IN_EFFECTS: + ctx->include_empty_buffers = option->value; + break; + default: break; } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4f9f04c7..16ddbf3c 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -927,6 +927,7 @@ struct hlsl_ctx bool semantic_compat_mapping; bool child_effect; + bool include_empty_buffers; bool warn_implicit_truncation; }; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 1e05c093..298db2b4 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -42,6 +42,7 @@ enum OPTION_CHILD_EFFECT, OPTION_ENTRY, OPTION_FRAGMENT_COORDINATE_ORIGIN, + OPTION_INCLUDE_EMPTY_BUFFERS, OPTION_MATRIX_STORAGE_ORDER, OPTION_OUTPUT, OPTION_PRINT_SOURCE_TYPES, @@ -202,6 +203,9 @@ static void print_usage(const char *program_name) " targets. Valid values are 'upper-left' (default) and\n" " 'lower-left'. The only value supported by Vulkan\n" " environments is 'upper-left'.\n" + " --fx-include-empty-buffers\n" + " Write empty constant buffers descriptions. This option\n" + " is only meaningful for fx_4_0 and fx_4_1 profiles.\n" " --matrix-storage-order=<order>\n" " Specify the default matrix storage order. Valid values\n" " are 'column' (default) and 'row'.\n" @@ -485,6 +489,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) {"child-effect", no_argument, NULL, OPTION_CHILD_EFFECT}, {"entry", required_argument, NULL, OPTION_ENTRY}, {"fragment-coordinate-origin", required_argument, NULL, OPTION_FRAGMENT_COORDINATE_ORIGIN}, + {"fx-include-empty-buffers", no_argument, NULL, OPTION_INCLUDE_EMPTY_BUFFERS}, {"matrix-storage-order", required_argument, NULL, OPTION_MATRIX_STORAGE_ORDER}, {"output", required_argument, NULL, OPTION_OUTPUT}, {"formatting", required_argument, NULL, OPTION_TEXT_FORMATTING}, @@ -559,6 +564,10 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->output_filename = optarg; break; + case OPTION_INCLUDE_EMPTY_BUFFERS: + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_INCLUDE_EMPTY_BUFFERS_IN_EFFECTS, 1); + break; + case OPTION_MATRIX_STORAGE_ORDER: if (!parse_matrix_storage_order(&pack_matrix_order, optarg)) {

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsics Dot2, Dot3 and Dot4.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: d72d5c35d1ef1d7b262fb530d3d3a528509f3c63 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d72d5c35d1ef1d7b262fb530d3d3a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 15 00:07:31 2023 +1000 vkd3d-shader/dxil: Implement DX intrinsics Dot2, Dot3 and Dot4. --- libs/vkd3d-shader/dxil.c | 48 ++++++++++++++++++++++++++++++++++++++++ tests/hlsl/dot.shader_test | 8 +++---- tests/hlsl/normalize.shader_test | 6 ++--- tests/hlsl/reflect.shader_test | 10 ++++----- 4 files changed, 60 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index c2c12aec..b5a61d99 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -382,6 +382,9 @@ enum dx_intrinsic_opcode DX_UMAD = 49, DX_IBFE = 51, DX_UBFE = 52, + DX_DOT2 = 54, + DX_DOT3 = 55, + DX_DOT4 = 56, DX_CREATE_HANDLE = 57, DX_CBUFFER_LOAD_LEGACY = 59, DX_SAMPLE = 60, @@ -4480,6 +4483,48 @@ static void sm6_parser_emit_dx_discard(struct sm6_parser *sm6, enum dx_intrinsic src_param_init_from_value(src_param, operands[0]); } +static void sm6_parser_emit_dx_dot(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_src_param *src_params; + struct vkd3d_shader_instruction *ins; + struct vkd3d_shader_register regs[2]; + enum vkd3d_shader_opcode handler_idx; + unsigned int component_count; + + switch (op) + { + case DX_DOT2: + handler_idx = VKD3DSIH_DP2; + component_count = 2; + break; + case DX_DOT3: + handler_idx = VKD3DSIH_DP3; + component_count = 3; + break; + case DX_DOT4: + handler_idx = VKD3DSIH_DP4; + component_count = 4; + break; + default: + vkd3d_unreachable(); + } + + if (!sm6_parser_emit_composite_construct(sm6, &operands[0], component_count, state, &regs[0])) + return; + if (!sm6_parser_emit_composite_construct(sm6, &operands[component_count], component_count, state, &regs[1])) + return; + + 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], &regs[0]); + src_param_init_vector_from_reg(&src_params[1], &regs[1]); + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static void sm6_parser_emit_dx_fabs(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -5356,6 +5401,9 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_DERIV_FINEX ] = {"e", "R", sm6_parser_emit_dx_unary}, [DX_DERIV_FINEY ] = {"e", "R", sm6_parser_emit_dx_unary}, [DX_DISCARD ] = {"v", "1", sm6_parser_emit_dx_discard}, + [DX_DOT2 ] = {"g", "RRRR", sm6_parser_emit_dx_dot}, + [DX_DOT3 ] = {"g", "RRRRRR", sm6_parser_emit_dx_dot}, + [DX_DOT4 ] = {"g", "RRRRRRRR", sm6_parser_emit_dx_dot}, [DX_EXP ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_FABS ] = {"g", "R", sm6_parser_emit_dx_fabs}, [DX_FIRST_BIT_HI ] = {"i", "m", sm6_parser_emit_dx_unary}, diff --git a/tests/hlsl/dot.shader_test b/tests/hlsl/dot.shader_test index 87bb82d1..7698c08e 100644 --- a/tests/hlsl/dot.shader_test +++ b/tests/hlsl/dot.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 uniform 4 float4 10.0 11.0 12.0 13.0 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (166.0, 166.0, 166.0, 166.0) [pixel shader] @@ -25,7 +25,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 0.0 0.0 uniform 4 float4 10.0 11.0 12.0 13.0 -todo(sm<4 | sm>=6 | glsl) draw quad +todo(sm<4 | glsl) draw quad probe all rgba (53.0, 53.0, 53.0, 53.0) [pixel shader] @@ -40,7 +40,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 uniform 4 float4 10.0 11.0 12.0 13.0 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (92.0, 92.0, 92.0, 92.0) [pixel shader] @@ -55,7 +55,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 10.0 11.0 12.0 13.0 uniform 4 float4 2.0 0.0 0.0 0.0 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (92.0, 92.0, 92.0, 92.0) [pixel shader] diff --git a/tests/hlsl/normalize.shader_test b/tests/hlsl/normalize.shader_test index d30e7efa..3f89e280 100644 --- a/tests/hlsl/normalize.shader_test +++ b/tests/hlsl/normalize.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 2 [pixel shader] @@ -21,7 +21,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 0.0 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (0.371390700, 0.557086051, 0.742781401, 0.0) 1 [pixel shader] @@ -34,7 +34,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 0.0 0.0 -todo(sm<4 | sm>=6 | glsl) draw quad +todo(sm<4 | glsl) draw quad probe all rgba (0.554700196, 0.832050323, 0.0, 0.0) 1 [pixel shader] diff --git a/tests/hlsl/reflect.shader_test b/tests/hlsl/reflect.shader_test index 601f26bb..1b3123c8 100644 --- a/tests/hlsl/reflect.shader_test +++ b/tests/hlsl/reflect.shader_test @@ -10,7 +10,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (-0.1, -0.5, 0.5, -0.7) 4 [pixel shader] @@ -27,7 +27,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.5 0.0 0.0 0.0 uniform 4 float4 0.6 0.4 -0.3 1.0 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (-0.52, -0.18, 1.01, -1.2) 4 [pixel shader] @@ -44,7 +44,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.0 0.0 0.0 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (-0.148, -0.748, -0.448, -0.348) 4 [pixel shader] @@ -79,7 +79,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.5 -0.1 0.0 0.0 uniform 4 float4 0.6 0.4 -0.3 1.0 -todo(sm<4 | sm>=6 | glsl) draw quad +todo(sm<4 | glsl) draw quad probe all rgba (0.188, -0.308, 0.0, 0.0) 4 [pixel shader] @@ -97,5 +97,5 @@ float4 main() : sv_target [test] uniform 0 float4 0.5 -0.1 0.2 0.0 uniform 4 float4 0.6 0.4 0.0 0.0 -todo(sm<4 | sm>=6 | glsl) draw quad +todo(sm<4 | glsl) draw quad probe all rgba (0.188, -0.308, 0.0, 0.0) 4

1 0

Zebediah Figura : vkd3d-shader/hlsl: Remove a redundant type check.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: 675d7b8cb64d5ad5afb51d3a1f034ae3aba5c3e2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/675d7b8cb64d5ad5afb51d3a1f034… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 26 15:59:49 2024 -0600 vkd3d-shader/hlsl: Remove a redundant type check. We already perform an implicit cast per component in initialize_var_components(). --- libs/vkd3d-shader/hlsl.y | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 52c21765..17bb565d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4358,22 +4358,7 @@ static struct hlsl_block *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type return NULL; for (i = 0; i < params->args_count; ++i) - { - struct hlsl_ir_node *arg = params->args[i]; - - if (arg->data_type->class == HLSL_CLASS_OBJECT) - { - struct vkd3d_string_buffer *string; - - if ((string = hlsl_type_to_string(ctx, arg->data_type))) - hlsl_error(ctx, &arg->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Invalid type %s for constructor argument.", string->buffer); - hlsl_release_string_buffer(ctx, string); - continue; - } - - initialize_var_components(ctx, params->instrs, var, &idx, arg); - } + initialize_var_components(ctx, params->instrs, var, &idx, params->args[i]); if (!(load = hlsl_new_var_load(ctx, var, loc))) return NULL;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Move a hlsl_fixme() to a more relevant place.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: 1e7d82798c9a6c0885c09e27986db981beea7fa7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1e7d82798c9a6c0885c09e27986db… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 28 15:13:11 2024 -0500 vkd3d-shader/hlsl: Move a hlsl_fixme() to a more relevant place. --- libs/vkd3d-shader/hlsl_codegen.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5c09ce04..6f2de937 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -427,7 +427,10 @@ static void prepend_input_copy_recurse(struct hlsl_ctx *ctx, struct hlsl_block * { field = &type->e.record.fields[i]; if (hlsl_type_is_resource(field->type)) + { + hlsl_fixme(ctx, &field->loc, "Prepend uniform copies for resource components within structs."); continue; + } validate_field_semantic(ctx, field); semantic = &field->semantic; elem_semantic_index = semantic->index; @@ -5237,25 +5240,6 @@ static void parse_numthreads_attribute(struct hlsl_ctx *ctx, const struct hlsl_a } } -static bool type_has_object_components(struct hlsl_type *type) -{ - if (type->class == HLSL_CLASS_OBJECT) - return true; - if (type->class == HLSL_CLASS_ARRAY) - return type_has_object_components(type->e.array.type); - if (type->class == HLSL_CLASS_STRUCT) - { - unsigned int i; - - for (i = 0; i < type->e.record.field_count; ++i) - { - if (type_has_object_components(type->e.record.fields[i].type)) - return true; - } - } - return false; -} - static void remove_unreachable_code(struct hlsl_ctx *ctx, struct hlsl_block *body) { struct hlsl_ir_node *instr, *next; @@ -5363,9 +5347,6 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry } else { - if (type_has_object_components(var->data_type)) - hlsl_fixme(ctx, &var->loc, "Prepend uniform copies for object components within structs."); - if (hlsl_get_multiarray_element_type(var->data_type)->class != HLSL_CLASS_STRUCT && !var->semantic.name) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Simplify type_has_object_components().
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: 54f2dfe403f4be5f873e439fcd453dd4b9b5de74 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/54f2dfe403f4be5f873e439fcd453… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 26 16:09:16 2024 -0600 vkd3d-shader/hlsl: Simplify type_has_object_components(). The extra argument is not very easy to intuit. Since all we're trying to do here is check whether the type is a struct with object components in it, write that out explicitly. --- libs/vkd3d-shader/hlsl.y | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 17bb565d..f6da4755 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2091,12 +2091,12 @@ static void initialize_var_components(struct hlsl_ctx *ctx, struct hlsl_block *i } } -static bool type_has_object_components(struct hlsl_type *type, bool must_be_in_struct) +static bool type_has_object_components(const struct hlsl_type *type) { if (type->class == HLSL_CLASS_OBJECT) - return !must_be_in_struct; + return true; if (type->class == HLSL_CLASS_ARRAY) - return type_has_object_components(type->e.array.type, must_be_in_struct); + return type_has_object_components(type->e.array.type); if (type->class == HLSL_CLASS_STRUCT) { @@ -2104,7 +2104,7 @@ static bool type_has_object_components(struct hlsl_type *type, bool must_be_in_s for (i = 0; i < type->e.record.field_count; ++i) { - if (type_has_object_components(type->e.record.fields[i].type, false)) + if (type_has_object_components(type->e.record.fields[i].type)) return true; } } @@ -2146,6 +2146,18 @@ static void check_invalid_in_out_modifiers(struct hlsl_ctx *ctx, unsigned int mo } } +static void check_invalid_object_fields(struct hlsl_ctx *ctx, const struct hlsl_ir_var *var) +{ + const struct hlsl_type *type = var->data_type; + + while (type->class == HLSL_CLASS_ARRAY) + type = type->e.array.type; + + if (type->class == HLSL_CLASS_STRUCT && type_has_object_components(type)) + hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Target profile doesn't support objects as struct members in uniform variables."); +} + static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v) { struct hlsl_type *basic_type = v->basic_type; @@ -2271,12 +2283,8 @@ static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v) if (!(modifiers & HLSL_STORAGE_STATIC)) var->storage_modifiers |= HLSL_STORAGE_UNIFORM; - if (ctx->profile->major_version < 5 && (var->storage_modifiers & HLSL_STORAGE_UNIFORM) && - type_has_object_components(var->data_type, true)) - { - hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Target profile doesn't support objects as struct members in uniform variables."); - } + if (ctx->profile->major_version < 5 && (var->storage_modifiers & HLSL_STORAGE_UNIFORM)) + check_invalid_object_fields(ctx, var); if ((func = hlsl_get_first_func_decl(ctx, var->name))) { @@ -2312,7 +2320,7 @@ static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v) } if ((var->storage_modifiers & HLSL_STORAGE_STATIC) && type_has_numeric_components(var->data_type) - && type_has_object_components(var->data_type, false)) + && type_has_object_components(var->data_type)) { hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Static variables cannot have both numeric and resource components."); @@ -2400,7 +2408,7 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var /* Initialize statics to zero by default. */ - if (type_has_object_components(var->data_type, false)) + if (type_has_object_components(var->data_type)) { free_parse_variable_def(v); continue;

1 0

Hans Leidekker : wmic: Make an error message more general.
by Alexandre Julliard 02 Apr '24

02 Apr '24

1 0

Hans Leidekker : wmic: Strip spaces once.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: 2b3bc20103306c6b6e427caf37c4e59f87fdf9ea URL: https://gitlab.winehq.org/wine/wine/-/commit/2b3bc20103306c6b6e427caf37c4e5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 2 14:44:41 2024 +0200 wmic: Strip spaces once. --- programs/wmic/main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 363b9af581f..c1a20384eb3 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -405,22 +405,25 @@ int __cdecl wmain(int argc, WCHAR *argv[]) while (fgetws(cmd, sizeof(cmd), stdin) != NULL) { - cmd[wcslen(cmd)-1] = 0; /* remove trailing '\n' */ + const WCHAR *stripped; - WINE_TRACE("command: %s\n", debugstr_w(cmd)); - if (!wcsicmp( strip_spaces(cmd), L"exit" ) || !wcsicmp( strip_spaces(cmd), L"quit" )) + cmd[wcslen(cmd) - 1] = 0; /* remove trailing '\n' */ + stripped = strip_spaces( cmd ); + + WINE_TRACE("command: %s\n", debugstr_w(stripped)); + if (!wcsicmp( stripped, L"exit" ) || !wcsicmp( stripped, L"quit" )) return 0; - if (!cmd[0]) + if (!stripped[0]) output_error( STRING_USAGE ); else { - int _argc; - WCHAR **_argv; + int new_argc; + WCHAR **new_argv; - _argv = CommandLineToArgvW( strip_spaces(cmd), &_argc ); - ret = process_args( _argc, _argv ); - LocalFree(_argv); + new_argv = CommandLineToArgvW( stripped, &new_argc ); + ret = process_args( new_argc, new_argv ); + LocalFree( new_argv ); output_newline(); } @@ -429,5 +432,5 @@ int __cdecl wmain(int argc, WCHAR *argv[]) return ret; } - return process_args( argc - 1, &argv[1] ); + return process_args( argc - 1, argv + 1 ); }

1 0

Hans Leidekker : wmic: Handle failure from CommandLineToArgvW().
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: ca629dec9b5eb5b7fceebc144275aab0b4a9ba27 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca629dec9b5eb5b7fceebc144275aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 2 14:51:57 2024 +0200 wmic: Handle failure from CommandLineToArgvW(). --- programs/wmic/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index c1a20384eb3..56c57ea45e9 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -421,7 +421,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) int new_argc; WCHAR **new_argv; - new_argv = CommandLineToArgvW( stripped, &new_argc ); + if (!(new_argv = CommandLineToArgvW( stripped, &new_argc ))) return 1; ret = process_args( new_argc, new_argv ); LocalFree( new_argv );

1 0

Hans Leidekker : wmic: Handle multiple properties separated by whitespace.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: bc52693f9a87142ed08228d8f23db9f18058ee9e URL: https://gitlab.winehq.org/wine/wine/-/commit/bc52693f9a87142ed08228d8f23db9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 2 14:57:59 2024 +0200 wmic: Handle multiple properties separated by whitespace. --- programs/wmic/main.c | 103 +++++++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 48 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 56c57ea45e9..f996d8018f4 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -107,62 +107,67 @@ static int output_newline( void ) return output_string( L"\n" ); } -static WCHAR * strip_spaces(WCHAR *start) +static WCHAR *strip_spaces( WCHAR *start ) { - WCHAR *str = start, *end; - - while (*str == ' ') - str++; - - end = start + lstrlenW(start) - 1; - while (end >= start && *end == ' ') - { - *end = '\0'; - end--; - } - + WCHAR *str = start, *end = start + wcslen( start ) - 1; + while (*str == ' ') str++; + while (end >= start && *end == ' ') *end-- = 0; return str; } -static HRESULT process_property_list( IWbemClassObject *obj, const WCHAR *proplist, WCHAR **ret ) +static HRESULT append_property( IWbemClassObject *obj, const WCHAR *prop, WCHAR *proplist ) { - WCHAR *p, *ctx, *ptr, *stripped; - HRESULT hr = S_OK; + HRESULT hr; - if (!(p = wcsdup( proplist ))) return E_OUTOFMEMORY; + if (FAILED(hr = IWbemClassObject_Get( obj, prop, 0, NULL, NULL, NULL ))) return hr; + if (*proplist) wcscat( proplist, L"," ); + wcscat( proplist, prop ); + return S_OK; +} - if (!(stripped = malloc( (wcslen( proplist ) + 1) * sizeof(**ret) ))) - { - free( p ); - return E_OUTOFMEMORY; - } +static HRESULT process_property_list( IWbemClassObject *obj, int argc, WCHAR *argv[], WCHAR **ret ) +{ + WCHAR *str = NULL, *ctx, *ptr, *stripped; + UINT i, len = 0; + HRESULT hr; + + for (i = 0; i < argc; i++) len += wcslen( argv[i] ); + if (!(stripped = malloc( (len + 1) * sizeof(*stripped) ))) return E_OUTOFMEMORY; *stripped = 0; - /* Validate that every requested property is supported. */ - ptr = wcstok_s( p, L",", &ctx ); - while (ptr) + for (i = 0; i < argc; i++) { - ptr = strip_spaces( ptr ); + if (!(str = wcsdup( argv[i] ))) + { + free( stripped ); + return E_OUTOFMEMORY; + } - if (FAILED(IWbemClassObject_Get( obj, ptr, 0, NULL, NULL, NULL ))) + /* Validate that every requested property is supported. */ + ptr = wcstok_s( str, L",", &ctx ); + if (!ptr) + { + ptr = strip_spaces( str ); + if (FAILED(hr = append_property( obj, ptr, stripped ))) goto error; + } + else { - hr = E_FAIL; - break; + while (ptr) + { + ptr = strip_spaces( ptr ); + if (FAILED(hr = append_property( obj, ptr, stripped ))) goto error; + ptr = wcstok_s( NULL, L",", &ctx ); + } } - if (*stripped) wcscat( stripped, L"," ); - wcscat( stripped, ptr ); - ptr = wcstok_s( NULL, L",", &ctx ); + free( str ); } - free( p ); - if (SUCCEEDED(hr)) - *ret = stripped; - else - { - free( stripped ); - *ret = NULL; - } + *ret = stripped; + return S_OK; +error: + free( str ); + free( stripped ); return hr; } @@ -218,7 +223,7 @@ done: WINE_FIXME( "Could not convert variant, vt %u.\n", vt ); } -static int query_prop( const WCHAR *class, const WCHAR *propnames ) +static int query_prop( const WCHAR *class, int argc, WCHAR *argv[] ) { HRESULT hr; IWbemLocator *locator = NULL; @@ -231,8 +236,11 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) IWbemClassObject *obj; ULONG count, width = 0; VARIANT v; + int i; - WINE_TRACE("%s, %s\n", debugstr_w(class), debugstr_w(propnames)); + WINE_TRACE( "%s", debugstr_w(class) ); + for (i = 0; i < argc; i++) WINE_TRACE( " %s", debugstr_w(argv[i]) ); + WINE_TRACE( "\n" ); CoInitialize( NULL ); CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, @@ -256,7 +264,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) } /* Check that this class supports all requested properties. */ - hr = process_property_list( obj, propnames, &proplist ); + hr = process_property_list( obj, argc, argv, &proplist ); IWbemClassObject_Release( obj ); if (FAILED(hr)) { @@ -337,7 +345,7 @@ done: static int process_args( int argc, WCHAR *argv[] ) { - const WCHAR *class, *value; + const WCHAR *class; int i; for (i = 0; i < argc && argv[i][0] == '/'; i++) @@ -383,8 +391,7 @@ static int process_args( int argc, WCHAR *argv[] ) { if (++i >= argc) goto not_supported; - value = argv[i]; - return query_prop( class, value ); + return query_prop( class, argc - i, argv + i ); } not_supported: @@ -403,14 +410,14 @@ int __cdecl wmain(int argc, WCHAR *argv[]) { fputws( L"wmic:root\\cli>", stdout ); - while (fgetws(cmd, sizeof(cmd), stdin) != NULL) + while (fgetws( cmd, sizeof(cmd), stdin ) != NULL) { const WCHAR *stripped; cmd[wcslen(cmd) - 1] = 0; /* remove trailing '\n' */ stripped = strip_spaces( cmd ); - WINE_TRACE("command: %s\n", debugstr_w(stripped)); + WINE_TRACE( "command: %s\n", debugstr_w(stripped) ); if (!wcsicmp( stripped, L"exit" ) || !wcsicmp( stripped, L"quit" )) return 0;

1 0

Rémi Bernon : mfreadwrite/reader: Use MFTEnumEx to enumerate stream transforms.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: 17fd8c8e11eabae136be25879b8748fed57b85fc URL: https://gitlab.winehq.org/wine/wine/-/commit/17fd8c8e11eabae136be25879b8748… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 27 14:55:31 2024 +0100 mfreadwrite/reader: Use MFTEnumEx to enumerate stream transforms. --- dlls/mfreadwrite/reader.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index b77b5f9c538..2baa3810ee0 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1926,7 +1926,8 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL { MFT_REGISTER_TYPE_INFO in_type, out_type; struct transform_entry *entry; - GUID *classes, category; + IMFActivate **activates; + GUID category; IMFTransform *transform; UINT i, count; HRESULT hr; @@ -1960,7 +1961,7 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL } count = 0; - if (SUCCEEDED(hr = MFTEnum(category, 0, &in_type, allow_processor ? NULL : &out_type, NULL, &classes, &count))) + if (SUCCEEDED(hr = MFTEnumEx(category, 0, &in_type, allow_processor ? NULL : &out_type, &activates, &count))) { if (!count) { @@ -1972,8 +1973,8 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL { IMFMediaType *media_type; - if (FAILED(hr = CoCreateInstance(&classes[i], NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&transform))) - break; + if (FAILED(IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform))) + continue; if (SUCCEEDED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0)) && SUCCEEDED(hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type))) { @@ -1995,17 +1996,20 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL { entry->transform = transform; *out = entry; - return S_OK; + break; } } IMFTransform_Release(transform); } - CoTaskMemFree(classes); + for (i = 0; i < count; ++i) + IMFActivate_Release(activates[i]); + CoTaskMemFree(activates); } - free(entry); + if (FAILED(hr)) + free(entry); return hr; }

1 0