- Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d-shader/dxil: Implement DX instruction CreateHandle.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: vkd3d Branch: master Commit: 3b1bbe2b0aa82fc1fe0db823176ba4d1e1bc88d5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3b1bbe2b0aa82fc1fe0db823176ba… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 16 11:47:11 2023 +1000 vkd3d-shader/dxil: Implement DX instruction CreateHandle. --- libs/vkd3d-shader/dxil.c | 153 ++++++++++++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 140 insertions(+), 14 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement the DXIL EXTRACTVAL instruction.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: vkd3d Branch: master Commit: 589670180a1a8e9221afd8923b61775264ccfb5e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/589670180a1a8e9221afd8923b617… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Oct 11 14:33:27 2023 +1000 vkd3d-shader/dxil: Implement the DXIL EXTRACTVAL instruction. --- libs/vkd3d-shader/dxil.c | 92 +++++++++++++++++++++++++++++ tests/hlsl/asfloat.shader_test | 2 +- tests/hlsl/cbuffer.shader_test | 16 ++--- tests/hlsl/expr-indexing.shader_test | 4 +- tests/hlsl/half.shader_test | 2 +- tests/hlsl/majority-pragma.shader_test | 26 ++++---- tests/hlsl/majority-syntax.shader_test | 2 +- tests/hlsl/matrix-indexing.shader_test | 8 +-- tests/hlsl/nested-arrays.shader_test | 2 +- tests/hlsl/object-field-offsets.shader_test | 4 +- tests/hlsl/storage-qualifiers.shader_test | 2 +- tests/hlsl/struct-array.shader_test | 2 +- tests/hlsl/swizzle-matrix.shader_test | 14 ++--- tests/hlsl/swizzles.shader_test | 6 +- tests/hlsl/uniform-semantics.shader_test | 4 +- tests/hlsl/vector-indexing.shader_test | 2 +- 16 files changed, 140 insertions(+), 48 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/spirv: Support scalar swizzle of vector SSA registers.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: vkd3d Branch: master Commit: e899b67bbf155030e454815e5ffeb11100f8a143 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e899b67bbf155030e454815e5ffeb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 6 00:35:28 2023 +1000 vkd3d-shader/spirv: Support scalar swizzle of vector SSA registers. --- libs/vkd3d-shader/spirv.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 343be44f..6faac0cc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3543,6 +3543,14 @@ static bool vkd3d_swizzle_is_equal(unsigned int dst_write_mask, return vkd3d_compact_swizzle(VKD3D_SHADER_NO_SWIZZLE, dst_write_mask) == vkd3d_compact_swizzle(swizzle, write_mask); } +static bool vkd3d_swizzle_is_scalar(unsigned int swizzle) +{ + unsigned int component_idx = vkd3d_swizzle_get_component(swizzle, 0); + return vkd3d_swizzle_get_component(swizzle, 1) == component_idx + && vkd3d_swizzle_get_component(swizzle, 2) == component_idx + && vkd3d_swizzle_get_component(swizzle, 3) == component_idx; +} + static uint32_t spirv_compiler_emit_swizzle(struct spirv_compiler *compiler, uint32_t val_id, unsigned int val_write_mask, enum vkd3d_shader_component_type component_type, unsigned int swizzle, unsigned int write_mask) @@ -3745,6 +3753,26 @@ static void spirv_compiler_set_ssa_register_id(const struct spirv_compiler *comp compiler->ssa_register_ids[i] = val_id; } +static uint32_t spirv_compiler_emit_load_ssa_reg(struct spirv_compiler *compiler, + const struct vkd3d_shader_register *reg, enum vkd3d_shader_component_type component_type, + unsigned int swizzle) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int component_idx; + uint32_t type_id, val_id; + + val_id = spirv_compiler_get_ssa_register_id(compiler, reg); + assert(val_id); + assert(vkd3d_swizzle_is_scalar(swizzle)); + + if (reg->dimension == VSIR_DIMENSION_SCALAR) + return val_id; + + type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); + component_idx = vkd3d_swizzle_get_component(swizzle, 0); + return vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, component_idx); +} + static uint32_t spirv_compiler_emit_load_reg(struct spirv_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) { @@ -3766,7 +3794,7 @@ static uint32_t spirv_compiler_emit_load_reg(struct spirv_compiler *compiler, component_type = vkd3d_component_type_from_data_type(reg->data_type); if (reg->type == VKD3DSPR_SSA) - return spirv_compiler_get_ssa_register_id(compiler, reg); + return spirv_compiler_emit_load_ssa_reg(compiler, reg, component_type, swizzle); if (!spirv_compiler_get_register_info(compiler, reg, &reg_info)) {

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX instruction CBufferLoadLegacy.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: vkd3d Branch: master Commit: 43b5d738709c02d5a30f2ba60af20ec15b2588a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/43b5d738709c02d5a30f2ba60af20… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Oct 5 15:38:09 2023 +1000 vkd3d-shader/dxil: Implement DX instruction CBufferLoadLegacy. --- libs/vkd3d-shader/dxil.c | 84 ++++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +++ 2 files changed, 87 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 352e4b58..aa16498f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -247,6 +247,7 @@ enum dx_intrinsic_opcode DX_LOAD_INPUT = 4, DX_STORE_OUTPUT = 5, DX_CREATE_HANDLE = 57, + DX_CBUFFER_LOAD_LEGACY = 59, }; struct sm6_pointer_info @@ -1586,6 +1587,11 @@ static const struct sm6_type *sm6_type_get_scalar_type(const struct sm6_type *ty } } +static unsigned int sm6_type_max_vector_size(const struct sm6_type *type) +{ + return min((VKD3D_VEC4_SIZE * sizeof(uint32_t) * CHAR_BIT) / type->u.width, VKD3D_VEC4_SIZE); +} + static const struct sm6_type *sm6_parser_get_type(struct sm6_parser *sm6, uint64_t type_id) { if (type_id >= sm6->type_count) @@ -1690,7 +1696,7 @@ static const char *sm6_parser_get_global_symbol_name(const struct sm6_parser *sm static unsigned int register_get_uint_value(const struct vkd3d_shader_register *reg) { - if (!register_is_constant(reg) || !data_type_is_integer(reg->data_type)) + if (!register_is_constant(reg) || (!data_type_is_integer(reg->data_type) && !data_type_is_bool(reg->data_type))) return UINT_MAX; if (reg->dimension == VSIR_DIMENSION_VEC4) @@ -1847,8 +1853,8 @@ static enum vkd3d_data_type vkd3d_data_type_from_sm6_type(const struct sm6_type return VKD3D_DATA_UINT; } -static void register_init_ssa_scalar(struct vkd3d_shader_register *reg, const struct sm6_type *type, - struct sm6_parser *sm6) +static void register_init_ssa_vector(struct vkd3d_shader_register *reg, const struct sm6_type *type, + unsigned int component_count, struct sm6_parser *sm6) { enum vkd3d_data_type data_type; unsigned int id; @@ -1856,6 +1862,13 @@ static void register_init_ssa_scalar(struct vkd3d_shader_register *reg, const st id = sm6_parser_alloc_ssa_id(sm6); data_type = vkd3d_data_type_from_sm6_type(sm6_type_get_scalar_type(type, 0)); register_init_with_id(reg, VKD3DSPR_SSA, data_type, id); + reg->dimension = component_count > 1 ? VSIR_DIMENSION_VEC4 : VSIR_DIMENSION_SCALAR; +} + +static void register_init_ssa_scalar(struct vkd3d_shader_register *reg, const struct sm6_type *type, + struct sm6_parser *sm6) +{ + register_init_ssa_vector(reg, type, 1, sm6); } static void dst_param_init(struct vkd3d_shader_dst_param *param) @@ -1872,6 +1885,13 @@ static inline void dst_param_init_scalar(struct vkd3d_shader_dst_param *param, u param->shift = 0; } +static void dst_param_init_vector(struct vkd3d_shader_dst_param *param, unsigned int component_count) +{ + param->write_mask = (1u << component_count) - 1; + param->modifiers = 0; + param->shift = 0; +} + static void dst_param_init_ssa_scalar(struct vkd3d_shader_dst_param *param, const struct sm6_type *type, struct sm6_parser *sm6) { @@ -1897,6 +1917,14 @@ static void src_param_init_from_value(struct vkd3d_shader_src_param *param, cons param->reg = src->u.reg; } +static void src_param_init_vector_from_reg(struct vkd3d_shader_src_param *param, + const struct vkd3d_shader_register *reg) +{ + param->swizzle = VKD3D_SHADER_NO_SWIZZLE; + param->modifiers = VKD3DSPSM_NONE; + param->reg = *reg; +} + static void register_index_address_init(struct vkd3d_shader_register_index *idx, const struct sm6_value *address, struct sm6_parser *sm6) { @@ -1928,6 +1956,17 @@ static void instruction_dst_param_init_ssa_scalar(struct vkd3d_shader_instructio dst->u.reg = param->reg; } +static void instruction_dst_param_init_ssa_vector(struct vkd3d_shader_instruction *ins, + unsigned int component_count, struct sm6_parser *sm6) +{ + struct vkd3d_shader_dst_param *param = instruction_dst_params_alloc(ins, 1, sm6); + struct sm6_value *dst = sm6_parser_get_current_value(sm6); + + dst_param_init_vector(param, component_count); + register_init_ssa_vector(&param->reg, sm6_type_get_scalar_type(dst->type, 0), component_count, sm6); + dst->u.reg = param->reg; +} + /* Recurse through the block tree while maintaining a current value count. The current * count is the sum of the global count plus all declarations within the current function. * Store into value_capacity the highest count seen. */ @@ -1992,6 +2031,18 @@ static size_t sm6_parser_get_value_index(struct sm6_parser *sm6, uint64_t idx) return i; } +static bool sm6_value_validate_is_handle(const struct sm6_value *value, struct sm6_parser *sm6) +{ + if (!sm6_value_is_handle(value)) + { + WARN("Handle parameter of type %u is not a handle.\n", value->value_type); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCE_HANDLE, + "A handle parameter passed to a DX intrinsic function is not a handle."); + return false; + } + return true; +} + static const struct sm6_value *sm6_parser_get_value_safe(struct sm6_parser *sm6, unsigned int idx) { if (idx < sm6->value_count) @@ -2554,6 +2605,32 @@ static struct sm6_block *sm6_block_create() return block; } +static void sm6_parser_emit_dx_cbuffer_load(struct sm6_parser *sm6, struct sm6_block *code_block, + enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct vkd3d_shader_instruction *ins) +{ + struct sm6_value *dst = sm6_parser_get_current_value(sm6); + struct vkd3d_shader_src_param *src_param; + const struct sm6_value *buffer; + const struct sm6_type *type; + + buffer = operands[0]; + if (!sm6_value_validate_is_handle(buffer, sm6)) + return; + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); + + src_param = instruction_src_params_alloc(ins, 1, sm6); + src_param_init_vector_from_reg(src_param, &buffer->u.handle.reg); + register_index_address_init(&src_param->reg.idx[2], operands[1], sm6); + assert(src_param->reg.idx_count == 3); + + type = sm6_type_get_scalar_type(dst->type, 0); + assert(type); + src_param->reg.data_type = vkd3d_data_type_from_sm6_type(type); + + instruction_dst_param_init_ssa_vector(ins, sm6_type_max_vector_size(type), sm6); +} + static const struct sm6_descriptor_info *sm6_parser_get_descriptor(struct sm6_parser *sm6, enum vkd3d_shader_descriptor_type type, unsigned int id, const struct sm6_value *address) { @@ -2718,6 +2795,7 @@ struct sm6_dx_opcode_info */ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = { + [DX_CBUFFER_LOAD_LEGACY ] = {'o', "Hi", sm6_parser_emit_dx_cbuffer_load}, [DX_CREATE_HANDLE ] = {'H', "ccib", sm6_parser_emit_dx_create_handle}, [DX_LOAD_INPUT ] = {'o', "ii8i", sm6_parser_emit_dx_load_input}, [DX_STORE_OUTPUT ] = {'v', "ii8o", sm6_parser_emit_dx_store_output}, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 95065e62..f6421cc8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -182,6 +182,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE = 8016, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES = 8017, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES = 8018, + VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCE_HANDLE = 8019, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301, @@ -584,6 +585,11 @@ static inline bool data_type_is_integer(enum vkd3d_data_type data_type) || data_type == VKD3D_DATA_UINT64; } +static inline bool data_type_is_bool(enum vkd3d_data_type data_type) +{ + return data_type == VKD3D_DATA_BOOL; +} + enum vsir_dimension { VSIR_DIMENSION_NONE,

1 0

Conor McCarthy : vkd3d-shader/dxil: Replace register_address_init() with register_index_address_init().
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: vkd3d Branch: master Commit: f57d65361ab0bca2f6caa7e472626828313fdd02 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f57d65361ab0bca2f6caa7e472626… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 16 11:18:30 2023 +1000 vkd3d-shader/dxil: Replace register_address_init() with register_index_address_init(). Makes it much clearer which register index is being written. --- libs/vkd3d-shader/dxil.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 19ce2936..30d3dff0 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1861,25 +1861,24 @@ static void src_param_init_from_value(struct vkd3d_shader_src_param *param, cons param->reg = src->u.reg; } -static void register_address_init(struct vkd3d_shader_register *reg, const struct sm6_value *address, - unsigned int idx, struct sm6_parser *sm6) +static void register_index_address_init(struct vkd3d_shader_register_index *idx, const struct sm6_value *address, + struct sm6_parser *sm6) { - assert(idx < ARRAY_SIZE(reg->idx)); if (sm6_value_is_constant(address)) { - reg->idx[idx].offset = sm6_value_get_constant_uint(address); + idx->offset = sm6_value_get_constant_uint(address); } else if (sm6_value_is_undef(address)) { - reg->idx[idx].offset = 0; + idx->offset = 0; } else { struct vkd3d_shader_src_param *rel_addr = shader_parser_get_src_params(&sm6->p, 1); if (rel_addr) src_param_init_from_value(rel_addr, address); - reg->idx[idx].offset = 0; - reg->idx[idx].rel_addr = rel_addr; + idx->offset = 0; + idx->rel_addr = rel_addr; } } @@ -2546,7 +2545,7 @@ static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, struct sm6_blo src_param->reg = sm6->input_params[row_index].reg; src_param_init_scalar(src_param, column_index); if (e->register_count > 1) - register_address_init(&src_param->reg, operands[1], 0, sm6); + register_index_address_init(&src_param->reg.idx[0], operands[1], sm6); instruction_dst_param_init_ssa_scalar(ins, sm6); } @@ -2598,7 +2597,7 @@ static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, struct sm6_b dst_param_init_scalar(dst_param, column_index); dst_param->reg = sm6->output_params[row_index].reg; if (e->register_count > 1) - register_address_init(&dst_param->reg, operands[1], 0, sm6); + register_index_address_init(&dst_param->reg.idx[0], operands[1], sm6); if ((src_param = instruction_src_params_alloc(ins, 1, sm6))) src_param_init_from_value(src_param, value);

1 0

Santino Mazza : mf: Handle errors with source event generator in session.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 0170cd3a4c67bd99291234dd8e0d638a824d7715 URL: https://gitlab.winehq.org/wine/wine/-/commit/0170cd3a4c67bd99291234dd8e0d63… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Tue Aug 29 13:33:32 2023 -0300 mf: Handle errors with source event generator in session. --- dlls/mf/session.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index b5b631fb00a..db742350161 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3679,7 +3679,9 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM if (FAILED(hr = IMFMediaEventGenerator_EndGetEvent(event_source, result, &event))) { WARN("Failed to get event from %p, hr %#lx.\n", event_source, hr); - goto failed; + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MEError, &GUID_NULL, hr, NULL); + IMFMediaEventGenerator_Release(event_source); + return hr; } if (FAILED(hr = IMFMediaEvent_GetType(event, &event_type))) @@ -3872,11 +3874,15 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM PropVariantClear(&value); failed: - if (event) - IMFMediaEvent_Release(event); if (FAILED(hr = IMFMediaEventGenerator_BeginGetEvent(event_source, iface, (IUnknown *)event_source))) + { WARN("Failed to re-subscribe, hr %#lx.\n", hr); + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + } + + if (event) + IMFMediaEvent_Release(event); IMFMediaEventGenerator_Release(event_source);

1 0

Bartosz Kosiorek : gdiplus: Fix GdipAddPathCurve3 curve calculation with offset and nseg variables.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 09c96907c1610396101f1317234b09ad4100c804 URL: https://gitlab.winehq.org/wine/wine/-/commit/09c96907c1610396101f1317234b09… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Oct 28 00:26:47 2023 +0200 gdiplus: Fix GdipAddPathCurve3 curve calculation with offset and nseg variables. --- dlls/gdiplus/graphicspath.c | 28 ++++++++++++++++++++-------- dlls/gdiplus/tests/graphicspath.c | 8 ++++---- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index b65d574e73b..63f120a6aba 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -562,15 +562,23 @@ GpStatus WINGDIPAPI GdipAddPathCurve3(GpPath *path, GDIPCONST GpPointF *points, tension = tension * TENSION_CONST; - calc_curve_bezier_endp(points[offset].X, points[offset].Y, points[offset + 1].X, points[offset + 1].Y, - tension, &x1, &y1); - pt[0].X = points[offset].X; pt[0].Y = points[offset].Y; - pt[1].X = x1; - pt[1].Y = y1; + if (offset > 0) + { + calc_curve_bezier(&(points[offset - 1]), tension, &x1, &y1, &x2, &y2); + pt[1].X = x2; + pt[1].Y = y2; + } + else + { + calc_curve_bezier_endp(points[offset].X, points[offset].Y, + points[offset + 1].X, points[offset + 1].Y, tension, &x1, &y1); + pt[1].X = x1; + pt[1].Y = y1; + } - for(i = 0; i < nseg-1; i++){ + for (i = 0; i < nseg - 1; i++){ calc_curve_bezier(&(points[offset + i]), tension, &x1, &y1, &x2, &y2); pt[3*i+2].X = x1; @@ -581,8 +589,12 @@ GpStatus WINGDIPAPI GdipAddPathCurve3(GpPath *path, GDIPCONST GpPointF *points, pt[3*i+4].Y = y2; } - calc_curve_bezier_endp(points[offset + nseg].X, points[offset + nseg].Y, - points[offset + nseg - 1].X, points[offset + nseg - 1].Y, tension, &x1, &y1); + if (offset + nseg + 1 < count) + /* If there are one more point in points table then use it for curve calculation */ + calc_curve_bezier(&(points[offset + nseg - 1]), tension, &x1, &y1, &x2, &y2); + else + calc_curve_bezier_endp(points[offset + nseg].X, points[offset + nseg].Y, + points[offset + nseg - 1].X, points[offset + nseg - 1].Y, tension, &x1, &y1); pt[len_pt-2].X = x1; pt[len_pt-2].Y = y1; diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index f4099555dae..823e1cf38ed 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -947,7 +947,7 @@ static path_test_t addcurve_path2[] = { }; static path_test_t addcurve_path3[] = { {10.0, 10.0, PathPointTypeStart, 0, 0}, /*0*/ - {13.3, 16.7, PathPointTypeBezier, 0, 1}, /*1*/ + {13.3, 16.7, PathPointTypeBezier, 0, 0}, /*1*/ {3.3, 20.0, PathPointTypeBezier, 0, 0}, /*2*/ {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*3*/ {16.7, 20.0, PathPointTypeBezier, 0, 0}, /*4*/ @@ -957,13 +957,13 @@ static path_test_t addcurve_path3[] = { static path_test_t addcurve_path4[] = { {0.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ {3.33, 3.33, PathPointTypeBezier, 0, 0}, /*1*/ - {6.66, 3.33, PathPointTypeBezier, 0, 1}, /*2*/ + {6.66, 3.33, PathPointTypeBezier, 0, 0}, /*2*/ {10.0, 10.0, PathPointTypeBezier, 0, 0}, /*3*/ }; static path_test_t addcurve_path5[] = { {10.0, 10.0, PathPointTypeStart, 0, 0}, /*0*/ - {13.3, 16.6, PathPointTypeBezier, 0, 1}, /*1*/ - {3.33, 20.0, PathPointTypeBezier, 0, 1}, /*2*/ + {13.3, 16.6, PathPointTypeBezier, 0, 0}, /*1*/ + {3.33, 20.0, PathPointTypeBezier, 0, 0}, /*2*/ {10.0, 20.0, PathPointTypeBezier, 0, 0} /*3*/ };

1 0

Anton Baskanov : dmsynth: Correctly handle internal connections with controls.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: d4f4bedc48db55ecba9c9a705bd9f6bbe6688992 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4f4bedc48db55ecba9c9a705bd9f6… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Oct 29 19:42:56 2023 +0700 dmsynth: Correctly handle internal connections with controls. Fixes modulation wheel effects. --- dlls/dmsynth/synth.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 72696cca856..ee1ec1aad06 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1497,9 +1497,9 @@ static BOOL mod_from_connection(USHORT source, USHORT transform, UINT *fluid_sou return TRUE; } -static BOOL add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION *conn, - UINT src1, UINT flags1, UINT src2, UINT flags2) +static BOOL add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION *conn) { + UINT src1 = FLUID_MOD_NONE, flags1 = 0, src2 = FLUID_MOD_NONE, flags2 = 0; fluid_mod_t *mod; UINT gen = -1; double value; @@ -1520,10 +1520,15 @@ static BOOL add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION if (conn->usControl != CONN_SRC_NONE && gen != -1) { - src1 = src2; - flags1 = flags2; - src2 = 0; - flags2 = 0; + if (!mod_from_connection(conn->usControl, (conn->usTransform >> 4) & 0x3f, &src1, &flags1)) + return FALSE; + } + else + { + if (!mod_from_connection(conn->usSource, (conn->usTransform >> 10) & 0x3f, &src1, &flags1)) + return FALSE; + if (!mod_from_connection(conn->usControl, (conn->usTransform >> 4) & 0x3f, &src2, &flags2)) + return FALSE; } if (gen == -1 && !gen_from_connection(conn, &gen)) return FALSE; @@ -1555,18 +1560,11 @@ static void add_voice_connections(fluid_voice_t *fluid_voice, const CONNECTIONLI for (i = 0; i < list->cConnections; i++) { - UINT src1 = FLUID_MOD_NONE, flags1 = 0, src2 = FLUID_MOD_NONE, flags2 = 0; const CONNECTION *conn = connections + i; if (set_gen_from_connection(fluid_voice, conn)) continue; - if (!mod_from_connection(conn->usSource, (conn->usTransform >> 10) & 0x3f, - &src1, &flags1)) - continue; - if (!mod_from_connection(conn->usControl, (conn->usTransform >> 4) & 0x3f, - &src2, &flags2)) - continue; - add_mod_from_connection(fluid_voice, conn, src1, flags1, src2, flags2); + add_mod_from_connection(fluid_voice, conn); } }

1 0

Anton Baskanov : dmsynth: Activate reverb and chorus according to effect flags.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 95e19ae01101bc3353159a9265f3aceb883c08d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/95e19ae01101bc3353159a9265f3ac… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Oct 29 20:15:12 2023 +0700 dmsynth: Activate reverb and chorus according to effect flags. --- dlls/dmsynth/synth.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index ee1ec1aad06..395cb5daafc 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -565,6 +565,10 @@ static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *par } fluid_settings_setnum(This->fluid_settings, "synth.sample-rate", actual.dwSampleRate); + fluid_settings_setint(This->fluid_settings, "synth.reverb.active", + !!(actual.dwEffectFlags & DMUS_EFFECT_REVERB)); + fluid_settings_setint(This->fluid_settings, "synth.chorus.active", + !!(actual.dwEffectFlags & DMUS_EFFECT_CHORUS)); if (!(This->fluid_synth = new_fluid_synth(This->fluid_settings))) return E_OUTOFMEMORY; if ((id = fluid_synth_add_sfont(This->fluid_synth, This->fluid_sfont)) == FLUID_FAILED) WARN("Failed to add fluid_sfont to fluid_synth\n");

1 0

Anton Baskanov : dmsynth: Return void from add_mod_from_connection().
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: c7b706dedf6ca0dd29f58246ebdc058bc02e4d23 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7b706dedf6ca0dd29f58246ebdc05… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Oct 31 12:00:57 2023 +0700 dmsynth: Return void from add_mod_from_connection(). --- dlls/dmsynth/synth.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 395cb5daafc..a4196f29a8a 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1501,7 +1501,7 @@ static BOOL mod_from_connection(USHORT source, USHORT transform, UINT *fluid_sou return TRUE; } -static BOOL add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION *conn) +static void add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION *conn) { UINT src1 = FLUID_MOD_NONE, flags1 = 0, src2 = FLUID_MOD_NONE, flags2 = 0; fluid_mod_t *mod; @@ -1525,19 +1525,19 @@ static BOOL add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION if (conn->usControl != CONN_SRC_NONE && gen != -1) { if (!mod_from_connection(conn->usControl, (conn->usTransform >> 4) & 0x3f, &src1, &flags1)) - return FALSE; + return; } else { if (!mod_from_connection(conn->usSource, (conn->usTransform >> 10) & 0x3f, &src1, &flags1)) - return FALSE; + return; if (!mod_from_connection(conn->usControl, (conn->usTransform >> 4) & 0x3f, &src2, &flags2)) - return FALSE; + return; } - if (gen == -1 && !gen_from_connection(conn, &gen)) return FALSE; + if (gen == -1 && !gen_from_connection(conn, &gen)) return; - if (!(mod = new_fluid_mod())) return FALSE; + if (!(mod = new_fluid_mod())) return; fluid_mod_set_source1(mod, src1, flags1); fluid_mod_set_source2(mod, src2, flags2); fluid_mod_set_dest(mod, gen); @@ -1553,8 +1553,6 @@ static BOOL add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION fluid_mod_set_amount(mod, value); fluid_voice_add_mod(fluid_voice, mod, FLUID_VOICE_OVERWRITE); - - return TRUE; } static void add_voice_connections(fluid_voice_t *fluid_voice, const CONNECTIONLIST *list,

1 0