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

Eric Pouech : cmd: Split parsing from executing FOR loops for numbers (/L).
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 9ba05f5e5b8e02c12caffe168287d405dad2b2bc URL: https://gitlab.winehq.org/wine/wine/-/commit/9ba05f5e5b8e02c12caffe168287d4… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 14 17:04:58 2024 +0200 cmd: Split parsing from executing FOR loops for numbers (/L). Introducing CMD_FOR_CONTROL structure to store parsing output for consumption in execution. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 40 +++++++++-- programs/cmd/wcmd.h | 20 ++++++ programs/cmd/wcmdmain.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 231 insertions(+), 7 deletions(-)

1 0

Eric Pouech : cmd: Fix delay expansion in FOR /L loops.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 53f7a5999204d42a154d13b1feab3e9cd89ba776 URL: https://gitlab.winehq.org/wine/wine/-/commit/53f7a5999204d42a154d13b1feab3e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 18 09:54:28 2024 +0200 cmd: Fix delay expansion in FOR /L loops. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 5 ----- programs/cmd/tests/test_builtins.cmd.exp | 22 +++++++++++----------- programs/cmd/wcmdmain.c | 1 + 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 2ef2d495a63..c9951a66373 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -757,11 +757,6 @@ setlocal EnableDelayedExpansion set WINE_FOO=foo bar for %%i in ("!WINE_FOO!") do echo %%i for %%i in (!WINE_FOO!) do echo %%i -rem tests disabled for now... wine's cmd loops endlessly here -rem set WINE_FOO=4 4 4 -rem for /l %%i in (!WINE_FOO!) do echo %%i -rem set WINE_FOO=4 -rem for /l %%i in (1 2 !WINE_FOO!) do echo %%i setlocal DisableDelayedExpansion echo --- in digit variables diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1c3b0dc81cc..b5989b55f52 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1018,17 +1018,17 @@ B D @todo_wine(a)inner argument {-x, y} --- nesting and delayed expansion a 1 2 -(a)todo_wine@1-A2 -(a)todo_wine@1-B1 -(a)todo_wine@2-A1 -(a)todo_wine@2-B2 -(a)todo_wine@b 1 3 -(a)todo_wine@1-A2 -(a)todo_wine@1-B1 -(a)todo_wine@2-A2 -(a)todo_wine@2-B2 -(a)todo_wine@3-A1 -(a)todo_wine@3-B2 +1-A2 +1-B1 +2-A1 +2-B2 +b 1 3 +1-A2 +1-B1 +2-A2 +2-B2 +3-A1 +3-B2 --- nesting if/for @todo_wine@"f" @todo_wine@"g" diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index e86ad8042f9..b50c159414e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2879,6 +2879,7 @@ static CMD_NODE *for_control_execute_numbers(CMD_FOR_CONTROL *for_ctrl, CMD_NODE int i; wcscpy(set, for_ctrl->set); + handleExpansion(set, context != NULL, delayedsubst); /* Note: native doesn't check the actual number of parameters, and set * them by default to 0.

1 0

Eric Pouech : cmd: Split parsing from executing FOR loops for filesets (/F).
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 2e2a3f4539d0af7c5b426aff353be86c2e06f4e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e2a3f4539d0af7c5b426aff353be8… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 14 17:34:06 2024 +0200 cmd: Split parsing from executing FOR loops for filesets (/F). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmd.h | 18 +- programs/cmd/wcmdmain.c | 337 ++++++++++++++++++++++++++++++- 3 files changed, 353 insertions(+), 4 deletions(-)

1 0

Eric Pouech : cmd: Fix delay expansion in FOR loop for filesets.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 6d6fee9ddaad1a2528135b3ef634c6fce674409a URL: https://gitlab.winehq.org/wine/wine/-/commit/6d6fee9ddaad1a2528135b3ef634c6… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 18 14:04:02 2024 +0200 cmd: Fix delay expansion in FOR loop for filesets. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- programs/cmd/wcmdmain.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a7af684cb9a..84637ce41e3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1014,8 +1014,8 @@ A D B C B D --- nested FORs and args tempering -(a)todo_wine@inner argument {-foo, bar} -(a)todo_wine@inner argument {-x, y} +inner argument {-foo, bar} +inner argument {-x, y} --- nesting and delayed expansion a 1 2 1-A2 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5f7d399b4e7..9bce77b19df 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -3140,13 +3140,17 @@ static CMD_NODE *for_control_execute_from_FILE(CMD_FOR_CONTROL *for_ctrl, FILE * static CMD_NODE *for_control_execute_fileset(CMD_FOR_CONTROL *for_ctrl, CMD_NODE *cmdList) { + WCHAR set[MAXSTRING]; WCHAR *args; size_t len; CMD_NODE *body = NULL; FILE *input; int i; - args = WCMD_skip_leading_spaces((WCHAR *)for_ctrl->set); + wcscpy(set, for_ctrl->set); + handleExpansion(set, context != NULL, delayedsubst); + + args = WCMD_skip_leading_spaces(set); for (len = wcslen(args); len && (args[len - 1] == L' ' || args[len - 1] == L'\t'); len--) args[len - 1] = L'\0'; if (args[0] == (for_ctrl->use_backq ? L'\'' : L'"') && match_ending_delim(args))

