February 2019 - Wine-devel - list.winehq.org

[PATCH vkd3d 4/6] vkd3d-shader: Add support for instanced join phases.
by Józef Kucia 07 Feb '19

07 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index da9d162cbb69..d6d487b51ecf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2323,6 +2323,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_FORKINSTID: snprintf(buffer, buffer_size, "vForkInstanceId"); break; + case VKD3DSPR_JOININSTID: + snprintf(buffer, buffer_size, "vJoinInstanceId"); + break; case VKD3DSPR_TESSCOORD: snprintf(buffer, buffer_size, "vDomainLocation"); break; @@ -3546,6 +3549,7 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil switch (reg->type) { case VKD3DSPR_FORKINSTID: + case VKD3DSPR_JOININSTID: val_id = phase->instance_id; break; default: @@ -4829,16 +4833,16 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c phase->function_location = 0; } -static int vkd3d_dxbc_compiler_emit_hs_fork_phase_instance_count(struct vkd3d_dxbc_compiler *compiler, +static int vkd3d_dxbc_compiler_emit_shader_phase_instance_count(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { struct vkd3d_shader_phase *phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; if (!compiler->shader_phase_count - || phase->type != VKD3DSIH_HS_FORK_PHASE + || (phase->type != VKD3DSIH_HS_FORK_PHASE && phase->type != VKD3DSIH_HS_JOIN_PHASE) || phase->function_id) { - WARN("Unexpected dcl_hs_fork_phase_instance_count instruction.\n"); + WARN("Unexpected dcl_hs_{fork,join}_phase_instance_count instruction.\n"); return VKD3D_ERROR_INVALID_SHADER; } @@ -7170,7 +7174,8 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break; case VKD3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT: - ret = vkd3d_dxbc_compiler_emit_hs_fork_phase_instance_count(compiler, instruction); + case VKD3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT: + ret = vkd3d_dxbc_compiler_emit_shader_phase_instance_count(compiler, instruction); break; case VKD3DSIH_HS_CONTROL_POINT_PHASE: case VKD3DSIH_HS_FORK_PHASE: -- 2.19.2

2 1

[PATCH vkd3d 5/6] vkd3d-shader: Implement hull shader barriers.
by Józef Kucia 07 Feb '19

07 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 72 ++++++++++++++++++++------- libs/vkd3d-shader/vkd3d_shader_main.c | 22 +++++++- 3 files changed, 75 insertions(+), 20 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index fe6f6e9c43c2..e803237c1f29 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -404,6 +404,7 @@ struct vkd3d_shader_scan_info unsigned int uav_read_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ unsigned int uav_counter_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ unsigned int sampler_comparison_mode_mask; /* 16 */ + bool use_vocp; }; int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d6d487b51ecf..3a80925a0e8b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4853,10 +4853,52 @@ static int vkd3d_dxbc_compiler_emit_shader_phase_instance_count(struct vkd3d_dxb return VKD3D_OK; } +static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_control_point_phase( + struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_phase *phase; + + if (compiler->shader_phase_count < 1) + return NULL; + + phase = &compiler->shader_phases[0]; + if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + return phase; + + return NULL; +} + +static void vkd3d_dxbc_compiler_emit_barrier(struct vkd3d_dxbc_compiler *compiler, + SpvScope execution_scope, SpvScope memory_scope, SpvMemorySemanticsMask semantics) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t execution_id, memory_id, semantics_id; + + memory_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, memory_scope); + semantics_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, semantics); + + if (execution_scope != SpvScopeMax) + { + execution_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, execution_scope); + vkd3d_spirv_build_op_control_barrier(builder, execution_id, memory_id, semantics_id); + } + else + { + vkd3d_spirv_build_op_memory_barrier(builder, memory_id, semantics_id); + } +} + +static void vkd3d_dxbc_compiler_emit_hull_shader_barrier(struct vkd3d_dxbc_compiler *compiler) +{ + vkd3d_dxbc_compiler_emit_barrier(compiler, + SpvScopeWorkgroup, SpvScopeInvocation, SpvMemorySemanticsMaskNone); +} + static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) { + const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - const struct vkd3d_shader_phase *phase; + const struct vkd3d_shader_phase *control_point_phase, *phase; uint32_t phase_instance_id; unsigned int i, j; uint32_t void_id; @@ -4864,9 +4906,18 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler vkd3d_spirv_builder_begin_main_function(builder); void_id = vkd3d_spirv_get_op_type_void(builder); + + if ((control_point_phase = vkd3d_dxbc_compiler_get_control_point_phase(compiler))) + vkd3d_spirv_build_op_function_call(builder, void_id, control_point_phase->function_id, NULL, 0); + + if (scan_info->use_vocp) + vkd3d_dxbc_compiler_emit_hull_shader_barrier(compiler); + for (i = 0; i < compiler->shader_phase_count; ++i) { phase = &compiler->shader_phases[i]; + if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + continue; if (phase->instance_count) { @@ -6968,14 +7019,10 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t execution_id, memory_id, semantics_id; + unsigned int memory_semantics = SpvMemorySemanticsAcquireReleaseMask; unsigned int flags = instruction->flags; SpvScope execution_scope = SpvScopeMax; SpvScope memory_scope = SpvScopeDevice; - unsigned int memory_semantics; - - memory_semantics = SpvMemorySemanticsAcquireReleaseMask; if (flags & VKD3DSSF_GROUP_SHARED_MEMORY) { @@ -7003,18 +7050,7 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, | SpvMemorySemanticsImageMemoryMask; } - memory_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, memory_scope); - semantics_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, memory_semantics); - if (execution_scope != SpvScopeMax) - { - execution_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, execution_scope); - vkd3d_spirv_build_op_control_barrier(builder, - execution_id, memory_id, semantics_id); - } - else - { - vkd3d_spirv_build_op_memory_barrier(builder, memory_id, semantics_id); - } + vkd3d_dxbc_compiler_emit_barrier(compiler, execution_scope, memory_scope, memory_semantics); } static void vkd3d_dxbc_compiler_emit_emit_stream(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 2bfdad0641cc..770281ca5ae8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -226,6 +226,15 @@ static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_info * scan_info->uav_counter_mask |= 1u << reg->idx[0].offset; } +static void vkd3d_shader_scan_input_declaration(struct vkd3d_shader_scan_info *scan_info, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; + + if (dst->reg.type == VKD3DSPR_OUTCONTROLPOINT) + scan_info->use_vocp = true; +} + static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_info *scan_info, const struct vkd3d_shader_instruction *instruction) { @@ -242,8 +251,17 @@ static void vkd3d_shader_scan_handle_instruction(struct vkd3d_shader_scan_info * { unsigned int i; - if (instruction->handler_idx == VKD3DSIH_DCL_SAMPLER) - vkd3d_shader_scan_sampler_declaration(scan_info, instruction); + switch (instruction->handler_idx) + { + case VKD3DSIH_DCL_INPUT: + vkd3d_shader_scan_input_declaration(scan_info, instruction); + break; + case VKD3DSIH_DCL_SAMPLER: + vkd3d_shader_scan_sampler_declaration(scan_info, instruction); + break; + default: + break; + } if (vkd3d_shader_instruction_is_uav_read(instruction)) { -- 2.19.2

2 1

[PATCH vkd3d 3/6] vkd3d-shader: Translate vForkInstanceId registers.
by Józef Kucia 07 Feb '19

07 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 56 ++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f14306e689c5..da9d162cbb69 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2320,6 +2320,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_DEPTHOUTLE: snprintf(buffer, buffer_size, "oDepth"); break; + case VKD3DSPR_FORKINSTID: + snprintf(buffer, buffer_size, "vForkInstanceId"); + break; case VKD3DSPR_TESSCOORD: snprintf(buffer, buffer_size, "vDomainLocation"); break; @@ -2756,12 +2759,21 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co } vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - if (component_count == 1) + /* Intermediate value (no storage class). */ + if (reg_info.storage_class == SpvStorageClassMax) + { + val_id = reg_info.id; + } + else if (component_count == 1) + { return vkd3d_dxbc_compiler_emit_load_scalar(compiler, reg, swizzle, write_mask, &reg_info); - - type_id = vkd3d_spirv_get_type_id(builder, - reg_info.component_type, vkd3d_write_mask_component_count(reg_info.write_mask)); - val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); + } + else + { + type_id = vkd3d_spirv_get_type_id(builder, + reg_info.component_type, vkd3d_write_mask_component_count(reg_info.write_mask)); + val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); + } val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, reg_info.write_mask, reg_info.component_type, swizzle, write_mask); @@ -3523,6 +3535,35 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * vkd3d_dxbc_compiler_emit_register_debug_name(builder, input_id, reg); } +static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_phase *phase, const struct vkd3d_shader_dst_param *dst) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_register *reg = &dst->reg; + struct vkd3d_symbol reg_symbol; + uint32_t val_id; + + switch (reg->type) + { + case VKD3DSPR_FORKINSTID: + val_id = phase->instance_id; + break; + default: + FIXME("Unhandled shader phase input register %#x.\n", reg->type); + return; + } + + vkd3d_symbol_make_register(&reg_symbol, reg); + reg_symbol.id = val_id; + reg_symbol.info.reg.storage_class = SpvStorageClassMax; /* Intermediate value */ + reg_symbol.info.reg.member_idx = 0; + reg_symbol.info.reg.component_type = VKD3D_TYPE_UINT; + reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_0; + reg_symbol.info.reg.is_aggregate = false; + vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); + vkd3d_dxbc_compiler_emit_register_debug_name(builder, val_id, reg); +} + static unsigned int vkd3d_dxbc_compiler_get_output_variable_index( struct vkd3d_dxbc_compiler *compiler, unsigned int register_idx) { @@ -4515,8 +4556,11 @@ static void vkd3d_dxbc_compiler_emit_dcl_input(struct vkd3d_dxbc_compiler *compi const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; + const struct vkd3d_shader_phase *phase; - if (vkd3d_shader_register_is_input(&dst->reg)) + if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) + vkd3d_dxbc_compiler_emit_shader_phase_input(compiler, phase, dst); + else if (vkd3d_shader_register_is_input(&dst->reg)) vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); else vkd3d_dxbc_compiler_emit_input_register(compiler, dst); -- 2.19.2

