- wine-devel - winehq.org

[PATCH vkd3d 7/7] vkd3d-shader: Implement SV_ViewportArrayIndex.
by Józef Kucia 22 Oct '18

22 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 06abe65a58fe..0813f49516aa 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2942,6 +2942,12 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com case SpvBuiltInLayer: vkd3d_spirv_enable_capability(builder, SpvCapabilityGeometry); break; + case SpvBuiltInViewportIndex: + vkd3d_spirv_enable_capability(builder, SpvCapabilityMultiViewport); + break; + case SpvBuiltInSampleId: + vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); + break; default: break; } @@ -3012,14 +3018,6 @@ static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler, return vkd3d_dxbc_compiler_emit_bool_to_int(compiler, 1, front_facing_id); } -static uint32_t sv_sample_index(struct vkd3d_dxbc_compiler *compiler, uint32_t id) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - - vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); - return id; -} - struct vkd3d_spirv_builtin { enum vkd3d_component_type component_type; @@ -3049,10 +3047,11 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, sv_instance_id_fixup}}, {VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}}, + {VKD3D_SIV_VIEWPORT_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInViewportIndex}}, {VKD3D_SIV_IS_FRONT_FACE, {VKD3D_TYPE_BOOL, 1, SpvBuiltInFrontFacing, sv_front_face_fixup}}, - {VKD3D_SIV_SAMPLE_INDEX, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleId, sv_sample_index}}, + {VKD3D_SIV_SAMPLE_INDEX, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleId}}, {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}}, {VKD3D_SIV_CULL_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInCullDistance, NULL, true}}, -- 2.18.1

2 1

[PATCH vkd3d 6/7] vkd3d-shader: Try to always use combined samplers for t# registers.
by Józef Kucia 22 Oct '18

22 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> For bufinfo and resinfo. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3186c2c3c9a3..06abe65a58fe 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5484,21 +5484,17 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil struct vkd3d_shader_image *image, const struct vkd3d_shader_register *resource_reg, const struct vkd3d_shader_register *sampler_reg, unsigned int flags) { - const struct vkd3d_symbol *symbol = NULL, *combined_sampler = NULL; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t sampler_var_id, sampler_id, sampled_image_type_id; - bool load, depth_comparison; + const struct vkd3d_symbol *symbol = NULL; + bool load, sampled, depth_comparison; load = !(flags & VKD3D_IMAGE_FLAG_NO_LOAD); + sampled = flags & VKD3D_IMAGE_FLAG_SAMPLED; depth_comparison = flags & VKD3D_IMAGE_FLAG_DEPTH; - if (flags & VKD3D_IMAGE_FLAG_SAMPLED) - { - assert(load); - combined_sampler = vkd3d_dxbc_compiler_find_combined_sampler(compiler, - resource_reg, sampler_reg); - symbol = combined_sampler; - } + if (resource_reg->type == VKD3DSPR_RESOURCE) + symbol = vkd3d_dxbc_compiler_find_combined_sampler(compiler, resource_reg, sampler_reg); if (!symbol) symbol = vkd3d_dxbc_compiler_find_resource(compiler, resource_reg); @@ -5509,13 +5505,13 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil image->structure_stride = symbol->info.resource.structure_stride; image->raw = symbol->info.resource.raw; - if (combined_sampler) + if (symbol->type == VKD3D_SYMBOL_COMBINED_SAMPLER) { sampled_image_type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image->image_type_id); image->sampled_image_id = vkd3d_spirv_build_op_load(builder, sampled_image_type_id, image->id, SpvMemoryAccessMaskNone); - image->image_id = vkd3d_spirv_build_op_image(builder, - image->image_type_id, image->sampled_image_id); + image->image_id = !sampled ? vkd3d_spirv_build_op_image(builder, + image->image_type_id, image->sampled_image_id) : 0; return; } @@ -5526,8 +5522,10 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil resource_reg, image->resource_type_info, image->sampled_type, image->structure_stride || image->raw, depth_comparison); - if (flags & VKD3D_IMAGE_FLAG_SAMPLED) + if (sampled) { + assert(image->image_id); + if (sampler_reg) sampler_var_id = vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg); else -- 2.18.1

2 1

[PATCH vkd3d 5/7] vkd3d-shader: Add support for combined samplers.
by Józef Kucia 22 Oct '18

22 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 15 +++ libs/vkd3d-shader/spirv.c | 164 +++++++++++++++++++++++++++++++-- libs/vkd3d/state.c | 4 + 3 files changed, 175 insertions(+), 8 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index ce8de6dad388..ac163583b65a 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -91,6 +91,18 @@ struct vkd3d_shader_resource_binding struct vkd3d_shader_descriptor_binding binding; }; +#define VKD3D_DUMMY_SAMPLER_INDEX ~0u + +struct vkd3d_shader_combined_resource_sampler +{ + unsigned int resource_index; + unsigned int sampler_index; + enum vkd3d_shader_visibility shader_visibility; + bool is_buffer; + + struct vkd3d_shader_descriptor_binding binding; +}; + struct vkd3d_shader_uav_counter_binding { unsigned int register_index; /* u# */ @@ -116,6 +128,9 @@ struct vkd3d_shader_interface const struct vkd3d_shader_push_constant_buffer *push_constant_buffers; unsigned int push_constant_buffer_count; + const struct vkd3d_shader_combined_resource_sampler *combined_samplers; + unsigned int combined_sampler_count; + /* A sampler used by OpImageFetches generated for SM4 ld instructions. * * In Vulkan OpImageFetch must be used with a sampled image. diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e964cce24677..3186c2c3c9a3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1676,6 +1676,12 @@ struct vkd3d_symbol_resource unsigned int idx; }; +struct vkd3d_symbol_combined_sampler +{ + unsigned int resource_idx; + unsigned int sampler_idx; +}; + struct vkd3d_symbol_register_data { SpvStorageClass storage_class; @@ -1703,12 +1709,14 @@ struct vkd3d_symbol { VKD3D_SYMBOL_REGISTER, VKD3D_SYMBOL_RESOURCE, + VKD3D_SYMBOL_COMBINED_SAMPLER, } type; union { struct vkd3d_symbol_register reg; struct vkd3d_symbol_resource resource; + struct vkd3d_symbol_combined_sampler combined_sampler; } key; uint32_t id; @@ -1757,6 +1765,15 @@ static void vkd3d_symbol_make_resource(struct vkd3d_symbol *symbol, symbol->key.resource.idx = reg->idx[0].offset; } +static void vkd3d_symbol_make_combined_sampler(struct vkd3d_symbol *symbol, + unsigned int resource_index, unsigned int sampler_index) +{ + symbol->type = VKD3D_SYMBOL_COMBINED_SAMPLER; + memset(&symbol->key, 0, sizeof(symbol->key)); + symbol->key.combined_sampler.resource_idx = resource_index; + symbol->key.combined_sampler.sampler_idx = sampler_index; +} + static struct vkd3d_symbol *vkd3d_symbol_dup(const struct vkd3d_symbol *symbol) { struct vkd3d_symbol *s; @@ -2009,6 +2026,31 @@ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_ return NULL; } +static bool vkd3d_dxbc_compiler_have_combined_sampler(const struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler) +{ + const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_combined_resource_sampler *combined_sampler; + unsigned int i; + + if (!shader_interface->combined_sampler_count) + return false; + + if (resource && resource->type == VKD3DSPR_UAV) + return false; + + for (i = 0; i < shader_interface->combined_sampler_count; ++i) + { + combined_sampler = &shader_interface->combined_samplers[i]; + + if (!(resource || combined_sampler->resource_index == resource->idx[0].offset) + && (!sampler || combined_sampler->sampler_index == sampler->idx[0].offset)) + return true; + } + + return false; +} + 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) @@ -3753,6 +3795,9 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com uint32_t type_id, ptr_type_id, var_id; struct vkd3d_symbol reg_symbol; + if (vkd3d_dxbc_compiler_have_combined_sampler(compiler, NULL, reg)) + return; + type_id = vkd3d_spirv_get_op_type_sampler(builder); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, @@ -3852,6 +3897,64 @@ static uint32_t vkd3d_dxbc_compiler_get_image_type_id(struct vkd3d_dxbc_compiler reg->type == VKD3DSPR_UAV ? 2 : 1, format); } +static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *resource, enum vkd3d_shader_resource_type resource_type, + enum vkd3d_component_type sampled_type, unsigned int structure_stride, bool raw, + const struct vkd3d_spirv_resource_type *resource_type_info) +{ + const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; + const SpvStorageClass storage_class = SpvStorageClassUniformConstant; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_combined_resource_sampler *current; + const unsigned int resource_index = resource->idx[0].offset; + uint32_t image_type_id, type_id, ptr_type_id, var_id; + bool is_buffer_resource, depth; + struct vkd3d_symbol symbol; + unsigned int i; + + is_buffer_resource = resource_type == VKD3D_SHADER_RESOURCE_BUFFER; + + for (i = 0; i < shader_interface->combined_sampler_count; ++i) + { + current = &shader_interface->combined_samplers[i]; + + if (current->resource_index != resource_index || current->is_buffer != is_buffer_resource) + continue; + + if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) + continue; + + depth = current->sampler_index != VKD3D_DUMMY_SAMPLER_INDEX + && scan_info->sampler_comparison_mode_mask & (1u << current->sampler_index); + + image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, + resource, resource_type_info, sampled_type, structure_stride || raw, depth); + type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image_type_id); + + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); + var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, + ptr_type_id, storage_class, 0); + + vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, var_id, &current->binding); + + if (current->sampler_index == VKD3D_DUMMY_SAMPLER_INDEX) + vkd3d_spirv_build_op_name(builder, var_id, "t%u_dummy_sampler", resource_index); + else + vkd3d_spirv_build_op_name(builder, var_id, "t%u_s%u", resource_index, current->sampler_index); + + vkd3d_symbol_make_combined_sampler(&symbol, resource_index, current->sampler_index); + symbol.id = var_id; + symbol.info.resource.sampled_type = sampled_type; + symbol.info.resource.type_id = image_type_id; + symbol.info.resource.resource_type_info = resource_type_info; + symbol.info.resource.structure_stride = structure_stride; + symbol.info.resource.raw = raw; + symbol.info.resource.uav_counter_id = 0; + vkd3d_dxbc_compiler_put_symbol(compiler, &symbol); + } +} + 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) @@ -3875,6 +3978,13 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp sampled_type = vkd3d_component_type_from_data_type(resource_data_type); + if (vkd3d_dxbc_compiler_have_combined_sampler(compiler, reg, NULL)) + { + vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, + reg, resource_type, sampled_type, structure_stride, raw, resource_type_info); + return; + } + type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, reg, resource_type_info, sampled_type, structure_stride || raw, 0); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); @@ -5350,27 +5460,65 @@ static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_resource(struct vkd3d return RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); } +static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_combined_sampler(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *resource_reg, const struct vkd3d_shader_register *sampler_reg) +{ + const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + unsigned int resource_index, sampler_index; + struct vkd3d_symbol key; + struct rb_entry *entry; + + if (!shader_interface->combined_sampler_count) + return NULL; + + resource_index = resource_reg->idx[0].offset; + sampler_index = sampler_reg ? sampler_reg->idx[0].offset : VKD3D_DUMMY_SAMPLER_INDEX; + + vkd3d_symbol_make_combined_sampler(&key, resource_index, sampler_index); + if ((entry = rb_get(&compiler->symbol_table, &key))) + return RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + return NULL; +} + static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_image *image, const struct vkd3d_shader_register *resource_reg, const struct vkd3d_shader_register *sampler_reg, unsigned int flags) { + const struct vkd3d_symbol *symbol = NULL, *combined_sampler = NULL; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t sampler_var_id, sampler_id, sampled_image_type_id; - const struct vkd3d_symbol *resource_symbol; bool load, depth_comparison; load = !(flags & VKD3D_IMAGE_FLAG_NO_LOAD); depth_comparison = flags & VKD3D_IMAGE_FLAG_DEPTH; - resource_symbol = vkd3d_dxbc_compiler_find_resource(compiler, resource_reg); + if (flags & VKD3D_IMAGE_FLAG_SAMPLED) + { + assert(load); + combined_sampler = vkd3d_dxbc_compiler_find_combined_sampler(compiler, + resource_reg, sampler_reg); + symbol = combined_sampler; + } + if (!symbol) + symbol = vkd3d_dxbc_compiler_find_resource(compiler, resource_reg); + + image->id = symbol->id; + image->sampled_type = symbol->info.resource.sampled_type; + image->image_type_id = symbol->info.resource.type_id; + image->resource_type_info = symbol->info.resource.resource_type_info; + image->structure_stride = symbol->info.resource.structure_stride; + image->raw = symbol->info.resource.raw; - image->sampled_type = resource_symbol->info.resource.sampled_type; - image->image_type_id = resource_symbol->info.resource.type_id; - image->resource_type_info = resource_symbol->info.resource.resource_type_info; - image->structure_stride = resource_symbol->info.resource.structure_stride; - image->raw = resource_symbol->info.resource.raw; + if (combined_sampler) + { + sampled_image_type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image->image_type_id); + image->sampled_image_id = vkd3d_spirv_build_op_load(builder, + sampled_image_type_id, image->id, SpvMemoryAccessMaskNone); + image->image_id = vkd3d_spirv_build_op_image(builder, + image->image_type_id, image->sampled_image_id); + return; + } - image->id = resource_symbol->id; image->image_id = load ? vkd3d_spirv_build_op_load(builder, image->image_type_id, image->id, SpvMemoryAccessMaskNone) : 0; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 82721f27b448..db761d884756 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1434,6 +1434,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; + shader_interface.combined_samplers = NULL; + shader_interface.combined_sampler_count = 0; shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = state->uav_counters; shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); @@ -2002,6 +2004,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; + shader_interface.combined_samplers = NULL; + shader_interface.combined_sampler_count = 0; shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; -- 2.18.1

