January 2024 - Wine-commits

Giovanni Mascellani : vkd3d-shader/ir: Fixup PHI nodes when lowering switches to selection ladders.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: 026c502f31cfcdaf2679e1ece74766598916e9c1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/026c502f31cfcdaf2679e1ece7476… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 15 17:02:07 2024 +0100 vkd3d-shader/ir: Fixup PHI nodes when lowering switches to selection ladders. A map between the blocks before and after the pass is built and then used to fix the PHI nodes. --- libs/vkd3d-shader/ir.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 149 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index c2568316..1bb35fd7 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2388,15 +2388,47 @@ static bool reserve_instructions(struct vkd3d_shader_instruction **instructions, return true; } +/* A record represents replacing a jump from block `switch_label' to + * block `target_label' with a jump from block `if_label' to block + * `target_label'. */ +struct lower_switch_to_if_ladder_block_mapping +{ + unsigned int switch_label; + unsigned int if_label; + unsigned int target_label; +}; + +static bool lower_switch_to_if_ladder_add_block_mapping(struct lower_switch_to_if_ladder_block_mapping **block_map, + size_t *map_capacity, size_t *map_count, unsigned int switch_label, unsigned int if_label, unsigned int target_label) +{ + if (!vkd3d_array_reserve((void **)block_map, map_capacity, *map_count + 1, sizeof(**block_map))) + { + ERR("Failed to allocate block mapping.\n"); + return false; + } + + (*block_map)[*map_count].switch_label = switch_label; + (*block_map)[*map_count].if_label = if_label; + (*block_map)[*map_count].target_label = target_label; + + *map_count += 1; + + return true; +} + static enum vkd3d_result lower_switch_to_if_ladder(struct vkd3d_shader_parser *parser) { - unsigned int block_count = parser->program.block_count, ssa_count = parser->program.ssa_count; + unsigned int block_count = parser->program.block_count, ssa_count = parser->program.ssa_count, current_label = 0, if_label; + size_t ins_capacity = 0, ins_count = 0, i, map_capacity = 0, map_count = 0; struct vkd3d_shader_instruction *instructions = NULL; - size_t ins_capacity = 0, ins_count = 0, i; + struct lower_switch_to_if_ladder_block_mapping *block_map = NULL; if (!reserve_instructions(&instructions, &ins_capacity, parser->program.instructions.count)) goto fail; + /* First subpass: convert SWITCH_MONOLITHIC instructions to + * selection ladders, keeping a map between blocks before and + * after the subpass. */ for (i = 0; i < parser->program.instructions.count; ++i) { struct vkd3d_shader_instruction *ins = &parser->program.instructions.elements[i]; @@ -2404,15 +2436,16 @@ static enum vkd3d_result lower_switch_to_if_ladder(struct vkd3d_shader_parser *p switch (ins->handler_idx) { + case VKD3DSIH_LABEL: + current_label = label_from_src_param(&ins->src[0]); + if (!reserve_instructions(&instructions, &ins_capacity, ins_count + 1)) + goto fail; + instructions[ins_count++] = *ins; + continue; + case VKD3DSIH_SWITCH_MONOLITHIC: break; - case VKD3DSIH_PHI: - WARN("Unhandled PHI when lowering switch.\n"); - vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, - "Unhandled PHI when lowering switch."); - return VKD3D_ERROR_NOT_IMPLEMENTED; - default: if (!reserve_instructions(&instructions, &ins_capacity, ins_count + 1)) goto fail; @@ -2439,6 +2472,8 @@ static enum vkd3d_result lower_switch_to_if_ladder(struct vkd3d_shader_parser *p if (!reserve_instructions(&instructions, &ins_capacity, ins_count + 3 * case_count - 1)) goto fail; + if_label = current_label; + for (j = 0; j < case_count; ++j) { unsigned int fallthrough_label, case_label = label_from_src_param(&ins->src[3 + 2 * j + 1]); @@ -2467,17 +2502,121 @@ static enum vkd3d_result lower_switch_to_if_ladder(struct vkd3d_shader_parser *p ++ssa_count; - if (j != case_count - 1) + if (!lower_switch_to_if_ladder_add_block_mapping(&block_map, &map_capacity, &map_count, + current_label, if_label, case_label)) + goto fail; + + if (j == case_count - 1) + { + if (!lower_switch_to_if_ladder_add_block_mapping(&block_map, &map_capacity, &map_count, + current_label, if_label, default_label)) + goto fail; + } + else { if (!vsir_instruction_init_with_params(parser, &instructions[ins_count], &ins->location, VKD3DSIH_LABEL, 0, 1)) goto fail; vsir_src_param_init_label(&instructions[ins_count].src[0], ++block_count); ++ins_count; + + if_label = block_count; } } } + /* Second subpass: creating new blocks might have broken + * references in PHI instructions, so we use the block map to fix + * them. */ + current_label = 0; + for (i = 0; i < ins_count; ++i) + { + struct vkd3d_shader_instruction *ins = &instructions[i]; + struct vkd3d_shader_src_param *new_src; + unsigned int j, l, new_src_count = 0; + + switch (ins->handler_idx) + { + case VKD3DSIH_LABEL: + current_label = label_from_src_param(&ins->src[0]); + continue; + + case VKD3DSIH_PHI: + break; + + default: + continue; + } + + /* First count how many source parameters we need. */ + for (j = 0; j < ins->src_count; j += 2) + { + unsigned int source_label = label_from_src_param(&ins->src[j + 1]); + size_t k, match_count = 0; + + for (k = 0; k < map_count; ++k) + { + struct lower_switch_to_if_ladder_block_mapping *mapping = &block_map[k]; + + if (mapping->switch_label == source_label && mapping->target_label == current_label) + match_count += 1; + } + + new_src_count += (match_count != 0) ? 2 * match_count : 2; + } + + assert(new_src_count >= ins->src_count); + + /* Allocate more source parameters if needed. */ + if (new_src_count == ins->src_count) + { + new_src = ins->src; + } + else + { + if (!(new_src = shader_parser_get_src_params(parser, new_src_count))) + { + ERR("Failed to allocate %u source parameters.\n", new_src_count); + goto fail; + } + } + + /* Then do the copy. */ + for (j = 0, l = 0; j < ins->src_count; j += 2) + { + unsigned int source_label = label_from_src_param(&ins->src[j + 1]); + size_t k, match_count = 0; + + for (k = 0; k < map_count; ++k) + { + struct lower_switch_to_if_ladder_block_mapping *mapping = &block_map[k]; + + if (mapping->switch_label == source_label && mapping->target_label == current_label) + { + match_count += 1; + + new_src[l] = ins->src[j]; + new_src[l + 1] = ins->src[j + 1]; + new_src[l + 1].reg.idx[0].offset = mapping->if_label; + l += 2; + } + } + + if (match_count == 0) + { + new_src[l] = ins->src[j]; + new_src[l + 1] = ins->src[j + 1]; + l += 2; + } + } + + assert(l == new_src_count); + + ins->src_count = new_src_count; + ins->src = new_src; + } + vkd3d_free(parser->program.instructions.elements); + vkd3d_free(block_map); parser->program.instructions.elements = instructions; parser->program.instructions.capacity = ins_capacity; parser->program.instructions.count = ins_count; @@ -2488,6 +2627,7 @@ static enum vkd3d_result lower_switch_to_if_ladder(struct vkd3d_shader_parser *p fail: vkd3d_free(instructions); + vkd3d_free(block_map); return VKD3D_ERROR_OUT_OF_MEMORY; }

1 0

Conor McCarthy : vkd3d-shader/dxil: Load raw/structured buffer SRV/UAV descriptors.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: 1bab93843d62e286c48153e7c290e28decec1013 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1bab93843d62e286c48153e7c290e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 3 16:07:49 2024 +1000 vkd3d-shader/dxil: Load raw/structured buffer SRV/UAV descriptors. --- libs/vkd3d-shader/dxil.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 8a31d03c..e09e90bf 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -5975,6 +5975,8 @@ static enum vkd3d_shader_resource_type shader_resource_type_from_dxil_resource_k switch (kind) { case RESOURCE_KIND_TYPEDBUFFER: + case RESOURCE_KIND_RAWBUFFER: + case RESOURCE_KIND_STRUCTUREDBUFFER: return VKD3D_SHADER_RESOURCE_BUFFER; default: return VKD3D_SHADER_RESOURCE_NONE; @@ -6039,6 +6041,13 @@ static struct vkd3d_shader_resource *sm6_parser_resources_load_common_info(struc } ins->resource_type = resource_type; + if (!m) + { + ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_RAW : VKD3DSIH_DCL_RESOURCE_RAW; + ins->declaration.raw_resource.resource.reg.write_mask = 0; + return &ins->declaration.raw_resource.resource; + } + if (!sm6_metadata_value_is_node(m)) { WARN("Resource metadata list is not a node.\n"); @@ -6093,6 +6102,39 @@ static struct vkd3d_shader_resource *sm6_parser_resources_load_common_info(struc return &ins->declaration.semantic.resource; } + else if (dxil_resource_type == RESOURCE_TYPE_RAW_STRUCTURED) + { + if (kind == RESOURCE_KIND_RAWBUFFER) + { + ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_RAW : VKD3DSIH_DCL_RESOURCE_RAW; + ins->declaration.raw_resource.resource.reg.write_mask = 0; + + return &ins->declaration.raw_resource.resource; + } + + if (kind != RESOURCE_KIND_STRUCTUREDBUFFER) + { + WARN("Unhandled resource kind %u.\n", kind); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource kind %u for a raw or structured buffer is unhandled.", kind); + return NULL; + } + + ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_STRUCTURED : VKD3DSIH_DCL_RESOURCE_STRUCTURED; + ins->declaration.structured_resource.byte_stride = values[1]; + ins->declaration.structured_resource.resource.reg.write_mask = 0; + + /* TODO: 16-bit resources. */ + if (ins->declaration.structured_resource.byte_stride % 4u) + { + WARN("Byte stride %u is not a multiple of 4.\n", ins->declaration.structured_resource.byte_stride); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Structured resource byte stride %u is not a multiple of 4.", + ins->declaration.structured_resource.byte_stride); + } + + return &ins->declaration.structured_resource.resource; + } else { FIXME("Unhandled resource type %u.\n", dxil_resource_type); @@ -6159,7 +6201,8 @@ static enum vkd3d_result sm6_parser_resources_load_srv(struct sm6_parser *sm6, d->kind = kind; d->reg_type = VKD3DSPR_RESOURCE; d->reg_data_type = (ins->resource_type == VKD3D_SHADER_RESOURCE_BUFFER) ? VKD3D_DATA_UINT : VKD3D_DATA_RESOURCE; - d->resource_data_type = ins->declaration.semantic.resource_data_type[0]; + d->resource_data_type = (ins->handler_idx == VKD3DSIH_DCL) + ? ins->declaration.semantic.resource_data_type[0] : VKD3D_DATA_UNUSED; init_resource_declaration(resource, VKD3DSPR_RESOURCE, d->reg_data_type, d->id, &d->range); @@ -6232,7 +6275,8 @@ static enum vkd3d_result sm6_parser_resources_load_uav(struct sm6_parser *sm6, d->kind = values[0]; d->reg_type = VKD3DSPR_UAV; d->reg_data_type = (ins->resource_type == VKD3D_SHADER_RESOURCE_BUFFER) ? VKD3D_DATA_UINT : VKD3D_DATA_UAV; - d->resource_data_type = ins->declaration.semantic.resource_data_type[0]; + d->resource_data_type = (ins->handler_idx == VKD3DSIH_DCL_UAV_TYPED) + ? ins->declaration.semantic.resource_data_type[0] : VKD3D_DATA_UNUSED; init_resource_declaration(resource, VKD3DSPR_UAV, d->reg_data_type, d->id, &d->range);

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic RawBufferLoad.
by Alexandre Julliard 29 Jan '24

29 Jan '24

Module: vkd3d Branch: master Commit: e08c0cfc4f83e428361d2e13a1d8280eef718ec2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e08c0cfc4f83e428361d2e13a1d82… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 3 16:09:01 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic RawBufferLoad. --- libs/vkd3d-shader/dxil.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index e09e90bf..ebe600e1 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -363,6 +363,7 @@ enum dx_intrinsic_opcode DX_DERIV_FINEY = 86, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, + DX_RAW_BUFFER_LOAD = 139, }; enum dxil_cast_code @@ -2078,6 +2079,8 @@ static void instruction_init_with_resource(struct vkd3d_shader_instruction *ins, { vsir_instruction_init(ins, &sm6->p.location, handler_idx); ins->resource_type = resource->u.handle.d->resource_type; + ins->raw = resource->u.handle.d->kind == RESOURCE_KIND_RAWBUFFER; + ins->structured = resource->u.handle.d->kind == RESOURCE_KIND_STRUCTUREDBUFFER; } static struct vkd3d_shader_src_param *instruction_src_params_alloc(struct vkd3d_shader_instruction *ins, @@ -3100,6 +3103,15 @@ static void dst_param_io_init(struct vkd3d_shader_dst_param *param, param->reg.dimension = VSIR_DIMENSION_VEC4; } +static void src_params_init_from_operands(struct vkd3d_shader_src_param *src_params, + const struct sm6_value **operands, unsigned int count) +{ + unsigned int i; + + for (i = 0; i < count; ++i) + src_param_init_from_value(&src_params[i], operands[i]); +} + static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shader_signature *s, enum vkd3d_shader_register_type reg_type, struct vkd3d_shader_dst_param *params) { @@ -3722,6 +3734,49 @@ static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, enum dx_intrin instruction_dst_param_init_ssa_scalar(ins, sm6); } +static void sm6_parser_emit_dx_raw_buffer_load(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + unsigned int operand_count, write_mask, component_count = VKD3D_VEC4_SIZE; + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_params; + const struct sm6_value *resource; + bool raw; + + resource = operands[0]; + if (!sm6_value_validate_is_handle(resource, sm6)) + return; + raw = resource->u.handle.d->kind == RESOURCE_KIND_RAWBUFFER; + + if (op == DX_RAW_BUFFER_LOAD) + { + write_mask = sm6_value_get_constant_uint(operands[3]); + if (!write_mask || write_mask > VKD3DSP_WRITEMASK_ALL) + { + WARN("Invalid write mask %#x.\n", write_mask); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Write mask %#x for a raw/structured buffer load operation is invalid.", write_mask); + return; + } + else if (write_mask & (write_mask + 1)) + { + FIXME("Unhandled write mask %#x.\n", write_mask); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Write mask %#x for a raw/structured buffer load operation is unhandled.", write_mask); + } + component_count = vsir_write_mask_component_count(write_mask); + } + + instruction_init_with_resource(ins, raw ? VKD3DSIH_LD_RAW : VKD3DSIH_LD_STRUCTURED, resource, sm6); + operand_count = 2 + !raw; + if (!(src_params = instruction_src_params_alloc(ins, operand_count, sm6))) + return; + src_params_init_from_operands(src_params, &operands[1], operand_count - 1); + src_param_init_vector_from_reg(&src_params[operand_count - 1], &resource->u.handle.reg); + + instruction_dst_param_init_ssa_vector(ins, component_count, sm6); +} + static void sm6_parser_emit_dx_buffer_load(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -3733,6 +3788,12 @@ static void sm6_parser_emit_dx_buffer_load(struct sm6_parser *sm6, enum dx_intri if (!sm6_value_validate_is_handle(resource, sm6)) return; + if (resource->u.handle.d->kind == RESOURCE_KIND_RAWBUFFER + || resource->u.handle.d->kind == RESOURCE_KIND_STRUCTUREDBUFFER) + { + return sm6_parser_emit_dx_raw_buffer_load(sm6, op, operands, state); + } + if (resource->u.handle.d->kind != RESOURCE_KIND_TYPEDBUFFER) { WARN("Resource is not a typed buffer.\n"); @@ -3884,6 +3945,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_LEGACY_F32TOF16 ] = {"i", "f", sm6_parser_emit_dx_unary}, [DX_LOAD_INPUT ] = {"o", "ii8i", sm6_parser_emit_dx_load_input}, [DX_LOG ] = {"g", "R", sm6_parser_emit_dx_unary}, + [DX_RAW_BUFFER_LOAD ] = {"o", "Hii8i", sm6_parser_emit_dx_raw_buffer_load}, [DX_ROUND_NE ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_ROUND_NI ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_ROUND_PI ] = {"g", "R", sm6_parser_emit_dx_unary},

1 0

Rémi Bernon : user32/tests: Filter the ll-hook messages with accept_message.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: c5e16d2090ac552b47c5ecb83d8ffe447fd90b8e URL: https://gitlab.winehq.org/wine/wine/-/commit/c5e16d2090ac552b47c5ecb83d8ffe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 26 10:19:51 2024 +0100 user32/tests: Filter the ll-hook messages with accept_message. Wine sends spurious mouse move messages in some cases, let's ignore them as it makes tests unreliable otherwise. --- dlls/user32/tests/input.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index b7dc5aac3b1..9eafde917af 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -302,6 +302,9 @@ static void ok_seq_( const char *file, int line, const struct user_call *expecte current_sequence_len = 0; } +static BOOL append_message_hwnd; +static BOOL (*p_accept_message)( UINT msg ); + static void append_ll_hook_kbd( UINT msg, const KBDLLHOOKSTRUCT *info ) { struct user_call call = @@ -312,9 +315,12 @@ static void append_ll_hook_kbd( UINT msg, const KBDLLHOOKSTRUCT *info ) .flags = info->flags, .extra = info->dwExtraInfo } }; - ULONG index = InterlockedIncrement( &current_sequence_len ) - 1; - ok( index < ARRAY_SIZE(current_sequence), "got %lu calls\n", index ); - current_sequence[index] = call; + if (!p_accept_message || p_accept_message( msg )) + { + ULONG index = InterlockedIncrement( &current_sequence_len ) - 1; + ok( index < ARRAY_SIZE(current_sequence), "got %lu calls\n", index ); + current_sequence[index] = call; + } } static void append_ll_hook_ms( UINT msg, const MSLLHOOKSTRUCT *info ) @@ -327,13 +333,14 @@ static void append_ll_hook_ms( UINT msg, const MSLLHOOKSTRUCT *info ) .time = info->time, .extra = info->dwExtraInfo } }; - ULONG index = InterlockedIncrement( &current_sequence_len ) - 1; - ok( index < ARRAY_SIZE(current_sequence), "got %lu calls\n", index ); - current_sequence[index] = call; + if (!p_accept_message || p_accept_message( msg )) + { + ULONG index = InterlockedIncrement( &current_sequence_len ) - 1; + ok( index < ARRAY_SIZE(current_sequence), "got %lu calls\n", index ); + current_sequence[index] = call; + } } -static BOOL append_message_hwnd; -static BOOL (*p_accept_message)( UINT msg ); static void append_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { if (!p_accept_message || p_accept_message( msg )) @@ -3536,13 +3543,6 @@ static void test_SendInput_mouse_messages(void) WIN_MSG(WM_LBUTTONDOWN, (HWND)-1/*hwnd*/, 0x1, MAKELONG(50, 50), .todo = TRUE), {0}, }; - struct user_call button_down_hwnd_todo_attached[] = - { - MS_HOOK(WM_LBUTTONDOWN, 50, 50), - WIN_MSG(WM_LBUTTONDOWN, (HWND)-1/*hwnd*/, 0x1, MAKELONG(50, 50), .todo = TRUE), - {.todo = TRUE /* spurious message on Wine */}, - {0}, - }; struct user_call button_up_hwnd[] = { MS_HOOK(WM_LBUTTONUP, 50, 50), @@ -3793,8 +3793,8 @@ static void test_SendInput_mouse_messages(void) mouse_event( MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0 ); wait_messages( 5, FALSE ); - button_down_hwnd_todo_attached[1].message.hwnd = hwnd; - ok_seq( button_down_hwnd_todo_attached ); + button_down_hwnd[1].message.hwnd = hwnd; + ok_seq( button_down_hwnd ); mouse_event( MOUSEEVENTF_LEFTUP, 0, 0, 0, 0 ); wait_messages( 5, FALSE ); button_up_hwnd[1].message.hwnd = hwnd;

1 0

Rémi Bernon : user32/tests: Test clicking through attribute-layered windows.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 71201815bcbf90967f6d6dfc86c995ebb8d3a4ab URL: https://gitlab.winehq.org/wine/wine/-/commit/71201815bcbf90967f6d6dfc86c995… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 26 10:36:14 2024 +0100 user32/tests: Test clicking through attribute-layered windows. --- dlls/user32/tests/input.c | 114 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9eafde917af..736172cb504 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -52,6 +52,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "wingdi.h" #include "winnls.h" #include "winreg.h" #include "ddk/hidsdi.h" @@ -3462,6 +3463,28 @@ static LRESULT CALLBACK mouse_move_wndproc(HWND hwnd, UINT msg, WPARAM wparam, L return DefWindowProcW(hwnd, msg, wparam, lparam); } +static LRESULT CALLBACK mouse_layered_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + append_message( hwnd, msg, wparam, lparam ); + + if (msg == WM_PAINT) + { + HBRUSH brush = CreateSolidBrush( RGB(50, 100, 255) ); + PAINTSTRUCT paint; + RECT client_rect; + + HDC hdc = BeginPaint( hwnd, &paint ); + GetClientRect( hwnd, &client_rect ); + FillRect( hdc, &client_rect, brush ); + EndPaint( hwnd, &paint ); + + DeleteObject( brush ); + return 0; + } + + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + struct send_input_mouse_test { BOOL set_cursor_pos; @@ -3541,6 +3564,7 @@ static void test_SendInput_mouse_messages(void) { MS_HOOK(WM_LBUTTONDOWN, 50, 50), WIN_MSG(WM_LBUTTONDOWN, (HWND)-1/*hwnd*/, 0x1, MAKELONG(50, 50), .todo = TRUE), + {0/* placeholder for Wine spurious messages */}, {0}, }; struct user_call button_up_hwnd[] = @@ -3553,6 +3577,7 @@ static void test_SendInput_mouse_messages(void) { MS_HOOK(WM_LBUTTONUP, 50, 50), WIN_MSG(WM_LBUTTONUP, (HWND)-1/*hwnd*/, 0, MAKELONG(50, 50), .todo = TRUE), + {0/* placeholder for Wine spurious messages */}, {0}, }; struct user_call button_down_no_message[] = @@ -3571,10 +3596,28 @@ static void test_SendInput_mouse_messages(void) #undef MS_HOOK static const POINT expect_60x50 = {60, 50}, expect_50x50 = {50, 50}; + static const struct layered_test + { + UINT color; + UINT alpha; + UINT flags; + BOOL expect_click; + } + layered_tests[] = + { + {.flags = LWA_ALPHA, .expect_click = FALSE}, + {.alpha = 1, .flags = LWA_ALPHA, .expect_click = TRUE}, + {.color = RGB(0, 255, 0), .flags = LWA_COLORKEY, .expect_click = TRUE}, + {.color = RGB(50, 100, 255), .flags = LWA_COLORKEY, .expect_click = TRUE}, + {.color = RGB(0, 255, 0), .flags = LWA_COLORKEY | LWA_ALPHA, .expect_click = FALSE}, + {.color = RGB(0, 255, 0), .alpha = 1, .flags = LWA_COLORKEY | LWA_ALPHA, .expect_click = TRUE}, + {.color = RGB(50, 100, 255), .alpha = 1, .flags = LWA_COLORKEY | LWA_ALPHA, .expect_click = TRUE}, + }; + struct create_transparent_window_params params = {0}; ULONG_PTR old_proc, old_other_proc; RECT clip_rect = {55, 55, 55, 55}; - UINT dblclk_time; + UINT dblclk_time, i; HWND hwnd, other; DWORD thread_id; HANDLE thread; @@ -3862,6 +3905,75 @@ static void test_SendInput_mouse_messages(void) SetCapture( 0 ); + + /* click through layered window with alpha channel / color key */ + + for (i = 0; i < ARRAY_SIZE(layered_tests); i++) + { + const struct layered_test *test = layered_tests + i; + BOOL ret; + + winetest_push_context( "layered %u", i ); + + other = CreateWindowW( L"static", NULL, WS_VISIBLE | WS_POPUP, 0, 0, 100, 100, NULL, NULL, NULL, NULL ); + ok_ne( NULL, other, HWND, "%p" ); + old_other_proc = SetWindowLongPtrW( other, GWLP_WNDPROC, (LONG_PTR)mouse_layered_wndproc ); + ok_ne( 0, old_other_proc, LONG_PTR, "%#Ix" ); + wait_messages( 100, FALSE ); + + + SetWindowLongW( other, GWL_EXSTYLE, GetWindowLongW( other, GWL_EXSTYLE ) | WS_EX_LAYERED ); + ret = SetLayeredWindowAttributes( other, test->color, test->alpha, test->flags ); + if (broken(!ret)) /* broken on Win7 probably because of the separate desktop */ + { + win_skip("Skipping broken SetLayeredWindowAttributes tests\n"); + DestroyWindow( other ); + break; + } + + ok_ret( 1, RedrawWindow( other, NULL, NULL, RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN ) ); + wait_messages( 5, FALSE ); + current_sequence_len = 0; + + mouse_event( MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0 ); + wait_messages( 5, FALSE ); + button_down_hwnd_todo[1].message.hwnd = test->expect_click ? other : hwnd; + button_down_hwnd_todo[1].todo = !test->expect_click; + button_down_hwnd_todo[2].todo = !test->alpha && (test->flags & LWA_ALPHA); + ok_seq( button_down_hwnd_todo ); + mouse_event( MOUSEEVENTF_LEFTUP, 0, 0, 0, 0 ); + wait_messages( 5, FALSE ); + button_up_hwnd_todo[1].message.hwnd = test->expect_click ? other : hwnd; + button_up_hwnd_todo[1].todo = !test->expect_click; + button_up_hwnd_todo[2].todo = !test->alpha && (test->flags & LWA_ALPHA); + ok_seq( button_up_hwnd_todo ); + + + /* removing the attribute isn't enough to get mouse input again? */ + + SetWindowLongW( other, GWL_EXSTYLE, GetWindowLongW( other, GWL_EXSTYLE ) & ~WS_EX_LAYERED ); + ok_ret( 1, RedrawWindow( other, NULL, NULL, RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN ) ); + wait_messages( 5, FALSE ); + + mouse_event( MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0 ); + wait_messages( 5, FALSE ); + button_down_hwnd_todo[1].message.hwnd = test->expect_click ? other : hwnd; + button_down_hwnd_todo[1].todo = !test->expect_click; + button_down_hwnd_todo[2].todo = !test->alpha && (test->flags & LWA_ALPHA); + ok_seq( button_down_hwnd_todo ); + mouse_event( MOUSEEVENTF_LEFTUP, 0, 0, 0, 0 ); + wait_messages( 5, FALSE ); + button_up_hwnd_todo[1].message.hwnd = test->expect_click ? other : hwnd; + button_up_hwnd_todo[1].todo = !test->expect_click; + button_up_hwnd_todo[2].todo = !test->alpha && (test->flags & LWA_ALPHA); + ok_seq( button_up_hwnd_todo ); + + ok_ret( 1, DestroyWindow( other ) ); + + winetest_pop_context(); + } + + /* warm up test case by moving cursor and window a bit first */ ok_ret( 1, SetCursorPos( 60, 50 ) ); ok_ret( 1, SetWindowPos( hwnd, NULL, 10, 0, 0, 0, SWP_NOSIZE ) );

1 0

Rémi Bernon : user32/tests: Tests clicking through window with SetWindowRgn.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 52a4d9e32162586fa3e8226f9407392c1e7012a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/52a4d9e32162586fa3e8226f940739… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 26 10:01:24 2024 +0100 user32/tests: Tests clicking through window with SetWindowRgn. --- dlls/user32/tests/input.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 736172cb504..02200fb37aa 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3622,6 +3622,8 @@ static void test_SendInput_mouse_messages(void) DWORD thread_id; HANDLE thread; HHOOK hook, hook_setpos, hook_getpos; + HRGN hregion; + RECT region; POINT pt; params.start_event = CreateEventA( NULL, FALSE, FALSE, NULL ); @@ -3921,6 +3923,8 @@ static void test_SendInput_mouse_messages(void) ok_ne( 0, old_other_proc, LONG_PTR, "%#Ix" ); wait_messages( 100, FALSE ); + ok_ret( ERROR, GetWindowRgnBox( other, &region ) ); + SetWindowLongW( other, GWL_EXSTYLE, GetWindowLongW( other, GWL_EXSTYLE ) | WS_EX_LAYERED ); ret = SetLayeredWindowAttributes( other, test->color, test->alpha, test->flags ); @@ -3974,6 +3978,35 @@ static void test_SendInput_mouse_messages(void) } + /* click on top-level window with SetWindowRgn called */ + + other = CreateWindowW( L"static", NULL, WS_VISIBLE | WS_POPUP, 0, 0, 100, 100, NULL, NULL, NULL, NULL ); + ok_ne( NULL, hwnd, HWND, "%p" ); + wait_messages( 100, FALSE ); + current_sequence_len = 0; + + old_other_proc = SetWindowLongPtrW( other, GWLP_WNDPROC, (LONG_PTR)append_message_wndproc ); + ok_ne( 0, old_other_proc, LONG_PTR, "%#Ix" ); + + hregion = CreateRectRgn( 0, 0, 10, 10 ); + ok_ne( NULL, hregion, HRGN, "%p" ); + ok_ret( 1, SetWindowRgn( other, hregion, TRUE ) ); + DeleteObject( hregion ); + ok_ret( SIMPLEREGION, GetWindowRgnBox( other, &region ) ); + + mouse_event( MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0 ); + wait_messages( 5, FALSE ); + button_down_hwnd[1].message.hwnd = hwnd; + ok_seq( button_down_hwnd ); + mouse_event( MOUSEEVENTF_LEFTUP, 0, 0, 0, 0 ); + wait_messages( 5, FALSE ); + button_up_hwnd[1].message.hwnd = hwnd; + ok_seq( button_up_hwnd ); + + ok_ret( 1, DestroyWindow( other ) ); + wait_messages( 0, FALSE ); + + /* warm up test case by moving cursor and window a bit first */ ok_ret( 1, SetCursorPos( 60, 50 ) ); ok_ret( 1, SetWindowPos( hwnd, NULL, 10, 0, 0, 0, SWP_NOSIZE ) );

1 0

Giovanni Mascellani : wined3d: Expose the image view usage for null views.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 7663be90ffa6c7e6d6252ccfdaec774f6d152270 URL: https://gitlab.winehq.org/wine/wine/-/commit/7663be90ffa6c7e6d6252ccfdaec77… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Oct 5 12:43:25 2023 +0200 wined3d: Expose the image view usage for null views. --- dlls/wined3d/adapter_vk.c | 2 ++ dlls/wined3d/device.c | 11 +++++++++++ dlls/wined3d/wined3d_vk.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0e6a7babfb1..49188f54710 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2359,6 +2359,7 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, ~0u}, {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u, true}, {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1, true}, + {VK_KHR_MAINTENANCE2_EXTENSION_NAME, VK_API_VERSION_1_1}, {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME,VK_API_VERSION_1_2}, {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1}, {VK_KHR_SWAPCHAIN_EXTENSION_NAME, ~0u, true}, @@ -2373,6 +2374,7 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk map[] = { {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, WINED3D_VK_EXT_TRANSFORM_FEEDBACK}, + {VK_KHR_MAINTENANCE2_EXTENSION_NAME, WINED3D_VK_KHR_MAINTENANCE2}, {VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE}, {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, WINED3D_VK_KHR_SHADER_DRAW_PARAMETERS}, {VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME, WINED3D_VK_EXT_HOST_QUERY_RESET}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4aeade1d2de..aad112d5b9d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -722,6 +722,7 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st struct wined3d_null_resources_vk *r = &device_vk->null_resources_vk; struct wined3d_null_views_vk *v = &device_vk->null_views_vk; VkBufferViewCreateInfo buffer_create_info; + VkImageViewUsageCreateInfoKHR usage_desc; const struct wined3d_vk_info *vk_info; VkImageViewCreateInfo view_desc; VkResult vr; @@ -768,6 +769,16 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st view_desc.subresourceRange.levelCount = 1; view_desc.subresourceRange.baseArrayLayer = 0; view_desc.subresourceRange.layerCount = 1; + + if (vk_info->supported[WINED3D_VK_KHR_MAINTENANCE2] || vk_info->api_version >= VK_API_VERSION_1_1) + { + usage_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR; + usage_desc.pNext = NULL; + usage_desc.usage = VK_IMAGE_USAGE_SAMPLED_BIT; + + view_desc.pNext = &usage_desc; + } + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_1d.imageView))) < 0) { ERR("Failed to create 1D image view, vr %s.\n", wined3d_debug_vkresult(vr)); diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 5d2191e9833..6d619ad89b8 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -216,6 +216,7 @@ enum wined3d_vk_extension WINED3D_VK_EXT_NONE, WINED3D_VK_EXT_TRANSFORM_FEEDBACK, + WINED3D_VK_KHR_MAINTENANCE2, WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, WINED3D_VK_KHR_SHADER_DRAW_PARAMETERS, WINED3D_VK_EXT_HOST_QUERY_RESET,

1 0

Giovanni Mascellani : wined3d: Expose the image view usage for non-default views.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 54217dab6de6d5adf6ccd46214dd8a896831d6f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/54217dab6de6d5adf6ccd46214dd8a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Oct 5 14:12:44 2023 +0200 wined3d: Expose the image view usage for non-default views. --- dlls/wined3d/view.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 967c758b1ed..c86501c118a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -751,11 +751,13 @@ static VkBufferView wined3d_view_vk_create_vk_buffer_view(struct wined3d_context static VkImageView wined3d_view_vk_create_vk_image_view(struct wined3d_context_vk *context_vk, const struct wined3d_view_desc *desc, struct wined3d_texture_vk *texture_vk, - const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool rtv) + const struct wined3d_format_vk *view_format_vk, struct color_fixup_desc fixup, bool rtv, + VkImageUsageFlags usage) { const struct wined3d_resource *resource = &texture_vk->t.resource; const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_format_vk *format_vk; + VkImageViewUsageCreateInfoKHR usage_info; struct wined3d_device_vk *device_vk; VkImageViewCreateInfo create_info; VkImageView vk_image_view; @@ -847,6 +849,13 @@ static VkImageView wined3d_view_vk_create_vk_image_view(struct wined3d_context_v create_info.subresourceRange.baseArrayLayer = desc->u.texture.layer_idx; create_info.subresourceRange.layerCount = desc->u.texture.layer_count; } + if (vk_info->supported[WINED3D_VK_KHR_MAINTENANCE2] || vk_info->api_version >= VK_API_VERSION_1_1) + { + usage_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR; + usage_info.pNext = NULL; + usage_info.usage = usage; + create_info.pNext = &usage_info; + } if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &create_info, NULL, &vk_image_view))) < 0) { ERR("Failed to create Vulkan image view, vr %s.\n", wined3d_debug_vkresult(vr)); @@ -864,6 +873,7 @@ static void wined3d_render_target_view_vk_cs_init(void *object) struct wined3d_texture_vk *texture_vk; struct wined3d_resource *resource; struct wined3d_context *context; + VkImageUsageFlags vk_usage = 0; uint32_t default_flags = 0; TRACE("view_vk %p.\n", view_vk); @@ -897,9 +907,14 @@ static void wined3d_render_target_view_vk_cs_init(void *object) return; } + if (resource->bind_flags & WINED3D_BIND_RENDER_TARGET) + vk_usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + if (resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) + vk_usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; + context = context_acquire(resource->device, NULL, 0); view_vk->vk_image_view = wined3d_view_vk_create_vk_image_view(wined3d_context_vk(context), - desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, true); + desc, texture_vk, format_vk, COLOR_FIXUP_IDENTITY, true, vk_usage); context_release(context); if (!view_vk->vk_image_view) @@ -1219,7 +1234,7 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); vk_image_view = wined3d_view_vk_create_vk_image_view(wined3d_context_vk(context), - desc, texture_vk, wined3d_format_vk(format), format->color_fixup, false); + desc, texture_vk, wined3d_format_vk(format), format->color_fixup, false, VK_IMAGE_USAGE_SAMPLED_BIT); context_release(context); if (!vk_image_view) @@ -2228,7 +2243,7 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view vk_image_info.imageView = wined3d_view_vk_create_vk_image_view(context_vk, view_desc, texture_vk, wined3d_format_vk(wined3d_get_format(context_vk->c.device->adapter, format_id, WINED3D_BIND_UNORDERED_ACCESS)), - COLOR_FIXUP_IDENTITY, false); + COLOR_FIXUP_IDENTITY, false, VK_IMAGE_USAGE_STORAGE_BIT); if (vk_image_info.imageView == VK_NULL_HANDLE) return; @@ -2446,7 +2461,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); vk_image_view = wined3d_view_vk_create_vk_image_view(context_vk, desc, - texture_vk, format_vk, format_vk->f.color_fixup, false); + texture_vk, format_vk, format_vk->f.color_fixup, false, VK_IMAGE_USAGE_STORAGE_BIT); context_release(&context_vk->c); if (!vk_image_view)

1 0

Rémi Bernon : winegstreamer: Fix reading MF_MT_USER_DATA into HEAACWAVEFORMAT.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 42c96b9c8fb0c4bcc912e365733b564f3faf5f7c URL: https://gitlab.winehq.org/wine/wine/-/commit/42c96b9c8fb0c4bcc912e365733b56… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 08:52:36 2024 +0100 winegstreamer: Fix reading MF_MT_USER_DATA into HEAACWAVEFORMAT. Fixes 681d20146226132c2ed18ae7ecb53003e6ffcf44. The winegstreamer private declaration of HEAACWAVEINFO previously didn't include the WAVEFORMATEX member as it should. --- dlls/winegstreamer/mfplat.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 82fb19126bb..e6d9fb9fd2c 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -634,12 +634,14 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, const GUID *sub static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUID *subtype, struct wg_format *format) { - BYTE buffer[64]; - HEAACWAVEFORMAT *user_data = (HEAACWAVEFORMAT *)buffer; + BYTE buffer[sizeof(HEAACWAVEFORMAT) + 64]; + HEAACWAVEFORMAT *wfx = (HEAACWAVEFORMAT *)buffer; UINT32 codec_data_size; BOOL raw_aac; - if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_USER_DATA, buffer, sizeof(buffer), &codec_data_size))) + wfx->wfInfo.wfx.cbSize = sizeof(buffer) - sizeof(wfx->wfInfo.wfx); + if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_USER_DATA, (BYTE *)(&wfx->wfInfo.wfx + 1), + wfx->wfInfo.wfx.cbSize, &codec_data_size))) { FIXME("Codec data is not set.\n"); return; @@ -647,16 +649,16 @@ static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUI raw_aac = IsEqualGUID(subtype, &MFAudioFormat_RAW_AAC); if (!raw_aac) - codec_data_size -= min(codec_data_size, offsetof(HEAACWAVEFORMAT, pbAudioSpecificConfig)); + codec_data_size -= min(codec_data_size, sizeof(HEAACWAVEINFO) - sizeof(WAVEFORMATEX)); if (codec_data_size > sizeof(format->u.audio_mpeg4.codec_data)) { FIXME("Codec data needs %u bytes.\n", codec_data_size); return; } if (raw_aac) - memcpy(format->u.audio_mpeg4.codec_data, buffer, codec_data_size); + memcpy(format->u.audio_mpeg4.codec_data, (BYTE *)(&wfx->wfInfo.wfx + 1), codec_data_size); else - memcpy(format->u.audio_mpeg4.codec_data, user_data->pbAudioSpecificConfig, codec_data_size); + memcpy(format->u.audio_mpeg4.codec_data, wfx->pbAudioSpecificConfig, codec_data_size); format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG4;

1 0

Rémi Bernon : winegstreamer: Use MFCreateAudioMediaType in the AAC decoder.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: c65703eac726f41b64ee58fb45fbdc9bbd83f5d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c65703eac726f41b64ee58fb45fbdc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 16 11:59:50 2023 +0100 winegstreamer: Use MFCreateAudioMediaType in the AAC decoder. --- dlls/winegstreamer/aac_decoder.c | 203 +++++++++++++-------------------------- 1 file changed, 66 insertions(+), 137 deletions(-)

1 0