August 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Remove a couple of redundant default switch cases.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: vkd3d Branch: master Commit: 65a13c829078df6d82bed43b7b7376a282dd7d57 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=65a13c829078df6d82bed43… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:36:15 2021 -0500 vkd3d-shader/hlsl: Remove a couple of redundant default switch cases. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 62dc535..7f12dd2 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1211,9 +1211,6 @@ static void dump_instr(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer, case HLSL_IR_SWIZZLE: dump_ir_swizzle(buffer, hlsl_ir_swizzle(instr)); break; - - default: - vkd3d_string_buffer_printf(buffer, "<No dump function for %s>", hlsl_node_type_to_string(instr->type)); } } @@ -1361,9 +1358,6 @@ void hlsl_free_instr(struct hlsl_ir_node *node) case HLSL_IR_SWIZZLE: free_ir_swizzle(hlsl_ir_swizzle(node)); break; - - default: - FIXME("Unsupported node type %s.\n", hlsl_node_type_to_string(node->type)); } }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make some FIXME messages into proper compiler errors.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: vkd3d Branch: master Commit: c08a9cff7f439217463a12316d7d7a46e792ba2c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c08a9cff7f439217463a123… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 13 16:03:24 2021 +0200 vkd3d-shader/hlsl: Make some FIXME messages into proper compiler errors. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 23 ++++++++++++++++++++--- libs/vkd3d-shader/hlsl.h | 3 +++ libs/vkd3d-shader/hlsl.y | 32 +++++++++++++++++--------------- libs/vkd3d-shader/hlsl_sm1.c | 10 ++++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 5 files changed, 47 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 7f12dd2..3544b9d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -55,6 +55,23 @@ void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, va_end(args); } +void hlsl_fixme(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, const char *fmt, ...) +{ + struct vkd3d_string_buffer *string; + va_list args; + + va_start(args, fmt); + string = hlsl_get_string_buffer(ctx); + vkd3d_string_buffer_printf(string, "Aborting due to not yet implemented feature: "); + vkd3d_string_buffer_vprintf(string, fmt, args); + vkd3d_shader_error(ctx->message_context, &loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, "%s", string->buffer); + hlsl_release_string_buffer(ctx, string); + va_end(args); + + if (!ctx->result) + ctx->result = VKD3D_ERROR_NOT_IMPLEMENTED; +} + bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var) { struct hlsl_scope *scope = ctx->cur_scope; @@ -1031,7 +1048,7 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl vkd3d_string_buffer_printf(buffer, "}"); } -static const char *debug_expr_op(const struct hlsl_ir_expr *expr) +const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) { static const char *const op_names[] = { @@ -1082,14 +1099,14 @@ static const char *debug_expr_op(const struct hlsl_ir_expr *expr) [HLSL_OP3_LERP] = "lerp", }; - return op_names[expr->op]; + return op_names[op]; } static void dump_ir_expr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_expr *expr) { unsigned int i; - vkd3d_string_buffer_printf(buffer, "%s (", debug_expr_op(expr)); + vkd3d_string_buffer_printf(buffer, "%s (", debug_hlsl_expr_op(expr->op)); for (i = 0; i < 3 && expr->operands[i].node; ++i) { dump_src(buffer, &expr->operands[i]); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4a4af5d..da309a6 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -590,6 +590,7 @@ static inline void hlsl_release_string_buffer(struct hlsl_ctx *ctx, struct vkd3d vkd3d_string_buffer_release(&ctx->string_buffers, buffer); } +const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op); const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); const char *debug_hlsl_writemask(unsigned int writemask); @@ -651,6 +652,8 @@ struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ctx *ctx, struct hlsl_ir_var void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5); +void hlsl_fixme(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, + const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4); void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5); void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ade78da..5f1e916 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1213,7 +1213,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in { if (lhs->type == HLSL_IR_EXPR && hlsl_ir_expr(lhs)->op == HLSL_OP1_CAST) { - FIXME("Cast on the lhs.\n"); + hlsl_fixme(ctx, lhs->loc, "Cast on the LHS."); vkd3d_free(store); return NULL; } @@ -1223,7 +1223,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in unsigned int width, s = swizzle->swizzle; if (lhs->data_type->type == HLSL_CLASS_MATRIX) - FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); + hlsl_fixme(ctx, lhs->loc, "Matrix assignment with a writemask."); if (!invert_swizzle(&s, &writemask, &width)) { @@ -1338,7 +1338,9 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru list_add_tail(list, &store->node.entry); } else - FIXME("Initializing with \"mismatched\" fields is not supported yet.\n"); + { + hlsl_fixme(ctx, node->loc, "Implicit cast in structure initializer."); + } } vkd3d_free(initializer->args); @@ -1502,14 +1504,14 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t } if (v->arrays.count) { - FIXME("Initializing arrays is not supported yet.\n"); + hlsl_fixme(ctx, v->loc, "Array initializer."); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } if (v->initializer.args_count > 1) { - FIXME("Complex initializers are not supported yet.\n"); + hlsl_fixme(ctx, v->loc, "Complex initializer."); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; @@ -1786,7 +1788,7 @@ hlsl_prog: | hlsl_prog declaration_statement { if (!list_empty($2)) - FIXME("Uniform initializer.\n"); + hlsl_fixme(ctx, @2, "Uniform initializer."); hlsl_free_instr_list($2); } | hlsl_prog preproc_directive @@ -2769,7 +2771,7 @@ postfix_expr: } if ($2->type == HLSL_CLASS_MATRIX) - FIXME("Matrix constructors are not supported yet.\n"); + hlsl_fixme(ctx, @2, "Matrix constructor."); sprintf(name, "<constructor-%x>", counter++); if (!(var = hlsl_new_synthetic_var(ctx, name, $2, @2))) @@ -2931,11 +2933,11 @@ shift_expr: add_expr | shift_expr OP_LEFTSHIFT add_expr { - FIXME("Left shift.\n"); + hlsl_fixme(ctx, @$, "Left shift."); } | shift_expr OP_RIGHTSHIFT add_expr { - FIXME("Right shift.\n"); + hlsl_fixme(ctx, @$, "Right shift."); } relational_expr: @@ -2972,42 +2974,42 @@ bitand_expr: equality_expr | bitand_expr '&' equality_expr { - FIXME("Bitwise AND.\n"); + hlsl_fixme(ctx, @$, "Bitwise AND."); } bitxor_expr: bitand_expr | bitxor_expr '^' bitand_expr { - FIXME("Bitwise XOR.\n"); + hlsl_fixme(ctx, @$, "Bitwise XOR."); } bitor_expr: bitxor_expr | bitor_expr '|' bitxor_expr { - FIXME("Bitwise OR.\n"); + hlsl_fixme(ctx, @$, "Bitwise OR."); } logicand_expr: bitor_expr | logicand_expr OP_AND bitor_expr { - FIXME("Logical AND.\n"); + hlsl_fixme(ctx, @$, "Logical AND."); } logicor_expr: logicand_expr | logicor_expr OP_OR logicand_expr { - FIXME("Logical OR.\n"); + hlsl_fixme(ctx, @$, "Logical OR."); } conditional_expr: logicor_expr | logicor_expr '?' expr ':' assignment_expr { - FIXME("Ternary operator.\n"); + hlsl_fixme(ctx, @$, "Ternary operator."); } assignment_expr: diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 85d54ac..b9a681a 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -606,7 +606,8 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b if (instr->data_type->base_type != HLSL_TYPE_FLOAT) { - FIXME("Non-float operations need to be lowered.\n"); + /* These need to be lowered. */ + hlsl_fixme(ctx, instr->loc, "SM1 non-float expression."); return; } @@ -636,7 +637,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b break; default: - FIXME("Unhandled op %u.\n", expr->op); + hlsl_fixme(ctx, instr->loc, "SM1 \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break; } } @@ -765,8 +766,9 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b { if (instr->data_type->type == HLSL_CLASS_MATRIX) { - FIXME("Matrix operations need to be lowered.\n"); - break; + /* These need to be lowered. */ + hlsl_fixme(ctx, instr->loc, "SM1 matrix expression."); + continue; } assert(instr->data_type->type == HLSL_CLASS_SCALAR || instr->data_type->type == HLSL_CLASS_VECTOR); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a9c4e75..8550380 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -112,6 +112,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN = 5014, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS = 5015, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION = 5016, + VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED = 5017, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, };

1 0

Zebediah Figura : vkd3d: Do not append a newline to messages passed to d3d12_device_mark_as_removed().
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: vkd3d Branch: master Commit: 3dfe0e17100df66d8ed6f5212aca4605c4571d60 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3dfe0e17100df66d8ed6f52… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 13 16:37:44 2021 -0500 vkd3d: Do not append a newline to messages passed to d3d12_device_mark_as_removed(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index bf80a9d..a23177f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5864,7 +5864,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm if (cmd_list->is_recording) { d3d12_device_mark_as_removed(command_queue->device, DXGI_ERROR_INVALID_CALL, - "Command list %p is in recording state.\n", command_lists[i]); + "Command list %p is in recording state.", command_lists[i]); vkd3d_free(buffers); return; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Split array copies.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: vkd3d Branch: master Commit: 3cc6b565cede6d4063bc7380f4c77da3bc8e7b48 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3cc6b565cede6d4063bc738… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:36:14 2021 -0500 vkd3d-shader/hlsl: Split array copies. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 119 +++++++++++++++++++++++++++------------ 1 file changed, 83 insertions(+), 36 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5f23f34..db340a7 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -264,12 +264,54 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst return false; } -static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +/* Helper for split_array_copies() and split_struct_copies(). Inserts new + * instructions right before "store". */ +static bool split_copy(struct hlsl_ctx *ctx, struct hlsl_ir_store *store, + const struct hlsl_ir_load *load, const unsigned int offset, struct hlsl_type *type) +{ + struct hlsl_ir_node *offset_instr, *add; + struct hlsl_ir_store *split_store; + struct hlsl_ir_load *split_load; + struct hlsl_ir_constant *c; + + if (!(c = hlsl_new_uint_constant(ctx, offset, store->node.loc))) + return false; + list_add_before(&store->node.entry, &c->node.entry); + + offset_instr = &c->node; + if (load->src.offset.node) + { + if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, load->src.offset.node, &c->node))) + return false; + list_add_before(&store->node.entry, &add->entry); + offset_instr = add; + } + if (!(split_load = hlsl_new_load(ctx, load->src.var, offset_instr, type, store->node.loc))) + return false; + list_add_before(&store->node.entry, &split_load->node.entry); + + offset_instr = &c->node; + if (store->lhs.offset.node) + { + if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, store->lhs.offset.node, &c->node))) + return false; + list_add_before(&store->node.entry, &add->entry); + offset_instr = add; + } + + if (!(split_store = hlsl_new_store(ctx, store->lhs.var, offset_instr, &split_load->node, 0, store->node.loc))) + return false; + list_add_before(&store->node.entry, &split_store->node.entry); + + return true; +} + +static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { - const struct hlsl_struct_field *field; - const struct hlsl_ir_load *rhs_load; const struct hlsl_ir_node *rhs; + struct hlsl_type *element_type; const struct hlsl_type *type; + unsigned int element_size, i; struct hlsl_ir_store *store; if (instr->type != HLSL_IR_STORE) @@ -278,46 +320,45 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr store = hlsl_ir_store(instr); rhs = store->rhs.node; type = rhs->data_type; - if (type->type != HLSL_CLASS_STRUCT) + if (type->type != HLSL_CLASS_ARRAY) return false; + element_type = type->e.array.type; + element_size = element_type->reg_size; - rhs_load = hlsl_ir_load(rhs); - - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + for (i = 0; i < type->e.array.elements_count; ++i) { - struct hlsl_ir_store *field_store; - struct hlsl_ir_node *offset, *add; - struct hlsl_ir_load *field_load; - struct hlsl_ir_constant *c; - - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, instr->loc))) + if (!split_copy(ctx, store, hlsl_ir_load(rhs), i * element_size, element_type)) return false; - list_add_before(&instr->entry, &c->node.entry); + } - offset = &c->node; - if (rhs_load->src.offset.node) - { - if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, rhs_load->src.offset.node, &c->node))) - return false; - list_add_before(&instr->entry, &add->entry); - offset = add; - } - if (!(field_load = hlsl_new_load(ctx, rhs_load->src.var, offset, field->type, instr->loc))) - return false; - list_add_before(&instr->entry, &field_load->node.entry); + /* Remove the store instruction, so that we can split structs which contain + * other structs. Although assignments produce a value, we don't allow + * HLSL_IR_STORE to be used as a source. */ + list_remove(&store->node.entry); + hlsl_free_instr(&store->node); + return true; +} - offset = &c->node; - if (store->lhs.offset.node) - { - if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, store->lhs.offset.node, &c->node))) - return false; - list_add_before(&instr->entry, &add->entry); - offset = add; - } +static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + const struct hlsl_struct_field *field; + const struct hlsl_ir_node *rhs; + const struct hlsl_type *type; + struct hlsl_ir_store *store; - if (!(field_store = hlsl_new_store(ctx, store->lhs.var, offset, &field_load->node, 0, instr->loc))) + if (instr->type != HLSL_IR_STORE) + return false; + + store = hlsl_ir_store(instr); + rhs = store->rhs.node; + type = rhs->data_type; + if (type->type != HLSL_CLASS_STRUCT) + return false; + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + if (!split_copy(ctx, store, hlsl_ir_load(rhs), field->reg_offset, field->type)) return false; - list_add_before(&instr->entry, &field_store->node.entry); } /* Remove the store instruction, so that we can split structs which contain @@ -1151,6 +1192,7 @@ struct hlsl_reg hlsl_reg_from_deref(const struct hlsl_deref *deref, const struct int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { struct hlsl_ir_var *var; + bool progress; list_move_head(entry_func->body, &ctx->static_initializers); @@ -1197,7 +1239,12 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun } while (transform_ir(ctx, fold_redundant_casts, entry_func->body, NULL)); - while (transform_ir(ctx, split_struct_copies, entry_func->body, NULL)); + do + { + progress = transform_ir(ctx, split_array_copies, entry_func->body, NULL); + progress |= transform_ir(ctx, split_struct_copies, entry_func->body, NULL); + } + while (progress); while (transform_ir(ctx, fold_constants, entry_func->body, NULL)); if (ctx->profile->major_version < 4)

1 0

Francois Gouget : winetest: Detect Windows 10 21H1.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: tools Branch: master Commit: ab445f0ccdd0309e97c414102bad492a17b60fb3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ab445f0ccdd0309e97c4141… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Aug 14 12:17:37 2021 +0200 winetest: Detect Windows 10 21H1. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/dissect b/winetest/dissect index 4371c90..43f7790 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -393,6 +393,7 @@ my @idmatch = ( [ "win1909", 2, 10, 0, 18363, 1, 0 ], [ "win2004", 2, 10, 0, 19041, 1, 0 ], [ "win2009", 2, 10, 0, 19042, 1, 0 ], + [ "win21H1", 2, 10, 0, 19043, 1, 0 ], # [ "ce", 3, undef, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, undef, 0 ], [ "unknown", undef, undef, undef, undef, undef, 1 ],

1 0

Francois Gouget : testbot/TestLauncher: Report CreateProcess() errors like WineTest.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: tools Branch: master Commit: 3115062baa5aaabf2539abc08c57f6ef680b9a8c URL: https://source.winehq.org/git/tools.git/?a=commit;h=3115062baa5aaabf2539abc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Aug 14 12:58:38 2021 +0200 testbot/TestLauncher: Report CreateProcess() errors like WineTest. Show the GetLastError() value on the done line instead of exiting with a non-standard error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index fc67f92..41fb904 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -238,16 +238,15 @@ DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pi */ if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) { + *Pid = 0; if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) { Skips++; printf("%s.c:0: Tests skipped: Side-by-side dll version not found\n", (*Subtest ? Subtest : "testlauncher")); - *Pid = 0; return 0; } - Error("CreateProcess failed (error %lu)\n", GetLastError()); - ExitProcess(1); + return -GetLastError(); } CloseHandle(ProcessInformation.hThread); *Pid = ProcessInformation.dwProcessId;

