April 2023 - Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d-shader/sm4: Merge sm4.h into tpf.c.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: vkd3d Branch: master Commit: 99bc07ccf581533a92a7ff390abca470f797be92 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/99bc07ccf581533a92a7ff390abca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 20 12:27:37 2023 +0200 vkd3d-shader/sm4: Merge sm4.h into tpf.c. --- Makefile.am | 1 - libs/vkd3d-shader/hlsl.h | 4 +- libs/vkd3d-shader/sm4.h | 552 ----------------------------------------------- libs/vkd3d-shader/tpf.c | 530 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 533 insertions(+), 554 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/sm4: Rename hlsl_sm4.c to tpf.c.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: vkd3d Branch: master Commit: 7800c7b40fc97c4f3f51cd0a2fce3d442711dcaf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7800c7b40fc97c4f3f51cd0a2fce3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 20 12:14:56 2023 +0200 vkd3d-shader/sm4: Rename hlsl_sm4.c to tpf.c. --- Makefile.am | 2 +- libs/vkd3d-shader/{hlsl_sm4.c => tpf.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 8cbd9662..e8c5ab47 100644 --- a/Makefile.am +++ b/Makefile.am @@ -257,11 +257,11 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/hlsl_codegen.c \ libs/vkd3d-shader/hlsl_constant_ops.c \ libs/vkd3d-shader/hlsl_sm1.c \ - libs/vkd3d-shader/hlsl_sm4.c \ libs/vkd3d-shader/ir.c \ libs/vkd3d-shader/preproc.h \ libs/vkd3d-shader/sm4.h \ libs/vkd3d-shader/spirv.c \ + libs/vkd3d-shader/tpf.c \ libs/vkd3d-shader/trace.c \ libs/vkd3d-shader/vkd3d_shader.map \ libs/vkd3d-shader/vkd3d_shader_main.c \ diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/tpf.c similarity index 100% rename from libs/vkd3d-shader/hlsl_sm4.c rename to libs/vkd3d-shader/tpf.c

1 0

Zebediah Figura : vkd3d-shader/hlsl: Remove an unused local variable from create_loop().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: vkd3d Branch: master Commit: 0959c6663ff4800d177edfbd2469d25970ee715d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0959c6663ff4800d177edfbd2469d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 19:27:45 2022 -0600 vkd3d-shader/hlsl: Remove an unused local variable from create_loop(). --- libs/vkd3d-shader/hlsl.y | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2a8e3160..b9e03325 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -444,7 +444,6 @@ static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, struc { struct list *list = NULL; struct hlsl_ir_loop *loop = NULL; - struct hlsl_ir_if *cond_jump = NULL; if (!(list = make_empty_list(ctx))) goto oom; @@ -477,7 +476,6 @@ static struct list *create_loop(struct hlsl_ctx *ctx, enum loop_type type, struc oom: vkd3d_free(loop); - vkd3d_free(cond_jump); vkd3d_free(list); destroy_instr_list(init); destroy_instr_list(cond);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_load_component().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: vkd3d Branch: master Commit: 39a03cfd22df4e90e3b620984378e934c9fc5689 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/39a03cfd22df4e90e3b620984378e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 20:19:39 2022 -0600 vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_load_component(). --- libs/vkd3d-shader/hlsl.c | 4 ++-- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 04630db7..32511590 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1263,7 +1263,7 @@ struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ctx *ctx, struct hlsl_ir_var return hlsl_new_load_index(ctx, &var_deref, NULL, loc); } -struct hlsl_ir_load *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_block *block, +struct hlsl_ir_node *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_block *block, const struct hlsl_deref *deref, unsigned int comp, const struct vkd3d_shader_location *loc) { struct hlsl_type *type, *comp_type; @@ -1288,7 +1288,7 @@ struct hlsl_ir_load *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_b hlsl_block_add_instr(block, &load->node); - return load; + return &load->node; } struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index a06674e2..7de5e2eb 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1079,7 +1079,7 @@ struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ctx *ctx, struct hlsl_ir_var const struct vkd3d_shader_location *loc); struct hlsl_ir_load *hlsl_new_load_index(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, struct hlsl_ir_node *idx, const struct vkd3d_shader_location *loc); -struct hlsl_ir_load *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_block *block, +struct hlsl_ir_node *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_block *block, const struct hlsl_deref *deref, unsigned int comp, const struct vkd3d_shader_location *loc); struct hlsl_ir_store *hlsl_new_simple_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 86f0f565..2a8e3160 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -628,7 +628,7 @@ static struct hlsl_ir_node *add_load_component(struct hlsl_ctx *ctx, struct list { const struct hlsl_deref *src; struct hlsl_ir_store *store; - struct hlsl_ir_load *load; + struct hlsl_ir_node *load; struct hlsl_block block; struct hlsl_ir_var *var; @@ -645,7 +645,7 @@ static struct hlsl_ir_node *add_load_component(struct hlsl_ctx *ctx, struct list return NULL; list_move_tail(instrs, &block.instrs); - return &load->node; + return load; } static bool add_record_access(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *record,

1 0

Zebediah Figura : tests/shader_runner: Remove a redundant vkd3d_test_pop_context().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: vkd3d Branch: master Commit: e34bdcab3a3f79598000ee8aff17a995c3488042 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e34bdcab3a3f79598000ee8aff17a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 12 11:34:42 2023 -0500 tests/shader_runner: Remove a redundant vkd3d_test_pop_context(). We already popped the context here. Move the break inside the previous if to make control flow a little clearer. --- tests/shader_runner.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 58ed2d98..8e66948e 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -887,10 +887,10 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o if (state != STATE_NONE) vkd3d_test_pop_context(); - } - if (!ret) - break; + if (!ret) + break; + } if (line[0] == '[') { @@ -1088,8 +1088,6 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o } } - vkd3d_test_pop_context(); - out: for (i = 0; i < runner->input_element_count; ++i) free(runner->input_elements[i].name);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_int_constant().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: vkd3d Branch: master Commit: dfe056596a502eea0d2dd3ea5781aa73fd49282a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dfe056596a502eea0d2dd3ea5781a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 20:06:59 2022 -0600 vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_int_constant(). --- libs/vkd3d-shader/hlsl.c | 5 ++--- libs/vkd3d-shader/hlsl.h | 3 +-- libs/vkd3d-shader/hlsl.y | 10 +++++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 2de53613..cb2639ce 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1149,8 +1149,7 @@ struct hlsl_ir_node *hlsl_new_float_constant(struct hlsl_ctx *ctx, float f, return &c->node; } -struct hlsl_ir_constant *hlsl_new_int_constant(struct hlsl_ctx *ctx, int n, - const struct vkd3d_shader_location *loc) +struct hlsl_ir_node *hlsl_new_int_constant(struct hlsl_ctx *ctx, int32_t n, const struct vkd3d_shader_location *loc) { struct hlsl_ir_constant *c; @@ -1159,7 +1158,7 @@ struct hlsl_ir_constant *hlsl_new_int_constant(struct hlsl_ctx *ctx, int n, if (c) c->value[0].i = n; - return c; + return &c->node; } struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index ce20a12c..11c46645 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1069,8 +1069,7 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, const struct vkd3d_shader_location *loc); struct hlsl_ir_node *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct hlsl_block *then_block, struct hlsl_block *else_block, const struct vkd3d_shader_location *loc); -struct hlsl_ir_constant *hlsl_new_int_constant(struct hlsl_ctx *ctx, int n, - const struct vkd3d_shader_location *loc); +struct hlsl_ir_node *hlsl_new_int_constant(struct hlsl_ctx *ctx, int32_t n, const struct vkd3d_shader_location *loc); struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type, const struct vkd3d_shader_location *loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b8b57d27..cce2437b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1839,7 +1839,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem const struct vkd3d_shader_location *loc) { struct hlsl_ir_node *lhs = node_from_list(instrs); - struct hlsl_ir_constant *one; + struct hlsl_ir_node *one; if (lhs->data_type->modifiers & HLSL_MODIFIER_CONST) hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_MODIFIES_CONST, @@ -1847,9 +1847,9 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem if (!(one = hlsl_new_int_constant(ctx, 1, loc))) return false; - list_add_tail(instrs, &one->node.entry); + list_add_tail(instrs, &one->entry); - if (!add_assignment(ctx, instrs, lhs, decrement ? ASSIGN_OP_SUB : ASSIGN_OP_ADD, &one->node)) + if (!add_assignment(ctx, instrs, lhs, decrement ? ASSIGN_OP_SUB : ASSIGN_OP_ADD, one)) return false; if (post) @@ -5389,11 +5389,11 @@ primary_expr: } | C_INTEGER { - struct hlsl_ir_constant *c; + struct hlsl_ir_node *c; if (!(c = hlsl_new_int_constant(ctx, $1, &@1))) YYABORT; - if (!($$ = make_list(ctx, &c->node))) + if (!($$ = make_list(ctx, c))) YYABORT; } | boolean

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_jump().
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: vkd3d Branch: master Commit: e5ec4317842aae527b71735723c48d524f484dcc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e5ec4317842aae527b71735723c48… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 20:08:44 2022 -0600 vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_jump(). --- libs/vkd3d-shader/hlsl.c | 10 +++------- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl.y | 21 ++++++++++----------- libs/vkd3d-shader/hlsl_codegen.c | 5 ++--- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index cb2639ce..04630db7 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1384,7 +1384,7 @@ struct hlsl_ir_node *hlsl_new_index(struct hlsl_ctx *ctx, struct hlsl_ir_node *v return &index->node; } -struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type, +struct hlsl_ir_node *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type, const struct vkd3d_shader_location *loc) { struct hlsl_ir_jump *jump; @@ -1393,7 +1393,7 @@ struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type return NULL; init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); jump->type = type; - return jump; + return &jump->node; } struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, const struct vkd3d_shader_location *loc) @@ -1543,11 +1543,7 @@ static struct hlsl_ir_node *clone_if(struct hlsl_ctx *ctx, struct clone_instr_ma static struct hlsl_ir_node *clone_jump(struct hlsl_ctx *ctx, struct hlsl_ir_jump *src) { - struct hlsl_ir_jump *dst; - - if (!(dst = hlsl_new_jump(ctx, src->type, &src->node.loc))) - return NULL; - return &dst->node; + return hlsl_new_jump(ctx, src->type, &src->node.loc); } static struct hlsl_ir_node *clone_load(struct hlsl_ctx *ctx, struct clone_instr_map *map, struct hlsl_ir_load *src) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 11c46645..a06674e2 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1070,8 +1070,8 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_ir_node *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct hlsl_block *then_block, struct hlsl_block *else_block, const struct vkd3d_shader_location *loc); struct hlsl_ir_node *hlsl_new_int_constant(struct hlsl_ctx *ctx, int32_t n, const struct vkd3d_shader_location *loc); -struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type, - const struct vkd3d_shader_location *loc); +struct hlsl_ir_node *hlsl_new_jump(struct hlsl_ctx *ctx, + enum hlsl_ir_jump_type type, const struct vkd3d_shader_location *loc); void hlsl_init_simple_deref_from_var(struct hlsl_deref *deref, struct hlsl_ir_var *var); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cce2437b..dd70c730 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -407,9 +407,8 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_list) { - struct hlsl_ir_node *condition, *not, *iff; + struct hlsl_ir_node *condition, *not, *iff, *jump; struct hlsl_block then_block; - struct hlsl_ir_jump *jump; /* E.g. "for (i = 0; ; ++i)". */ if (list_empty(cond_list)) @@ -424,7 +423,7 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_lis if (!(jump = hlsl_new_jump(ctx, HLSL_IR_JUMP_BREAK, &condition->loc))) return false; - hlsl_block_add_instr(&then_block, &jump->node); + hlsl_block_add_instr(&then_block, jump); if (!(iff = hlsl_new_if(ctx, not, &then_block, NULL, &condition->loc))) return false; @@ -585,11 +584,11 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ctx *ctx, struct hlsl_ir_ return NULL; } -static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs, +static bool add_return(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *return_value, const struct vkd3d_shader_location *loc) { struct hlsl_type *return_type = ctx->cur_function->return_type; - struct hlsl_ir_jump *jump; + struct hlsl_ir_node *jump; if (ctx->cur_function->return_var) { @@ -598,16 +597,16 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs struct hlsl_ir_store *store; if (!(return_value = add_implicit_conversion(ctx, instrs, return_value, return_type, loc))) - return NULL; + return false; if (!(store = hlsl_new_simple_store(ctx, ctx->cur_function->return_var, return_value))) - return NULL; + return false; list_add_after(&return_value->entry, &store->node.entry); } else { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN, "Non-void functions must return a value."); - return NULL; + return false; } } else @@ -617,10 +616,10 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs } if (!(jump = hlsl_new_jump(ctx, HLSL_IR_JUMP_RETURN, loc))) - return NULL; - list_add_tail(instrs, &jump->node.entry); + return false; + list_add_tail(instrs, &jump->entry); - return jump; + return true; } static struct hlsl_ir_load *add_load_component(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *var_instr, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index d09d47f8..42f8ab3b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -516,10 +516,9 @@ static bool find_recursive_calls(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst static void insert_early_return_break(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *func, struct hlsl_ir_node *cf_instr) { + struct hlsl_ir_node *iff, *jump; struct hlsl_block then_block; - struct hlsl_ir_jump *jump; struct hlsl_ir_load *load; - struct hlsl_ir_node *iff; hlsl_block_init(&then_block); @@ -529,7 +528,7 @@ static void insert_early_return_break(struct hlsl_ctx *ctx, if (!(jump = hlsl_new_jump(ctx, HLSL_IR_JUMP_BREAK, &cf_instr->loc))) return; - hlsl_block_add_instr(&then_block, &jump->node); + hlsl_block_add_instr(&then_block, jump); if (!(iff = hlsl_new_if(ctx, &load->node, &then_block, NULL, &cf_instr->loc))) return;

1 0

Henri Verbeet : vkd3d: Update the version information for release 1.7.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: master Commit: 7f90c9d7eb08891394f5d48448fd1a6cb5a67df9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f90c9d7eb08891394f5d48448fd1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 20 21:18:04 2023 +0200 vkd3d: Update the version information for release 1.7. --- libs/vkd3d/config.h | 4 ++-- libs/vkd3d/include/private/vkd3d_version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/config.h b/libs/vkd3d/config.h index 914d34288f8..6d2eeba235a 100644 --- a/libs/vkd3d/config.h +++ b/libs/vkd3d/config.h @@ -1,5 +1,5 @@ #define PACKAGE_NAME "vkd3d" -#define PACKAGE_STRING "vkd3d 1.6" -#define PACKAGE_VERSION "1.6" +#define PACKAGE_STRING "vkd3d 1.7" +#define PACKAGE_VERSION "1.7" #define PATH_MAX 1024 #define SONAME_LIBVULKAN "vulkan-1.dll" diff --git a/libs/vkd3d/include/private/vkd3d_version.h b/libs/vkd3d/include/private/vkd3d_version.h index fe0e9ce6b30..0edc4428022 100644 --- a/libs/vkd3d/include/private/vkd3d_version.h +++ b/libs/vkd3d/include/private/vkd3d_version.h @@ -1 +1 @@ -#define VKD3D_VCS_ID " (git 1eaf73147cd3)" +#define VKD3D_VCS_ID " (Wine bundled)"

1 0

Piotr Caban : wineps: Handle EMR_STRETCHDIBITS record in spool files.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: master Commit: 5ece770d3706f7e49c6fe0148d6b353670fd926b URL: https://gitlab.winehq.org/wine/wine/-/commit/5ece770d3706f7e49c6fe0148d6b35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 20 14:47:01 2023 +0200 wineps: Handle EMR_STRETCHDIBITS record in spool files. --- dlls/wineps.drv/printproc.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 2715cb952fc..48f584e1a7e 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -888,6 +888,52 @@ static int set_di_bits_to_device(PHYSDEV dev, const EMRSETDIBITSTODEVICE *p) return 1; } +static int stretch_di_bits(PHYSDEV dev, const EMRSTRETCHDIBITS *p) +{ + char bi_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + const BYTE *bits = (BYTE *)p + p->offBitsSrc; + BITMAPINFO *bi = (BITMAPINFO *)bi_buffer; + EMRSTRETCHBLT blt; + + memcpy(bi, (BYTE *)p + p->offBmiSrc, p->cbBmiSrc); + memset(bi_buffer + p->cbBmiSrc, 0, sizeof(bi_buffer) - p->cbBmiSrc); + + if (p->iUsageSrc == DIB_PAL_COLORS && (bi->bmiHeader.biBitCount == 1 || + bi->bmiHeader.biBitCount == 4 || bi->bmiHeader.biBitCount == 8)) + { + PALETTEENTRY pal[256]; + HPALETTE hpal; + UINT i, size; + + hpal = GetCurrentObject(dev->hdc, OBJ_PAL); + size = GetPaletteEntries(hpal, 0, 1 << bi->bmiHeader.biBitCount, pal); + for (i = 0; i < size; i++) + { + bi->bmiColors[i].rgbBlue = pal[i].peBlue; + bi->bmiColors[i].rgbGreen = pal[i].peGreen; + bi->bmiColors[i].rgbRed = pal[i].peRed; + } + } + + memset(&blt, 0, sizeof(blt)); + blt.rclBounds = p->rclBounds; + blt.xDest = p->xDest; + blt.yDest = p->yDest; + blt.cxDest = p->cxDest; + blt.cyDest = p->cyDest; + blt.dwRop = p->dwRop; + blt.xSrc = p->xSrc; + blt.ySrc = abs(bi->bmiHeader.biHeight) - p->ySrc - p->cySrc; + blt.xformSrc.eM11 = 1; + blt.xformSrc.eM22 = 1; + blt.iUsageSrc = p->iUsageSrc; + blt.cbBmiSrc = sizeof(bi_buffer); + blt.cbBitsSrc = p->cbBitsSrc; + blt.cxSrc = p->cxSrc; + blt.cySrc = p->cySrc; + return stretch_blt(dev, &blt, bi, bits); +} + static int poly_draw(PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count) { POINT first, cur, pts[4]; @@ -2680,6 +2726,8 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } case EMR_SETDIBITSTODEVICE: return set_di_bits_to_device(&data->pdev->dev, (const EMRSETDIBITSTODEVICE *)rec); + case EMR_STRETCHDIBITS: + return stretch_di_bits(&data->pdev->dev, (const EMRSTRETCHDIBITS *)rec); case EMR_EXTTEXTOUTW: { const EMREXTTEXTOUTW *p = (const EMREXTTEXTOUTW *)rec;

1 0

Francois Gouget : kernel32/tests: Fix the ScrollConsoleScreenBuffer() tests on Windows 10 1909.
by Alexandre Julliard April 20, 2023

April 20, 2023

Module: wine Branch: master Commit: 4d3eb56e7cd53f8f6df7717e2b1274691f0ebd70 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d3eb56e7cd53f8f6df7717e2b1274… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 20 14:24:39 2023 +0200 kernel32/tests: Fix the ScrollConsoleScreenBuffer() tests on Windows 10 1909. On Windows 10 1909 ScrollConsoleScreenBufferA() returns an error if the destination is not within the clip rectangle but still modifies the console buffer as expected! So mark this behavior as very_broken(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54871 --- dlls/kernel32/tests/console.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c2a8e99458f..5adce2d3f37 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -683,6 +683,20 @@ static void testScroll(HANDLE hCon, COORD sbSize) "Expected ERROR_NOT_ENOUGH_MEMORY, got %lu\n", GetLastError()); } + /* no clipping, src & dst rect do overlap */ + scroll.Left = 0; + scroll.Right = W - 1; + scroll.Top = 0; + scroll.Bottom = H - 1; + dst.X = W / 2 - 3; + dst.Y = H / 2 - 3; + ci.Char.UnicodeChar = '#'; + ci.Attributes = TEST_ATTRIB; + + ret = ScrollConsoleScreenBufferA(hCon, &scroll, NULL, dst, &ci); + ok(ret, "ScrollConsoleScreenBufferA failed: %lu\n", GetLastError()); + /* no win10 1909 error here, only check the result of the clipped case */ + /* clipping, src & dst rect do overlap */ resetContent(hCon, sbSize, TRUE); @@ -700,8 +714,14 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Top = H / 2; clip.Bottom = min(H + H / 2, sbSize.Y - 1); + /* Windows 10 1909 fails if the destination is not in the clip rect + * but the result is still ok! + */ + SetLastError(0xdeadbeef); ret = ScrollConsoleScreenBufferA(hCon, &scroll, &clip, dst, &ci); - ok(ret, "ScrollConsoleScreenBufferA failed: %lu\n", GetLastError()); + ok((ret && GetLastError() == 0xdeadbeef) || + broken(!ret && GetLastError() == ERROR_INVALID_PARAMETER), + "ScrollConsoleScreenBufferA failed: %lu\n", GetLastError()); for (c.Y = 0; c.Y < sbSize.Y; c.Y++) {

1 0