2 1

[PATCH vkd3d 2/7] vkd3d-shader: Generalize helper for emitting descriptor binding decorations.
by Józef Kucia 22 Oct '18

22 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 33be8de7e78d..93a549c5d6cc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2015,7 +2015,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; enum vkd3d_shader_descriptor_type descriptor_type; - struct vkd3d_shader_descriptor_binding vk_binding; + struct vkd3d_shader_descriptor_binding binding; unsigned int reg_idx = reg->idx[0].offset; bool is_buffer_resource; unsigned int i; @@ -2068,21 +2068,28 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor descriptor_type, reg_idx, compiler->shader_type); } - vk_binding.set = 0; - vk_binding.binding = compiler->binding_idx++; - return vk_binding; + binding.set = 0; + binding.binding = compiler->binding_idx++; + return binding; } static void vkd3d_dxbc_compiler_emit_descriptor_binding(struct vkd3d_dxbc_compiler *compiler, + uint32_t variable_id, const struct vkd3d_shader_descriptor_binding *binding) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationDescriptorSet, binding->set); + vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationBinding, binding->binding); +} + +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) { - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - struct vkd3d_shader_descriptor_binding vk_binding; + struct vkd3d_shader_descriptor_binding binding; - vk_binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, resource_type, is_uav_counter); - vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationDescriptorSet, vk_binding.set); - vkd3d_spirv_build_op_decorate1(builder, variable_id, SpvDecorationBinding, vk_binding.binding); + binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, resource_type, is_uav_counter); + vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding); } static void vkd3d_dxbc_compiler_put_symbol(struct vkd3d_dxbc_compiler *compiler, @@ -3688,7 +3695,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, pointer_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, VKD3D_SHADER_RESOURCE_BUFFER, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3751,7 +3758,7 @@ 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(compiler, + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, VKD3D_SHADER_RESOURCE_NONE, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3874,7 +3881,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(compiler, var_id, reg, resource_type, false); + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, resource_type, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3896,7 +3903,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp counter_var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); - vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, + vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, counter_var_id, reg, resource_type, true); vkd3d_spirv_build_op_name(builder, counter_var_id, "u%u_counter", reg->idx[0].offset); -- 2.18.1

2 1

[PATCH vkd3d 4/7] vkd3d-shader: Scan sampler comparison mode.
by Józef Kucia 22 Oct '18

22 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index f0ff82b8ce7f..ce8de6dad388 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -345,6 +345,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; + uint32_t sampler_comparison_mode_mask; }; int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5b269bd6a343..348fa5d6e7c6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -160,11 +160,25 @@ 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_sampler_declaration(struct vkd3d_shader_scan_info *scan_info, + const struct vkd3d_shader_instruction *instruction) +{ + unsigned int sampler_index = instruction->declaration.dst.reg.idx[0].offset; + if (instruction->flags & VKD3DSI_SAMPLER_COMPARISON_MODE) + { + assert(sampler_index < CHAR_BIT * sizeof(scan_info->sampler_comparison_mode_mask)); + scan_info->sampler_comparison_mode_mask |= 1u << sampler_index; + } +} + static void vkd3d_shader_scan_handle_instruction(struct vkd3d_shader_scan_info *scan_info, const struct vkd3d_shader_instruction *instruction) { unsigned int i; + if (instruction->handler_idx == VKD3DSIH_DCL_SAMPLER) + vkd3d_shader_scan_sampler_declaration(scan_info, instruction); + if (vkd3d_shader_instruction_is_uav_read(instruction)) { for (i = 0; i < instruction->dst_count; ++i) -- 2.18.1

2 1

[PATCH vkd3d 3/7] vkd3d-shader: Merge prepare_image() functions.
by Józef Kucia 22 Oct '18

22 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 85 +++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 47 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 93a549c5d6cc..e964cce24677 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5336,6 +5336,7 @@ struct vkd3d_shader_image #define VKD3D_IMAGE_FLAG_NONE 0x0 #define VKD3D_IMAGE_FLAG_DEPTH 0x1 #define VKD3D_IMAGE_FLAG_NO_LOAD 0x2 +#define VKD3D_IMAGE_FLAG_SAMPLED 0x4 static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_resource(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *resource_reg) @@ -5351,9 +5352,10 @@ static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_resource(struct vkd3d static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_image *image, const struct vkd3d_shader_register *resource_reg, - unsigned int flags) + const struct vkd3d_shader_register *sampler_reg, unsigned int flags) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t sampler_var_id, sampler_id, sampled_image_type_id; const struct vkd3d_symbol *resource_symbol; bool load, depth_comparison; @@ -5376,37 +5378,23 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil resource_reg, image->resource_type_info, image->sampled_type, image->structure_stride || image->raw, depth_comparison); - image->sampled_image_id = 0; -} - -static void vkd3d_dxbc_compiler_prepare_sampled_image_for_sampler(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_image *image, const struct vkd3d_shader_register *resource_reg, - uint32_t sampler_var_id, unsigned int flags) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t sampler_id, sampled_image_type_id; - - vkd3d_dxbc_compiler_prepare_image(compiler, image, resource_reg, flags); - sampler_id = vkd3d_spirv_build_op_load(builder, - vkd3d_spirv_get_op_type_sampler(builder), sampler_var_id, SpvMemoryAccessMaskNone); - sampled_image_type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image->image_type_id); - image->sampled_image_id = vkd3d_spirv_build_op_sampled_image(builder, - sampled_image_type_id, image->image_id, sampler_id); -} - -static void vkd3d_dxbc_compiler_prepare_dummy_sampled_image(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_image *image, const struct vkd3d_shader_register *resource_reg) -{ - vkd3d_dxbc_compiler_prepare_sampled_image_for_sampler(compiler, image, resource_reg, - vkd3d_dxbc_compiler_get_dummy_sampler_id(compiler), false); -} + if (flags & VKD3D_IMAGE_FLAG_SAMPLED) + { + if (sampler_reg) + sampler_var_id = vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg); + else + sampler_var_id = vkd3d_dxbc_compiler_get_dummy_sampler_id(compiler); -static void vkd3d_dxbc_compiler_prepare_sampled_image(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_image *image, const struct vkd3d_shader_register *resource_reg, - const struct vkd3d_shader_register *sampler_reg, unsigned int flags) -{ - vkd3d_dxbc_compiler_prepare_sampled_image_for_sampler(compiler, image, resource_reg, - vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg), flags); + sampler_id = vkd3d_spirv_build_op_load(builder, + vkd3d_spirv_get_op_type_sampler(builder), sampler_var_id, SpvMemoryAccessMaskNone); + sampled_image_type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image->image_type_id); + image->sampled_image_id = vkd3d_spirv_build_op_sampled_image(builder, + sampled_image_type_id, image->image_id, sampler_id); + } + else + { + image->sampled_image_id = 0; + } } static uint32_t vkd3d_dxbc_compiler_emit_texel_offset(struct vkd3d_dxbc_compiler *compiler, @@ -5437,7 +5425,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, multisample = instruction->handler_idx == VKD3DSIH_LD2DMS; /* OpImageFetch must be used with a sampled image. */ - vkd3d_dxbc_compiler_prepare_dummy_sampled_image(compiler, &image, &src[1].reg); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, NULL, VKD3D_IMAGE_FLAG_SAMPLED); image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); @@ -5475,6 +5463,7 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + const struct vkd3d_shader_src_param *resource, *sampler; uint32_t sampled_type_id, coordinate_id, val_id; SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; @@ -5483,8 +5472,10 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler DWORD coordinate_mask; SpvOp op; - vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, - &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_NONE); + resource = &src[1]; + sampler = &src[2]; + vkd3d_dxbc_compiler_prepare_image(compiler, &image, + &resource->reg, &sampler->reg, VKD3D_IMAGE_FLAG_SAMPLED); switch (instruction->handler_idx) { @@ -5531,7 +5522,7 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler image.sampled_image_id, coordinate_id, operands_mask, image_operands, image_operand_count); vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, - dst, val_id, image.sampled_type, src[1].swizzle); + dst, val_id, image.sampled_type, resource->swizzle); } static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compiler, @@ -5562,8 +5553,8 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil op = SpvOpImageSampleDrefImplicitLod; } - vkd3d_dxbc_compiler_prepare_sampled_image(compiler, - &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_DEPTH); + vkd3d_dxbc_compiler_prepare_image(compiler, + &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_SAMPLED | VKD3D_IMAGE_FLAG_DEPTH); sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); @@ -5587,7 +5578,7 @@ static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compile struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - unsigned int image_flags = VKD3D_IMAGE_FLAG_NONE; + unsigned int image_flags = VKD3D_IMAGE_FLAG_SAMPLED; SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; @@ -5608,7 +5599,7 @@ static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compile resource = &src[1 + extended_offset]; sampler = &src[2 + extended_offset]; - vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, &sampler->reg, image_flags); if (offset) @@ -5700,13 +5691,13 @@ static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc { /* OpImageFetch must be used with a sampled image. */ op = SpvOpImageFetch; - vkd3d_dxbc_compiler_prepare_dummy_sampled_image(compiler, &image, &resource->reg); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_SAMPLED); image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); } else { op = SpvOpImageRead; - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, VKD3D_IMAGE_FLAG_NONE); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_NONE); image_id = image.image_id; } @@ -5807,7 +5798,7 @@ static void vkd3d_dxbc_compiler_emit_store_uav_raw_structured(struct vkd3d_dxbc_ unsigned int component_count; type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &dst->reg, VKD3D_IMAGE_FLAG_NONE); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &dst->reg, NULL, VKD3D_IMAGE_FLAG_NONE); assert((instruction->handler_idx == VKD3DSIH_STORE_STRUCTURED) != !image.structure_stride); base_coordinate_id = vkd3d_dxbc_compiler_emit_raw_structured_addressing(compiler, type_id, image.structure_stride, &src[0], VKD3DSP_WRITEMASK_0, &src[1], VKD3DSP_WRITEMASK_0); @@ -5902,7 +5893,7 @@ static void vkd3d_dxbc_compiler_emit_ld_uav_typed(struct vkd3d_dxbc_compiler *co struct vkd3d_shader_image image; DWORD coordinate_mask; - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, VKD3D_IMAGE_FLAG_NONE); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, NULL, VKD3D_IMAGE_FLAG_NONE); type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); @@ -5927,7 +5918,7 @@ static void vkd3d_dxbc_compiler_emit_store_uav_typed(struct vkd3d_dxbc_compiler vkd3d_spirv_enable_capability(builder, SpvCapabilityStorageImageWriteWithoutFormat); - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &dst->reg, VKD3D_IMAGE_FLAG_NONE); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &dst->reg, NULL, VKD3D_IMAGE_FLAG_NONE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); /* XXX: Fix the data type. */ @@ -6071,7 +6062,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil else { scope = SpvScopeDevice; - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, VKD3D_IMAGE_FLAG_NO_LOAD); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_NO_LOAD); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; structure_stride = image.structure_stride; raw = image.raw; @@ -6137,7 +6128,7 @@ static void vkd3d_dxbc_compiler_emit_bufinfo(struct vkd3d_dxbc_compiler *compile vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, VKD3D_IMAGE_FLAG_NONE); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, NULL, VKD3D_IMAGE_FLAG_NONE); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); val_id = vkd3d_spirv_build_op_image_query_size(builder, type_id, image.image_id); @@ -6178,7 +6169,7 @@ static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compile vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, VKD3D_IMAGE_FLAG_NONE); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, NULL, VKD3D_IMAGE_FLAG_NONE); size_component_count = image.resource_type_info->coordinate_component_count; type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, size_component_count); -- 2.18.1

2 1

[PATCH vkd3d 1/7] vkd3d-shader: Remove sampler_id from struct vkd3d_shader_image.
by Józef Kucia 22 Oct '18

22 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8508741652ff..33be8de7e78d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5317,7 +5317,6 @@ struct vkd3d_shader_image { uint32_t id; uint32_t image_id; - uint32_t sampler_id; uint32_t sampled_image_id; enum vkd3d_component_type sampled_type; @@ -5370,7 +5369,6 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil resource_reg, image->resource_type_info, image->sampled_type, image->structure_stride || image->raw, depth_comparison); - image->sampler_id = 0; image->sampled_image_id = 0; } @@ -5379,14 +5377,14 @@ static void vkd3d_dxbc_compiler_prepare_sampled_image_for_sampler(struct vkd3d_d uint32_t sampler_var_id, unsigned int flags) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t sampled_image_type_id; + uint32_t sampler_id, sampled_image_type_id; vkd3d_dxbc_compiler_prepare_image(compiler, image, resource_reg, flags); - image->sampler_id = vkd3d_spirv_build_op_load(builder, + sampler_id = vkd3d_spirv_build_op_load(builder, vkd3d_spirv_get_op_type_sampler(builder), sampler_var_id, SpvMemoryAccessMaskNone); sampled_image_type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image->image_type_id); image->sampled_image_id = vkd3d_spirv_build_op_sampled_image(builder, - sampled_image_type_id, image->image_id, image->sampler_id); + sampled_image_type_id, image->image_id, sampler_id); } static void vkd3d_dxbc_compiler_prepare_dummy_sampled_image(struct vkd3d_dxbc_compiler *compiler, -- 2.18.1

2 1

[PATCH] services/tests: Some spelling and duplicate word fixes.
by Francois Gouget 22 Oct '18

22 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/services/tests/service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index aaae6801f67..5e9265d587f 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -149,11 +149,11 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR service_ok(r, "GetMonitorInfo failed.\n"); service_ok(mi.rcMonitor.left == 0 && mi.rcMonitor.top == 0 && mi.rcMonitor.right >= 640 && mi.rcMonitor.bottom >= 480, - "Unexepected monitor rcMonitor values: {%d,%d,%d,%d}\n", + "Unexpected monitor rcMonitor values: {%d,%d,%d,%d}\n", mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); service_ok(mi.rcWork.left == 0 && mi.rcWork.top == 0 && mi.rcWork.right >= 640 && mi.rcWork.bottom >= 480, - "Unexepected monitor rcWork values: {%d,%d,%d,%d}\n", + "Unexpected monitor rcWork values: {%d,%d,%d,%d}\n", mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); service_ok(!strcmp(mi.szDevice, "WinDisc") || !strcmp(mi.szDevice, "\\\\.\\DISPLAY1"), @@ -164,7 +164,7 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR return TRUE; } -/* query informations monitor information, even in non-interactive services */ +/* query monitor information, even in non-interactive services */ static void test_monitors(void) { BOOL r; -- 2.19.1

1 0

[PATCH] hnetcfg: Add a trailing '\n' to a TRACE().
by Francois Gouget 22 Oct '18

22 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/hnetcfg/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 7f3f6c51191..2bb589adb29 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -631,7 +631,7 @@ static HRESULT WINAPI upnpnat_QueryInterface(IUPnPNAT *iface, REFIID riid, void } else if(IsEqualGUID( riid, &IID_IProvideClassInfo)) { - TRACE("IProvideClassInfo not supported."); + TRACE("IProvideClassInfo not supported.\n"); return E_NOINTERFACE; } else -- 2.19.1

1 0

[PATCH] po: Remove a stray line in the Chinese (PRC) translation.
by Francois Gouget 22 Oct '18

22 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/zh_CN.po | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH] po: Remove spaces before '\n's.
by Francois Gouget 22 Oct '18

22 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/fr.po | 8 ++++---- po/tr.po | 4 ++-- po/zh_CN.po | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH 1/3] include: Add FMS* definitions.
by Gijs Vermeulen 21 Oct '18

