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

Zebediah Figura : vkd3d-shader/hlsl: Return an hlsl_ir_node pointer from hlsl_new_load_component().
by Alexandre Julliard 20 Apr '23

20 Apr '23

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 : vkd3d-shader/hlsl: Remove an unused local variable from create_loop().
by Alexandre Julliard 20 Apr '23

20 Apr '23

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 : tests/shader_runner: Remove a redundant vkd3d_test_pop_context().
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Henri Verbeet : vkd3d-shader/sm4: Move the TPF parser from dxbc.c to hlsl_sm4.c.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: vkd3d Branch: master Commit: 804e315b68e48ee5615a4ca277c3c47e33929937 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/804e315b68e48ee5615a4ca277c3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 20 12:11:22 2023 +0200 vkd3d-shader/sm4: Move the TPF parser from dxbc.c to hlsl_sm4.c. --- libs/vkd3d-shader/dxbc.c | 1748 +----------------------------- libs/vkd3d-shader/hlsl_sm4.c | 1660 +++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 3 files changed, 1706 insertions(+), 1704 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/sm4: Rename hlsl_sm4.c to tpf.c.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Henri Verbeet : vkd3d-shader/sm4: Merge sm4.h into tpf.c.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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/sm1: Merge hlsl_sm1.c into d3dbc.c.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: vkd3d Branch: master Commit: 8e0df3f72067b37993f337304cdc8a9dbd1c4b39 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8e0df3f72067b37993f337304cdc8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 20 12:33:54 2023 +0200 vkd3d-shader/sm1: Merge hlsl_sm1.c into d3dbc.c. --- Makefile.am | 1 - libs/vkd3d-shader/d3dbc.c | 973 +++++++++++++++++++++++++++++++++++++++++- libs/vkd3d-shader/hlsl_sm1.c | 990 ------------------------------------------- 3 files changed, 972 insertions(+), 992 deletions(-)

1 0

Francois Gouget : kernel32/tests: Fix the ScrollConsoleScreenBuffer() tests on Windows 10 1909.
by Alexandre Julliard 20 Apr '23

20 Apr '23

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

Piotr Caban : wineps: Clip visible rectangle to bitmap size in get_vis_rectangles.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: master Commit: 08386cd984a6ebd116aa97c32bd8fcf14ed9de3e URL: https://gitlab.winehq.org/wine/wine/-/commit/08386cd984a6ebd116aa97c32bd8fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 20 14:44:12 2023 +0200 wineps: Clip visible rectangle to bitmap size in get_vis_rectangles. --- dlls/wineps.drv/printproc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index b40f7a7962c..0a1f36c82d8 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -378,6 +378,10 @@ static void get_vis_rectangles(HDC hdc, struct bitblt_coords *dst, src->width = rect.right - rect.left; src->height = rect.bottom - rect.top; get_bounding_rect(&rect, src->x, src->y, src->width, src->height); + if (rect.left < 0) rect.left = 0; + if (rect.top < 0) rect.top = 0; + if (rect.right > width) rect.right = width; + if (rect.bottom > height) rect.bottom = height; src->visrect = rect; intersect_vis_rectangles(dst, src); @@ -413,7 +417,7 @@ static int stretch_blt(PHYSDEV dev, const EMRSTRETCHBLT *blt, src.layout = 0; get_vis_rectangles(dev->hdc, &dst, &blt->xformSrc, - bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, &src); + bi->bmiHeader.biWidth, abs(bi->bmiHeader.biHeight), &src); memcpy(dst_info, bi, blt->cbBmiSrc); memset(&bits, 0, sizeof(bits));

1 0

Piotr Caban : wineps: Handle EMR_CREATEPALETTE record in spool files.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: master Commit: 40fdf388cfeeae5c1507c0dce3613be47206c3a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/40fdf388cfeeae5c1507c0dce3613b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 20 14:44:57 2023 +0200 wineps: Handle EMR_CREATEPALETTE record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 0a1f36c82d8..1b5095bd109 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2839,6 +2839,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_MODIFYWORLDTRANSFORM: case EMR_CREATEPEN: case EMR_CREATEBRUSHINDIRECT: + case EMR_CREATEPALETTE: case EMR_SETARCDIRECTION: case EMR_CLOSEFIGURE: case EMR_FLATTENPATH:

1 0