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

Ziqing Hui : winegstreamer: Implement GetInputStatus for WMV decoder DMO.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 2a83ef077f9b872832e22306e4008bd192fb40b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a83ef077f9b872832e22306e4008b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 23 12:21:09 2023 +0800 winegstreamer: Implement GetInputStatus for WMV decoder DMO. --- dlls/mf/tests/transform.c | 7 ------- dlls/winegstreamer/wmv_decoder.c | 12 ++++++++++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 70bd2195521..031eb50f319 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5580,23 +5580,18 @@ static void test_wmv_decoder_media_object(void) /* Test GetInputStatus. */ hr = IMediaObject_GetInputStatus(media_object, 0xdeadbeef, NULL); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputStatus returned %#lx.\n", hr); status = 0xdeadbeef; hr = IMediaObject_GetInputStatus(media_object, 0xdeadbeef, &status); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputStatus returned %#lx.\n", hr); ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); hr = IMediaObject_GetInputStatus(media_object, 0, NULL); - todo_wine ok(hr == E_POINTER, "GetInputStatus returned %#lx.\n", hr); hr = IMediaObject_GetInputStatus(media_object, 0, &status); - todo_wine ok(hr == S_OK, "GetInputStatus returned %#lx.\n", hr); - todo_wine ok(status == DMO_INPUT_STATUSF_ACCEPT_DATA, "Unexpected status %#lx.\n", status); /* Test Discontinuity. */ @@ -5610,9 +5605,7 @@ static void test_wmv_decoder_media_object(void) todo_wine ok(hr == S_OK, "Discontinuity returned %#lx.\n", hr); hr = IMediaObject_GetInputStatus(media_object, 0, &status); - todo_wine ok(hr == S_OK, "GetInputStatus returned %#lx.\n", hr); - todo_wine ok(status == DMO_INPUT_STATUSF_ACCEPT_DATA, "Unexpected status %#lx.\n", status); /* Test Flush. */ diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index 82c69776bd6..75a7068a432 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -680,8 +680,16 @@ static HRESULT WINAPI media_object_FreeStreamingResources(IMediaObject *iface) static HRESULT WINAPI media_object_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("iface %p, index %lu, flags %p stub!\n", iface, index, flags); - return E_NOTIMPL; + TRACE("iface %p, index %lu, flags %p.\n", iface, index, flags); + + if (index > 0) + return DMO_E_INVALIDSTREAMINDEX; + if (!flags) + return E_POINTER; + + *flags = DMO_INPUT_STATUSF_ACCEPT_DATA; + + return S_OK; } static HRESULT WINAPI media_object_ProcessInput(IMediaObject *iface, DWORD index,

1 0

Ziqing Hui : winegstreamer: Implement Discontinuity for WMV decoder DMO.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 51c5f44bd707f066709759bfe8e0be14d8d9c25f URL: https://gitlab.winehq.org/wine/wine/-/commit/51c5f44bd707f066709759bfe8e0be… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 23 12:22:51 2023 +0800 winegstreamer: Implement Discontinuity for WMV decoder DMO. --- dlls/mf/tests/transform.c | 3 --- dlls/winegstreamer/wmv_decoder.c | 8 ++++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 031eb50f319..b1ac3ffbb14 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5596,13 +5596,10 @@ static void test_wmv_decoder_media_object(void) /* Test Discontinuity. */ hr = IMediaObject_Discontinuity(media_object, 0xdeadbeef); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "Discontinuity returned %#lx.\n", hr); hr = IMediaObject_Discontinuity(media_object, 0); - todo_wine ok(hr == S_OK, "Discontinuity returned %#lx.\n", hr); hr = IMediaObject_Discontinuity(media_object, 0); - todo_wine ok(hr == S_OK, "Discontinuity returned %#lx.\n", hr); hr = IMediaObject_GetInputStatus(media_object, 0, &status); ok(hr == S_OK, "GetInputStatus returned %#lx.\n", hr); diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index 75a7068a432..a22de7ccb7f 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -662,8 +662,12 @@ static HRESULT WINAPI media_object_Flush(IMediaObject *iface) static HRESULT WINAPI media_object_Discontinuity(IMediaObject *iface, DWORD index) { - FIXME("iface %p, index %lu stub!\n", iface, index); - return E_NOTIMPL; + TRACE("iface %p, index %lu.\n", iface, index); + + if (index > 0) + return DMO_E_INVALIDSTREAMINDEX; + + return S_OK; } static HRESULT WINAPI media_object_AllocateStreamingResources(IMediaObject *iface)

1 0