21 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45079 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- include/wfext.h | 88 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/include/wfext.h b/include/wfext.h index e28c9978be..12c1d58348 100644 --- a/include/wfext.h +++ b/include/wfext.h @@ -57,6 +57,94 @@ extern "C" { #define FM_GETFILESEL WINELIB_NAME_AW(FM_GETFILESEL) #define FM_GETFILESELLFN WINELIB_NAME_AW(FM_GETFILESELLFN) +typedef struct _FMS_GETFILESELA { + FILETIME ftTime; + DWORD dwSize; + BYTE bAttr; + CHAR szName[260]; +} FMS_GETFILESELA, *LPFMS_GETFILESELA; + +typedef struct _FMS_GETFILESELW { + FILETIME ftTime; + DWORD dwSize; + BYTE bAttr; + WCHAR szName[260]; +} FMS_GETFILESELW, *LPFMS_GETFILESELW; + +#define FMS_GETFILESEL WINELIB_NAME_AW(FMS_GETFILESEL) +#define LPFMS_GETFILESEL WINELIB_NAME_AW(LPFMS_GETFILESEL) + +typedef struct _FMS_GETDRIVEINFOA { + DWORD dwTotalSpace; + DWORD dwFreeSpace; + CHAR szPath[260]; + CHAR szVolume[14]; + CHAR szShare[128]; +} FMS_GETDRIVEINFOA, *LPFMS_GETDRIVEINFOA; + +typedef struct _FMS_GETDRIVEINFOW { + DWORD dwTotalSpace; + DWORD dwFreeSpace; + WCHAR szPath[260]; + WCHAR szVolume[14]; + WCHAR szShare[128]; +} FMS_GETDRIVEINFOW, *LPFMS_GETDRIVEINFOW; + +#define FMS_GETDRIVEINFO WINELIB_NAME_AW(FMS_GETDRIVEINFO) +#define LPFMS_GETDRIVEINFO WINELIB_NAME_AW(LPFMS_GETDRIVEINFO) + +typedef struct _FMS_LOADA { + DWORD dwSize; + CHAR szMenuName[MENU_TEXT_LEN]; + HMENU hMenu; + UINT wMenuDelta; +} FMS_LOADA, *LPFMS_LOADA; + +typedef struct _FMS_LOADW { + DWORD dwSize; + WCHAR szMenuName[MENU_TEXT_LEN]; + HMENU hMenu; + UINT wMenuDelta; +} FMS_LOADW, *LPFMS_LOADW; + +#define FMS_LOAD WINELIB_NAME_AW(FMS_LOAD) +#define LPFMS_LOAD WINELIB_NAME_AW(LPFMS_LOAD) + +typedef struct tagEXT_BUTTON { + WORD idCommand; + WORD idsHelp; + WORD fsStyle; +} EXT_BUTTON, *LPEXT_BUTTON; + +typedef struct tagFMS_TOOLBARLOAD { + DWORD dwSize; + LPEXT_BUTTON lpButtons; + WORD cButtons; + WORD cBitmaps; + WORD idBitmap; + HBITMAP hBitmap; +} FMS_TOOLBARLOAD, *LPFMS_TOOLBARLOAD; + +typedef struct tagFMS_HELPSTRINGA { + INT idCommand; + HMENU hMenu; + CHAR szHelp[128]; +} FMS_HELPSTRINGA, *LPFMS_HELPSTRINGA; + +typedef struct tagFMS_HELPSTRINGW { + INT idCommand; + HMENU hMenu; + WCHAR szHelp[128]; +} FMS_HELPSTRINGW, *LPFMS_HELPSTRINGW; + +#define FMS_HELPSTRING WINELIB_NAME_AW(FMS_HELPSTRING) +#define LPFMS_HELPSTRING WINELIB_NAME_AW(LPFMS_HELPSTRING) + +typedef DWORD (WINAPI *FM_EXT_PROC)(HWND,WORD,LONG); +typedef DWORD (WINAPI *FM_UNDELETE_PROCA)(HWND,LPSTR); +typedef DWORD (WINAPI *FM_UNDELETE_PROCW)(HWND,LPWSTR); +DECL_WINELIB_TYPE_AW(FM_UNDELETE_PROC); + LONG WINAPI FMExtensionProc(HWND,WORD,LONG); LONG WINAPI FMExtensionProcW(HWND,WORD,LONG); -- 2.19.1

1 2

[PATCH] winex11: Return FALSE from LoadTabletInfo if the system isn't a tablet
by Alex Henrie 21 Oct '18

21 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46024 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winex11.drv/wintab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index e4259bf5eb..7a9a3a7b1c 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -761,14 +761,14 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) } /* for XListInputDevices */ pXFreeDeviceList(devices); - if (axis_read_complete) - gSysDevice.NCSRTYPES = gNumCursors; - else + if (!axis_read_complete) { disable_system_cursors(); WARN("Did not find a valid stylus, unable to determine system context parameters. Wintab is disabled.\n"); + return FALSE; } + gSysDevice.NCSRTYPES = gNumCursors; return TRUE; } -- 2.19.1

1 0

[PATCH v3 1/4] msxml3: Allow creating floating attributes.
by Daniel Lehman 21 Oct '18

21 Oct '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/attribute.c | 9 ++++++++- dlls/msxml3/element.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 637615b341..8eb2695128 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -50,6 +50,7 @@ typedef struct _domattr xmlnode node; IXMLDOMAttribute IXMLDOMAttribute_iface; LONG ref; + BOOL floating; } domattr; static const tid_t domattr_se_tids[] = { @@ -116,6 +117,11 @@ static ULONG WINAPI domattr_Release( if ( ref == 0 ) { destroy_xmlnode(&This->node); + if ( This->floating ) + { + xmlFreeNs( This->node.node->ns ); + xmlFreeNode( This->node.node ); + } heap_free( This ); } @@ -709,7 +715,7 @@ static dispex_static_data_t domattr_dispex = { domattr_iface_tids }; -IUnknown* create_attribute( xmlNodePtr attribute ) +IUnknown* create_attribute( xmlNodePtr attribute, BOOL floating ) { domattr *This; @@ -719,6 +725,7 @@ IUnknown* create_attribute( xmlNodePtr attribute ) This->IXMLDOMAttribute_iface.lpVtbl = &domattr_vtbl; This->ref = 1; + This->floating = floating; init_xmlnode(&This->node, attribute, (IXMLDOMNode*)&This->IXMLDOMAttribute_iface, &domattr_dispex); diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 6e00aa0116..4faeed400c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1398,7 +1398,7 @@ static HRESULT WINAPI domelem_getAttributeNode( if (attr) { - IUnknown *unk = create_attribute((xmlNodePtr)attr); + IUnknown *unk = create_attribute((xmlNodePtr)attr, FALSE); hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMAttribute, (void**)attributeNode); IUnknown_Release(unk); } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 94ef66b23d..abc6ab3465 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -252,7 +252,7 @@ extern IUnknown *create_domdoc( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_xmldoc( void ) DECLSPEC_HIDDEN; extern IXMLDOMNode *create_node( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_element( xmlNodePtr ) DECLSPEC_HIDDEN; -extern IUnknown *create_attribute( xmlNodePtr ) DECLSPEC_HIDDEN; +extern IUnknown *create_attribute( xmlNodePtr, BOOL ) DECLSPEC_HIDDEN; extern IUnknown *create_text( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_pi( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_comment( xmlNodePtr ) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index bcb4181374..fc18935b69 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -2271,7 +2271,7 @@ IXMLDOMNode *create_node( xmlNodePtr node ) pUnk = create_element( node ); break; case XML_ATTRIBUTE_NODE: - pUnk = create_attribute( node ); + pUnk = create_attribute( node, FALSE ); break; case XML_TEXT_NODE: pUnk = create_text( node ); -- 2.17.1

2 7

[PATCH 1/4] d3drm/tests: Add tests for IDirect3DRMTexture*::InitFromFile. (v2 resend)
by Aaryaman Vasishta 21 Oct '18

21 Oct '18

v2: Add todo_wine(s) on failed tests (which will be removed on the next patch in this series) Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> --- dlls/d3drm/tests/d3drm.c | 74 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f78e098fec..e336b98b95 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5572,6 +5572,7 @@ static void test_load_texture(void) char *filename; HRESULT hr; BOOL ret; + ULONG ref1, ref2; int i; static const struct @@ -5595,6 +5596,7 @@ static void test_load_texture(void) ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr); + ref1 = get_refcount((IUnknown *)d3drm1); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -5602,22 +5604,74 @@ static void test_load_texture(void) hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */ + if (hr == D3DRMERR_BADOBJECT) + IDirect3DRM_Release(d3drm1); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture_Release(texture1); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void **)&texture1); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, ""); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); d3drm_img = IDirect3DRMTexture_GetImage(texture1); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + if (hr == D3DRMERR_BADOBJECT) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4 + 1, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture2_Release(texture2); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, ""); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture2_Release(texture2); hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + if (hr == D3DRMERR_BADOBJECT) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) @@ -5632,6 +5686,22 @@ static void test_load_texture(void) test_bitmap_data(i * 4 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); IDirect3DRMTexture3_Release(texture3); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, (void **)&texture3); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, ""); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture3_Release(texture3); ret = DeleteFileA(filename); ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename); -- 2.17.1

1 3

[PATCH 1/4] d3drm/tests: Add tests for IDirect3DRMTexture*::InitFromFile. (v2)
by Aaryaman Vasishta 21 Oct '18

21 Oct '18

v2: Add todo_wine(s) on failed tests (which will be removed on the next patch in this series) --- dlls/d3drm/tests/d3drm.c | 74 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f78e098fec..e336b98b95 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5572,6 +5572,7 @@ static void test_load_texture(void) char *filename; HRESULT hr; BOOL ret; + ULONG ref1, ref2; int i; static const struct @@ -5595,6 +5596,7 @@ static void test_load_texture(void) ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr); + ref1 = get_refcount((IUnknown *)d3drm1); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -5602,22 +5604,74 @@ static void test_load_texture(void) hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */ + if (hr == D3DRMERR_BADOBJECT) + IDirect3DRM_Release(d3drm1); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture_Release(texture1); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void **)&texture1); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, ""); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); d3drm_img = IDirect3DRMTexture_GetImage(texture1); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + if (hr == D3DRMERR_BADOBJECT) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4 + 1, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture2_Release(texture2); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, ""); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture2_Release(texture2); hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + if (hr == D3DRMERR_BADOBJECT) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) @@ -5632,6 +5686,22 @@ static void test_load_texture(void) test_bitmap_data(i * 4 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); IDirect3DRMTexture3_Release(texture3); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, (void **)&texture3); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, ""); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + todo_wine ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture3_Release(texture3); ret = DeleteFileA(filename); ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename); -- 2.17.1

2 5

[PATCH 3/3] kernel32: GetLongPathName should fail when called with a wildcard.
by Dmitry Timoshkov 20 Oct '18