1 0

Alexandros Frantzis : opengl32: Add default implementation for wglGetPixelFormatAttribivARB.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 5b126f78069e61fab53f8ecd8b002aa936f9a86f URL: https://gitlab.winehq.org/wine/wine/-/commit/5b126f78069e61fab53f8ecd8b002a… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Jun 12 10:56:13 2024 +0300 opengl32: Add default implementation for wglGetPixelFormatAttribivARB. Extend the wgl_pixel_format struct with extra fields required to implement wglGetPixelFormatAttribivARB in opengl32.dll. The default implementation will be used automatically if the driver populates the extra fields. --- dlls/opengl32/make_opengl | 26 ++++++ dlls/opengl32/thunks.c | 10 +-- dlls/opengl32/wgl.c | 219 +++++++++++++++++++++++++++++++++++++++++++++- include/wine/wgl_driver.h | 27 +++++- 4 files changed, 271 insertions(+), 11 deletions(-)

1 0

Alfred Agrell : quartz: Implement AMT/WMT differences for WMV media type.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: e4e5d221455722889b8899da1c22dfeb6feb7c55 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4e5d221455722889b8899da1c22df… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu Jun 13 22:53:55 2024 +0200 quartz: Implement AMT/WMT differences for WMV media type. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56769 --- dlls/winegstreamer/quartz_parser.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 125e5c00c0f..3902c652648 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -630,7 +630,7 @@ static bool amt_from_wg_format_video_cinepak(AM_MEDIA_TYPE *mt, const struct wg_ return true; } -static bool amt_from_wg_format_video_wmv(AM_MEDIA_TYPE *mt, const struct wg_format *format) +static bool amt_from_wg_format_video_wmv(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm) { VIDEOINFOHEADER *video_format; uint32_t frame_time; @@ -671,7 +671,8 @@ static bool amt_from_wg_format_video_wmv(AM_MEDIA_TYPE *mt, const struct wg_form mt->pbFormat = (BYTE *)video_format; memset(video_format, 0, sizeof(*video_format)); - SetRect(&video_format->rcSource, 0, 0, format->u.video.width, format->u.video.height); + if (wm) + SetRect(&video_format->rcSource, 0, 0, format->u.video.width, format->u.video.height); video_format->rcTarget = video_format->rcSource; if ((frame_time = MulDiv(10000000, format->u.video.fps_d, format->u.video.fps_n)) != -1) video_format->AvgTimePerFrame = frame_time; @@ -681,6 +682,8 @@ static bool amt_from_wg_format_video_wmv(AM_MEDIA_TYPE *mt, const struct wg_form video_format->bmiHeader.biPlanes = 1; video_format->bmiHeader.biCompression = mt->subtype.Data1; video_format->bmiHeader.biBitCount = 24; + if (!wm) + video_format->bmiHeader.biSizeImage = 3 * format->u.video.width * format->u.video.height; video_format->dwBitRate = 0; memcpy(video_format+1, format->u.video.codec_data, format->u.video.codec_data_len); @@ -747,7 +750,7 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool return amt_from_wg_format_video_cinepak(mt, format); case WG_MAJOR_TYPE_VIDEO_WMV: - return amt_from_wg_format_video_wmv(mt, format); + return amt_from_wg_format_video_wmv(mt, format, wm); case WG_MAJOR_TYPE_VIDEO_MPEG1: return amt_from_wg_format_video_mpeg1(mt, format);

1 0

Elizabeth Figura : tests: Run combined-samplers.shader_test on sm1 as well.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: vkd3d Branch: master Commit: 669e85171e59e0aca1e1323ce1f0396b78ddf29c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/669e85171e59e0aca1e1323ce1f03… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Jun 18 12:56:27 2024 -0500 tests: Run combined-samplers.shader_test on sm1 as well. Now that we have if() this is easier. --- tests/hlsl/combined-samplers.shader_test | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test index 8972b541..28e9f1a7 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -1,5 +1,4 @@ [require] -shader model >= 4.0 shader model < 6.0 options: backcompat @@ -49,7 +48,8 @@ todo(glsl) draw quad probe (0, 0) rgba (0, 0, 0, 1) -% Textures for new separated samplers are allocated before regular textures. +% On sm4, textures for new separated samplers are allocated before regular textures. +% On sm1, textures for new combined samplers are allocated before regular samplers. [pixel shader] Texture2D tex; sampler sam; @@ -61,7 +61,23 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe (0, 0) rgba (10, 10, 10, 11) +if(sm<4) todo probe (0, 0) rgba (1, 1, 1, 11) +if(sm>=4) probe (0, 0) rgba (10, 10, 10, 11) + + +[pixel shader] +Texture2D tex; +sampler sam; + +float4 main() : sv_target +{ + return 10 * tex.Sample(sam, float2(0, 0)) + tex2D(sam, float2(0, 0)); +} + +[test] +todo(glsl) draw quad +if(sm<4) todo probe (0, 0) rgba (1, 1, 1, 11) +if(sm>=4) probe (0, 0) rgba (10, 10, 10, 11) [pixel shader todo(sm<4)] @@ -74,7 +90,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(sm<4 | glsl) draw quad probe (0, 0) rgba (21, 21, 21, 11) @@ -91,10 +107,11 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe (0, 0) rgba (12, 12, 12, 111) +if(sm<4) probe (0, 0) rgba (102, 102, 102, 111) +if(sm>=4) probe (0, 0) rgba (12, 12, 12, 111) -[pixel shader] +[pixel shader notimpl(sm<4)] Texture2D tex[2][2]; sampler sam;

1 0

Elizabeth Figura : tests: Add another combined sampler test.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: vkd3d Branch: master Commit: 8d946f3c204a4fd505f54ccad942550dd7d8b68e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8d946f3c204a4fd505f54ccad9425… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Jun 18 13:01:31 2024 -0500 tests: Add another combined sampler test. Shader provided by Francisco Casas. --- tests/hlsl/combined-samplers.shader_test | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test index 28e9f1a7..1eb181ca 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -16,8 +16,9 @@ filter linear linear linear address clamp clamp clamp [srv 0] -size (2d, 1, 1) -0.0 0.0 0.0 1.0 +size (2d, 2, 2) +0.0 0.0 0.0 1.0 0.0 1.0 0.0 1.0 +0.0 0.0 1.0 1.0 1.0 0.0 0.0 1.0 [srv 1] size (2d, 1, 1) @@ -48,6 +49,22 @@ todo(glsl) draw quad probe (0, 0) rgba (0, 0, 0, 1) +[pixel shader] +sampler sam; + +float v; + +float4 main() : sv_target +{ + return tex2D(sam, float2(0, 0)) + v; +} + +[test] +uniform 0 float4 0.5 0.0 0.0 0.0 +todo(glsl) draw quad +probe (0, 0) rgba (0.5, 0.5, 0.5, 1.5) + + % On sm4, textures for new separated samplers are allocated before regular textures. % On sm1, textures for new combined samplers are allocated before regular samplers. [pixel shader]

1 0

Elizabeth Figura : vkd3d-shader/hlsl: Respect the coords writemask in write_sm1_resource_load().
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: vkd3d Branch: master Commit: 7fe581203b2b5d4277910c55e9a67308dc9b386a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7fe581203b2b5d4277910c55e9a67… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Jun 18 13:18:59 2024 -0500 vkd3d-shader/hlsl: Respect the coords writemask in write_sm1_resource_load(). Spotted by Francisco Casas. --- libs/vkd3d-shader/d3dbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 2290385d..3665b99a 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2582,7 +2582,7 @@ static void write_sm1_resource_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_ .srcs[0].type = D3DSPR_TEMP, .srcs[0].reg = coords->reg.id, - .srcs[0].swizzle = hlsl_swizzle_from_writemask(VKD3DSP_WRITEMASK_ALL), + .srcs[0].swizzle = hlsl_swizzle_from_writemask(coords->reg.writemask), .srcs[1].type = D3DSPR_SAMPLER, .srcs[1].reg = reg_id,

1 0

Elizabeth Figura : vkd3d-shader/hlsl: Only allocate the aligned size for uniforms.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: vkd3d Branch: master Commit: acc9d79fbb112642518f25d2b9046e7f5264d42a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/acc9d79fbb112642518f25d2b9046… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jun 17 16:42:11 2024 -0500 vkd3d-shader/hlsl: Only allocate the aligned size for uniforms. --- libs/vkd3d-shader/hlsl_codegen.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 09066a61..36270b15 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4188,8 +4188,10 @@ static struct hlsl_reg allocate_numeric_registers_for_type(struct hlsl_ctx *ctx, { unsigned int reg_size = type->reg_size[HLSL_REGSET_NUMERIC]; + /* FIXME: We could potentially pack structs or arrays more efficiently... */ + if (type->class <= HLSL_CLASS_VECTOR) - return allocate_register(ctx, allocator, first_write, last_read, reg_size, type->dimx); + return allocate_register(ctx, allocator, first_write, last_read, type->dimx, type->dimx); else return allocate_range(ctx, allocator, first_write, last_read, reg_size); }

1 0