Nikolay Sivov : d2d1: Implement IsSupported() for DC target.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: df50411fac9a1dc56ce1b80888e923d374c831f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/df50411fac9a1dc56ce1b80888e923… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 20 01:05:37 2023 +0200 d2d1: Implement IsSupported() for DC target. --- dlls/d2d1/d2d1_private.h | 3 +- dlls/d2d1/dc_render_target.c | 30 +++++- dlls/d2d1/tests/d2d1.c | 233 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 262 insertions(+), 4 deletions(-)

1 0

Nikolay Sivov : d2d1/tests: Use test context for more tests.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 02919e4298513c6c21e8ff0fe29c0615f6259245 URL: https://gitlab.winehq.org/wine/wine/-/commit/02919e4298513c6c21e8ff0fe29c06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 21 14:37:09 2023 +0200 d2d1/tests: Use test context for more tests. --- dlls/d2d1/tests/d2d1.c | 217 ++++++++++++++++++++----------------------------- 1 file changed, 87 insertions(+), 130 deletions(-)

1 0

Nikolay Sivov : d2d1: Reject D2D1_ALPHA_MODE_STRAIGHT alpha mode for HWND targets.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: ae43a87d017ca28a7f246e5d755a50c73a4024df URL: https://gitlab.winehq.org/wine/wine/-/commit/ae43a87d017ca28a7f246e5d755a50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 21 15:58:40 2023 +0200 d2d1: Reject D2D1_ALPHA_MODE_STRAIGHT alpha mode for HWND targets. --- dlls/d2d1/hwnd_render_target.c | 7 +++++++ dlls/d2d1/tests/d2d1.c | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 325eb941782..a62f31b909d 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -862,6 +862,13 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target if (dxgi_rt_desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_UNKNOWN) dxgi_rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + if (dxgi_rt_desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_STRAIGHT) + { + IDXGIFactory_Release(dxgi_factory); + WARN("Alpha mode %u is not supported.\n", dxgi_rt_desc.pixelFormat.alphaMode); + return D2DERR_UNSUPPORTED_PIXEL_FORMAT; + } + render_target->desc = dxgi_rt_desc; /* FIXME: should be resolved to either HW or SW type. */ if (render_target->desc.type == D2D1_RENDER_TARGET_TYPE_DEFAULT) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f0b0da732df..1607bacd2bc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6214,10 +6214,7 @@ static void test_hwnd_target(BOOL d3d11) hr = ID2D1Factory_CreateHwndRenderTarget(ctx.factory, &desc, &hwnd_rt_desc, &rt); if (format_tests[i].expected_failure) { - todo_wine - ok(FAILED(hr), "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ID2D1HwndRenderTarget_Release(rt); + ok(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT, "Got unexpected hr %#lx.\n", hr); winetest_pop_context(); continue; }

1 0

Nikolay Sivov : d2d1/tests: Add some more tests for ID2D1GdiInteropRenderTarget.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 612020f952254fcd3b2c6e237530a1e3b19c4ff5 URL: https://gitlab.winehq.org/wine/wine/-/commit/612020f952254fcd3b2c6e237530a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 22 01:13:35 2023 +0200 d2d1/tests: Add some more tests for ID2D1GdiInteropRenderTarget. --- dlls/d2d1/tests/d2d1.c | 344 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 299 insertions(+), 45 deletions(-)

1 0

Nikolay Sivov : d2d1: Create GDI-compatible target bitmap for GDI-compatible target usage.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 981db8313fc305412add7c91c36f4f72bad5a0da URL: https://gitlab.winehq.org/wine/wine/-/commit/981db8313fc305412add7c91c36f4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 22 20:08:50 2023 +0200 d2d1: Create GDI-compatible target bitmap for GDI-compatible target usage. --- dlls/d2d1/device.c | 2 ++ dlls/d2d1/tests/d2d1.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 93fcecf72ba..42db30b2888 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -4456,6 +4456,8 @@ HRESULT d2d_d3d_create_render_target(ID2D1Device *device, IDXGISurface *surface, { bitmap_desc.pixelFormat = desc->pixelFormat; bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; + if (desc->usage & D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE) + bitmap_desc.bitmapOptions |= D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE; bitmap_desc.colorContext = NULL; if (FAILED(hr = ID2D1DeviceContext1_CreateBitmapFromDxgiSurface(&object->ID2D1DeviceContext1_iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bff93c1815c..ae0e36f1e17 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6453,10 +6453,7 @@ static void test_dxgi_surface_target_gdi_interop(BOOL d3d11) desc.usage = D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE; hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(ctx.factory, surface, &desc, &rt); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ID2D1RenderTarget_Release(rt); refcount = IDXGISurface_Release(surface); ok(!refcount, "Unexpected refcount %lu.\n", refcount);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_cast().
by Alexandre Julliard 23 May '23