20 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/path.c | 10 ++++++++-- dlls/kernel32/tests/path.c | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a9db7e8cdf..41f0d34aa4 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -297,6 +297,8 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen HANDLE goit; BOOL is_legal_8dot3; + TRACE("%s,%p,%u\n", debugstr_w(shortpath), longpath, longlen); + if (!shortpath) { SetLastError(ERROR_INVALID_PARAMETER); @@ -308,8 +310,6 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen return 0; } - TRACE("%s,%p,%d\n", debugstr_w(shortpath), longpath, longlen); - if (shortpath[0] == '\\' && shortpath[1] == '\\') { FIXME("UNC pathname %s\n", debugstr_w(shortpath)); @@ -333,6 +333,12 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen lp = sp = 2; } + if (strpbrkW(shortpath + sp, wildcardsW)) + { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + while (shortpath[sp]) { /* check for path delimiters and reproduce them */ diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index f0cfb4d43c..df91b316ce 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1202,9 +1202,7 @@ static void test_GetLongPathNameA(void) strcpy(name, "*"); SetLastError(0xdeadbeef); length = pGetLongPathNameA(tempfile, temppath, MAX_PATH); -todo_wine ok(!length, "GetLongPathNameA should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); strcpy(name, "longfilename.longext"); -- 2.17.1

1 0

[PATCH 2/3] kernel32: GetShortPathName should fail when called with a wildcard.
by Dmitry Timoshkov 20 Oct '18

20 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/path.c | 11 ++++++++++- dlls/kernel32/tests/path.c | 2 -- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 7dcb937430..a9db7e8cdf 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); static int path_safe_mode = -1; /* path mode set by SetSearchPathMode */ +static const WCHAR wildcardsW[] = {'*','?',0}; + /* check if a file name is for an executable file (.exe or .com) */ static inline BOOL is_executable( const WCHAR *name ) { @@ -445,7 +447,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl WIN32_FIND_DATAW wfd; HANDLE goit; - TRACE("%s\n", debugstr_w(longpath)); + TRACE("%s,%p,%u\n", debugstr_w(longpath), shortpath, shortlen); if (!longpath) { @@ -474,6 +476,13 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl sp = lp = 4; } + if (strpbrkW(longpath + lp, wildcardsW)) + { + HeapFree(GetProcessHeap(), 0, tmpshortpath); + SetLastError(ERROR_INVALID_NAME); + return 0; + } + /* check for drive letter */ if (longpath[lp] != '/' && longpath[lp + 1] == ':' ) { diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 5ca69d3b3c..f0cfb4d43c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1477,9 +1477,7 @@ static void test_GetShortPathNameW(void) lstrcpyW(ptr, wildW); SetLastError(0xdeadbeef); length = GetShortPathNameW( path, short_path, ARRAY_SIZE( short_path ) ); -todo_wine ok(!length, "GetShortPathNameW should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); lstrcpyW(ptr, a_bcdeW); -- 2.17.1

1 0

[PATCH 1/3] kernel32/tests: Add some tests for GetLongPathName/GetShortPathName called with a wildcard.
by Dmitry Timoshkov 20 Oct '18

20 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/path.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index ca1cbf30ec..5ca69d3b3c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1186,7 +1186,7 @@ static void test_GetTempPath(void) static void test_GetLongPathNameA(void) { DWORD length, explength, hostsize; - char tempfile[MAX_PATH]; + char tempfile[MAX_PATH], *name; char longpath[MAX_PATH]; char unc_prefix[MAX_PATH]; char unc_short[MAX_PATH], unc_long[MAX_PATH]; @@ -1197,7 +1197,17 @@ static void test_GetLongPathNameA(void) return; GetTempPathA(MAX_PATH, tempfile); - lstrcatA(tempfile, "longfilename.longext"); + name = tempfile + strlen(tempfile); + + strcpy(name, "*"); + SetLastError(0xdeadbeef); + length = pGetLongPathNameA(tempfile, temppath, MAX_PATH); +todo_wine + ok(!length, "GetLongPathNameA should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); + + strcpy(name, "longfilename.longext"); file = CreateFileA(tempfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); CloseHandle(file); @@ -1401,6 +1411,7 @@ static void test_GetShortPathNameW(void) static const WCHAR name[] = { 't', 'e', 's', 't', 0 }; static const WCHAR backSlash[] = { '\\', 0 }; static const WCHAR a_bcdeW[] = {'a','.','b','c','d','e',0}; + static const WCHAR wildW[] = { '*',0 }; WCHAR path[MAX_PATH], tmppath[MAX_PATH], *ptr; WCHAR short_path[MAX_PATH]; DWORD length; @@ -1463,6 +1474,15 @@ static void test_GetShortPathNameW(void) length = GetShortPathNameW( path, short_path, ARRAY_SIZE( short_path )); ok( length, "GetShortPathNameW failed: %u.\n", GetLastError() ); + lstrcpyW(ptr, wildW); + SetLastError(0xdeadbeef); + length = GetShortPathNameW( path, short_path, ARRAY_SIZE( short_path ) ); +todo_wine + ok(!length, "GetShortPathNameW should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); + + lstrcpyW(ptr, a_bcdeW); ret = DeleteFileW( path ); ok( ret, "Cannot delete file.\n" ); *ptr = 0; -- 2.17.1

1 0

[PATCH 1/2] wined3d: Implement D3D11_STANDARD_MULTISAMPLE_PATTERN.
by Andrew Wesie 20 Oct '18

20 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45197 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/wined3d/texture.c | 8 +++++--- include/wine/wined3d.h | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2244db5cb6..53ad664ad3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -627,6 +627,8 @@ static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture unsigned int samples = wined3d_texture_get_gl_sample_count(texture); GLsizei height = wined3d_texture_get_level_pow2_height(texture, 0); GLsizei width = wined3d_texture_get_level_pow2_width(texture, 0); + GLboolean standard_pattern = texture->resource.multisample_type != WINED3D_MULTISAMPLE_NON_MASKABLE + && texture->resource.multisample_quality == WINED3D_STANDARD_MULTISAMPLE_PATTERN; switch (texture->target) { @@ -640,11 +642,11 @@ static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture break; case GL_TEXTURE_2D_MULTISAMPLE: GL_EXTCALL(glTexStorage2DMultisample(texture->target, samples, - gl_internal_format, width, height, GL_FALSE)); + gl_internal_format, width, height, standard_pattern)); break; case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: GL_EXTCALL(glTexStorage3DMultisample(texture->target, samples, - gl_internal_format, width, height, texture->layer_count, GL_FALSE)); + gl_internal_format, width, height, texture->layer_count, standard_pattern)); break; case GL_TEXTURE_1D_ARRAY: GL_EXTCALL(glTexStorage2D(texture->target, texture->level_count, @@ -3604,7 +3606,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct } if (desc->multisample_type != WINED3D_MULTISAMPLE_NON_MASKABLE && (!(format->multisample_types & 1u << (desc->multisample_type - 1)) - || desc->multisample_quality)) + || (desc->multisample_quality && desc->multisample_quality != WINED3D_STANDARD_MULTISAMPLE_PATTERN))) { WARN("Unsupported multisample type %u quality %u requested.\n", desc->multisample_type, desc->multisample_quality); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c62d3640e5..0c94d774a1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1572,6 +1572,8 @@ enum wined3d_shader_type #define WINED3D_TEXTURE_CREATE_GET_DC 0x00000008 #define WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS 0x00000010 +#define WINED3D_STANDARD_MULTISAMPLE_PATTERN 0xffffffff + #define WINED3D_APPEND_ALIGNED_ELEMENT 0xffffffff #define WINED3D_OUTPUT_SLOT_SEMANTIC 0xffffffff -- 2.17.1

2 2

[PATCH 4/4] ntdll: Set IO_STATUS_BLOCK on non-blocking NtFlushBuffersFile success.
by Jacek Caban 20 Oct '18

20 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I wouldn't add iosb check (esp. virtual_check_buffer_for_write one), but we already have tests that would crash otherwise. Although I could use __TRY/__EXCEPT when setting those values, technically we should probably still check that in blocking case (and fail early, like in the patch). dlls/ntdll/file.c | 21 ++++++++++++++------- dlls/ntdll/tests/file.c | 2 -- dlls/ntdll/tests/pipe.c | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-)

1 0

[PATCH 3/4] server: Improve error handling of disconnected named pipe clients.
by Jacek Caban 20 Oct '18

20 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 1 - dlls/ntdll/tests/pipe.c | 4 ---- server/named_pipe.c | 10 ++++++++-- 3 files changed, 8 insertions(+), 7 deletions(-)

1 0

[PATCH 2/4] kernel32/tests: Add more PeekNamedPipe tests.
by Jacek Caban 20 Oct '18

20 Oct '18

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

1 0

[PATCH 1/4] server: Return STATUS_BUFFER_OVERFLOW in pipe_end_peek for partial reads in message mode.
by Jacek Caban 20 Oct '18

20 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/sync.c | 1 + dlls/ntdll/tests/pipe.c | 22 ++++++++++++++++++++-- server/named_pipe.c | 1 + 3 files changed, 22 insertions(+), 2 deletions(-)

1 0

RFC: wintab32: Qt applications crash after WTOpen
by Bernhard Übelacker 20 Oct '18

20 Oct '18

Hello all, I tried to look into a Debian bug [1] where Qt applications started to crash in recent wine-development versions. In my opinion WTInfo returns some uninitialized stack memory in LOGCONTEXTW. Qt does not look at the return value at all and calls then WTOpen, which puts some window messages near lcMsgBase into the message queue. Most of the time this works as a random window message is just ignored. But under some circumstances an existing wine internal window message is hit, but that message needs parameters which are not given, therefore it is crashing. This happens when there is no device attached that is usable via wintab32.dll. I have prepared two patches: - first avoids the copy of the uninitilized stack memory. - second makes WTOpen just succeed if there is any usable device found. But as I have no suitable hardware I could just test the behaviour in that case. Tried to use the qemu usb-wacom-tablet, but I fear that this also relies on present hardware outside of the VM. Also I found all testbot VMs having no wintab32.dll available at all. Therefore I would be glad if I could receive some feedback on the patches and how I should proceed with this issue, because I do really not want to break the case where such hardware is present and working. Also should I create a Wine bug for it. Or should this considered a Qt bug because on most systems wintab32.dll is possibly not pressent and therefore no problem. Should a bug be opened there? Kind regards, Bernhard [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=905090

2 2

[PATCH 3/3] rpcrt4: Use the standard ARRAY_SIZE() macro
by Michael Stefaniuc 19 Oct '18

19 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index ffe8b77cab..b98bf9e0ae 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -54,8 +54,6 @@ #define DEFAULT_NCACN_HTTP_TIMEOUT (60 * 1000) -#define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0])) - WINE_DEFAULT_DEBUG_CHANNEL(rpc); static RpcConnection *rpcrt4_spawn_connection(RpcConnection *old_connection); @@ -2397,11 +2395,11 @@ static const struct } auth_schemes[] = { - { basicW, ARRAYSIZE(basicW) - 1, RPC_C_HTTP_AUTHN_SCHEME_BASIC }, - { ntlmW, ARRAYSIZE(ntlmW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NTLM }, - { passportW, ARRAYSIZE(passportW) - 1, RPC_C_HTTP_AUTHN_SCHEME_PASSPORT }, - { digestW, ARRAYSIZE(digestW) - 1, RPC_C_HTTP_AUTHN_SCHEME_DIGEST }, - { negotiateW, ARRAYSIZE(negotiateW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE } + { basicW, ARRAY_SIZE(basicW) - 1, RPC_C_HTTP_AUTHN_SCHEME_BASIC }, + { ntlmW, ARRAY_SIZE(ntlmW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NTLM }, + { passportW, ARRAY_SIZE(passportW) - 1, RPC_C_HTTP_AUTHN_SCHEME_PASSPORT }, + { digestW, ARRAY_SIZE(digestW) - 1, RPC_C_HTTP_AUTHN_SCHEME_DIGEST }, + { negotiateW, ARRAY_SIZE(negotiateW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE } }; static DWORD auth_scheme_from_header( const WCHAR *header ) @@ -3260,7 +3258,7 @@ static const struct protseq_ops protseq_list[] = const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq) { unsigned int i; - for(i=0; i<ARRAYSIZE(protseq_list); i++) + for(i = 0; i < ARRAY_SIZE(protseq_list); i++) if (!strcmp(protseq_list[i].name, protseq)) return &protseq_list[i]; return NULL; @@ -3269,7 +3267,7 @@ const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq) static const struct connection_ops *rpcrt4_get_conn_protseq_ops(const char *protseq) { unsigned int i; - for(i=0; i<ARRAYSIZE(conn_protseq_list); i++) + for(i = 0; i < ARRAY_SIZE(conn_protseq_list); i++) if (!strcmp(conn_protseq_list[i].name, protseq)) return &conn_protseq_list[i]; return NULL; @@ -3507,7 +3505,7 @@ RPC_STATUS RpcTransport_ParseTopOfTower(const unsigned char *tower_data, (floor4->count_lhs != sizeof(floor4->protid))) return EPT_S_NOT_REGISTERED; - for(i = 0; i < ARRAYSIZE(conn_protseq_list); i++) + for(i = 0; i < ARRAY_SIZE(conn_protseq_list); i++) if ((protocol_floor->protid == conn_protseq_list[i].epm_protocols[0]) && (floor4->protid == conn_protseq_list[i].epm_protocols[1])) { @@ -3613,12 +3611,12 @@ RPC_STATUS WINAPI RpcNetworkInqProtseqsW( RPC_PROTSEQ_VECTORW** protseqs ) TRACE("(%p)\n", protseqs); - *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned short*)*ARRAYSIZE(protseq_list))); + *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned short*)*ARRAY_SIZE(protseq_list))); if (!*protseqs) goto end; pvector = *protseqs; pvector->Count = 0; - for (i = 0; i < ARRAYSIZE(protseq_list); i++) + for (i = 0; i < ARRAY_SIZE(protseq_list); i++) { pvector->Protseq[i] = HeapAlloc(GetProcessHeap(), 0, (strlen(protseq_list[i].name)+1)*sizeof(unsigned short)); if (pvector->Protseq[i] == NULL) @@ -3646,12 +3644,12 @@ RPC_STATUS WINAPI RpcNetworkInqProtseqsA(RPC_PROTSEQ_VECTORA** protseqs) TRACE("(%p)\n", protseqs); - *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned char*)*ARRAYSIZE(protseq_list))); + *protseqs = HeapAlloc(GetProcessHeap(), 0, sizeof(RPC_PROTSEQ_VECTORW)+(sizeof(unsigned char*)*ARRAY_SIZE(protseq_list))); if (!*protseqs) goto end; pvector = *protseqs; pvector->Count = 0; - for (i = 0; i < ARRAYSIZE(protseq_list); i++) + for (i = 0; i < ARRAY_SIZE(protseq_list); i++) { pvector->Protseq[i] = HeapAlloc(GetProcessHeap(), 0, strlen(protseq_list[i].name)+1); if (pvector->Protseq[i] == NULL) -- 2.14.4

1 0

[PATCH 2/3] rpcrt4: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 19 Oct '18

19 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/cpsf.c | 2 +- dlls/rpcrt4/rpc_epmap.c | 4 ++-- dlls/rpcrt4/rpc_message.c | 6 +++--- dlls/rpcrt4/rpc_transport.c | 21 +++++++++++---------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index 9375c40fa4..e92d226498 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -279,7 +279,7 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll, /* register clsid to point to module */ strcpyW( keyname, clsidW ); strcatW( keyname, clsid ); - len = GetModuleFileNameW(hDll, module, sizeof(module)/sizeof(WCHAR)); + len = GetModuleFileNameW(hDll, module, ARRAY_SIZE(module)); if (len && len < sizeof(module)) { TRACE("registering CLSID %s => %s\n", debugstr_w(clsid), debugstr_w(module)); if (RegCreateKeyW(HKEY_CLASSES_ROOT, keyname, &key) == ERROR_SUCCESS) { diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 1380bf3428..803c9f851b 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -148,7 +148,7 @@ static RPC_STATUS get_epm_handle_client(RPC_BINDING_HANDLE handle, RPC_BINDING_H if (bind->server) return RPC_S_INVALID_BINDING; - for (i = 0; i < sizeof(epm_endpoints)/sizeof(epm_endpoints[0]); i++) + for (i = 0; i < ARRAY_SIZE(epm_endpoints); i++) if (!strcmp(bind->Protseq, epm_endpoints[i].protseq)) pszEndpoint = epm_endpoints[i].endpoint; @@ -469,7 +469,7 @@ RPC_STATUS WINAPI RpcEpResolveBinding( RPC_BINDING_HANDLE Binding, RPC_IF_HANDLE { __TRY { - ept_map(handle, &uuid, tower, &entry_handle, sizeof(towers)/sizeof(towers[0]), &num_towers, towers, &status2); + ept_map(handle, &uuid, tower, &entry_handle, ARRAY_SIZE(towers), &num_towers, towers, &status2); /* FIXME: translate status2? */ } __EXCEPT(rpc_filter) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 3eea88a714..59cd438a26 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -63,8 +63,8 @@ DWORD RPCRT4_GetHeaderSize(const RpcPktHdr *Header) 0, 0, sizeof(Header->auth3), 0, 0, 0, sizeof(Header->http) }; ULONG ret = 0; - - if (Header->common.ptype < sizeof(header_sizes) / sizeof(header_sizes[0])) { + + if (Header->common.ptype < ARRAY_SIZE(header_sizes)) { ret = header_sizes[Header->common.ptype]; if (ret == 0) FIXME("unhandled packet type %u\n", Header->common.ptype); @@ -691,7 +691,7 @@ RPC_STATUS RPCRT4_default_secure_packet(RpcConnection *Connection, SECURITY_STATUS sec_status; message.ulVersion = SECBUFFER_VERSION; - message.cBuffers = sizeof(buffers)/sizeof(buffers[0]); + message.cBuffers = ARRAY_SIZE(buffers); message.pBuffers = buffers; buffers[0].cbBuffer = hdr_size; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 26641fd274..ffe8b77cab 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1919,9 +1919,9 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) static const WCHAR wszRpcProxy[] = {'R','p','c','P','r','o','x','y','=',0}; static const WCHAR wszHttpProxy[] = {'H','t','t','p','P','r','o','x','y','=',0}; - if (!strncmpiW(option, wszRpcProxy, sizeof(wszRpcProxy)/sizeof(wszRpcProxy[0])-1)) + if (!strncmpiW(option, wszRpcProxy, ARRAY_SIZE(wszRpcProxy)-1)) { - const WCHAR *value_start = option + sizeof(wszRpcProxy)/sizeof(wszRpcProxy[0])-1; + const WCHAR *value_start = option + ARRAY_SIZE(wszRpcProxy)-1; const WCHAR *value_end; const WCHAR *p; @@ -1938,9 +1938,9 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) TRACE("RpcProxy value is %s\n", debugstr_wn(value_start, value_end-value_start)); servername = RPCRT4_strndupW(value_start, value_end-value_start); } - else if (!strncmpiW(option, wszHttpProxy, sizeof(wszHttpProxy)/sizeof(wszHttpProxy[0])-1)) + else if (!strncmpiW(option, wszHttpProxy, ARRAY_SIZE(wszHttpProxy)-1)) { - const WCHAR *value_start = option + sizeof(wszHttpProxy)/sizeof(wszHttpProxy[0])-1; + const WCHAR *value_start = option + ARRAY_SIZE(wszHttpProxy)-1; const WCHAR *value_end; value_end = strchrW(option, ','); @@ -2068,7 +2068,7 @@ static RPC_STATUS insert_content_length_header(HINTERNET request, DWORD len) { static const WCHAR fmtW[] = {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','u','\r','\n',0}; - WCHAR header[sizeof(fmtW) / sizeof(fmtW[0]) + 10]; + WCHAR header[ARRAY_SIZE(fmtW) + 10]; sprintfW(header, fmtW, len); if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD))) return RPC_S_OK; @@ -2581,7 +2581,7 @@ static RPC_STATUS insert_authorization_header(HINTERNET request, ULONG scheme, c static const WCHAR basicW[] = {'B','a','s','i','c',' '}; static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',' '}; static const WCHAR ntlmW[] = {'N','T','L','M',' '}; - int scheme_len, auth_len = sizeof(authW) / sizeof(authW[0]), len = ((data_len + 2) * 4) / 3; + int scheme_len, auth_len = ARRAY_SIZE(authW), len = ((data_len + 2) * 4) / 3; const WCHAR *scheme_str; WCHAR *header, *ptr; RPC_STATUS status = RPC_S_SERVER_UNAVAILABLE; @@ -2590,15 +2590,15 @@ static RPC_STATUS insert_authorization_header(HINTERNET request, ULONG scheme, c { case RPC_C_HTTP_AUTHN_SCHEME_BASIC: scheme_str = basicW; - scheme_len = sizeof(basicW) / sizeof(basicW[0]); + scheme_len = ARRAY_SIZE(basicW); break; case RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE: scheme_str = negotiateW; - scheme_len = sizeof(negotiateW) / sizeof(negotiateW[0]); + scheme_len = ARRAY_SIZE(negotiateW); break; case RPC_C_HTTP_AUTHN_SCHEME_NTLM: scheme_str = ntlmW; - scheme_len = sizeof(ntlmW) / sizeof(ntlmW[0]); + scheme_len = ARRAY_SIZE(ntlmW); break; default: ERR("unknown scheme %u\n", scheme); @@ -2779,7 +2779,8 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) if (!url) return RPC_S_OUT_OF_MEMORY; memcpy(url, wszRpcProxyPrefix, sizeof(wszRpcProxyPrefix)); - MultiByteToWideChar(CP_ACP, 0, Connection->NetworkAddr, -1, url+sizeof(wszRpcProxyPrefix)/sizeof(wszRpcProxyPrefix[0])-1, strlen(Connection->NetworkAddr)+1); + MultiByteToWideChar(CP_ACP, 0, Connection->NetworkAddr, -1, url+ARRAY_SIZE(wszRpcProxyPrefix)-1, + strlen(Connection->NetworkAddr)+1); strcatW(url, wszColon); MultiByteToWideChar(CP_ACP, 0, Connection->Endpoint, -1, url+strlenW(url), strlen(Connection->Endpoint)+1); -- 2.14.4

1 0

[PATCH 1/3] rpcrt4: Avoid a variable holding an ARRAY_SIZE result
by Michael Stefaniuc 19 Oct '18

19 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4fd091ce6a..26641fd274 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2403,12 +2403,11 @@ auth_schemes[] = { digestW, ARRAYSIZE(digestW) - 1, RPC_C_HTTP_AUTHN_SCHEME_DIGEST }, { negotiateW, ARRAYSIZE(negotiateW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE } }; -static const unsigned int num_auth_schemes = sizeof(auth_schemes)/sizeof(auth_schemes[0]); static DWORD auth_scheme_from_header( const WCHAR *header ) { unsigned int i; - for (i = 0; i < num_auth_schemes; i++) + for (i = 0; i < ARRAY_SIZE(auth_schemes); i++) { if (!strncmpiW( header, auth_schemes[i].str, auth_schemes[i].len ) && (header[auth_schemes[i].len] == ' ' || !header[auth_schemes[i].len])) return auth_schemes[i].scheme; -- 2.14.4

1 0

[PATCH vkd3d 3/4] vkd3d-shader: Implement conservative depth output.
by Józef Kucia 19 Oct '18

19 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 2 ++ libs/vkd3d-shader/spirv.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5daf07a65f00..eb1729c9bcf2 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1567,6 +1567,8 @@ static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *re switch (reg->type) { case VKD3DSPR_DEPTHOUT: + case VKD3DSPR_DEPTHOUTGE: + case VKD3DSPR_DEPTHOUTLE: case VKD3DSPR_GSINSTID: case VKD3DSPR_LOCALTHREADINDEX: case VKD3DSPR_OUTPOINTID: diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f1eea02027e7..63ef7c2a807b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2246,6 +2246,8 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf snprintf(buffer, buffer_size, "o%u", idx); break; case VKD3DSPR_DEPTHOUT: + case VKD3DSPR_DEPTHOUTGE: + case VKD3DSPR_DEPTHOUTLE: snprintf(buffer, buffer_size, "oDepth"); break; case VKD3DSPR_TESSCOORD: @@ -2470,6 +2472,8 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler * case VKD3DSPR_OUTPUT: case VKD3DSPR_COLOROUT: case VKD3DSPR_DEPTHOUT: + case VKD3DSPR_DEPTHOUTGE: + case VKD3DSPR_DEPTHOUTLE: case VKD3DSPR_CONSTBUFFER: case VKD3DSPR_IMMCONSTBUFFER: case VKD3DSPR_SAMPLER: @@ -3056,8 +3060,26 @@ vkd3d_register_builtins[] = {VKD3DSPR_TESSCOORD, {VKD3D_TYPE_FLOAT, 3, SpvBuiltInTessCoord}}, {VKD3DSPR_DEPTHOUT, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, + {VKD3DSPR_DEPTHOUTGE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, + {VKD3DSPR_DEPTHOUTLE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, }; +static void vkd3d_dxbc_compiler_emit_register_execution_mode(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *reg) +{ + switch (reg->type) + { + case VKD3DSPR_DEPTHOUTGE: + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthGreater, NULL, 0); + break; + case VKD3DSPR_DEPTHOUTLE: + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthLess, NULL, 0); + break; + default: + return; + } +} + static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3458,6 +3480,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (builtin) { vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, &dst->reg); if (component_idx) FIXME("Unhandled component index %u.\n", component_idx); } -- 2.18.1

2 1

[PATCH vkd3d 4/4] vkd3d-shader: Simplify DepthReplacing execution mode handling.
by Józef Kucia 19 Oct '18

19 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 63ef7c2a807b..8508741652ff 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -248,14 +248,6 @@ struct vkd3d_spirv_builder struct vkd3d_spirv_stream execution_mode_stream; /* execution mode instructions */ - union - { - struct - { - bool depth_replacing; - } fragment; - } u; - struct vkd3d_spirv_stream original_function_stream; struct vkd3d_spirv_stream insertion_stream; size_t insertion_location; @@ -332,13 +324,6 @@ static void vkd3d_spirv_set_execution_model(struct vkd3d_spirv_builder *builder, } } -static void vkd3d_spirv_enable_depth_replacing(struct vkd3d_spirv_builder *builder) -{ - assert(builder->execution_model == SpvExecutionModelFragment); - - builder->u.fragment.depth_replacing = true; -} - static uint32_t vkd3d_spirv_opcode_word(SpvOp op, unsigned int word_count) { assert(!(op & ~SpvOpCodeMask)); @@ -1568,24 +1553,6 @@ static void vkd3d_spirv_builder_free(struct vkd3d_spirv_builder *builder) vkd3d_free(builder->iface); } -static void vkd3d_spirv_build_additional_execution_modes(struct vkd3d_spirv_builder *builder, - struct vkd3d_spirv_stream *stream) -{ - const uint32_t function_id = builder->main_function_id; - - switch (builder->execution_model) - { - case SpvExecutionModelFragment: - if (builder->u.fragment.depth_replacing) - vkd3d_spirv_build_op_execution_mode(stream, function_id, - SpvExecutionModeDepthReplacing, NULL, 0); - break; - - default: - break; - } -} - static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, struct vkd3d_shader_code *spirv) { @@ -1627,7 +1594,6 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, /* execution mode declarations */ vkd3d_spirv_stream_append(&stream, &builder->execution_mode_stream); - vkd3d_spirv_build_additional_execution_modes(builder, &stream); vkd3d_spirv_stream_append(&stream, &builder->debug_stream); vkd3d_spirv_stream_append(&stream, &builder->annotation_stream); @@ -2922,7 +2888,7 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com builtin = SpvBuiltInFragCoord; break; case SpvBuiltInFragDepth: - vkd3d_spirv_enable_depth_replacing(builder); + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthReplacing, NULL, 0); break; case SpvBuiltInLayer: vkd3d_spirv_enable_capability(builder, SpvCapabilityGeometry); -- 2.18.1

2 1

[PATCH vkd3d 1/4] vkd3d: Avoid heap memory allocations while updating descriptor tables.
by Józef Kucia 19 Oct '18

19 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e17fca979a9d..d8a65622507d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2084,13 +2084,13 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list VkPipelineBindPoint bind_point, unsigned int index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write; const struct d3d12_root_signature *root_signature = bindings->root_signature; - struct VkWriteDescriptorSet *descriptor_writes, *current_descriptor_write; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - struct VkDescriptorImageInfo *image_infos, *current_image_info; + struct VkDescriptorImageInfo image_infos[24], *current_image_info; const struct d3d12_root_descriptor_table *descriptor_table; const struct d3d12_root_descriptor_table_range *range; - struct d3d12_device *device = list->device; + VkDevice vk_device = list->device->vk_device; unsigned int i, j, descriptor_count; struct d3d12_desc *descriptor; @@ -2110,14 +2110,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list return; } - if (!(descriptor_writes = vkd3d_calloc(descriptor_count, sizeof(*descriptor_writes)))) - return; - if (!(image_infos = vkd3d_calloc(descriptor_count, sizeof(*image_infos)))) - { - vkd3d_free(descriptor_writes); - return; - } - descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2153,13 +2145,18 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list ++descriptor_count; ++current_descriptor_write; ++current_image_info; + + if (descriptor_count == ARRAY_SIZE(descriptor_writes)) + { + VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL)); + descriptor_count = 0; + current_descriptor_write = descriptor_writes; + current_image_info = image_infos; + } } } - VK_CALL(vkUpdateDescriptorSets(device->vk_device, descriptor_count, descriptor_writes, 0, NULL)); - - vkd3d_free(descriptor_writes); - vkd3d_free(image_infos); + VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL)); } static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *vk_descriptor_write, -- 2.18.1

2 1

[PATCH vkd3d 2/4] vkd3d-shader: Translate bufinfo instructions.
by Józef Kucia 19 Oct '18

19 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bb70dd5935a4..f1eea02027e7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1263,6 +1263,13 @@ static uint32_t vkd3d_spirv_build_op_and(struct vkd3d_spirv_builder *builder, SpvOpBitwiseAnd, result_type, operand0, operand1); } +static uint32_t vkd3d_spirv_build_op_shift_left_logical(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t base, uint32_t shift) +{ + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + SpvOpShiftLeftLogical, result_type, base, shift); +} + static uint32_t vkd3d_spirv_build_op_shift_right_logical(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t base, uint32_t shift) { @@ -6123,6 +6130,46 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, result_id); } +static void vkd3d_dxbc_compiler_emit_bufinfo(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, val_id, stride_id; + struct vkd3d_shader_image image; + uint32_t constituents[2]; + unsigned int write_mask; + + vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); + + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, VKD3D_IMAGE_FLAG_NONE); + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + val_id = vkd3d_spirv_build_op_image_query_size(builder, type_id, image.image_id); + write_mask = VKD3DSP_WRITEMASK_0; + + if (image.structure_stride) + { + stride_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, image.structure_stride); + constituents[0] = vkd3d_spirv_build_op_udiv(builder, type_id, val_id, stride_id); + constituents[1] = stride_id; + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, ARRAY_SIZE(constituents)); + val_id = vkd3d_spirv_build_op_composite_construct(builder, + type_id, constituents, ARRAY_SIZE(constituents)); + write_mask |= VKD3DSP_WRITEMASK_1; + } + else if (image.raw) + { + val_id = vkd3d_spirv_build_op_shift_left_logical(builder, type_id, + val_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, 2)); + } + + val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, + val_id, write_mask, VKD3D_TYPE_UINT, src->swizzle, dst->write_mask); + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); +} + static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -6567,6 +6614,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_IMM_ATOMIC_XOR: vkd3d_dxbc_compiler_emit_atomic_instruction(compiler, instruction); break; + case VKD3DSIH_BUFINFO: + vkd3d_dxbc_compiler_emit_bufinfo(compiler, instruction); + break; case VKD3DSIH_RESINFO: vkd3d_dxbc_compiler_emit_resinfo(compiler, instruction); break; -- 2.18.1