2 1

[PATCH vkd3d 2/6] vkd3d-shader: Add support for instanced fork phases.
by Józef Kucia 07 Feb '19

07 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 62 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e1ea236136a4..f14306e689c5 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1910,6 +1910,7 @@ struct vkd3d_shader_phase unsigned int idx; unsigned int instance_count; uint32_t function_id; + uint32_t instance_id; size_t function_location; }; @@ -3836,16 +3837,31 @@ static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *c { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t void_id, function_type_id; + unsigned int param_count; + uint32_t param_type_id; const char *name; + if (phase->instance_count) + { + param_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + param_count = 1; + } + else + { + param_count = 0; + } + phase->function_id = vkd3d_spirv_alloc_id(builder); void_id = vkd3d_spirv_get_op_type_void(builder); - function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, NULL, 0); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, &param_type_id, param_count); vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, SpvFunctionControlMaskNone, function_type_id); - vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + if (phase->instance_count) + phase->instance_id = vkd3d_spirv_build_op_function_parameter(builder, param_type_id); + + vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); switch (phase->type) @@ -4765,15 +4781,37 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c phase->idx = idx; phase->instance_count = 0; phase->function_id = 0; + phase->instance_id = 0; phase->function_location = 0; } +static int vkd3d_dxbc_compiler_emit_hs_fork_phase_instance_count(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_shader_phase *phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; + + if (!compiler->shader_phase_count + || phase->type != VKD3DSIH_HS_FORK_PHASE + || phase->function_id) + { + WARN("Unexpected dcl_hs_fork_phase_instance_count instruction.\n"); + return VKD3D_ERROR_INVALID_SHADER; + } + + phase->instance_count = instruction->declaration.count; + + vkd3d_dxbc_compiler_begin_shader_phase(compiler, phase); + + return VKD3D_OK; +} + static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_phase *phase; + uint32_t phase_instance_id; + unsigned int i, j; uint32_t void_id; - unsigned int i; vkd3d_spirv_builder_begin_main_function(builder); @@ -4781,7 +4819,20 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler for (i = 0; i < compiler->shader_phase_count; ++i) { phase = &compiler->shader_phases[i]; - vkd3d_spirv_build_op_function_call(builder, void_id, phase->function_id, NULL, 0); + + if (phase->instance_count) + { + for (j = 0; j < phase->instance_count; ++j) + { + phase_instance_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, j); + vkd3d_spirv_build_op_function_call(builder, + void_id, phase->function_id, &phase_instance_id, 1); + } + } + else + { + vkd3d_spirv_build_op_function_call(builder, void_id, phase->function_id, NULL, 0); + } } vkd3d_spirv_build_op_return(builder); @@ -7074,6 +7125,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DCL_THREAD_GROUP: vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break; + case VKD3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT: + ret = vkd3d_dxbc_compiler_emit_hs_fork_phase_instance_count(compiler, instruction); + break; case VKD3DSIH_HS_CONTROL_POINT_PHASE: case VKD3DSIH_HS_FORK_PHASE: case VKD3DSIH_HS_JOIN_PHASE: -- 2.19.2