23 May '23

Module: vkd3d Branch: master Commit: eb04829e669ec877f994031057113c3f38c0b30d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eb04829e669ec877f994031057113… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:43:57 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_cast(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 0eca3939..676126d7 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -62,7 +62,8 @@ static bool fold_abs(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct return true; } -static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src) +static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, + const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) { unsigned int k; uint32_t u; @@ -70,11 +71,11 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct double d; float f; - if (dst->node.data_type->dimx != src->node.data_type->dimx - || dst->node.data_type->dimy != src->node.data_type->dimy) + if (dst_type->dimx != src->node.data_type->dimx + || dst_type->dimy != src->node.data_type->dimy) { FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type), - debug_hlsl_type(ctx, dst->node.data_type)); + debug_hlsl_type(ctx, dst_type)); return false; } @@ -122,23 +123,23 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct vkd3d_unreachable(); } - switch (dst->node.data_type->base_type) + switch (dst_type->base_type) { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - dst->value.u[k].f = f; + dst->u[k].f = f; break; case HLSL_TYPE_DOUBLE: - dst->value.u[k].d = d; + dst->u[k].d = d; break; case HLSL_TYPE_INT: - dst->value.u[k].i = i; + dst->u[k].i = i; break; case HLSL_TYPE_UINT: - dst->value.u[k].u = u; + dst->u[k].u = u; break; case HLSL_TYPE_BOOL: @@ -578,7 +579,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP1_CAST: - success = fold_cast(ctx, res, arg1); + success = fold_cast(ctx, &res->value, instr->data_type, arg1); break; case HLSL_OP1_NEG:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_neg().
by Alexandre Julliard 23 May '23

23 May '23

Module: vkd3d Branch: master Commit: 7d9b24fe11e88e7e2c757acd2fd63e5ab7cb31bb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d9b24fe11e88e7e2c757acd2fd63… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:46:10 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_neg(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 676126d7..2a2b4729 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -151,9 +151,10 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, return true; } -static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src) +static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, + const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src->node.data_type->base_type); @@ -164,20 +165,20 @@ static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - dst->value.u[k].f = -src->value.u[k].f; + dst->u[k].f = -src->value.u[k].f; break; case HLSL_TYPE_DOUBLE: - dst->value.u[k].d = -src->value.u[k].d; + dst->u[k].d = -src->value.u[k].d; break; case HLSL_TYPE_INT: case HLSL_TYPE_UINT: - dst->value.u[k].u = -src->value.u[k].u; + dst->u[k].u = -src->value.u[k].u; break; default: - FIXME("Fold negation for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold negation for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -583,7 +584,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP1_NEG: - success = fold_neg(ctx, res, arg1); + success = fold_neg(ctx, &res->value, instr->data_type, arg1); break; case HLSL_OP2_ADD:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_add().
by Alexandre Julliard 23 May '23

23 May '23

Module: vkd3d Branch: master Commit: 623cd94997f0f7c70fb28cfdf2dfad3e0dc478b2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/623cd94997f0f7c70fb28cfdf2dfa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:47:28 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_add(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 2a2b4729..24ebbf8d 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -185,10 +185,10 @@ static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, return true; } -static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src1, - struct hlsl_ir_constant *src2) +static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src1->node.data_type->base_type); @@ -200,22 +200,22 @@ static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - dst->value.u[k].f = src1->value.u[k].f + src2->value.u[k].f; + dst->u[k].f = src1->value.u[k].f + src2->value.u[k].f; break; case HLSL_TYPE_DOUBLE: - dst->value.u[k].d = src1->value.u[k].d + src2->value.u[k].d; + dst->u[k].d = src1->value.u[k].d + src2->value.u[k].d; break; /* Handling HLSL_TYPE_INT through the unsigned field to avoid * undefined behavior with signed integers in C. */ case HLSL_TYPE_INT: case HLSL_TYPE_UINT: - dst->value.u[k].u = src1->value.u[k].u + src2->value.u[k].u; + dst->u[k].u = src1->value.u[k].u + src2->value.u[k].u; break; default: - FIXME("Fold addition for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold addition for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -588,7 +588,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_ADD: - success = fold_add(ctx, res, arg1, arg2); + success = fold_add(ctx, &res->value, instr->data_type, arg1, arg2); break; case HLSL_OP2_MUL:

1 0