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

Nikolay Sivov : vkd3d-shader/fx: Write depth stencil view object variables.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: a879ac55363f19e2387b943b8d944577fbc4f191 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a879ac55363f19e2387b943b8d944… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 23:29:15 2024 +0200 vkd3d-shader/fx: Write depth stencil view object variables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 07c78528..e99ca782 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -87,6 +87,7 @@ struct fx_write_context uint32_t shared_object_count; uint32_t shader_variable_count; uint32_t parameter_count; + uint32_t dsv_count; int status; bool child_effect; @@ -1032,6 +1033,10 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ ++fx->shader_variable_count; break; + case HLSL_CLASS_DEPTH_STENCIL_VIEW: + fx->dsv_count += elements_count; + break; + default: hlsl_fixme(ctx, &ctx->location, "Writing initializer for object type %u is not implemented.", type->e.numeric.type); @@ -1117,6 +1122,7 @@ static bool is_object_variable(const struct hlsl_ir_var *var) switch (type->class) { + case HLSL_CLASS_DEPTH_STENCIL_VIEW: case HLSL_CLASS_PIXEL_SHADER: case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_SAMPLER: @@ -1182,7 +1188,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0); /* Rasterizer state count. */ put_u32(&buffer, 0); /* Sampler state count. */ put_u32(&buffer, 0); /* Rendertarget view count. */ - put_u32(&buffer, 0); /* Depth stencil view count. */ + put_u32(&buffer, fx.dsv_count); put_u32(&buffer, fx.shader_variable_count); /* Shader count. */ put_u32(&buffer, 0); /* Inline shader count. */ @@ -1240,7 +1246,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0); /* Rasterizer state count. */ put_u32(&buffer, 0); /* Sampler state count. */ put_u32(&buffer, 0); /* Rendertarget view count. */ - put_u32(&buffer, 0); /* Depth stencil view count. */ + put_u32(&buffer, fx.dsv_count); put_u32(&buffer, fx.shader_variable_count); /* Shader count. */ put_u32(&buffer, 0); /* Inline shader count. */ put_u32(&buffer, fx.group_count); /* Group count. */

1 0

Nikolay Sivov : vkd3d-shader/fx: Set RTV counter in the header.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: 162d8760bee5e814e8dbe07a3d2640c089e74517 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/162d8760bee5e814e8dbe07a3d264… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 20 16:19:54 2024 +0200 vkd3d-shader/fx: Set RTV counter in the header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index e99ca782..9e61fc23 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -88,6 +88,7 @@ struct fx_write_context uint32_t shader_variable_count; uint32_t parameter_count; uint32_t dsv_count; + uint32_t rtv_count; int status; bool child_effect; @@ -1021,6 +1022,8 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ switch (type->class) { case HLSL_CLASS_RENDER_TARGET_VIEW: + fx->rtv_count += elements_count; + break; case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: break; @@ -1187,7 +1190,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0); /* Blend state count. */ put_u32(&buffer, 0); /* Rasterizer state count. */ put_u32(&buffer, 0); /* Sampler state count. */ - put_u32(&buffer, 0); /* Rendertarget view count. */ + put_u32(&buffer, fx.rtv_count); put_u32(&buffer, fx.dsv_count); put_u32(&buffer, fx.shader_variable_count); /* Shader count. */ put_u32(&buffer, 0); /* Inline shader count. */ @@ -1245,7 +1248,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0); /* Blend state count. */ put_u32(&buffer, 0); /* Rasterizer state count. */ put_u32(&buffer, 0); /* Sampler state count. */ - put_u32(&buffer, 0); /* Rendertarget view count. */ + put_u32(&buffer, fx.rtv_count); put_u32(&buffer, fx.dsv_count); put_u32(&buffer, fx.shader_variable_count); /* Shader count. */ put_u32(&buffer, 0); /* Inline shader count. */

1 0

