May 2020 - Wine-devel - list.winehq.org

[PATCH 12/12] configure: Enable -Wabsolute-value on cross compiler.
by Jacek Caban 27 May '20

27 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure.ac | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH 11/12] taskmgr: Introduce size_diff helper.
by Jacek Caban 27 May '20

27 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/taskmgr/perfdata.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

2 1

[PATCH 02/12] dmusic/tests: Introduce compare_time helper.
by Jacek Caban 27 May '20

27 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dmusic/tests/dmusic.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

2 1

[PATCH 10/12] wintab32: Fix -Wabsolute-value warning.
by Jacek Caban 27 May '20

27 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wintab32/context.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 07/12] quartz/tests: Fix -Wabsolute-value warnings.
by Jacek Caban 27 May '20

27 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 18 ++++++++++++------ dlls/quartz/tests/systemclock.c | 8 +++++++- dlls/quartz/tests/vmr9.c | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-)

1 0

[PATCH 06/12] kernel32/tests: Avoid using abs on ULONGLONG values.
by Jacek Caban 27 May '20

27 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 05/12] kernel32/tests: Remove workaround for NT4.
by Jacek Caban 27 May '20

27 May '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/resource.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[PATCH vkd3d v4 2/8] vkd3d-shader: Read constant buffer offsets from the second index.
by Zebediah Figura 27 May '20

27 May '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: also change shader_sm4_read_dcl_constant_buffer()... libs/vkd3d-shader/dxbc.c | 10 +++++++++- libs/vkd3d-shader/spirv.c | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5156074..de6aea3 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -646,7 +646,7 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction if (opcode_token & VKD3D_SM4_INDEX_TYPE_MASK) ins->flags |= VKD3DSI_INDEXED_DYNAMIC; - ins->declaration.cb.size = ins->declaration.cb.src.reg.idx[1].offset; + ins->declaration.cb.size = ins->declaration.cb.src.reg.idx[2].offset; ins->declaration.cb.register_space = 0; if (shader_is_sm_5_1(priv)) @@ -1603,6 +1603,14 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr break; } } + else if (register_type == VKD3D_SM4_RT_CONSTBUFFER && order == 2) + { + /* SM5.1 places the buffer offset in idx[2]; earlier versions place it + * in idx[1]. Normalize to SM5.1. */ + param->idx[2] = param->idx[1]; + param->idx[1].rel_addr = NULL; + param->idx[1].offset = 0; + } map_register(priv, param); diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0d4812b..a3cc5f9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2832,7 +2832,7 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp { assert(!reg->idx[0].rel_addr); indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); - indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]); + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[2]); } else if (reg->type == VKD3DSPR_IMMCONSTBUFFER) { -- 2.26.2

2 1

[PATCH vkd3d v2 1/8] vkd3d-shader: Read the resource index from idx[1] instead of idx[0] when looking up SM5.1 bindings.
by Zebediah Figura 27 May '20

27 May '20