2 1

[PATCH 1/4] d3drm/tests: Add tests for IDirect3DRMTexture*::InitFromFile.
by Aaryaman Vasishta 18 Oct '18

18 Oct '18

--- dlls/d3drm/tests/d3drm.c | 79 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f78e098fec..4ed90ca682 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5572,6 +5572,7 @@ static void test_load_texture(void) char *filename; HRESULT hr; BOOL ret; + ULONG ref1, ref2; int i; static const struct @@ -5595,6 +5596,7 @@ static void test_load_texture(void) ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr); + ref1 = get_refcount((IUnknown *)d3drm1); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -5602,24 +5604,74 @@ static void test_load_texture(void) hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */ + if (FAILED(hr)) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture_Release(texture1); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void **)&texture1); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, ""); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); + ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + if (FAILED(hr)) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) - test_bitmap_data(i * 4 + 1, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture2_Release(texture2); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, ""); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); + ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture2_Release(texture2); hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + if (FAILED(hr)) + IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) test_bitmap_data(i * 4 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); /* Test whether querying a version 1 texture from version 3 causes a @@ -5627,11 +5679,26 @@ static void test_load_texture(void) hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1); ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#x.\n", hr); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); if (d3drm_img) test_bitmap_data(i * 4 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); IDirect3DRMTexture3_Release(texture3); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + + hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, (void **)&texture3); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, ""); + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); + hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); + ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); + ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture3_Release(texture3); ret = DeleteFileA(filename); ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename); -- 2.17.1

2 5

[PATCH] gdiplus: Implement GdipScalePenTransform().
by Nikolay Sivov 18 Oct '18

18 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/pen.c | 7 +--- dlls/gdiplus/tests/pen.c | 75 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index b86808b87e..1f18f3f5a3 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -470,17 +470,12 @@ GpStatus WINGDIPAPI GdipTranslatePenTransform(GpPen *pen, REAL dx, REAL dy, GpMa GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%0.2f,%0.2f,%u)\n", pen, sx, sy, order); if(!pen) return InvalidParameter; - if(!(calls++)) - FIXME("(%p, %.2f, %.2f, %d) stub\n", pen, sx, sy, order); - - return NotImplemented; + return GdipScaleMatrix(&pen->transform, sx, sy, order); } GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen *pen, REAL angle, GpMatrixOrder order) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index be3d76d655..6f69c3b8b4 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -389,6 +389,22 @@ todo_wine { GdipDeletePen(pen); } +static void get_pen_transform(GpPen *pen, REAL *values) +{ + GpMatrix *matrix; + GpStatus status; + + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + + status = GdipGetPenTransform(pen, matrix); + expect(Ok, status); + status = GdipGetMatrixElements(matrix, values); + expect(Ok, status); + + GdipDeleteMatrix(matrix); +} + static void test_transform(void) { GpStatus status; @@ -478,6 +494,65 @@ static void test_transform(void) expectf(0.0, values[4]); expectf(0.0, values[5]); + /* Scale */ + status = GdipScalePenTransform(NULL, 1.0, 1.0, MatrixOrderPrepend); + expect(InvalidParameter, status); + + status = GdipScalePenTransform(pen, 1.0, 1.0, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(1.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(1.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(2.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(-10.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderAppend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(4.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(100.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); + + status = GdipTranslatePenTransform(pen, 1.0, -2.0, MatrixOrderAppend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(4.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(100.0, values[3]); + expectf(1.0, values[4]); + expectf(-2.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(8.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(-1000.0, values[3]); + expectf(1.0, values[4]); + expectf(-2.0, values[5]); + GdipDeletePen(pen); GdipDeleteMatrix(matrix); -- 2.19.1

2 1

[PATCH] browseui: Implement PROGDLG_AUTOTIME flag for IProgressDialog.
by Alistair Leslie-Hughes 18 Oct '18

18 Oct '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/browseui/browseui.rc | 5 +++ dlls/browseui/progressdlg.c | 65 ++++++++++++++++++++++++++++++++++--- dlls/browseui/resids.h | 5 +++ 3 files changed, 70 insertions(+), 5 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 4c612e93e3..6a152d7bcf 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -25,6 +25,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { IDS_CANCELLING "Canceling..." + IDS_REMAINING1 "%u %s remaining" + IDS_REMAINING2 "%u %s and %u %s remaining" + IDS_SECONDS "seconds" + IDS_MINUTES "minutes" + IDS_HOURS "hours" } IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 2355b0cfa0..88c629099a 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -74,6 +74,9 @@ typedef struct tagProgressDialog { ULONGLONG ullCompleted; ULONGLONG ullTotal; HWND hwndDisabledParent; /* For modal dialog: the parent that need to be re-enabled when the dialog ends */ + ULONGLONG startTime; + LPWSTR remainingMsg[2]; + LPWSTR timeMsg[3]; } ProgressDialog; static inline ProgressDialog *impl_from_IProgressDialog(IProgressDialog *iface) @@ -158,6 +161,22 @@ static void update_dialog(ProgressDialog *This, DWORD dwUpdate) } } +static void load_time_strings(ProgressDialog *This) +{ + int i; + + for (i = 0; i < 2; i++) + { + if (!This->remainingMsg[i]) + This->remainingMsg[i] = load_string(BROWSEUI_hinstance, IDS_REMAINING1 + i); + } + for (i = 0; i < 3; i++) + { + if (!This->timeMsg[i]) + This->timeMsg[i] = load_string(BROWSEUI_hinstance, IDS_SECONDS + i); + } +} + static void end_dialog(ProgressDialog *This) { SendMessageW(This->hwnd, WM_DLG_DESTROY, 0, 0); @@ -260,14 +279,18 @@ static DWORD WINAPI dialog_thread(LPVOID lpParameter) static void ProgressDialog_Destructor(ProgressDialog *This) { + int i; TRACE("destroying %p\n", This); if (This->hwnd) end_dialog(This); - heap_free(This->lines[0]); - heap_free(This->lines[1]); - heap_free(This->lines[2]); + for (i = 0; i < 3; i++) + heap_free(This->lines[i]); heap_free(This->cancelMsg); heap_free(This->title); + for (i = 0; i < 2; i++) + heap_free(This->remainingMsg[i]); + for (i = 0; i < 3; i++) + heap_free(This->timeMsg[i]); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); heap_free(This); @@ -329,8 +352,6 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, TRACE("(%p, %p, %x, %p)\n", iface, punkEnableModeless, dwFlags, reserved); if (punkEnableModeless || reserved) FIXME("Reserved parameters not null (%p, %p)\n", punkEnableModeless, reserved); - if (dwFlags & PROGDLG_AUTOTIME) - FIXME("Flags PROGDLG_AUTOTIME not supported\n"); if (dwFlags & PROGDLG_NOTIME) FIXME("Flags PROGDLG_NOTIME not supported\n"); @@ -365,6 +386,10 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, This->hwndDisabledParent = hwndDisable; } + if (dwFlags & PROGDLG_AUTOTIME) + load_time_strings(This); + + This->startTime = GetTickCount64(); LeaveCriticalSection(&This->cs); return S_OK; @@ -422,6 +447,34 @@ static BOOL WINAPI ProgressDialog_HasUserCancelled(IProgressDialog *iface) return This->isCancelled; } +static void update_time_remaining(ProgressDialog *This, ULONGLONG ullCompleted, ULONGLONG ullTotal) +{ + unsigned int remaining, remainder = 0; + ULONGLONG elapsed; + WCHAR line[128]; + int i; + + if (!This->startTime || !ullCompleted || !ullTotal) + return; + + elapsed = GetTickCount64() - This->startTime; + remaining = (elapsed * ullTotal / ullCompleted - elapsed) / 1000; + + for (i = 0; remaining >= 60 && i < 2; i++) + { + remainder = remaining % 60; + remaining /= 60; + } + + if (i > 0 && remaining < 2 && remainder != 0) + wsprintfW(line, This->remainingMsg[1], remaining, This->timeMsg[i], remainder, This->timeMsg[i-1]); + else + wsprintfW(line, This->remainingMsg[0], remaining, This->timeMsg[i]); + + set_buffer(&This->lines[2], line); + This->dwUpdate |= UPDATE_LINE3; +} + static HRESULT WINAPI ProgressDialog_SetProgress64(IProgressDialog *iface, ULONGLONG ullCompleted, ULONGLONG ullTotal) { ProgressDialog *This = impl_from_IProgressDialog(iface); @@ -434,6 +487,8 @@ static HRESULT WINAPI ProgressDialog_SetProgress64(IProgressDialog *iface, ULONG This->ullCompleted = ullCompleted; This->dwUpdate |= UPDATE_PROGRESS; hwnd = This->hwnd; + if (This->dwFlags & PROGDLG_AUTOTIME) + update_time_remaining(This, ullCompleted, ullTotal); LeaveCriticalSection(&This->cs); if (hwnd) diff --git a/dlls/browseui/resids.h b/dlls/browseui/resids.h index cd44a8ebd9..865cdd1a5e 100644 --- a/dlls/browseui/resids.h +++ b/dlls/browseui/resids.h @@ -21,6 +21,11 @@ #include "commctrl.h" #define IDS_CANCELLING 16 +#define IDS_REMAINING1 17 +#define IDS_REMAINING2 18 +#define IDS_SECONDS 19 +#define IDS_MINUTES 20 +#define IDS_HOURS 21 #define IDC_ANIMATION 100 #define IDC_PROGRESS_BAR 102 -- 2.19.1

2 1

[PATCH 1/2] d2d1: Return S_OK from RegisterEffectFromString().
by Nikolay Sivov 18 Oct '18

18 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- These 2 patches let Office 2016 to work when ID2D1Factory1 is exposed. dlls/d2d1/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 8d9d8c324b..dea25effa9 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -480,7 +480,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Facto FIXME("iface %p, effect_id %s, property_xml %s, bindings %p, binding_count %u, effect_factory %p stub!\n", iface, debugstr_guid(effect_id), debugstr_w(property_xml), bindings, binding_count, effect_factory); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory1 *iface, REFCLSID effect_id) -- 2.19.1

2 3

[PATCH] d3d10core/tests: Add test for rendering to A8_UNORM texture.
by Józef Kucia 18 Oct '18

18 Oct '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 105 +++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 777384558d64..0e8a63a60f69 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -727,6 +727,11 @@ static void *get_readback_data(struct resource_readback *rb, unsigned int x, uns return (BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch + x * byte_width; } +static BYTE get_readback_byte(struct resource_readback *rb, unsigned int x, unsigned int y) +{ + return *(BYTE *)get_readback_data(rb, x, y, sizeof(BYTE)); +} + static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(DWORD *)get_readback_data(rb, x, y, sizeof(DWORD)); @@ -779,6 +784,40 @@ static DWORD get_texture_color(ID3D10Texture2D *texture, unsigned int x, unsigne return color; } +#define check_readback_data_byte(a, b, c, d) check_readback_data_byte_(__LINE__, a, b, c, d) +static void check_readback_data_byte_(unsigned int line, struct resource_readback *rb, + const RECT *rect, BYTE expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0; + BOOL all_match = TRUE; + RECT default_rect; + BYTE value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_byte(rb, x, y); + if (!compare_color(value, expected_value, max_diff)) + { + all_match = FALSE; + break; + } + } + if (!all_match) + break; + } + ok_(__FILE__, line)(all_match, + "Got 0x%02x, expected 0x%02x at (%u, %u), sub-resource %u.\n", + value, expected_value, x, y, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) @@ -17340,6 +17379,71 @@ static void test_staging_buffers(void) release_test_context(&test_context); } +static void test_render_a8(void) +{ + static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + struct resource_readback rb; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(out float4 target : SV_Target) + { + target = float4(0.0f, 0.25f, 0.5f, 1.0f); + } +#endif + 0x43425844, 0x8a06129f, 0x3041bde2, 0x09389749, 0xb339ba8b, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3e800000, 0x3f000000, 0x3f800000, 0x0100003e, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_A8_UNORM; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr); + + for (i = 0; i < 2; ++i) + { + ID3D10Device_ClearRenderTargetView(device, rtv, black); + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + draw_quad(&test_context); + get_texture_readback(texture, 0, &rb); + check_readback_data_byte(&rb, NULL, 0xff, 0); + release_resource_readback(&rb); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, black); + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); + draw_quad(&test_context); + check_texture_sub_resource_color(test_context.backbuffer, 0, NULL, 0xff7f4000, 1); + } + + ID3D10PixelShader_Release(ps); + ID3D10Texture2D_Release(texture); + ID3D10RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -17449,6 +17553,7 @@ START_TEST(d3d10core) queue_test(test_multisample_resolve); queue_test(test_depth_clip); queue_test(test_staging_buffers); + queue_test(test_render_a8); run_queued_tests(); -- 2.18.1

3 2

[PATCH 2/3] d3d11/tests: Add test for initial texture data.
by Józef Kucia 18 Oct '18

18 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45996 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 135 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 74b429f6e395..010139c7e0dc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11565,6 +11565,140 @@ static void test_fragment_coords(void) release_test_context(&test_context); } +static void test_initial_texture_data(void) +{ + ID3D11Texture2D *texture, *staging_texture; + struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11SamplerState *sampler_state; + ID3D11ShaderResourceView *ps_srv; + D3D11_SAMPLER_DESC sampler_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i, j; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.Sample(s, p); + } +#endif + 0x43425844, 0x1ce9b612, 0xc8176faa, 0xd37844af, 0xdb515605, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD bitmap_data[] = + { + 0xffffffff, 0xff000000, 0xffffffff, 0xff000000, + 0xff00ff00, 0xff0000ff, 0xff00ffff, 0x00000000, + 0xffffff00, 0xffff0000, 0xffff00ff, 0x00000000, + 0xff000000, 0xff7f7f7f, 0xffffffff, 0x00000000, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 4; + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + texture_desc.BindFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*bitmap_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &staging_texture); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.CPUAccessFlags = 0; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)texture, (ID3D11Resource *)staging_texture); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &ps_srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler_state); + ok(hr == S_OK, "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &ps_srv); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + draw_quad(&test_context); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D11PixelShader_Release(ps); + ID3D11SamplerState_Release(sampler_state); + ID3D11ShaderResourceView_Release(ps_srv); + ID3D11Texture2D_Release(staging_texture); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_update_subresource(void) { struct d3d11_test_context test_context; @@ -28454,6 +28588,7 @@ START_TEST(d3d11) queue_test(test_il_append_aligned); queue_test(test_instance_id); queue_test(test_fragment_coords); + queue_test(test_initial_texture_data); queue_test(test_update_subresource); queue_test(test_copy_subresource_region); queue_test(test_copy_subresource_region_1d); -- 2.18.1

3 2

[PATCH 3/3] d3d10core/tests: Add test for initial texture data.
by Józef Kucia 18 Oct '18

18 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45996 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 133 +++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 777384558d64..e4d353ac69e1 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -8913,6 +8913,138 @@ static void test_fragment_coords(void) release_test_context(&test_context); } +static void test_initial_texture_data(void) +{ + ID3D10Texture2D *texture, *staging_texture; + struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10SamplerState *sampler_state; + ID3D10ShaderResourceView *ps_srv; + D3D10_SAMPLER_DESC sampler_desc; + struct resource_readback rb; + ID3D10PixelShader *ps; + ID3D10Device *device; + unsigned int i, j; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.Sample(s, p); + } +#endif + 0x43425844, 0x1ce9b612, 0xc8176faa, 0xd37844af, 0xdb515605, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD bitmap_data[] = + { + 0xffffffff, 0xff000000, 0xffffffff, 0xff000000, + 0xff00ff00, 0xff0000ff, 0xff00ffff, 0x00000000, + 0xffffff00, 0xffff0000, 0xffff00ff, 0x00000000, + 0xff000000, 0xff7f7f7f, 0xffffffff, 0x00000000, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 4; + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_STAGING; + texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; + texture_desc.BindFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*bitmap_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &staging_texture); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.CPUAccessFlags = 0; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + ID3D10Device_CopyResource(device, (ID3D10Resource *)texture, (ID3D10Resource *)staging_texture); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &ps_srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state); + ok(hr == S_OK, "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D10Device_PSSetShaderResources(device, 0, 1, &ps_srv); + ID3D10Device_PSSetSamplers(device, 0, 1, &sampler_state); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + draw_quad(&test_context); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D10PixelShader_Release(ps); + ID3D10SamplerState_Release(sampler_state); + ID3D10ShaderResourceView_Release(ps_srv); + ID3D10Texture2D_Release(staging_texture); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_update_subresource(void) { struct d3d10core_test_context test_context; @@ -17395,6 +17527,7 @@ START_TEST(d3d10core) queue_test(test_il_append_aligned); queue_test(test_instance_id); queue_test(test_fragment_coords); + queue_test(test_initial_texture_data); queue_test(test_update_subresource); queue_test(test_copy_subresource_region); queue_test(test_copy_subresource_region_1d); -- 2.18.1

3 2

[PATCH 1/3] wined3d: Call wined3d_cs_emit_update_sub_resource() directly in wined3d_texture_create().
by Józef Kucia 18 Oct '18

18 Oct '18

Fixes a regression introduced by commit 490c6d548abab55ea0a3913d55eecd26f01d1949. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45996 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/texture.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2244db5cb6f6..b8e7ef034891 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3645,6 +3645,8 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct if (data) { unsigned int sub_count = level_count * layer_count; + unsigned int level, width, height, depth; + struct wined3d_box box; unsigned int i; for (i = 0; i < sub_count; ++i) @@ -3660,8 +3662,14 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct for (i = 0; i < sub_count; ++i) { - wined3d_device_update_sub_resource(device, &object->resource, - i, NULL, data[i].data, data[i].row_pitch, data[i].slice_pitch, 0); + level = i % object->level_count; + width = wined3d_texture_get_level_width(object, level); + height = wined3d_texture_get_level_height(object, level); + depth = wined3d_texture_get_level_depth(object, level); + wined3d_box_set(&box, 0, 0, width, height, 0, depth); + + wined3d_cs_emit_update_sub_resource(device->cs, &object->resource, + i, &box, data[i].data, data[i].row_pitch, data[i].slice_pitch); } } -- 2.18.1

2 1

[PATCH vkd3d 6/6] vkd3d-shader: Implement early depth/stencil tests.
by Józef Kucia 18 Oct '18

18 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2f72c5c05d79..bb70dd5935a4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3503,10 +3503,18 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler static void vkd3d_dxbc_compiler_emit_dcl_global_flags(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - if (instruction->flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) - FIXME("Unhandled global flags %#x.\n", instruction->flags); + unsigned int flags = instruction->flags; + + if (flags & VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL) + { + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeEarlyFragmentTests, NULL, 0); + flags &= ~VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL; + } + + if (flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) + FIXME("Unhandled global flags %#x.\n", flags); else - WARN("Unhandled global flags %#x.\n", instruction->flags); + WARN("Unhandled global flags %#x.\n", flags); } static void vkd3d_dxbc_compiler_emit_dcl_temps(struct vkd3d_dxbc_compiler *compiler, -- 2.18.1

2 1

[PATCH vkd3d 3/6] vkd3d-shader: Fix f32tof16 instruction.
by Józef Kucia 18 Oct '18

18 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 13 ++++++++----- tests/d3d12.c | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9c51df14316e..41c49acd9270 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4760,12 +4760,13 @@ static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compil static void vkd3d_dxbc_compiler_emit_f32tof16(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - uint32_t instr_set_id, type_id, scalar_type_id, src_id, zero_id, constituents[2], result_id; + uint32_t instr_set_id, type_id, scalar_type_id, src_id, zero_id, constituents[2]; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t components[VKD3D_VEC4_SIZE]; + unsigned int i, j; DWORD write_mask; - unsigned int i; instr_set_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 2); @@ -4773,7 +4774,7 @@ static void vkd3d_dxbc_compiler_emit_f32tof16(struct vkd3d_dxbc_compiler *compil zero_id = vkd3d_dxbc_compiler_get_constant_float(compiler, 0.0f); /* FIXME: Consider a single PackHalf2x16 intruction per 2 components. */ - for (i = 0; i < VKD3D_VEC4_SIZE; ++i) + for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { if (!(write_mask = dst->write_mask & (VKD3DSP_WRITEMASK_0 << i))) continue; @@ -4783,10 +4784,12 @@ static void vkd3d_dxbc_compiler_emit_f32tof16(struct vkd3d_dxbc_compiler *compil constituents[1] = zero_id; src_id = vkd3d_spirv_build_op_composite_construct(builder, type_id, constituents, ARRAY_SIZE(constituents)); - result_id = vkd3d_spirv_build_op_ext_inst(builder, scalar_type_id, + components[j++] = vkd3d_spirv_build_op_ext_inst(builder, scalar_type_id, instr_set_id, GLSLstd450PackHalf2x16, &src_id, 1); - vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst->reg, write_mask, result_id); } + + vkd3d_dxbc_compiler_emit_store_dst_components(compiler, + dst, vkd3d_component_type_from_data_type(dst->reg.data_type), components); } static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_compiler *compiler, diff --git a/tests/d3d12.c b/tests/d3d12.c index 0ef382f46103..a63e122f7232 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -6608,6 +6608,29 @@ static void test_shader_instructions(void) 0x06000082, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_f32tof16 = {ps_f32tof16_code, sizeof(ps_f32tof16_code)}; + static const DWORD ps_f32tof16_2_code[] = + { +#if 0 + ps_5_0 + dcl_globalFlags refactoringAllowed + dcl_constantbuffer cb0[1], immediateIndexed + dcl_output o0.xyzw + dcl_temps 1 + mov r0.xyzw, cb0[0].xyzw + f32tof16 r0.xyzw, r0.wzyx + mov o0.xyzw, r0.xyzw + ret +#endif + 0x43425844, 0x607c82d2, 0x940cc7c2, 0xe9de23c6, 0x696beb90, 0x00000001, 0x000000ec, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000074, 0x00000050, 0x0000001d, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, + 0x05000082, 0x001000f2, 0x00000000, 0x001001b6, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, + 0x00100e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_f32tof16_2 = {ps_f32tof16_2_code, sizeof(ps_f32tof16_2_code)}; static const DWORD ps_imad_code[] = { #if 0 @@ -7355,6 +7378,8 @@ static void test_shader_instructions(void) {&ps_f32tof16, {.f = {{0.0f, 1.0f, -1.0f, 666.0f}}}, {{0, 0x3c00, 0xbc00, 0x6134}}}, + {&ps_f32tof16_2, {.f = {{0.0f, 1.0f, -1.0f, 666.0f}}}, {{0x6134, 0xbc00, 0x3c00, 0}}}, + {&ps_imad, {{{0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}}, {{ 0, 0, 0, 0}}}, {&ps_imad, {{{0, 0, 0, 0}, {0, 0, 0, 0}, {1, 2, 0, 0}}}, {{ 1, 2, 0, 0}}}, {&ps_imad, {{{2, 3, 4, 5}, {5, 5, 5, 5}, {0, 0, 0, 0}}}, {{10, 15, 20, 25}}}, -- 2.18.1

2 1

[PATCH vkd3d 5/6] vkd3d-shader: Translate ld2dms instructions.
by Józef Kucia 18 Oct '18

18 Oct '18

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, 12 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ac95bd3b343e..2f72c5c05d79 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5423,6 +5423,9 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_image image; uint32_t image_operands[2]; DWORD coordinate_mask; + bool multisample; + + multisample = instruction->handler_idx == VKD3DSIH_LD2DMS; /* OpImageFetch must be used with a sampled image. */ vkd3d_dxbc_compiler_prepare_dummy_sampled_image(compiler, &image, &src[1].reg); @@ -5431,7 +5434,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); - if (image.resource_type_info->resource_type != VKD3D_SHADER_RESOURCE_BUFFER) + if (image.resource_type_info->resource_type != VKD3D_SHADER_RESOURCE_BUFFER && !multisample) { operands_mask |= SpvImageOperandsLodMask; image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, @@ -5443,6 +5446,13 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_texel_offset(compiler, instruction, image.resource_type_info); } + if (multisample) + { + operands_mask |= SpvImageOperandsSampleMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, + &src[2], VKD3DSP_WRITEMASK_0); + } + assert(image_operand_count <= ARRAY_SIZE(image_operands)); val_id = vkd3d_spirv_build_op_image_fetch(builder, type_id, image_id, coordinate_id, operands_mask, image_operands, image_operand_count); @@ -6490,6 +6500,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_DSY_FINE: vkd3d_dxbc_compiler_emit_deriv_instruction(compiler, instruction); break; + case VKD3DSIH_LD2DMS: case VKD3DSIH_LD: vkd3d_dxbc_compiler_emit_ld(compiler, instruction); break; -- 2.18.1

2 1

[PATCH vkd3d 4/6] vkd3d-shader: Fix resinfo for multisample textures.
by Józef Kucia 18 Oct '18

18 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 41c49acd9270..ac95bd3b343e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6115,6 +6115,7 @@ static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compile uint32_t constituents[VKD3D_VEC4_SIZE]; unsigned int i, size_component_count; struct vkd3d_shader_image image; + bool supports_mipmaps; vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); @@ -6122,24 +6123,20 @@ static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compile size_component_count = image.resource_type_info->coordinate_component_count; type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, size_component_count); - if (src[1].reg.type == VKD3DSPR_RESOURCE) + supports_mipmaps = src[1].reg.type != VKD3DSPR_UAV && !image.resource_type_info->ms; + if (supports_mipmaps) { lod_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_0); val_id = vkd3d_spirv_build_op_image_query_size_lod(builder, type_id, image.image_id, lod_id); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); miplevel_count_id = vkd3d_spirv_build_op_image_query_levels(builder, type_id, image.image_id); } - else if (src[1].reg.type == VKD3DSPR_UAV) + else { val_id = vkd3d_spirv_build_op_image_query_size(builder, type_id, image.image_id); /* For UAVs the returned miplevel count is always 1. */ miplevel_count_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 1); } - else - { - ERR("Unexpected register type %#x.\n", src[1].reg.type); - return; - } constituents[0] = val_id; for (i = 0; i < 3 - size_component_count; ++i) -- 2.18.1

2 1

[PATCH vkd3d 2/6] vkd3d-shader: Fix f16tof32 instruction.
by Józef Kucia 18 Oct '18

18 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 11 +++++++---- tests/d3d12.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1d97a98c2e80..9c51df14316e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4732,15 +4732,16 @@ static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compil struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t components[VKD3D_VEC4_SIZE]; + unsigned int i, j; DWORD write_mask; - unsigned int i; instr_set_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 2); scalar_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); /* FIXME: Consider a single UnpackHalf2x16 intruction per 2 components. */ - for (i = 0; i < VKD3D_VEC4_SIZE; ++i) + for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { if (!(write_mask = dst->write_mask & (VKD3DSP_WRITEMASK_0 << i))) continue; @@ -4748,10 +4749,12 @@ static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compil src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, write_mask); result_id = vkd3d_spirv_build_op_ext_inst(builder, type_id, instr_set_id, GLSLstd450UnpackHalf2x16, &src_id, 1); - result_id = vkd3d_spirv_build_op_composite_extract1(builder, + components[j++] = vkd3d_spirv_build_op_composite_extract1(builder, scalar_type_id, result_id, 0); - vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst->reg, write_mask, result_id); } + + vkd3d_dxbc_compiler_emit_store_dst_components(compiler, + dst, vkd3d_component_type_from_data_type(dst->reg.data_type), components); } static void vkd3d_dxbc_compiler_emit_f32tof16(struct vkd3d_dxbc_compiler *compiler, diff --git a/tests/d3d12.c b/tests/d3d12.c index 34c4802f7fde..0ef382f46103 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -6567,6 +6567,29 @@ static void test_shader_instructions(void) 0x0500001c, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_f16tof32 = {ps_f16tof32_code, sizeof(ps_f16tof32_code)}; + static const DWORD ps_f16tof32_2_code[] = + { +#if 0 + ps_5_0 + dcl_globalFlags refactoringAllowed + dcl_constantbuffer cb0[1], immediateIndexed + dcl_output o0.xyzw + dcl_temps 1 + mov r0.xyzw, cb0[0].xyzw + f16tof32 r0.xyzw, r0.wzyx + ftou o0.xyzw, r0.xyzw + ret +#endif + 0x43425844, 0x38472f03, 0x2c49b7dd, 0xc2d76bbf, 0xfc093e1d, 0x00000001, 0x000000ec, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000074, 0x00000050, 0x0000001d, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, + 0x05000083, 0x001000f2, 0x00000000, 0x001001b6, 0x00000000, 0x0500001c, 0x001020f2, 0x00000000, + 0x00100e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_f16tof32_2 = {ps_f16tof32_2_code, sizeof(ps_f16tof32_2_code)}; static const DWORD ps_f32tof16_code[] = { #if 0 @@ -7325,6 +7348,11 @@ static void test_shader_instructions(void) {&ps_f16tof32, {{{0x000f0000, 0x000f3c00, 0x000f5640, 0x000f5bd0}}}, {{0, 1, 100, 250}}}, {&ps_f16tof32, {{{0xffff0000, 0xffff3c00, 0xffff5640, 0xffff5bd0}}}, {{0, 1, 100, 250}}}, + {&ps_f16tof32_2, {{{0x00000000, 0x00003c00, 0x00005640, 0x00005bd0}}}, {{250, 100, 1, 0}}}, + {&ps_f16tof32_2, {{{0x00010000, 0x00013c00, 0x00015640, 0x00015bd0}}}, {{250, 100, 1, 0}}}, + {&ps_f16tof32_2, {{{0x000f0000, 0x000f3c00, 0x000f5640, 0x000f5bd0}}}, {{250, 100, 1, 0}}}, + {&ps_f16tof32_2, {{{0xffff0000, 0xffff3c00, 0xffff5640, 0xffff5bd0}}}, {{250, 100, 1, 0}}}, + {&ps_f32tof16, {.f = {{0.0f, 1.0f, -1.0f, 666.0f}}}, {{0, 0x3c00, 0xbc00, 0x6134}}}, {&ps_imad, {{{0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}}, {{ 0, 0, 0, 0}}}, -- 2.18.1

2 1

[PATCH vkd3d 1/6] vkd3d-shader: Fix bitfield instructions.
by Józef Kucia 18 Oct '18

18 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Avoid overwriting registers before all results are computed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 13 +++++++------ tests/d3d12.c | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7cf58f8eb2f2..1d97a98c2e80 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4678,11 +4678,11 @@ static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, static void vkd3d_dxbc_compiler_emit_bitfield_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + uint32_t src_ids[4], constituents[VKD3D_VEC4_SIZE], type_id, mask_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t src_ids[4], result_id, type_id, mask_id; - unsigned int i, j, src_count; + unsigned int i, j, k, src_count; DWORD write_mask; SpvOp op; @@ -4702,7 +4702,7 @@ static void vkd3d_dxbc_compiler_emit_bitfield_instruction(struct vkd3d_dxbc_comp return; } - for (i = 0; i < VKD3D_VEC4_SIZE; ++i) + for (i = 0, k = 0; i < VKD3D_VEC4_SIZE; ++i) { if (!(write_mask = dst->write_mask & (VKD3DSP_WRITEMASK_0 << i))) continue; @@ -4717,11 +4717,12 @@ static void vkd3d_dxbc_compiler_emit_bitfield_instruction(struct vkd3d_dxbc_comp src_ids[j] = vkd3d_spirv_build_op_and(builder, int_type_id, src_ids[j], mask_id); } - result_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, + constituents[k++] = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, op, type_id, src_ids, src_count); - - vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst->reg, write_mask, result_id); } + + vkd3d_dxbc_compiler_emit_store_dst_components(compiler, + dst, vkd3d_component_type_from_data_type(dst->reg.data_type), constituents); } static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compiler, diff --git a/tests/d3d12.c b/tests/d3d12.c index f40aded6ca98..34c4802f7fde 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -6285,6 +6285,29 @@ static void test_shader_instructions(void) 0x00000000, 0x00208aa6, 0x00000000, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_ibfe = {ps_ibfe_code, sizeof(ps_ibfe_code)}; + static const DWORD ps_ibfe2_code[] = + { +#if 0 + ps_5_0 + dcl_globalFlags refactoringAllowed + dcl_constantbuffer cb0[1], immediateIndexed + dcl_output o0.xyzw + dcl_temps 1 + mov r0.xyzw, cb0[0].xyzw + ibfe r0.xyzw, r0.xxxx, r0.yyyy, r0.zzzz + mov o0.xyzw, r0.xyzw + ret +#endif + 0x43425844, 0x347a9c0e, 0x3eff39a4, 0x3dd41cc5, 0xff87ec8d, 0x00000001, 0x000000fc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000084, 0x00000050, 0x00000021, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, + 0x0900008b, 0x001000f2, 0x00000000, 0x00100006, 0x00000000, 0x00100556, 0x00000000, 0x00100aa6, + 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_ibfe2 = {ps_ibfe2_code, sizeof(ps_ibfe2_code)}; static const DWORD ps_ubfe_code[] = { #if 0 @@ -7203,6 +7226,8 @@ static void test_shader_instructions(void) {&ps_ibfe, {{{31, 31, 0x80000000}}}, {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}}, {&ps_ibfe, {{{31, 31, 0x7fffffff}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}}, + {&ps_ibfe2, {{{16, 15, 0x3fffffff}}}, {{0x00007fff, 0x00007fff, 0x00007fff, 0x00007fff}}}, + {&ps_ubfe, {{{0x00000000}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}}, {&ps_ubfe, {{{0xffffffff}}}, {{0x0000000f, 0x007fffff, 0x0000007f, 0x3fffffff}}}, {&ps_ubfe, {{{0xff000000}}}, {{0x00000000, 0x007f0000, 0x00000000, 0x3f800000}}}, -- 2.18.1

2 1

[PATCH vkd3d] include: Avoid _t-suffixes.
by Henri Verbeet 18 Oct '18

18 Oct '18

The _t-suffix is reserved by POSIX. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/private/rbtree.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/private/rbtree.h b/include/private/rbtree.h index 4c18f9c..7f44a0e 100644 --- a/include/private/rbtree.h +++ b/include/private/rbtree.h @@ -34,15 +34,15 @@ struct rb_entry unsigned int flags; }; -typedef int (*rb_compare_func_t)(const void *key, const struct rb_entry *entry); +typedef int (*rb_compare_func)(const void *key, const struct rb_entry *entry); struct rb_tree { - rb_compare_func_t compare; + rb_compare_func compare; struct rb_entry *root; }; -typedef void (rb_traverse_func_t)(struct rb_entry *entry, void *context); +typedef void (rb_traverse_func)(struct rb_entry *entry, void *context); #define RB_FLAG_RED 0x1 @@ -150,32 +150,32 @@ static inline struct rb_entry *rb_postorder_next(struct rb_entry *iter) (elem) = (elem2)) -static inline void rb_postorder(struct rb_tree *tree, rb_traverse_func_t *callback, void *context) +static inline void rb_postorder(struct rb_tree *tree, rb_traverse_func *callback, void *context) { struct rb_entry *iter, *next; rb_FOR_EACH_DESTRUCTOR(iter, next, tree) callback(iter, context); } -static inline void rb_init(struct rb_tree *tree, rb_compare_func_t compare) +static inline void rb_init(struct rb_tree *tree, rb_compare_func compare) { tree->compare = compare; tree->root = NULL; } -static inline void rb_for_each_entry(struct rb_tree *tree, rb_traverse_func_t *callback, void *context) +static inline void rb_for_each_entry(struct rb_tree *tree, rb_traverse_func *callback, void *context) { struct rb_entry *iter; rb_FOR_EACH(iter, tree) callback(iter, context); } -static inline void rb_clear(struct rb_tree *tree, rb_traverse_func_t *callback, void *context) +static inline void rb_clear(struct rb_tree *tree, rb_traverse_func *callback, void *context) { /* Note that we use postorder here because the callback will likely free the entry. */ if (callback) rb_postorder(tree, callback, context); tree->root = NULL; } -static inline void rb_destroy(struct rb_tree *tree, rb_traverse_func_t *callback, void *context) +static inline void rb_destroy(struct rb_tree *tree, rb_traverse_func *callback, void *context) { rb_clear(tree, callback, context); } -- 2.11.0