Nikolay Sivov : vkd3d-shader/fx: Set texture count in the header.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: cb1a271151e845ce309f45dd18afbd3ffaf9271d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cb1a271151e845ce309f45dd18afb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 20 16:28:34 2024 +0200 vkd3d-shader/fx: Set texture count in the header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 9e61fc23..9528bf98 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -89,6 +89,7 @@ struct fx_write_context uint32_t parameter_count; uint32_t dsv_count; uint32_t rtv_count; + uint32_t texture_count; int status; bool child_effect; @@ -1025,6 +1026,8 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ fx->rtv_count += elements_count; break; case HLSL_CLASS_TEXTURE: + fx->texture_count += elements_count; + break; case HLSL_CLASS_UAV: break; @@ -1185,7 +1188,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, fx.technique_count); size_offset = put_u32(&buffer, 0); /* Unstructured size. */ put_u32(&buffer, 0); /* String count. */ - put_u32(&buffer, 0); /* Texture object count. */ + put_u32(&buffer, fx.texture_count); put_u32(&buffer, 0); /* Depth stencil state count. */ put_u32(&buffer, 0); /* Blend state count. */ put_u32(&buffer, 0); /* Rasterizer state count. */ @@ -1243,7 +1246,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, fx.technique_count); size_offset = put_u32(&buffer, 0); /* Unstructured size. */ put_u32(&buffer, 0); /* String count. */ - put_u32(&buffer, 0); /* Texture object count. */ + put_u32(&buffer, fx.texture_count); put_u32(&buffer, 0); /* Depth stencil state count. */ put_u32(&buffer, 0); /* Blend state count. */ put_u32(&buffer, 0); /* Rasterizer state count. */

1 0

Nikolay Sivov : vkd3d-shader/fx: Fix shader counter in the header.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: 9bbed1498742951d99437d8e2b95712be1045df2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9bbed1498742951d99437d8e2b957… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 20 16:30:05 2024 +0200 vkd3d-shader/fx: Fix shader counter in the header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 9528bf98..9c2bd72a 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -85,7 +85,7 @@ struct fx_write_context uint32_t numeric_variable_count; uint32_t object_variable_count; uint32_t shared_object_count; - uint32_t shader_variable_count; + uint32_t shader_count; uint32_t parameter_count; uint32_t dsv_count; uint32_t rtv_count; @@ -1036,7 +1036,7 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ /* FIXME: write shader blobs, once parser support works. */ for (i = 0; i < elements_count; ++i) put_u32(buffer, 0); - ++fx->shader_variable_count; + fx->shader_count += elements_count; break; case HLSL_CLASS_DEPTH_STENCIL_VIEW: @@ -1195,7 +1195,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0); /* Sampler state count. */ put_u32(&buffer, fx.rtv_count); put_u32(&buffer, fx.dsv_count); - put_u32(&buffer, fx.shader_variable_count); /* Shader count. */ + put_u32(&buffer, fx.shader_count); put_u32(&buffer, 0); /* Inline shader count. */ set_u32(&buffer, size_offset, fx.unstructured.size); @@ -1253,7 +1253,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0); /* Sampler state count. */ put_u32(&buffer, fx.rtv_count); put_u32(&buffer, fx.dsv_count); - put_u32(&buffer, fx.shader_variable_count); /* Shader count. */ + put_u32(&buffer, fx.shader_count); put_u32(&buffer, 0); /* Inline shader count. */ put_u32(&buffer, fx.group_count); /* Group count. */ put_u32(&buffer, 0); /* UAV count. */

1 0

Ziqing Hui : winegstreamer/video_decoder: Make output_plane_align specific to h264.
by Alexandre Julliard 08 May '24

08 May '24