We still use the first index to uniquely identify the register in vkd3d_symbol, only changing which field is used to declare it. This patch does not handle descriptor arrays. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Store the resource index as a separate field in the "declaration" union members. libs/vkd3d-shader/dxbc.c | 18 ++++++++++++ libs/vkd3d-shader/spirv.c | 35 ++++++++++++------------ libs/vkd3d-shader/vkd3d_shader_private.h | 10 +++---- 3 files changed, 41 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5e504dc..5156074 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -582,6 +582,14 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, ins->declaration.icb = &priv->icb; } +static unsigned int shader_sm4_map_resource_idx(struct vkd3d_shader_register *reg, const struct vkd3d_sm4_data *priv) +{ + if (shader_is_sm_5_1(priv)) + return reg->idx[1].offset; + else + return reg->idx[0].offset; +} + static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) @@ -604,6 +612,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, } reg_data_type = opcode == VKD3D_SM4_OP_DCL_RESOURCE ? VKD3D_DATA_RESOURCE : VKD3D_DATA_UAV; shader_sm4_read_dst_param(priv, &tokens, end, reg_data_type, &ins->declaration.semantic.reg); + ins->declaration.semantic.register_index = shader_sm4_map_resource_idx(&ins->declaration.semantic.reg.reg, priv); components = *tokens++; if ((components & 0xfff0) != (components & 0xf) * 0x1110) @@ -633,6 +642,7 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction const DWORD *end = &tokens[token_count]; shader_sm4_read_src_param(priv, &tokens, end, VKD3D_DATA_FLOAT, &ins->declaration.cb.src); + ins->declaration.cb.register_index = shader_sm4_map_resource_idx(&ins->declaration.cb.src.reg, priv); if (opcode_token & VKD3D_SM4_INDEX_TYPE_MASK) ins->flags |= VKD3DSI_INDEXED_DYNAMIC; @@ -662,6 +672,7 @@ static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, if (ins->flags & ~VKD3D_SM4_SAMPLER_COMPARISON) FIXME("Unhandled sampler mode %#x.\n", ins->flags); shader_sm4_read_src_param(priv, &tokens, end, VKD3D_DATA_SAMPLER, &ins->declaration.sampler.src); + ins->declaration.sampler.register_index = shader_sm4_map_resource_idx(&ins->declaration.sampler.src.reg, priv); shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.sampler.register_space); } @@ -861,6 +872,8 @@ static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &ins->declaration.raw_resource.dst); + ins->declaration.raw_resource.register_index = shader_sm4_map_resource_idx( + &ins->declaration.raw_resource.dst.reg, priv); ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.raw_resource.register_space); } @@ -872,6 +885,8 @@ static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction * const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &ins->declaration.structured_resource.reg); + ins->declaration.structured_resource.register_index = shader_sm4_map_resource_idx( + &ins->declaration.structured_resource.reg.reg, priv); ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; ins->declaration.structured_resource.byte_stride = *tokens++; if (ins->declaration.structured_resource.byte_stride % 4) @@ -908,6 +923,8 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &ins->declaration.structured_resource.reg); + ins->declaration.structured_resource.register_index = shader_sm4_map_resource_idx( + &ins->declaration.structured_resource.reg.reg, priv); ins->declaration.structured_resource.byte_stride = *tokens++; if (ins->declaration.structured_resource.byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); @@ -921,6 +938,7 @@ static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *in const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &ins->declaration.dst); + ins->declaration.raw_resource.register_index = shader_sm4_map_resource_idx(&ins->declaration.dst.reg, priv); shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.raw_resource.register_space); } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ba21113..0d4812b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2231,9 +2231,9 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_ } static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_constant_buffer( - const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg) + const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_constant_buffer *cb) { - unsigned int reg_idx = reg->idx[0].offset; + unsigned int reg_idx = cb->register_index; unsigned int i; for (i = 0; i < compiler->shader_interface.push_constant_buffer_count; ++i) @@ -2280,13 +2280,12 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor_binding( struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, - enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) + unsigned int reg_idx, enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; - unsigned int reg_idx = reg->idx[0].offset; unsigned int i; descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN; @@ -2359,11 +2358,12 @@ static void vkd3d_dxbc_compiler_emit_descriptor_binding(struct vkd3d_dxbc_compil static void vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(struct vkd3d_dxbc_compiler *compiler, uint32_t variable_id, const struct vkd3d_shader_register *reg, - enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) + unsigned int register_index, enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) { struct vkd3d_shader_descriptor_binding binding; - binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, resource_type, is_uav_counter); + binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, + register_index, resource_type, is_uav_counter); vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding); } @@ -4972,7 +4972,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi if (cb->register_space) FIXME("Unhandled register space %u.\n", cb->register_space); - if ((push_cb = vkd3d_dxbc_compiler_find_push_constant_buffer(compiler, reg))) + if ((push_cb = vkd3d_dxbc_compiler_find_push_constant_buffer(compiler, cb))) { /* Push constant buffers are handled in * vkd3d_dxbc_compiler_emit_push_constant_buffers(). @@ -5002,7 +5002,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi pointer_type_id, storage_class, 0); vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, - var_id, reg, VKD3D_SHADER_RESOURCE_BUFFER, false); + var_id, reg, cb->register_index, VKD3D_SHADER_RESOURCE_BUFFER, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -5065,8 +5065,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, - var_id, reg, VKD3D_SHADER_RESOURCE_NONE, false); + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, + instruction->declaration.sampler.register_index, VKD3D_SHADER_RESOURCE_NONE, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -5197,8 +5197,9 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ } static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, enum vkd3d_shader_resource_type resource_type, - enum vkd3d_data_type resource_data_type, unsigned int structure_stride, bool raw) + const struct vkd3d_shader_register *reg, unsigned int register_index, + enum vkd3d_shader_resource_type resource_type, enum vkd3d_data_type resource_data_type, + unsigned int structure_stride, bool raw) { uint32_t counter_type_id, type_id, ptr_type_id, var_id, counter_var_id = 0; const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; @@ -5232,7 +5233,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, resource_type, false); + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, register_index, resource_type, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -5255,7 +5256,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp ptr_type_id, storage_class, 0); vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, - counter_var_id, reg, resource_type, true); + counter_var_id, reg, register_index, resource_type, true); vkd3d_spirv_build_op_name(builder, counter_var_id, "u%u_counter", reg->idx[0].offset); } @@ -5282,7 +5283,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource(struct vkd3d_dxbc_compiler *co FIXME("Unhandled UAV flags %#x.\n", instruction->flags); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->reg.reg, - semantic->resource_type, semantic->resource_data_type, 0, false); + semantic->register_index, semantic->resource_type, semantic->resource_data_type, 0, false); } static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler *compiler, @@ -5296,7 +5297,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler FIXME("Unhandled UAV flags %#x.\n", instruction->flags); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->dst.reg, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, 0, true); + resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, 0, true); } static void vkd3d_dxbc_compiler_emit_dcl_resource_structured(struct vkd3d_dxbc_compiler *compiler, @@ -5312,7 +5313,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_structured(struct vkd3d_dxbc_c FIXME("Unhandled UAV flags %#x.\n", instruction->flags); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, reg, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, stride / 4, false); + resource->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, stride / 4, false); } static void vkd3d_dxbc_compiler_emit_workgroup_memory(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 100d515..97371f9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -614,7 +614,7 @@ struct vkd3d_shader_semantic enum vkd3d_shader_resource_type resource_type; enum vkd3d_data_type resource_data_type; struct vkd3d_shader_dst_param reg; - unsigned int register_space; + unsigned int register_space, register_index; }; enum vkd3d_shader_input_sysval_semantic @@ -662,27 +662,27 @@ struct vkd3d_shader_register_semantic struct vkd3d_shader_sampler { struct vkd3d_shader_src_param src; - unsigned int register_space; + unsigned int register_space, register_index; }; struct vkd3d_shader_constant_buffer { struct vkd3d_shader_src_param src; unsigned int size; - unsigned int register_space; + unsigned int register_space, register_index; }; struct vkd3d_shader_structured_resource { struct vkd3d_shader_dst_param reg; unsigned int byte_stride; - unsigned int register_space; + unsigned int register_space, register_index; }; struct vkd3d_shader_raw_resource { struct vkd3d_shader_dst_param dst; - unsigned int register_space; + unsigned int register_space, register_index; }; struct vkd3d_shader_tgsm -- 2.26.2

2 14

[PATCH v2 1/7] quartz/vmr9: Fake success from IVMRMixerConrol9::SetMixingPrefs().
by Zebediah Figura 27 May '20

27 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: actually call the test function... dlls/quartz/tests/vmr9.c | 33 +++++++++++++++++++++++++++++++++ dlls/quartz/vmr9.c | 14 +++++++++++--- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index dfa9dae73e5..0a8ae371a6b 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3876,6 +3876,38 @@ out: DestroyWindow(window); } +static void test_mixing_prefs(void) +{ + IBaseFilter *filter = create_vmr9(VMR9Mode_Windowed); + IVMRMixerControl9 *mixer_control; + DWORD flags; + HRESULT hr; + ULONG ref; + + set_mixing_mode(filter, 1); + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRMixerControl9_GetMixingPrefs(mixer_control, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(flags == (MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering + | MixerPref9_RenderTargetRGB), "Got flags %#x.\n", flags); + + hr = IVMRMixerControl9_SetMixingPrefs(mixer_control, MixerPref9_NoDecimation + | MixerPref9_ARAdjustXorY | MixerPref9_PointFiltering | MixerPref9_RenderTargetRGB); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRMixerControl9_GetMixingPrefs(mixer_control, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(flags == (MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_PointFiltering + | MixerPref9_RenderTargetRGB), "Got flags %#x.\n", flags); + + IVMRMixerControl9_Release(mixer_control); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -3910,6 +3942,7 @@ START_TEST(vmr9) test_surface_allocator_notify_refcount(); test_basic_video(); test_windowless_size(); + test_mixing_prefs(); CoUninitialize(); } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 81e265f104a..a716a6e7128 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -84,6 +84,7 @@ struct quartz_vmr BOOL allocator_is_ex; DWORD stream_count; + DWORD mixing_prefs; /* * The Video Mixing Renderer supports 3 modes, renderless, windowless and windowed @@ -2227,7 +2228,10 @@ static HRESULT WINAPI mixer_control9_SetMixingPrefs(IVMRMixerControl9 *iface, DW FIXME("filter %p, flags %#x, stub!\n", filter, flags); - return E_NOTIMPL; + EnterCriticalSection(&filter->renderer.filter.csFilter); + filter->mixing_prefs = flags; + LeaveCriticalSection(&filter->renderer.filter.csFilter); + return S_OK; } static HRESULT WINAPI mixer_control9_GetMixingPrefs(IVMRMixerControl9 *iface, DWORD *flags) @@ -2236,8 +2240,9 @@ static HRESULT WINAPI mixer_control9_GetMixingPrefs(IVMRMixerControl9 *iface, DW FIXME("filter %p, flags %p, stub!\n", filter, flags); - *flags = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; - + EnterCriticalSection(&filter->renderer.filter.csFilter); + *flags = filter->mixing_prefs; + LeaveCriticalSection(&filter->renderer.filter.csFilter); return S_OK; } @@ -2500,6 +2505,9 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + object->mixing_prefs = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY + | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; + TRACE("Created VMR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK; -- 2.26.2

2 1