2 1

[PATCH vkd3d 1/6] vkd3d-shader: Delay generating functions for shader phases.
by Józef Kucia 07 Feb '19

07 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Mainly in order to wait for dcl_hs_{fork,join}_phase_instance_count. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 86 +++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8efb38530ce9..e1ea236136a4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1907,6 +1907,8 @@ struct vkd3d_push_constant_buffer_binding struct vkd3d_shader_phase { enum VKD3D_SHADER_INSTRUCTION_HANDLER type; + unsigned int idx; + unsigned int instance_count; uint32_t function_id; size_t function_location; }; @@ -3829,16 +3831,56 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); } +static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *compiler, + struct vkd3d_shader_phase *phase) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t void_id, function_type_id; + const char *name; + + phase->function_id = vkd3d_spirv_alloc_id(builder); + + void_id = vkd3d_spirv_get_op_type_void(builder); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, NULL, 0); + vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, + SpvFunctionControlMaskNone, function_type_id); + vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + + phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); + + switch (phase->type) + { + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + name = "control"; + break; + case VKD3DSIH_HS_FORK_PHASE: + name = "fork"; + break; + case VKD3DSIH_HS_JOIN_PHASE: + name = "join"; + break; + default: + ERR("Invalid phase type %#x.\n", phase->type); + return; + } + vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, phase->idx); +} + static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( - const struct vkd3d_dxbc_compiler *compiler) + struct vkd3d_dxbc_compiler *compiler) { + struct vkd3d_shader_phase *phase; + if (!compiler->shader_phase_count) return NULL; - return &compiler->shader_phases[compiler->shader_phase_count - 1]; + phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; + if (!phase->function_id) + vkd3d_dxbc_compiler_begin_shader_phase(compiler, phase); + return phase; } -static size_t vkd3d_dxbc_compiler_get_current_function_location(const struct vkd3d_dxbc_compiler *compiler) +static size_t vkd3d_dxbc_compiler_get_current_function_location(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_phase *phase; @@ -4708,14 +4750,10 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c const struct vkd3d_shader_instruction *instruction) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t void_id, function_type_id; struct vkd3d_shader_phase *phase; - const char *name; - unsigned int id; - - id = compiler->shader_phase_count; + unsigned int idx; - if (id) + if ((idx = compiler->shader_phase_count)) vkd3d_spirv_build_op_function_end(builder); if (!vkd3d_array_reserve((void **)&compiler->shader_phases, &compiler->shader_phases_size, @@ -4724,32 +4762,10 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c phase = &compiler->shader_phases[compiler->shader_phase_count++]; phase->type = instruction->handler_idx; - phase->function_id = vkd3d_spirv_alloc_id(builder); - - void_id = vkd3d_spirv_get_op_type_void(builder); - function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, NULL, 0); - vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, - SpvFunctionControlMaskNone, function_type_id); - vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); - - phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); - - switch (instruction->handler_idx) - { - case VKD3DSIH_HS_CONTROL_POINT_PHASE: - name = "control"; - break; - case VKD3DSIH_HS_FORK_PHASE: - name = "fork"; - break; - case VKD3DSIH_HS_JOIN_PHASE: - name = "join"; - break; - default: - ERR("Invalid shader phase %#x.\n", instruction->handler_idx); - return; - } - vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, id); + phase->idx = idx; + phase->instance_count = 0; + phase->function_id = 0; + phase->function_location = 0; } static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) -- 2.19.2