Module: wine Branch: master Commit: 08478473b720e02a403a15b44462b15ebda0e40b URL: https://gitlab.winehq.org/wine/wine/-/commit/08478473b720e02a403a15b44462b1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 8 11:15:23 2024 +0800 winegstreamer/video_decoder: Make output_plane_align specific to h264. If we set output align to wmv decoder, it will fail at copy_video_buffer(). The output size will larger than the sample we provided due to alignment. --- dlls/winegstreamer/video_decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 60eca8ba6bd..6525cbff513 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -1500,7 +1500,6 @@ static HRESULT video_decoder_create_with_types(const GUID *const *input_types, U if (FAILED(hr = MFCreateSampleCopierMFT(&decoder->copier))) goto failed; - decoder->wg_transform_attrs.output_plane_align = 15; decoder->wg_transform_attrs.input_queue_length = 15; *out = decoder; @@ -1569,6 +1568,7 @@ HRESULT h264_decoder_create(REFIID riid, void **out) | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; decoder->output_info.cbSize = 1920 * 1088 * 2; + decoder->wg_transform_attrs.output_plane_align = 15; decoder->wg_transform_attrs.allow_size_change = TRUE; TRACE("Created h264 transform %p.\n", &decoder->IMFTransform_iface);

1 0

Daniel Lehman : msvcrt/tests: Add result for Turkish_Türkiye.1254.
by Alexandre Julliard 08 May '24

08 May '24

Module: wine Branch: master Commit: 218c4ac11564f57a2feb4486e4f661854f18bef5 URL: https://gitlab.winehq.org/wine/wine/-/commit/218c4ac11564f57a2feb4486e4f661… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed May 1 15:26:56 2024 -0700 msvcrt/tests: Add result for Turkish_Türkiye.1254. --- dlls/msvcrt/tests/locale.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index f77e8f93abb..ede9728517e 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -573,12 +573,14 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "trk"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Turkish_Turkey.1254"), "ret = %s\n", ret); + ok(!strcmp(ret, "Turkish_Turkey.1254") + || !strcmp(ret, "Turkish_T\xfcrkiye.1254"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "turkish"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Turkish_Turkey.1254"), "ret = %s\n", ret); + ok(!strcmp(ret, "Turkish_Turkey.1254") + || !strcmp(ret, "Turkish_T\xfcrkiye.1254"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "uk"); ok(ret != NULL, "ret == NULL\n");

1 0

Elizabeth Figura : maintainers: Change the full form of my name.
by Alexandre Julliard 08 May '24

08 May '24

Module: wine Branch: master Commit: 06cb24bb65d0b91d4e77d03c17111f04d7d233c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/06cb24bb65d0b91d4e77d03c17111f… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed May 8 00:15:17 2024 -0500 maintainers: Change the full form of my name. And update to a more reliable email address. --- .mailmap | 3 ++- AUTHORS | 2 +- MAINTAINERS | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.mailmap b/.mailmap index 7cf13e67174..2439fd362ad 100644 --- a/.mailmap +++ b/.mailmap @@ -25,6 +25,8 @@ Dimitrie O. Paun <dimi(a)bigfoot.com> Dimitrie O. Paun <dimi(a)lattica.com> EA Durbin <eadurbin(a)freebsd.org> Eduardo García <eduardo.garcia(a)gmx.com> +Elizabeth Figura <z.figura12(a)gmail.com> +Elizabeth Figura <zfigura(a)codeweavers.com> Erich Hoover <erich.e.hoover(a)gmail.com> Erich Hoover <erich.e.hoover(a)wine-staging.com> Erwin Wolff <erwinwolffnl(a)microformatica.com> @@ -156,7 +158,6 @@ William Poetra Yoga Hadisoesen <williampoetra(a)yahoo.com> Won Kyu Park <wkpark(a)kldp.org> Yuri Kozlov <yuriy.kozlov(a)gmail.com> Zachary Brown <zac(a)zacbrown.org> -Zebediah Figura <zfigura(a)codeweavers.com> Zoltan Nagy <nagyzoli(a)drotposta.hu> unidentified <9700584(a)cs.stadia.fi> unidentified <develop(a)stueben.com> diff --git a/AUTHORS b/AUTHORS index da301ba9d1a..117940d75ce 100644 --- a/AUTHORS +++ b/AUTHORS @@ -490,6 +490,7 @@ Ekaterine Papava Elias Benali Elias Ross Elie Morisse +Elizabeth Figura Emilio Cobos Álvarez Emmanuel Maillard Enol Puente @@ -1896,7 +1897,6 @@ Zachary Brown Zach Goldberg Zach Gorman Zach Smith -Zebediah Figura Zhangrong Huang Zhang Shuai Zhan Jianyu diff --git a/MAINTAINERS b/MAINTAINERS index 34c2acdd56b..22979d93ea1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -66,7 +66,7 @@ P: Henri Verbeet <hverbeet(a)codeweavers.com> F: dlls/d2d*/ Direct3D -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> M: Jan Sikorski <jsikorski(a)codeweavers.com> P: Henri Verbeet <hverbeet(a)codeweavers.com> P: Stefan Dösinger <stefan(a)codeweavers.com> @@ -106,7 +106,7 @@ F: dlls/dpnet/ F: dlls/dpwsockx/ DirectShow -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/amstream/ F: dlls/devenum/ @@ -159,7 +159,7 @@ M: Marcus Meissner <marcus(a)jet.franken.de> F: dlls/gphoto2.ds/ GStreamer multimedia backend -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/winegstreamer/ @@ -173,7 +173,7 @@ F: dlls/mouhid.sys/ F: dlls/winehid.sys/ HTTP server -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/httpapi/ F: dlls/http.sys/ @@ -214,7 +214,7 @@ F: dlls/msacm32/ Media Foundation GStreamer backend M: Rémi Bernon <rbernon(a)codeweavers.com> P: Nikolay Sivov <nsivov(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/mf/tests/transform.c F: dlls/winegstreamer/aac_decoder.c F: dlls/winegstreamer/color_convert.c @@ -238,7 +238,7 @@ F: dlls/vcruntime140_1/ MSI installers M: Hans Leidekker <hans(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/msi/ Netstat @@ -288,7 +288,7 @@ P: Huw Davies <huw(a)codeweavers.com> F: dlls/oleaut32/typelib.c Plug and Play -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/newdev/ F: dlls/ntoskrnl.exe/pnp.c F: dlls/setupapi/devinst.c @@ -310,7 +310,7 @@ F: dlls/riched20/ RPC Runtime P: Huw Davies <huw(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/rpcrt4/ Theming @@ -349,7 +349,7 @@ F: dlls/shdocvw/ WIDL P: Huw Davies <huw(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: tools/widl/ Windows Imaging Component @@ -365,7 +365,7 @@ F: dlls/wbemprox/ F: dlls/wmiutils/ Windows Media Format -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/wmp/ F: dlls/wmvcore/ @@ -431,7 +431,7 @@ W: https://wiki.winehq.org/StableRules Staging Branch M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> P: Paul Gofman <gofmanp(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> W: https://wine-staging.com/

1 0

Dmitry Timoshkov : user32/tests: Offset child CS_PARENTDC window from parent to make more bugs visible.
by Alexandre Julliard 08 May '24

08 May '24

Module: wine Branch: master Commit: fdc2caf6788c071f89d5b5f402d70a661987e47b URL: https://gitlab.winehq.org/wine/wine/-/commit/fdc2caf6788c071f89d5b5f402d70a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 19:58:12 2024 +0300 user32/tests: Offset child CS_PARENTDC window from parent to make more bugs visible. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/dce.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 613512d0f5f..18f31e3708c 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -369,6 +369,7 @@ static void test_dc_visrgn(void) /* parent DC */ hdc = GetDC( hwnd_parentdc ); GetClipBox( hdc, &rect ); + MapWindowPoints(hwnd_parentdc, hwnd_parent, (POINT *)&rect, 2); ReleaseDC( hwnd_parentdc, hdc ); hdc = GetDC( hwnd_parent ); @@ -508,18 +509,19 @@ static void test_begin_paint(void) RedrawWindow( hwnd_parentdc, NULL, 0, RDW_INVALIDATE ); hdc = BeginPaint( hwnd_parentdc, &ps ); GetClipBox( hdc, &rect ); + MapWindowPoints(hwnd_parentdc, hwnd_parent, (POINT *)&rect, 2); cr = SetPixel( hdc, 10, 10, RGB(255, 0, 0) ); ok( cr != -1, "error drawing outside of window client area\n" ); EndPaint( hwnd_parentdc, &ps ); GetClientRect( hwnd_parent, &parent_rect ); - ok( rect.left == parent_rect.left, "rect.left = %ld, expected %ld\n", rect.left, parent_rect.left ); - ok( rect.top == parent_rect.top, "rect.top = %ld, expected %ld\n", rect.top, parent_rect.top ); + todo_wine ok( rect.left == parent_rect.left, "rect.left = %ld, expected %ld\n", rect.left, parent_rect.left ); + todo_wine ok( rect.top == parent_rect.top, "rect.top = %ld, expected %ld\n", rect.top, parent_rect.top ); todo_wine ok( rect.right == parent_rect.right, "rect.right = %ld, expected %ld\n", rect.right, parent_rect.right ); todo_wine ok( rect.bottom == parent_rect.bottom, "rect.bottom = %ld, expected %ld\n", rect.bottom, parent_rect.bottom ); hdc = GetDC( hwnd_parent ); - todo_wine ok( GetPixel( hdc, 10, 10 ) == cr, "error drawing outside of window client area\n" ); + todo_wine ok( GetPixel( hdc, 60, 60 ) == cr, "error drawing outside of window client area\n" ); ReleaseDC( hwnd_parent, hdc ); } @@ -772,7 +774,7 @@ START_TEST(dce) hwnd_parent = CreateWindowA("static", NULL, WS_OVERLAPPED | WS_VISIBLE, 400, 0, 100, 100, 0, 0, 0, NULL ); hwnd_parentdc = CreateWindowA("parentdc_class", NULL, WS_CHILD | WS_VISIBLE, - 0, 0, 1, 1, hwnd_parent, 0, 0, NULL ); + 50, 50, 1, 1, hwnd_parent, 0, 0, NULL ); test_dc_attributes(); test_parameters();

1 0

Eric Pouech : cmd: Consistenly use the same variable to identify current command.
by Alexandre Julliard 08 May '24

08 May '24

Module: wine Branch: master Commit: 371eda6c4c95319d11e84c4663c20bdf9ed0dabb URL: https://gitlab.winehq.org/wine/wine/-/commit/371eda6c4c95319d11e84c4663c20b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Apr 9 12:55:44 2024 +0200 cmd: Consistenly use the same variable to identify current command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index eb66b29836e..ffd63d9771a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1319,11 +1319,10 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, while (IsCharAlphaNumericW(whichcmd[count])) { count++; } - for (i=0; i<=WCMD_EXIT; i++) { + for (cmd_index=0; cmd_index<=WCMD_EXIT; cmd_index++) { if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - whichcmd, count, inbuilt[i], -1) == CSTR_EQUAL) break; + whichcmd, count, inbuilt[cmd_index], -1) == CSTR_EQUAL) break; } - cmd_index = i; parms_start = WCMD_skip_leading_spaces (&whichcmd[count]); /* If the next command is a pipe then we implement pipes by redirecting @@ -1491,15 +1490,15 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, WCMD_parse (parms_start, quals, param1, param2); WINE_TRACE("param1: %s, param2: %s\n", wine_dbgstr_w(param1), wine_dbgstr_w(param2)); - if (i <= WCMD_EXIT && (parms_start[0] == '/') && (parms_start[1] == '?')) { + if (cmd_index <= WCMD_EXIT && (parms_start[0] == '/') && (parms_start[1] == '?')) { /* this is a help request for a builtin program */ - i = WCMD_HELP; + cmd_index = WCMD_HELP; memcpy(parms_start, whichcmd, count * sizeof(WCHAR)); parms_start[count] = '\0'; } - switch (i) { + switch (cmd_index) { case WCMD_CALL: WCMD_call (parms_start); @@ -1633,8 +1632,8 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, these two commands, neither 'for' nor 'if' is supported when called, i.e. 'call if 1==1...' will fail. */ if (!retrycall) { - if (i==WCMD_FOR) WCMD_for (parms_start, cmdList); - else if (i==WCMD_IF) WCMD_if (parms_start, cmdList); + if (cmd_index==WCMD_FOR) WCMD_for (parms_start, cmdList); + else if (cmd_index==WCMD_IF) WCMD_if (parms_start, cmdList); break; } /* else: drop through */

1 0

Eric Pouech : cmd: No longer keep track of last element in command list.
by Alexandre Julliard 08 May '24

08 May '24

Module: wine Branch: master Commit: 76237079d1430fec63ff37bbe90914252619a310 URL: https://gitlab.winehq.org/wine/wine/-/commit/76237079d1430fec63ff37bbe90914… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Apr 11 16:06:03 2024 +0200 cmd: No longer keep track of last element in command list. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ffd63d9771a..059920c9608 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1699,7 +1699,7 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, WCHAR *redirs, int *redirLen, WCHAR **copyTo, int **copyToLen, CMD_DELIMITERS prevDelim, int curDepth, - CMD_LIST **lastEntry, CMD_LIST **output) { + CMD_LIST **output) { CMD_LIST *thisEntry = NULL; @@ -1734,12 +1734,9 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, thisEntry->nextcommand = NULL; thisEntry->prevDelim = prevDelim; thisEntry->bracketDepth = curDepth; - if (*lastEntry) { - (*lastEntry)->nextcommand = thisEntry; - } else { - *output = thisEntry; - } - *lastEntry = thisEntry; + + for (; *output; output = &((*output)->nextcommand)) {} + *output = thisEntry; } @@ -1822,7 +1819,6 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE WCHAR *curCopyTo; int *curLen; int curDepth = 0; - CMD_LIST *lastEntry = NULL; CMD_DELIMITERS prevDelim = CMD_NONE; static WCHAR *extraSpace = NULL; /* Deliberately never freed */ BOOL inOneLine = FALSE; @@ -1842,6 +1838,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE int lineCurDepth; /* Bracket depth when line was read in */ BOOL resetAtEndOfLine = FALSE; /* Do we need to reset curdepth at EOL */ + *output = NULL; /* Allocate working space for a command read from keyboard, file etc */ if (!extraSpace) extraSpace = xalloc((MAXSTRING + 1) * sizeof(WCHAR)); @@ -2093,7 +2090,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirs, &curRedirsLen, &curCopyTo, &curLen, prevDelim, curDepth, - &lastEntry, output); + output); } @@ -2167,7 +2164,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirs, &curRedirsLen, &curCopyTo, &curLen, prevDelim, curDepth, - &lastEntry, output); + output); curDepth++; } else { @@ -2198,7 +2195,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirs, &curRedirsLen, &curCopyTo, &curLen, prevDelim, curDepth, - &lastEntry, output); + output); } @@ -2231,7 +2228,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirs, &curRedirsLen, &curCopyTo, &curLen, prevDelim, curDepth, - &lastEntry, output); + output); } /* Add an empty entry to the command list */ @@ -2240,7 +2237,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirs, &curRedirsLen, &curCopyTo, &curLen, prevDelim, curDepth, - &lastEntry, output); + output); curDepth--; /* Leave inIn if necessary */ @@ -2276,7 +2273,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirs, &curRedirsLen, &curCopyTo, &curLen, prevDelim, curDepth, - &lastEntry, output); + output); /* If we had a single line if or else, and we pretended to add brackets, end them now */

1 0