- Wine-Commits - list.winehq.org

Eric Pouech : mf/tests: Add tests about (negative) stride handling.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 77a21bfbe3d5b0666622400d8520c4a700694cd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/77a21bfbe3d5b0666622400d8520c4… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Apr 15 10:14:47 2023 +0200 mf/tests: Add tests about (negative) stride handling. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/mf/tests/transform.c | 579 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 434 insertions(+), 145 deletions(-)

1 0

Henri Verbeet : d3dcompiler: Check for minimum bytecode size in d3dcompiler_get_blob_part().
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: a342c75a37e4f83c706c9e9f9a9a5106f99e42e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a342c75a37e4f83c706c9e9f9a9a51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 17:44:39 2023 +0200 d3dcompiler: Check for minimum bytecode size in d3dcompiler_get_blob_part(). --- dlls/d3dcompiler_43/blob.c | 2 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index c8c198fb520..7a76fa0adce 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -220,7 +220,7 @@ static HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D HRESULT hr; unsigned int i, count; - if (!data || !data_size || flags || !blob) + if (!data || data_size < DXBC_HEADER_SIZE || flags || !blob) { WARN("Invalid arguments: data %p, data_size %Iu, flags %#x, blob %p.\n", data, data_size, flags, blob); return D3DERR_INVALIDCALL; diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 6dea5a08a85..5f9f6c87647 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -532,6 +532,8 @@ struct bwriter_shader *SlAssembleShader(const char *text, char **messages) DECLS HRESULT shader_write_bytecode(const struct bwriter_shader *shader, uint32_t **result, uint32_t *size) DECLSPEC_HIDDEN; void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; +#define DXBC_HEADER_SIZE (8 * sizeof(uint32_t)) + #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 ))

1 0

Ziqing Hui : wingstreamer: Create extra decodebin to decode compressed stream.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 992984f12c18183e477be9ba2668bf42567f4e0a URL: https://gitlab.winehq.org/wine/wine/-/commit/992984f12c18183e477be9ba2668bf… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Apr 3 16:32:05 2023 +0800 wingstreamer: Create extra decodebin to decode compressed stream. --- dlls/winegstreamer/wg_parser.c | 191 +++++++++++++++++++++++++++++++++++------ 1 file changed, 163 insertions(+), 28 deletions(-)

1 0

Anton Baskanov : winegstreamer: Call init_gstreamer() in winegstreamer_create_video_decoder().
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 5ae89b0c8b5465f9a8465b1fc53612f70cbb13e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ae89b0c8b5465f9a8465b1fc53612… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Apr 15 13:53:33 2023 +0700 winegstreamer: Call init_gstreamer() in winegstreamer_create_video_decoder(). --- dlls/winegstreamer/video_decoder.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 66df8173038..1fdabd46b96 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -484,6 +484,9 @@ HRESULT WINAPI winegstreamer_create_video_decoder(IMFTransform **out) TRACE("out %p.\n", out); + if (!init_gstreamer()) + return E_FAIL; + if (!(decoder = calloc(1, sizeof(*decoder)))) return E_OUTOFMEMORY;

1 0

Ziqing Hui : winegstreamer: Implement wg_format_from_caps_video_wmv.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: 3cef365f63a14912d958ba80c2e28b03e96cfa5b URL: https://gitlab.winehq.org/wine/wine/-/commit/3cef365f63a14912d958ba80c2e28b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Mar 13 12:28:13 2023 +0800 winegstreamer: Implement wg_format_from_caps_video_wmv. --- dlls/winegstreamer/wg_format.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 6317a69edee..da0cd052804 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -229,6 +229,59 @@ static void wg_format_from_caps_video_cinepak(struct wg_format *format, const Gs format->u.video_cinepak.fps_d = fps_d; } +static void wg_format_from_caps_video_wmv(struct wg_format *format, const GstCaps *caps) +{ + const GstStructure *structure = gst_caps_get_structure(caps, 0); + gint width, height, fps_n, fps_d, wmv_version = 0; + gchar format_buffer[5] = {'W','M','V','0',0}; + enum wg_wmv_video_format wmv_format; + const gchar *wmv_format_str = NULL; + + if (!gst_structure_get_int(structure, "width", &width)) + { + GST_WARNING("Missing \"width\" value."); + return; + } + if (!gst_structure_get_int(structure, "height", &height)) + { + GST_WARNING("Missing \"height\" value."); + return; + } + + if (!(wmv_format_str = gst_structure_get_string(structure, "format"))) + { + if (!gst_structure_get_int(structure, "wmvversion", &wmv_version)) + GST_WARNING("Unable to get WMV format."); + format_buffer[3] += wmv_version; + wmv_format_str = format_buffer; + } + if (!strcmp(wmv_format_str, "WMV1")) + wmv_format = WG_WMV_VIDEO_FORMAT_WMV1; + else if (!strcmp(wmv_format_str, "WMV2")) + wmv_format = WG_WMV_VIDEO_FORMAT_WMV2; + else if (!strcmp(wmv_format_str, "WMV3")) + wmv_format = WG_WMV_VIDEO_FORMAT_WMV3; + else if (!strcmp(wmv_format_str, "WMVA")) + wmv_format = WG_WMV_VIDEO_FORMAT_WMVA; + else if (!strcmp(wmv_format_str, "WVC1")) + wmv_format = WG_WMV_VIDEO_FORMAT_WVC1; + else + wmv_format = WG_WMV_VIDEO_FORMAT_UNKNOWN; + + if (!gst_structure_get_fraction(structure, "framerate", &fps_n, &fps_d)) + { + fps_n = 0; + fps_d = 1; + } + + format->major_type = WG_MAJOR_TYPE_VIDEO_WMV; + format->u.video_wmv.width = width; + format->u.video_wmv.height = height; + format->u.video_wmv.format = wmv_format; + format->u.video_wmv.fps_n = fps_n; + format->u.video_wmv.fps_d = fps_d; +} + void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) { const GstStructure *structure = gst_caps_get_structure(caps, 0); @@ -258,6 +311,10 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) { wg_format_from_caps_video_cinepak(format, caps); } + else if (!strcmp(name, "video/x-wmv")) + { + wg_format_from_caps_video_wmv(format, caps); + } else { gchar *str = gst_caps_to_string(caps);

1 0

Anton Baskanov : winegstreamer: Fix negative height image size calculation.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: wine Branch: master Commit: a455dd53d5af144aae70263d9f4e798a305ab775 URL: https://gitlab.winehq.org/wine/wine/-/commit/a455dd53d5af144aae70263d9f4e79… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Apr 15 13:33:41 2023 +0700 winegstreamer: Fix negative height image size calculation. Fixes intro video playback in multiple games (e.g. Earth 2150). --- dlls/winegstreamer/quartz_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 590ef48fef4..de62187cd7d 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -286,7 +286,7 @@ unsigned int wg_format_get_max_size(const struct wg_format *format) { case WG_MAJOR_TYPE_VIDEO: { - unsigned int width = format->u.video.width, height = format->u.video.height; + unsigned int width = format->u.video.width, height = abs(format->u.video.height); switch (format->u.video.format) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Do not write DCL instructions for ps_1_* shaders.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: b19105eaeb9d919da72c5a45d37736cb5e2b4365 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b19105eaeb9d919da72c5a45d3773… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 24 12:52:07 2023 -0600 vkd3d-shader/hlsl: Do not write DCL instructions for ps_1_* shaders. --- libs/vkd3d-shader/hlsl_sm1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 69b881c4..0afeac68 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -645,7 +645,7 @@ static void write_sm1_semantic_dcls(struct hlsl_ctx *ctx, struct vkd3d_bytecode_ bool write_in = false, write_out = false; struct hlsl_ir_var *var; - if (ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL) + if (ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL && ctx->profile->major_version >= 2) write_in = true; else if (ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX && ctx->profile->major_version == 3) write_in = write_out = true;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Sort only uniforms by name in the sm1 backend.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: 98e2461392a4ff98c7e15afeefe69cefc1f83701 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98e2461392a4ff98c7e15afeefe69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 23 23:27:29 2023 -0600 vkd3d-shader/hlsl: Sort only uniforms by name in the sm1 backend. --- libs/vkd3d-shader/hlsl_sm1.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index be665981..73ec8453 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -302,7 +302,10 @@ static void sm1_sort_externs(struct hlsl_ctx *ctx) struct hlsl_ir_var *var, *next; LIST_FOR_EACH_ENTRY_SAFE(var, next, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) - sm1_sort_extern(&sorted, var); + { + if (var->is_uniform) + sm1_sort_extern(&sorted, var); + } list_move_tail(&ctx->extern_vars, &sorted); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Allow VPOS and VFACE to be specified in sm3 pixel shaders.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: 0654d88edd53b0721e071084004eb42619cbd6fa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0654d88edd53b0721e071084004eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 24 13:11:06 2023 -0600 vkd3d-shader/hlsl: Allow VPOS and VFACE to be specified in sm3 pixel shaders. We were previously (accidentally) rejecting them because they didn't have a usage. --- libs/vkd3d-shader/hlsl_codegen.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index c8130a3f..adaf8201 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2921,7 +2921,8 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var D3DDECLUSAGE usage; uint32_t usage_idx; - if (!hlsl_sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx)) + builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg); + if (!builtin && !hlsl_sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx)) { hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, "Invalid semantic '%s'.", var->semantic.name); @@ -2930,8 +2931,6 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if ((!output && !var->last_read) || (output && !var->first_write)) return; - - builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg); } else {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Map ps_1_* color and texcoord semantics to registers.
by Alexandre Julliard April 18, 2023

April 18, 2023

Module: vkd3d Branch: master Commit: 99d413206b9409971e856c50640d8afcaefdd293 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/99d413206b9409971e856c50640d8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 24 12:51:33 2023 -0600 vkd3d-shader/hlsl: Map ps_1_* color and texcoord semantics to registers. --- libs/vkd3d-shader/hlsl_sm1.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 73ec8453..69b881c4 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -37,6 +37,9 @@ bool hlsl_sm1_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_sem } register_table[] = { + {"color", false, VKD3D_SHADER_TYPE_PIXEL, 1, D3DSPR_INPUT}, + {"texcoord", false, VKD3D_SHADER_TYPE_PIXEL, 1, D3DSPR_TEXTURE}, + {"color", true, VKD3D_SHADER_TYPE_PIXEL, 2, D3DSPR_COLOROUT}, {"depth", true, VKD3D_SHADER_TYPE_PIXEL, 2, D3DSPR_DEPTHOUT}, {"sv_depth", true, VKD3D_SHADER_TYPE_PIXEL, 2, D3DSPR_DEPTHOUT},

1 0