1 0

[PATCH 1/2] testbot: Avoid some unneeded regular expressions when parsing logs.
by Francois Gouget 18 Oct '18

18 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 6caa0212c2..1f3831bba9 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -83,11 +83,11 @@ sub ParseTaskLog($) foreach my $Line (<$LogFile>) { chomp $Line; - if ($Line =~ /^Task: ok$/) + if ($Line eq "Task: ok") { $Result ||= "ok"; } - elsif ($Line =~ /^Task: Patch failed to apply$/) + elsif ($Line eq "Task: Patch failed to apply") { $Result = "badpatch"; last; # Should be the last and most specific message -- 2.19.1

1 1

[PATCH] testbot/WineReconfig: Make sure not to leave obsolete wineprefixes behind.
by Francois Gouget 18 Oct '18

18 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineReconfig.pl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 2416eebfa4..63d72e89d3 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -37,6 +37,9 @@ sub BEGIN $::BuildEnv = 1; } +use File::Basename; +use File::Path; + use Build::Utils; use WineTestBot::Config; @@ -95,6 +98,16 @@ sub UpdateWinePrefixes($) { my ($Targets) = @_; + # Make sure no obsolete wineprefix is left behind in case WineReconfig + # is called with a different set of targets + foreach my $Dir (glob("'$DataDir/wineprefix-*'")) + { + if (basename($Dir) =~ /^(wineprefix-[a-zA-Z0-9\(a)_.-]+)$/) # untaint + { + rmtree("$DataDir/$1"); + } + } + # Set up brand new WinePrefixes ready for use for testing. # This way we do it once instead of doing it for every test, thus saving # time. Note that this requires using a different wineprefix for each build. -- 2.19.1

1 0

[PATCH] opengl32/tests: PFD_TYPE_RGBA should be in the iPixelType field, not in the flag field
by nozomi.kodama＠yahoo.com 18 Oct '18

18 Oct '18

1 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel