wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 integer negation.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: c64627313fe9288bec24dc2de3e5063c922a1f4c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c64627313fe9288bec24dc2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 1 17:14:59 2021 +0100 vkd3d-shader/hlsl: Write SM4 integer negation. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 +-- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 88bdc0e..934d7e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -309,8 +309,7 @@ XFAIL_TESTS = \ tests/sampler.shader_test \ tests/texture-load.shader_test \ tests/texture-load-typed.shader_test \ - tests/trigonometry.shader_test \ - tests/writemask-assignop-1.shader_test + tests/trigonometry.shader_test endif if BUILD_DEMOS diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index ef4a432..7f2f960 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1416,6 +1416,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP1_NEG: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_INEG, &expr->node, arg1, 0); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 int \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass a vkd3d_shader_location pointer to the intrinsic handler callback.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 3ad860924746471d01563a6395e4312da9602e14 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3ad860924746471d01563a6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 17:14:58 2021 +0100 vkd3d-shader/hlsl: Pass a vkd3d_shader_location pointer to the intrinsic handler callback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 68 +++++++++++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=3ad860924746471d015…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass a vkd3d_shader_location pointer to message reporting functions.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 943bd2fedeea431fa4d7bea0aaa506ead721ab69 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=943bd2fedeea431fa4d7bea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 17:14:57 2021 +0100 vkd3d-shader/hlsl: Pass a vkd3d_shader_location pointer to message reporting functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 18 ++-- libs/vkd3d-shader/hlsl.h | 8 +- libs/vkd3d-shader/hlsl.l | 2 +- libs/vkd3d-shader/hlsl.y | 194 +++++++++++++++++++-------------------- libs/vkd3d-shader/hlsl_codegen.c | 26 +++--- libs/vkd3d-shader/hlsl_sm1.c | 8 +- libs/vkd3d-shader/hlsl_sm4.c | 32 +++---- 7 files changed, 144 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=943bd2fedeea431fa4d…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Lower narrowing casts to swizzles.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: a33439f1a02a55a3d5f8a6b7411dca9f19b695a8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a33439f1a02a55a3d5f8a6b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 17:14:56 2021 +0100 vkd3d-shader/hlsl: Lower narrowing casts to swizzles. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_codegen.c | 37 +++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_sm4.c | 15 ++++++--------- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4010533..88bdc0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -290,7 +290,6 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ - tests/hlsl-cross.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 4e1d043..29ced37 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -616,6 +616,42 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } +static bool lower_narrowing_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + const struct hlsl_type *src_type, *dst_type; + struct hlsl_type *dst_vector_type; + struct hlsl_ir_expr *cast; + + if (instr->type != HLSL_IR_EXPR) + return false; + cast = hlsl_ir_expr(instr); + src_type = cast->operands[0].node->data_type; + dst_type = cast->node.data_type; + + if (cast->op == HLSL_OP1_CAST + && src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR + && dst_type->dimx < src_type->dimx) + { + struct hlsl_ir_swizzle *swizzle; + struct hlsl_ir_expr *new_cast; + + dst_vector_type = hlsl_get_vector_type(ctx, dst_type->base_type, src_type->dimx); + /* We need to preserve the cast since it might be doing more than just + * narrowing the vector. */ + if (!(new_cast = hlsl_new_cast(ctx, cast->operands[0].node, dst_vector_type, &cast->node.loc))) + return false; + list_add_after(&cast->node.entry, &new_cast->node.entry); + if (!(swizzle = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(X, Y, Z, W), dst_type->dimx, &new_cast->node, &cast->node.loc))) + return false; + list_add_after(&new_cast->node.entry, &swizzle->node.entry); + + replace_node(&cast->node, &swizzle->node); + return true; + } + + return false; +} + static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -1669,6 +1705,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun progress |= transform_ir(ctx, split_struct_copies, body, NULL); } while (progress); + transform_ir(ctx, lower_narrowing_casts, body, NULL); do { progress = transform_ir(ctx, fold_constants, body, NULL); diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 1c0fea5..a75abbc 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1298,9 +1298,8 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, { const struct hlsl_type *src_type = arg1->data_type; - /* Narrowing casts need to be lowered. */ - if (src_type->dimx != expr->node.data_type->dimx) - hlsl_fixme(ctx, expr->node.loc, "Narrowing cast.\n"); + /* Narrowing casts were already lowered. */ + assert(src_type->dimx == expr->node.data_type->dimx); switch (src_type->base_type) { @@ -1388,9 +1387,8 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, { const struct hlsl_type *src_type = arg1->data_type; - /* Narrowing casts need to be lowered. */ - if (src_type->dimx != expr->node.data_type->dimx) - hlsl_fixme(ctx, expr->node.loc, "Narrowing cast."); + /* Narrowing casts were already lowered. */ + assert(src_type->dimx == expr->node.data_type->dimx); switch (src_type->base_type) { @@ -1433,9 +1431,8 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, { const struct hlsl_type *src_type = arg1->data_type; - /* Narrowing casts need to be lowered. */ - if (src_type->dimx != expr->node.data_type->dimx) - hlsl_fixme(ctx, expr->node.loc, "SM4 narrowing cast.\n"); + /* Narrowing casts were already lowered. */ + assert(src_type->dimx == expr->node.data_type->dimx); switch (src_type->base_type) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Lower scalar-to-vector casts to swizzles.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 0a4e948453ff9beef0ee04b7fb22f52cccb57fb5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0a4e948453ff9beef0ee04b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 17:14:55 2021 +0100 vkd3d-shader/hlsl: Lower scalar-to-vector casts to swizzles. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_codegen.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index be3d8ec..4010533 100644 --- a/Makefile.am +++ b/Makefile.am @@ -290,7 +290,6 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ - tests/hlsl-comma.shader_test \ tests/hlsl-cross.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index d3957f8..4e1d043 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -237,6 +237,43 @@ static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) hlsl_free_instr(old); } +/* Lower casts from vec1 to vecN to swizzles. */ +static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + const struct hlsl_type *src_type, *dst_type; + struct hlsl_type *dst_scalar_type; + struct hlsl_ir_expr *cast; + + if (instr->type != HLSL_IR_EXPR) + return false; + cast = hlsl_ir_expr(instr); + src_type = cast->operands[0].node->data_type; + dst_type = cast->node.data_type; + + if (cast->op == HLSL_OP1_CAST + && src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR + && src_type->dimx == 1) + { + struct hlsl_ir_swizzle *swizzle; + struct hlsl_ir_expr *new_cast; + + dst_scalar_type = hlsl_get_scalar_type(ctx, dst_type->base_type); + /* We need to preserve the cast since it might be doing more than just + * turning the scalar into a vector. */ + if (!(new_cast = hlsl_new_cast(ctx, cast->operands[0].node, dst_scalar_type, &cast->node.loc))) + return false; + list_add_after(&cast->node.entry, &new_cast->node.entry); + if (!(swizzle = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(X, X, X, X), dst_type->dimx, &new_cast->node, &cast->node.loc))) + return false; + list_add_after(&new_cast->node.entry, &swizzle->node.entry); + + replace_node(&cast->node, &swizzle->node); + return true; + } + + return false; +} + struct copy_propagation_value { struct hlsl_ir_node *node; @@ -1624,6 +1661,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun append_output_var_copy(ctx, &body->instrs, entry_func->return_var); } + transform_ir(ctx, lower_broadcasts, body, NULL); while (transform_ir(ctx, fold_redundant_casts, body, NULL)); do {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 sample instructions.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: cbe69494a7031de4c5a98ba2013f63ae2575d5c5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cbe69494a7031de4c5a98ba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 17:14:54 2021 +0100 vkd3d-shader/hlsl: Write SM4 sample instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 59 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index c0c26f8..1c0fea5 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -753,7 +753,7 @@ struct sm4_instruction struct sm4_register reg; enum vkd3d_sm4_swizzle_type swizzle_type; unsigned int swizzle; - } srcs[2]; + } srcs[3]; unsigned int src_count; uint32_t idx[2]; @@ -776,6 +776,16 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r reg->idx_count = 1; *writemask = VKD3DSP_WRITEMASK_ALL; } + else if (data_type->type == HLSL_CLASS_OBJECT && data_type->base_type == HLSL_TYPE_SAMPLER) + { + reg->type = VKD3D_SM4_RT_SAMPLER; + reg->dim = VKD3D_SM4_DIMENSION_NONE; + if (swizzle_type) + *swizzle_type = VKD3D_SM4_SWIZZLE_NONE; + reg->idx[0] = var->reg.id; + reg->idx_count = 1; + *writemask = VKD3DSP_WRITEMASK_ALL; + } else { unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref) + var->buffer_offset; @@ -1238,6 +1248,34 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf write_sm4_instruction(buffer, &instr); } +static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, + const struct hlsl_deref *resource, const struct hlsl_deref *sampler, const struct hlsl_ir_node *coords) +{ + struct sm4_instruction instr; + unsigned int writemask; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_SAMPLE; + + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); + instr.dst_count = 1; + + sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, coords); + instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); + + sm4_register_from_deref(ctx, &instr.srcs[1].reg, &writemask, + &instr.srcs[1].swizzle_type, resource, resource_type); + instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); + + sm4_register_from_deref(ctx, &instr.srcs[2].reg, &writemask, + &instr.srcs[2].swizzle_type, sampler, sampler->var->data_type); + + instr.src_count = 3; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr) { @@ -1516,6 +1554,21 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, const struct hlsl_type *resource_type = load->resource.var->data_type; const struct hlsl_ir_node *coords = load->coords.node; + if (load->sampler.var) + { + const struct hlsl_type *sampler_type = load->sampler.var->data_type; + + assert(sampler_type->type == HLSL_CLASS_OBJECT); + assert(sampler_type->base_type == HLSL_TYPE_SAMPLER); + assert(sampler_type->sampler_dim == HLSL_SAMPLER_DIM_GENERIC); + + if (!load->sampler.var->is_uniform) + { + hlsl_fixme(ctx, load->node.loc, "Sample using non-uniform sampler variable."); + return; + } + } + if (!load->resource.var->is_uniform) { hlsl_fixme(ctx, load->node.loc, "Load from non-uniform resource variable."); @@ -1529,7 +1582,9 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, break; case HLSL_RESOURCE_SAMPLE: - hlsl_fixme(ctx, load->node.loc, "Resource sample instruction."); + if (!load->sampler.var) + hlsl_fixme(ctx, load->node.loc, "SM4 combined sample expression."); + write_sm4_sample(ctx, buffer, resource_type, &load->node, &load->resource, &load->sampler, coords); break; } }

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Introduce a copy propagation pass.
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: vkd3d Branch: master Commit: 5c1c9cba7a3cccd4cbd21b4143e03d684b13518c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5c1c9cba7a3cccd4cbd21b4… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 1 17:14:50 2021 +0100 vkd3d-shader/hlsl: Introduce a copy propagation pass. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 20 +++- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 217 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 232 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=5c1c9cba7a3cccd4cbd…

1 0

Connor McAdams : ws2_32: Return WSAEINVAL from GetAddrInfoExOverlappedResult if overlapped is NULL.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: 2f9f126a6e7f663446e05366183f2ede16cb58a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f9f126a6e7f663446e05366… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Dec 15 13:30:03 2021 -0500 ws2_32: Return WSAEINVAL from GetAddrInfoExOverlappedResult if overlapped is NULL. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 4 ++++ dlls/ws2_32/tests/protocol.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 239e4d14cd2..867e9513ca2 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -514,6 +514,10 @@ int WINAPI GetAddrInfoExW( const WCHAR *name, const WCHAR *servname, DWORD names int WINAPI GetAddrInfoExOverlappedResult( OVERLAPPED *overlapped ) { TRACE( "(%p)\n", overlapped ); + + if (!overlapped) + return WSAEINVAL; + return overlapped->Internal; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 6eebb5f6b4d..881e3a388fd 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1904,6 +1904,9 @@ static void test_GetAddrInfoExW(void) ok(!ret, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); pFreeAddrInfoExW(result); + ret = pGetAddrInfoExOverlappedResult(NULL); + ok(ret == WSAEINVAL, "overlapped result is %d\n", ret); + result = (void *)0xdeadbeef; memset(&overlapped, 0xcc, sizeof(overlapped)); overlapped.hEvent = event;

1 0

Zebediah Figura : qasf/tests: Test that the DMO wrapper (de)commits its source pins' allocators when changing state.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: 617c9b4692a1e87e4b79dab71d8f1a7e702212ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=617c9b4692a1e87e4b79dab7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 15 11:50:49 2021 -0600 qasf/tests: Test that the DMO wrapper (de)commits its source pins' allocators when changing state. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index bd87a3494b2..9cebbda3af2 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1375,10 +1375,12 @@ static void test_sink_allocator(IMemInputPin *input) IMemAllocator_Release(ret_allocator); } -static void test_source_allocator(IFilterGraph2 *graph, IPin *source, struct testfilter *testsink) +static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, + IPin *source, struct testfilter *testsink) { ALLOCATOR_PROPERTIES props, req_props = {2, 30000, 32, 0}; IMemAllocator *allocator; + IMediaSample *sample; HRESULT hr; hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt2); @@ -1392,6 +1394,22 @@ static void test_source_allocator(IFilterGraph2 *graph, IPin *source, struct tes ok(props.cbAlign == 1, "Got alignment %d.\n", props.cbAlign); ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix); + hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(sample); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + IFilterGraph2_Disconnect(graph, source); IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); @@ -1500,7 +1518,8 @@ static void test_filter_state(IMediaControl *control) ok(state == State_Stopped, "Got state %u.\n", state); } -static void test_sample_processing(IMediaControl *control, IMemInputPin *input) +static void test_sample_processing(IMediaControl *control, IMemInputPin *input, + struct testfilter *testsink) { REFERENCE_TIME start, stop; IMemAllocator *allocator; @@ -1863,7 +1882,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); test_filter_state(control); - test_sample_processing(control, meminput); + test_sample_processing(control, meminput, &testsink); /* Streaming event tests are more interesting if multiple source pins are * connected. */ @@ -2007,7 +2026,7 @@ static void test_connect_pin(void) ok(!testdmo_input_mt_set, "Input type should not be set.\n"); - test_source_allocator(graph, source, &testsink); + test_source_allocator(graph, control, source, &testsink); IPin_Release(sink); IPin_Release(source);

1 0

Zebediah Figura : winegstreamer: Return E_UNEXPECTED when calling IWMReader::Stop() if no stream is open.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: 78f916f598b4e0acadbda2c095058bf8a268eb72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78f916f598b4e0acadbda2c0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 15 11:50:19 2021 -0600 winegstreamer: Return E_UNEXPECTED when calling IWMReader::Stop() if no stream is open. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52038 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 8 ++++++++ dlls/wmvcore/tests/wmvcore.c | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 18698a698e2..aa15a5a77f9 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -356,6 +356,14 @@ static HRESULT WINAPI WMReader_Stop(IWMReader *iface) TRACE("reader %p.\n", reader); EnterCriticalSection(&reader->reader.cs); + + if (!reader->reader.wg_parser) + { + LeaveCriticalSection(&reader->reader.cs); + WARN("No stream is open; returning E_UNEXPECTED.\n"); + return E_UNEXPECTED; + } + stop_streaming(reader); IWMReaderCallback_OnStatus(reader->callback, WMT_STOPPED, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index e27011f49a0..66ad89a185e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2169,6 +2169,9 @@ static void test_async_reader_streaming(void) IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced); + hr = IWMReader_Stop(reader); + ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + hr = IWMReaderAdvanced2_OpenStream(advanced, &stream.IStream_iface, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); @@ -2257,6 +2260,9 @@ static void test_async_reader_streaming(void) ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); callback_cleanup(&callback); + hr = IWMReader_Stop(reader); + ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); CloseHandle(stream.file); ret = DeleteFileW(filename);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021