2 1

ole32/clipboard.c
by Dawser Stevens 07 Feb '19

07 Feb '19

Hi, I have been debugging an issue regarding the clipboard, and I would be thankful if anyone could confirm what I suspect. When an application requests data from the clipboard in some specific format, the data may come from the ole clipboard or the general one (user32<->wineserver). If the piece of data comes from the general clipboard through `wineserver`, the ole clipboard still considers the format as needing to be "TYMED" (ole32/clipboard.c:get_priv_data(): call get_tymed_from_nonole_cf(cf)). Most formats available in the general clipboard are not included in the switch statement, which makes them unavailable. However, the full data is transferred by `wineserver`, so if the default in `get_tymed_from_nonole_cf` were TYMED_HGLOBAL, the ole clipboard would duplicate the transferred data with a global handle, and applications could use those formats that have been put there. Is there a reason why TYMED_HGLOBAL is not the default for unrecognized formats? I am still learning the code, but in my limited testing I have still not seen failures when I make it so. Thank you.

1 0

[PATCH v5 3/3] mfplat: Implement IMFByteStream::{Read,Write}.
by Jactry Zeng 07 Feb '19

07 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 25 +++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 26 +++++++++++++------------- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4f42fc0939..898634f153 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -981,10 +981,23 @@ static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *end static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) { mfbytestream *This = impl_from_IMFByteStream(iface); + STATSTG statstg; + QWORD length; + HRESULT hr; - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + TRACE("(%p)->(%p, %u, %p)\n", This, data, count, byte_read); - return E_NOTIMPL; + memset(&statstg, 0, sizeof(statstg)); + hr = IStream_Stat(This->stream, &statstg, STATFLAG_NONAME); + if(FAILED(hr)) + return hr; + if((statstg.grfMode & 0xf) == STGM_WRITE) + return E_ACCESSDENIED; + + IMFByteStream_GetLength(iface, &length); + if(count > length) + count = length; + return IStream_Read(This->stream, data, count, byte_read); } static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, @@ -1009,10 +1022,14 @@ static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) { mfbytestream *This = impl_from_IMFByteStream(iface); + HRESULT hr; - FIXME("%p, %p, %u, %p\n", This, data, count, written); + TRACE("(%p)->(%p, %u, %p)\n", This, data, count, written); - return E_NOTIMPL; + hr = IStream_Write(This->stream, data, count, written); + if(hr == STG_E_ACCESSDENIED) + return E_ACCESSDENIED; + return hr; } static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index dabc5f7301..53c96ea3e3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -797,13 +797,13 @@ static void test_bytestream_from_file(void) CHECK_BS_LEN(bytestream, sizeof(asf_header)); read = 0; hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); - todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); - todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); memset(buffer, 0, sizeof(buffer)); hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); hr = IMFByteStream_SetLength(bytestream, 200); ok(hr == E_FAIL, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -814,12 +814,12 @@ static void test_bytestream_from_file(void) MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); todo_wine CHECK_BS_POS(bytestream, 0); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -846,8 +846,8 @@ static void test_bytestream_from_file(void) CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); IMFByteStream_Release(bytestream); @@ -904,8 +904,8 @@ static void test_bytestream_from_stream(void) CHECK_BS_LEN(bytestream, sizeof(asf_header)); hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); todo_wine ok(hr == S_FALSE, "IMFByteStream_Read returned: 0x%08x.\n", hr); - todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); - todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); memset(buffer, 0, sizeof(buffer)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -928,8 +928,8 @@ static void test_bytestream_from_stream(void) todo_wine CHECK_BS_POS(bytestream, 0); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); -- 2.20.1

1 0

[PATCH v5 2/3] mfplat: Implement IMFByteStream::{GetLength,SetLength}.
by Jactry Zeng 07 Feb '19

07 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 19 +++- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 194 +++++++++++++++++++++++++++++++++- 3 files changed, 208 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8aab65c28d..4f42fc0939 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -922,19 +922,30 @@ static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD * static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) { mfbytestream *This = impl_from_IMFByteStream(iface); + HRESULT hr; + STATSTG statstg; - FIXME("%p, %p\n", This, length); + TRACE("(%p)->(%p)\n", This, length); - return E_NOTIMPL; + memset(&statstg, 0, sizeof(statstg)); + + hr = IStream_Stat(This->stream, &statstg, STATFLAG_NONAME); + + if (SUCCEEDED(hr)) + *length = statstg.cbSize.QuadPart; + + return hr; } static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) { mfbytestream *This = impl_from_IMFByteStream(iface); + ULARGE_INTEGER size; - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(length)); - return E_NOTIMPL; + size.QuadPart = length; + return IStream_SetSize(This->stream, size); } static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 07cf328ad2..f7f09aa33e 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat +IMPORTS = ole32 mfplat shlwapi C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a4f11da36e..dabc5f7301 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -33,6 +33,7 @@ #include "mfidl.h" #include "mferror.h" #include "mfreadwrite.h" +#include "shlwapi.h" #include "wine/test.h" @@ -52,6 +53,9 @@ DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17, DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +static const byte asf_header[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11, + 0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; + static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; #define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) @@ -638,7 +642,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, file_size); + CHECK_BS_LEN(bytestream, file_size); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); CHECK_FILE_SIZE(filename, file_size); @@ -653,7 +657,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); CHECK_FILE_SIZE(filename, 0); @@ -766,6 +770,190 @@ static void test_MFSample(void) IMFSample_Release(sample); } +static void test_bytestream_from_file(void) +{ + IMFByteStream *bytestream; + HRESULT hr; + HANDLE file; + static WCHAR asffile[] = {'t','e','s','t','.','a','s','f',0}; + byte buffer[1024] = {0}; + byte test_data[] = {0x1,0x2,0x3,0x4}; + ULONG written, read; + QWORD length; + + file = CreateFileW(asffile, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(file, asf_header, sizeof(asf_header), &written, NULL); + CloseHandle(file); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "MFStartup failed: 0x%08x.\n", hr); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + read = 0; + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + memset(buffer, 0, sizeof(buffer)); + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + hr = IMFByteStream_SetLength(bytestream, 200); + ok(hr == E_FAIL, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + + hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == sizeof(asf_header) || length == (sizeof(asf_header) + 2) /* xp */, + "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read == sizeof(asf_header) + 2, "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + memset(buffer, 0, sizeof(buffer)); + CloseHandle(file); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); + hr = IMFByteStream_SetLength(bytestream, 2000); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == 0 || length == 2000 /* xp */, "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, 0); + IMFByteStream_Release(bytestream); + + MFShutdown(); + DeleteFileW(asffile); +} + +static void test_bytestream_from_stream(void) +{ + IMFByteStream *bytestream; + IStream *stream; + HRESULT hr; + HANDLE file; + static WCHAR asffile[] = {'t','e','s','t','.','a','s','f',0}; + byte buffer[1024] = {0}; + ULONG written, read; + QWORD length; + + if(!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); + return; + } + + file = CreateFileW(asffile, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(file, asf_header, sizeof(asf_header), &written, NULL); + CloseHandle(file); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "MFStartup failed: 0x%08x.\n", hr); + + hr = SHCreateStreamOnFileW(asffile, STGM_READ|STGM_FAILIFTHERE|STGM_SHARE_DENY_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileEx failed: 0x%08x.\n", hr); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "MFCreateMFByteStreamOnStream failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_FALSE, "IMFByteStream_Read returned: 0x%08x.\n", hr); + todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + memset(buffer, 0, sizeof(buffer)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_SetLength(bytestream, 200); + ok(hr == E_FAIL || hr == S_OK, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + IStream_Release(stream); + + hr = SHCreateStreamOnFileW(asffile, STGM_WRITE|STGM_FAILIFTHERE|STGM_SHARE_DENY_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileEx failed: 0x%08x.\n", hr); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "MFCreateMFByteStreamOnStream failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_FALSE, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + + hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == sizeof(asf_header) || length == (sizeof(asf_header) + 2) /* xp */, + "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + IStream_Release(stream); + file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read == sizeof(asf_header) + 2, "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + memset(buffer, 0, sizeof(buffer)); + CloseHandle(file); + + MFShutdown(); + DeleteFileW(asffile); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -781,6 +969,8 @@ START_TEST(mfplat) test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); test_source_resolver(); + test_bytestream_from_file(); + test_bytestream_from_stream(); CoUninitialize(); } -- 2.20.1

1 0

[PATCH v5 1/3] mfplat: Implement MFCreateFile().
by Jactry Zeng 07 Feb '19

07 Feb '19

Superseded patch 157922 to 157924. ChangeLog: v5: - Fix crash when calling MFCreateMFByteStreamOnStream() on Windows. Thanks Alistair for pointing out! v4: - Fix test failure on Windows XP and Vista. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 69 +++++++++++++++----------- dlls/mfplat/tests/mfplat.c | 99 +++++++++++++++++++++++++++++++++----- 3 files changed, 127 insertions(+), 43 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 76843f5f25..5d9c8eb4c6 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 +IMPORTS = advapi32 ole32 shlwapi C_SRCS = \ main.c diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c346512f..8aab65c28d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -31,6 +31,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "shlwapi.h" #include "wine/heap.h" #include "wine/debug.h" @@ -849,6 +850,7 @@ typedef struct _mfbytestream { mfattributes attributes; IMFByteStream IMFByteStream_iface; + IStream *stream; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -901,6 +903,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -1144,6 +1147,8 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->stream = stream; + IStream_AddRef(object->stream); *bytestream = &object->IMFByteStream_iface; @@ -1154,60 +1159,65 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open LPCWSTR url, IMFByteStream **bytestream) { mfbytestream *object; - DWORD fileaccessmode = 0; - DWORD filesharemode = FILE_SHARE_READ; - DWORD filecreation_disposition = 0; - DWORD fileattributes = 0; - HANDLE file; + DWORD mode = STGM_SHARE_DENY_WRITE; + DWORD attributes = FILE_ATTRIBUTE_NORMAL; + BOOL create = FALSE, reset = FALSE; + IStream *stream = NULL; + HRESULT hres; - FIXME("(%d, %d, %d, %s, %p): stub\n", accessmode, openmode, flags, debugstr_w(url), bytestream); + TRACE("(%d, %d, %d, %s, %p)\n", accessmode, openmode, flags, debugstr_w(url), bytestream); switch (accessmode) { case MF_ACCESSMODE_READ: - fileaccessmode = GENERIC_READ; + mode |= STGM_READ; break; case MF_ACCESSMODE_WRITE: - fileaccessmode = GENERIC_WRITE; + mode |= STGM_WRITE; break; case MF_ACCESSMODE_READWRITE: - fileaccessmode = GENERIC_READ | GENERIC_WRITE; + mode |= STGM_READWRITE; break; } switch (openmode) { - case MF_OPENMODE_FAIL_IF_NOT_EXIST: - filecreation_disposition = OPEN_EXISTING; - break; - case MF_OPENMODE_FAIL_IF_EXIST: - filecreation_disposition = CREATE_NEW; - break; case MF_OPENMODE_RESET_IF_EXIST: - filecreation_disposition = TRUNCATE_EXISTING; + if (accessmode == MF_ACCESSMODE_READ) + return E_INVALIDARG; + reset = TRUE; + mode |= STGM_FAILIFTHERE; break; case MF_OPENMODE_APPEND_IF_EXIST: - filecreation_disposition = OPEN_ALWAYS; - fileaccessmode |= FILE_APPEND_DATA; + if (GetFileAttributesW(url) == INVALID_FILE_ATTRIBUTES) + create = TRUE; + case MF_OPENMODE_FAIL_IF_NOT_EXIST: + mode |= STGM_FAILIFTHERE; + break; + case MF_OPENMODE_FAIL_IF_EXIST: + mode |= STGM_FAILIFTHERE; + create = TRUE; break; case MF_OPENMODE_DELETE_IF_EXIST: - filecreation_disposition = CREATE_ALWAYS; + mode |= STGM_CREATE; break; } if (flags & MF_FILEFLAGS_NOBUFFERING) - fileattributes |= FILE_FLAG_NO_BUFFERING; - - /* Open HANDLE to file */ - file = CreateFileW(url, fileaccessmode, filesharemode, NULL, - filecreation_disposition, fileattributes, 0); - - if(file == INVALID_HANDLE_VALUE) - return HRESULT_FROM_WIN32(GetLastError()); + attributes |= FILE_FLAG_NO_BUFFERING; + if ((flags & MF_FILEFLAGS_ALLOW_WRITE_SHARING) && (accessmode == MF_ACCESSMODE_READ)) + mode &= ~STGM_SHARE_DENY_WRITE; - /* Close the file again, since we don't do anything with it yet */ - CloseHandle(file); + hres = SHCreateStreamOnFileEx(url, mode, attributes, create, NULL, &stream); + if(FAILED(hres)) + return hres; + if (reset) + { + ULARGE_INTEGER zero; + zero.QuadPart = 0; + IStream_SetSize(stream, zero); + } object = heap_alloc( sizeof(*object) ); if(!object) return E_OUTOFMEMORY; @@ -1215,6 +1225,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->stream = stream; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa59f4816..a4f11da36e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -54,6 +54,48 @@ DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22, static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; +#define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) +static void _check_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + +#define CHECK_BS_POS(obj,pos) _check_bs_pos(obj, pos, __LINE__) +static void _check_bs_pos(IMFByteStream* obj, QWORD pos, int line) +{ + QWORD position = 0xdeadbeef; + HRESULT hr; + hr = IMFByteStream_GetCurrentPosition(obj, &position); + ok_(__FILE__,line)(hr == S_OK, "IMFByteStream_GetCurrentPosition failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(position == pos, "got wrong position: %s.\n", + wine_dbgstr_longlong(position)); +} + +#define CHECK_BS_LEN(obj,len) _check_bs_len(obj, len, __LINE__) +static void _check_bs_len(IMFByteStream* obj, QWORD len, int line) +{ + QWORD length = 0xdeadbeef; + HRESULT hr; + hr = IMFByteStream_GetLength(obj, &length); + ok_(__FILE__,line)(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(length == len, "got wrong length: %s.\n", + wine_dbgstr_longlong(length)); +} + +#define CHECK_FILE_SIZE(filename,exp_size) _check_file_size(filename, exp_size, __LINE__) +static void _check_file_size(const WCHAR *filename, LONG exp_size, int line) +{ + HANDLE handle; + DWORD file_size = 0xdeadbeef; + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file_size = GetFileSize(handle, NULL); + ok_(__FILE__,line)(file_size == exp_size, "got wrong file size: %d.\n", file_size); + CloseHandle(handle); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -450,8 +492,10 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 1); hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 2); hr = IMFByteStream_QueryInterface(bytestream, &IID_IUnknown, (void **)&unknown); @@ -509,7 +553,8 @@ static void test_MFCreateFile(void) IMFAttributes *attributes = NULL; HRESULT hr; WCHAR *filename; - + LONG file_size; + HANDLE handle; static const WCHAR newfilename[] = {'n','e','w','.','m','p','4',0}; filename = load_resource(mp4file); @@ -534,13 +579,11 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_READWRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); IMFByteStream_Release(bytestream); @@ -558,18 +601,15 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); IMFByteStream_Release(bytestream); @@ -580,10 +620,43 @@ static void test_MFCreateFile(void) /* Opening the file again fails even though MF_FILEFLAGS_ALLOW_WRITE_SHARING is set. */ hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION) /* xp and vista */, + "MFCreateFile failed: 0x%08x.\n", hr); + if(hr == S_OK) + IMFByteStream_Release(bytestream2); + IMFByteStream_Release(bytestream); + + /* test MF_OPENMODE_APPEND_IF_EXIST */ + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + file_size = GetFileSize(handle, NULL); + CloseHandle(handle); + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_LEN(bytestream, file_size); + todo_wine CHECK_BS_POS(bytestream, 0); + IMFByteStream_Release(bytestream); + CHECK_FILE_SIZE(filename, file_size); + + /* test MF_OPENMODE_RESET_IF_EXIST with read-only mode */ + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); + ok(hr == E_INVALIDARG, "MFCreateFile should fail: 0x%08x.\n", hr); + CHECK_FILE_SIZE(filename, file_size); + + /* test MF_OPENMODE_RESET_IF_EXIST */ + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_LEN(bytestream, 0); + todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); + CHECK_FILE_SIZE(filename, 0); MFShutdown(); -- 2.20.1

1 0

[PATCH] crypt32/tests: Show that PFXImportCertStore doesn't set CERT_KEY_PROV_INFO_PROP_ID.
by Hans Leidekker 07 Feb '19

07 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/tests/store.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index f3fb420140..b8d0ad6666 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3286,6 +3286,7 @@ static void test_PFXImportCertStore(void) CRYPT_DATA_BLOB pfx; const CERT_CONTEXT *cert; CERT_KEY_CONTEXT key; + CRYPT_KEY_PROV_INFO keyprov; CERT_INFO *info; DWORD count, size; BOOL ret; @@ -3323,6 +3324,11 @@ static void test_PFXImportCertStore(void) ok( key.hCryptProv, "hCryptProv not set\n" ); ok( key.dwKeySpec == AT_KEYEXCHANGE, "got %u\n", key.dwKeySpec ); + size = sizeof(keyprov); + SetLastError( 0xdeadbeef ); + ret = CertGetCertificateContextProperty( cert, CERT_KEY_PROV_INFO_PROP_ID, &keyprov, &size ); + ok( !ret && GetLastError() == CRYPT_E_NOT_FOUND, "got %08x\n", GetLastError() ); + CertCloseStore( store, 0 ); } -- 2.20.1

1 0