1 0

Alexandre Julliard : Wine release 6.15
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: website Branch: master Commit: 365fc2f69209d256ed075453f0e573bb803a5db4 URL: https://source.winehq.org/git/website.git/?a=commit;h=365fc2f69209d256ed075… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 13 21:44:31 2021 +0200 Wine release 6.15 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021081301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2021081301.xml b/news/en/2021081301.xml new file mode 100644 index 00000000..25326675 --- /dev/null +++ b/news/en/2021081301.xml @@ -0,0 +1,18 @@ +<news> +<date>August 13, 2021</date> +<title>Wine 6.15 Released</title> +<body> + The Wine development release 6.15 is now available. + <a href="{$root}/announce/6.15">What's new</a> in this release: +<ul> + <li>WinSock (WS2_32) library converted to PE.</li> + <li>Support for performance data in the registry.</li> + <li>More 32->64-bit thunks for NTDLL calls.</li> + <li>Improved floating point status handling in the C runtime.</li> + <li>More preparation work for the GDI syscall interface.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.15.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-6.15 : Alexandre Julliard : Release 6.15
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: refs/tags/wine-6.15 Tag: fe33148e556d2a333154d5d3e40085423e142b5d URL: https://source.winehq.org/git/wine.git/?a=tag;h=fe33148e556d2a333154d5d3e40… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 13 21:42:33 2021 +0200 Release 6.15

1 0

Jacek Caban : gdi32: Move Escape to gdidc.c.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: 84fb3b943d0a0b978e41ee972db71b43575d11d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84fb3b943d0a0b978e41ee97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 12:09:51 2021 +0200 gdi32: Move Escape to gdidc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 97 ----------------------------------------------------- dlls/gdi32/gdidc.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 97 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a00fe510233..1fe288eae2f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1155,103 +1155,6 @@ DWORD WINAPI GDI_CallDeviceCapabilities16( LPCSTR lpszDevice, LPCSTR lpszPort, } -/************************************************************************ - * Escape [GDI32.@] - */ -INT WINAPI Escape( HDC hdc, INT escape, INT in_count, LPCSTR in_data, LPVOID out_data ) -{ - INT ret; - POINT *pt; - - switch (escape) - { - case ABORTDOC: - return AbortDoc( hdc ); - - case ENDDOC: - return EndDoc( hdc ); - - case GETPHYSPAGESIZE: - pt = out_data; - pt->x = GetDeviceCaps( hdc, PHYSICALWIDTH ); - pt->y = GetDeviceCaps( hdc, PHYSICALHEIGHT ); - return 1; - - case GETPRINTINGOFFSET: - pt = out_data; - pt->x = GetDeviceCaps( hdc, PHYSICALOFFSETX ); - pt->y = GetDeviceCaps( hdc, PHYSICALOFFSETY ); - return 1; - - case GETSCALINGFACTOR: - pt = out_data; - pt->x = GetDeviceCaps( hdc, SCALINGFACTORX ); - pt->y = GetDeviceCaps( hdc, SCALINGFACTORY ); - return 1; - - case NEWFRAME: - return EndPage( hdc ); - - case SETABORTPROC: - return SetAbortProc( hdc, (ABORTPROC)in_data ); - - case STARTDOC: - { - DOCINFOA doc; - char *name = NULL; - - /* in_data may not be 0 terminated so we must copy it */ - if (in_data) - { - name = HeapAlloc( GetProcessHeap(), 0, in_count+1 ); - memcpy( name, in_data, in_count ); - name[in_count] = 0; - } - /* out_data is actually a pointer to the DocInfo structure and used as - * a second input parameter */ - if (out_data) doc = *(DOCINFOA *)out_data; - else - { - doc.cbSize = sizeof(doc); - doc.lpszOutput = NULL; - doc.lpszDatatype = NULL; - doc.fwType = 0; - } - doc.lpszDocName = name; - ret = StartDocA( hdc, &doc ); - HeapFree( GetProcessHeap(), 0, name ); - if (ret > 0) ret = StartPage( hdc ); - return ret; - } - - case QUERYESCSUPPORT: - { - DWORD code; - - if (in_count < sizeof(SHORT)) return 0; - code = (in_count < sizeof(DWORD)) ? *(const USHORT *)in_data : *(const DWORD *)in_data; - switch (code) - { - case ABORTDOC: - case ENDDOC: - case GETPHYSPAGESIZE: - case GETPRINTINGOFFSET: - case GETSCALINGFACTOR: - case NEWFRAME: - case QUERYESCSUPPORT: - case SETABORTPROC: - case STARTDOC: - return TRUE; - } - break; - } - } - - /* if not handled internally, pass it to the driver */ - return ExtEscape( hdc, escape, in_count, in_data, 0, out_data ); -} - - /****************************************************************************** * NtGdiExtEscape (win32u.@) * diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0545dfef696..e6531d0d94d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -135,6 +135,102 @@ INT WINAPI GetDeviceCaps( HDC hdc, INT cap ) return NtGdiGetDeviceCaps( hdc, cap ); } +/*********************************************************************** + * Escape (GDI32.@) + */ +INT WINAPI Escape( HDC hdc, INT escape, INT in_count, const char *in_data, void *out_data ) +{ + INT ret; + POINT *pt; + + switch (escape) + { + case ABORTDOC: + return AbortDoc( hdc ); + + case ENDDOC: + return EndDoc( hdc ); + + case GETPHYSPAGESIZE: + pt = out_data; + pt->x = GetDeviceCaps( hdc, PHYSICALWIDTH ); + pt->y = GetDeviceCaps( hdc, PHYSICALHEIGHT ); + return 1; + + case GETPRINTINGOFFSET: + pt = out_data; + pt->x = GetDeviceCaps( hdc, PHYSICALOFFSETX ); + pt->y = GetDeviceCaps( hdc, PHYSICALOFFSETY ); + return 1; + + case GETSCALINGFACTOR: + pt = out_data; + pt->x = GetDeviceCaps( hdc, SCALINGFACTORX ); + pt->y = GetDeviceCaps( hdc, SCALINGFACTORY ); + return 1; + + case NEWFRAME: + return EndPage( hdc ); + + case SETABORTPROC: + return SetAbortProc( hdc, (ABORTPROC)in_data ); + + case STARTDOC: + { + DOCINFOA doc; + char *name = NULL; + + /* in_data may not be 0 terminated so we must copy it */ + if (in_data) + { + name = HeapAlloc( GetProcessHeap(), 0, in_count+1 ); + memcpy( name, in_data, in_count ); + name[in_count] = 0; + } + /* out_data is actually a pointer to the DocInfo structure and used as + * a second input parameter */ + if (out_data) doc = *(DOCINFOA *)out_data; + else + { + doc.cbSize = sizeof(doc); + doc.lpszOutput = NULL; + doc.lpszDatatype = NULL; + doc.fwType = 0; + } + doc.lpszDocName = name; + ret = StartDocA( hdc, &doc ); + HeapFree( GetProcessHeap(), 0, name ); + if (ret > 0) ret = StartPage( hdc ); + return ret; + } + + case QUERYESCSUPPORT: + { + DWORD code; + + if (in_count < sizeof(SHORT)) return 0; + code = (in_count < sizeof(DWORD)) ? *(const USHORT *)in_data : *(const DWORD *)in_data; + switch (code) + { + case ABORTDOC: + case ENDDOC: + case GETPHYSPAGESIZE: + case GETPRINTINGOFFSET: + case GETSCALINGFACTOR: + case NEWFRAME: + case QUERYESCSUPPORT: + case SETABORTPROC: + case STARTDOC: + return TRUE; + } + break; + } + } + + /* if not handled internally, pass it to the driver */ + return ExtEscape( hdc, escape, in_count, in_data, 0, out_data ); +} + /*********************************************************************** * ExtEscape [GDI32.@] */

1 0

Jacek Caban : include: Use WOWHandle32 for HDC_32 on Wine.
by Alexandre Julliard Aug. 13, 2021

Aug. 13, 2021

Module: wine Branch: master Commit: 5c8ac458bb72518a1c6f2ed05c783cee6c4a3b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c8ac458bb72518a1c6f2ed0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 14:59:53 2021 +0200 include: Use WOWHandle32 for HDC_32 on Wine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51570 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wownt32.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/wownt32.h b/include/wownt32.h index ddfa9b562b7..0afe23d360a 100644 --- a/include/wownt32.h +++ b/include/wownt32.h @@ -85,7 +85,6 @@ WORD WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE); #define HMENU_32(h16) ((HMENU) (ULONG_PTR)(h16)) #define HDWP_32(h16) ((HDWP) (ULONG_PTR)(h16)) #define HDROP_32(h16) ((HDROP) (ULONG_PTR)(h16)) -#define HDC_32(h16) ((HDC) (ULONG_PTR)(h16)) #define HFONT_32(h16) ((HFONT) (ULONG_PTR)(h16)) #define HRGN_32(h16) ((HRGN) (ULONG_PTR)(h16)) #define HBITMAP_32(h16) ((HBITMAP) (ULONG_PTR)(h16)) @@ -113,7 +112,6 @@ WORD WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE); #define HMENU_32(h16) ((HMENU) (WOWHandle32(h16, WOW_TYPE_HMENU))) #define HDWP_32(h16) ((HDWP) (WOWHandle32(h16, WOW_TYPE_HDWP))) #define HDROP_32(h16) ((HDROP) (WOWHandle32(h16, WOW_TYPE_HDROP))) -#define HDC_32(h16) ((HDC) (WOWHandle32(h16, WOW_TYPE_HDC))) #define HFONT_32(h16) ((HFONT) (WOWHandle32(h16, WOW_TYPE_HFONT))) #define HRGN_32(h16) ((HRGN) (WOWHandle32(h16, WOW_TYPE_HRGN))) #define HBITMAP_32(h16) ((HBITMAP) (WOWHandle32(h16, WOW_TYPE_HBITMAP))) @@ -137,9 +135,10 @@ WORD WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE); #endif /* __WINESRC__ */ -#define HMETAFILE_32(h16) ((HMETAFILE)(WOWHandle32(h16, WOW_TYPE_HMETAFILE))) -#define HTASK_32(h16) ((DWORD)(WOWHandle32(h16, WOW_TYPE_HTASK))) -#define FULLHWND_32(h16) ((HWND)(WOWHandle32(h16, WOW_TYPE_FULLHWND))) +#define HDC_32(h16) ((HDC) (WOWHandle32(h16, WOW_TYPE_HDC))) +#define HMETAFILE_32(h16) ((HMETAFILE) (WOWHandle32(h16, WOW_TYPE_HMETAFILE))) +#define HTASK_32(h16) ((DWORD) (WOWHandle32(h16, WOW_TYPE_HTASK))) +#define FULLHWND_32(h16) ((HWND) (WOWHandle32(h16, WOW_TYPE_FULLHWND))) #define HMETAFILE_16(h32) (WOWHandle16(h32, WOW_TYPE_HMETAFILE)) #define HTASK_16(h32) (WOWHandle16((HANDLE)(h32), WOW_TYPE_HTASK))

1 0