wine-devel June 2018

wine-devel@winehq.org

68 participants
583 discussions

[PATCH vkd3d 03/12] libs/vkd3d-shader: Add initial support for typed registers.
by Józef Kucia 26 Jun '18

26 Jun '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 119 ++++++++++++++++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 6 ++ 2 files changed, 98 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8f6a833cd313..71db4be6b493 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1667,6 +1667,8 @@ struct vkd3d_symbol_register_data { SpvStorageClass storage_class; uint32_t member_idx; + enum vkd3d_component_type component_type; + unsigned int write_mask; unsigned int structure_stride; }; @@ -2243,6 +2245,8 @@ struct vkd3d_shader_register_info { uint32_t id; SpvStorageClass storage_class; + enum vkd3d_component_type component_type; + unsigned int write_mask; uint32_t member_idx; unsigned int structure_stride; }; @@ -2260,6 +2264,8 @@ static bool vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *co assert(reg->idx[0].offset < compiler->temp_count); register_info->id = compiler->temp_id + reg->idx[0].offset; register_info->storage_class = SpvStorageClassFunction; + register_info->component_type = VKD3D_TYPE_FLOAT; + register_info->write_mask = VKD3DSP_WRITEMASK_ALL; register_info->member_idx = 0; return true; } @@ -2275,6 +2281,8 @@ static bool vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *co symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); register_info->id = symbol->id; register_info->storage_class = symbol->info.reg.storage_class; + register_info->component_type = symbol->info.reg.component_type; + register_info->write_mask = symbol->info.reg.write_mask; register_info->structure_stride = symbol->info.reg.structure_stride; register_info->member_idx = symbol->info.reg.member_idx; @@ -2356,14 +2364,15 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler * } } -static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *compiler, - uint32_t val_id, enum vkd3d_component_type component_type, DWORD swizzle, DWORD write_mask) +static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler *compiler, + uint32_t val_id, unsigned int val_write_mask, enum vkd3d_component_type component_type, + unsigned int swizzle, unsigned int write_mask) { + unsigned int i, component_idx, component_count, val_component_count; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - unsigned int i, component_idx, component_count; uint32_t type_id, components[VKD3D_VEC4_SIZE]; - if (swizzle == VKD3D_NO_SWIZZLE && write_mask == VKD3DSP_WRITEMASK_ALL) + if (swizzle == VKD3D_NO_SWIZZLE && write_mask == val_write_mask) return val_id; component_count = vkd3d_write_mask_component_count(write_mask); @@ -2376,6 +2385,20 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *com return vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, component_idx); } + val_component_count = vkd3d_write_mask_component_count(val_write_mask); + if (val_component_count == 1) + { + for (i = 0, component_idx = 0; i < VKD3D_VEC4_SIZE; ++i) + { + if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) + { + assert(VKD3DSP_WRITEMASK_0 << vkd3d_swizzle_get_component(swizzle, i) == val_write_mask); + components[component_idx++] = val_id; + } + } + return vkd3d_spirv_build_op_composite_construct(builder, type_id, components, component_count); + } + for (i = 0, component_idx = 0; i < VKD3D_VEC4_SIZE; ++i) { if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) @@ -2385,6 +2408,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *com type_id, val_id, val_id, components, component_count); } +static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *compiler, + uint32_t val_id, enum vkd3d_component_type component_type, DWORD swizzle, DWORD write_mask) +{ + return vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, + val_id, VKD3DSP_WRITEMASK_ALL, component_type, swizzle, write_mask); +} + static uint32_t vkd3d_dxbc_compiler_emit_load_constant(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) { @@ -2416,36 +2446,44 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, ptr_type_id, indexes[1], chain_id, val_id; + uint32_t type_id, ptr_type_id, indexes[1], reg_id, val_id; + unsigned int component_idx, reg_component_count; struct vkd3d_shader_register_info reg_info; - unsigned int component_idx; + enum vkd3d_component_type component_type; assert(reg->type != VKD3DSPR_IMMCONST); assert(vkd3d_write_mask_component_count(write_mask) == 1); component_idx = vkd3d_write_mask_get_component_idx(write_mask); component_idx = vkd3d_swizzle_get_component(swizzle, component_idx); + component_type = vkd3d_component_type_from_data_type(reg->data_type); if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) { - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(reg->data_type), 1); + type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); } vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); + reg_component_count = vkd3d_write_mask_component_count(reg_info.write_mask); - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); - indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); - chain_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, - ptr_type_id, reg_info.id, indexes, ARRAY_SIZE(indexes)); + if (component_idx > reg_component_count) + ERR("Invalid component_idx for register %#x, %u.\n", reg->type, reg->idx[0].offset); - val_id = vkd3d_spirv_build_op_load(builder, type_id, chain_id, SpvMemoryAccessMaskNone); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, 1); + reg_id = reg_info.id; + if (reg_component_count != 1) + { + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); + indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); + reg_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, + ptr_type_id, reg_id, indexes, ARRAY_SIZE(indexes)); + } - if (reg->data_type != VKD3D_DATA_FLOAT) + val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_id, SpvMemoryAccessMaskNone); + + if (component_type != reg_info.component_type) { - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(reg->data_type), 1); + type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); } @@ -2456,8 +2494,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t src_id, type_id, val_id; + struct vkd3d_shader_register_info reg_info; + enum vkd3d_component_type component_type; unsigned int component_count; + uint32_t type_id, val_id; if (reg->type == VKD3DSPR_IMMCONST) return vkd3d_dxbc_compiler_emit_load_constant(compiler, reg, swizzle, write_mask); @@ -2466,17 +2506,24 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co if (component_count == 1) return vkd3d_dxbc_compiler_emit_load_scalar(compiler, reg, swizzle, write_mask); - src_id = vkd3d_dxbc_compiler_get_register_id(compiler, reg); - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); - val_id = vkd3d_spirv_build_op_load(builder, type_id, src_id, SpvMemoryAccessMaskNone); + component_type = vkd3d_component_type_from_data_type(reg->data_type); + if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) + { + type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); + return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); + } + vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3D_TYPE_FLOAT, swizzle, write_mask); + type_id = vkd3d_spirv_get_type_id(builder, + reg_info.component_type, vkd3d_write_mask_component_count(reg_info.write_mask)); + val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); - if (reg->data_type != VKD3D_DATA_FLOAT) + val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, + val_id, reg_info.write_mask, reg_info.component_type, swizzle, write_mask); + + if (component_type != reg_info.component_type) { - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(reg->data_type), component_count); + type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); } @@ -2995,6 +3042,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi { reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; + reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; + reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3105,6 +3154,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp { reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; + reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; + reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -3221,6 +3272,8 @@ static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_com reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; reg_symbol.info.reg.member_idx = j; + reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; + reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); ++j; @@ -3281,6 +3334,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; reg_symbol.info.reg.member_idx = 0; + reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; + reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -3314,6 +3369,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_immediate_constant_buffer(struct vkd3d_ vkd3d_symbol_make_register(&reg_symbol, &reg); reg_symbol.id = icb_id; reg_symbol.info.reg.storage_class = SpvStorageClassPrivate; + reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; + reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -3566,6 +3623,8 @@ static void vkd3d_dxbc_compiler_emit_workgroup_memory(struct vkd3d_dxbc_compiler reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; reg_symbol.info.reg.member_idx = 0; + reg_symbol.info.reg.component_type = VKD3D_TYPE_UINT; + reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_0; reg_symbol.info.reg.structure_stride = structure_stride; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -3959,13 +4018,19 @@ static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t val_id, dst_val_id, type_id, dst_id, src_id; + struct vkd3d_shader_register_info reg_info; uint32_t components[VKD3D_VEC4_SIZE]; unsigned int i, component_count; component_count = vkd3d_write_mask_component_count(dst->write_mask); + memset(&reg_info, 0, sizeof(reg_info)); + if (src->reg.type != VKD3DSPR_IMMCONST) + vkd3d_dxbc_compiler_get_register_info(compiler, &src->reg, &reg_info); + if (component_count == 1 || component_count == VKD3D_VEC4_SIZE - || dst->modifiers || src->modifiers || src->reg.type == VKD3DSPR_IMMCONST) + || dst->modifiers || src->modifiers || src->reg.type == VKD3DSPR_IMMCONST + || reg_info.component_type != VKD3D_TYPE_FLOAT || reg_info.write_mask != VKD3DSP_WRITEMASK_ALL) { val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst->write_mask); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 7fc42627f820..9eb2c126332d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -872,6 +872,12 @@ static inline unsigned int vkd3d_write_mask_component_count(DWORD write_mask) return count; } +static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int component_count) +{ + assert(component_count <= 4); + return (VKD3DSP_WRITEMASK_0 << component_count) - 1; +} + static inline unsigned int vkd3d_swizzle_get_component(DWORD swizzle, unsigned int idx) { -- 2.16.4

2 1

[PATCH vkd3d 02/12] libs/vkd3d-shader: Do not generate code in vkd3d_dxbc_compiler_get_register_info().
by Józef Kucia 26 Jun '18

26 Jun '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 289797de9f01..8f6a833cd313 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2243,18 +2243,15 @@ struct vkd3d_shader_register_info { uint32_t id; SpvStorageClass storage_class; + uint32_t member_idx; unsigned int structure_stride; }; static bool vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_info *register_info) { - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_symbol reg_symbol, *symbol; - uint32_t type_id, ptr_type_id; - uint32_t index_count = 0; struct rb_entry *entry; - uint32_t indexes[2]; assert(reg->type != VKD3DSPR_IMMCONST); @@ -2263,6 +2260,7 @@ static bool vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *co assert(reg->idx[0].offset < compiler->temp_count); register_info->id = compiler->temp_id + reg->idx[0].offset; register_info->storage_class = SpvStorageClassFunction; + register_info->member_idx = 0; return true; } @@ -2278,11 +2276,23 @@ static bool vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *co register_info->id = symbol->id; register_info->storage_class = symbol->info.reg.storage_class; register_info->structure_stride = symbol->info.reg.structure_stride; + register_info->member_idx = symbol->info.reg.member_idx; + + return true; +} + +static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_info *register_info) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, ptr_type_id; + unsigned int index_count = 0; + uint32_t indexes[2]; if (reg->type == VKD3DSPR_CONSTBUFFER) { assert(!reg->idx[0].rel_addr); - indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, symbol->info.reg.member_idx); + indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]); } else if (reg->type == VKD3DSPR_IMMCONSTBUFFER) @@ -2306,8 +2316,6 @@ static bool vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *co register_info->id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, register_info->id, indexes, index_count); } - - return true; } static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler *compiler, @@ -2331,7 +2339,10 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler * case VKD3DSPR_LOCALTHREADINDEX: case VKD3DSPR_THREADGROUPID: if (vkd3d_dxbc_compiler_get_register_info(compiler, reg, &register_info)) + { + vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &register_info); return register_info.id; + } return vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, SpvStorageClassPrivate, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); case VKD3DSPR_IMMCONST: @@ -2421,6 +2432,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler vkd3d_component_type_from_data_type(reg->data_type), 1); return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); } + vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); @@ -2565,6 +2577,7 @@ static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *co if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) return; + vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); -- 2.16.4

2 1

[PATCH vkd3d 01/12] libs/vkd3d-shader: Split SPIR-V built-ins table into two tables.
by Józef Kucia 26 Jun '18

26 Jun '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 75 +++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 10806a5a9a2f..289797de9f01 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2747,7 +2747,7 @@ typedef uint32_t (*vkd3d_spirv_builtin_fixup_pfn)(struct vkd3d_dxbc_compiler *co uint32_t val_id); /* Substitute "InstanceIndex - BaseInstance" for SV_InstanceID. */ -static uint32_t vkd3d_spirv_instance_id_fixup(struct vkd3d_dxbc_compiler *compiler, +static uint32_t sv_instance_id_fixup(struct vkd3d_dxbc_compiler *compiler, uint32_t instance_index_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -2773,47 +2773,57 @@ static uint32_t vkd3d_spirv_instance_id_fixup(struct vkd3d_dxbc_compiler *compil type_id, instance_index_id, base_instance_id); } -static uint32_t vkd3d_spirv_front_facing_fixup(struct vkd3d_dxbc_compiler *compiler, +static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler, uint32_t front_facing_id) { return vkd3d_dxbc_compiler_emit_bool_to_int(compiler, 1, front_facing_id); } -/* - * The following table is based on the "14.6. Built-In Variables" section from - * the Vulkan spec. - */ -static const struct vkd3d_spirv_builtin +struct vkd3d_spirv_builtin { - enum vkd3d_shader_input_sysval_semantic sysval; - enum vkd3d_shader_register_type reg_type; - enum vkd3d_component_type component_type; unsigned int component_count; SpvBuiltIn spirv_builtin; vkd3d_spirv_builtin_fixup_pfn fixup_pfn; +}; + +/* + * The following tables are based on the "14.6. Built-In Variables" section + * from the Vulkan spec. + */ +static const struct +{ + enum vkd3d_shader_input_sysval_semantic sysval; + struct vkd3d_spirv_builtin builtin; } -vkd3d_spirv_builtin_table[] = +vkd3d_system_value_builtins[] = { - {VKD3D_SIV_NONE, VKD3DSPR_THREADID, VKD3D_TYPE_INT, 3, SpvBuiltInGlobalInvocationId}, - {VKD3D_SIV_NONE, VKD3DSPR_LOCALTHREADID, VKD3D_TYPE_INT, 3, SpvBuiltInLocalInvocationId}, - {VKD3D_SIV_NONE, VKD3DSPR_LOCALTHREADINDEX, VKD3D_TYPE_INT, 1, SpvBuiltInLocalInvocationIndex}, - {VKD3D_SIV_NONE, VKD3DSPR_THREADGROUPID, VKD3D_TYPE_INT, 3, SpvBuiltInWorkgroupId}, + {VKD3D_SIV_POSITION, {VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition}}, + {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex}}, + {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, sv_instance_id_fixup}}, - {VKD3D_SIV_NONE, VKD3DSPR_GSINSTID, VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}, - {VKD3D_SIV_NONE, VKD3DSPR_OUTPOINTID, VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}, + {VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}}, - {VKD3D_SIV_NONE, VKD3DSPR_TESSCOORD, VKD3D_TYPE_FLOAT, 3, SpvBuiltInTessCoord}, - - {VKD3D_SIV_NONE, VKD3DSPR_DEPTHOUT, VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}, + {VKD3D_SIV_IS_FRONT_FACE, {VKD3D_TYPE_BOOL, 1, SpvBuiltInFrontFacing, sv_front_face_fixup}}, +}; +static const struct +{ + enum vkd3d_shader_register_type reg_type; + struct vkd3d_spirv_builtin builtin; +} +vkd3d_register_builtins[] = +{ + {VKD3DSPR_THREADID, {VKD3D_TYPE_INT, 3, SpvBuiltInGlobalInvocationId}}, + {VKD3DSPR_LOCALTHREADID, {VKD3D_TYPE_INT, 3, SpvBuiltInLocalInvocationId}}, + {VKD3DSPR_LOCALTHREADINDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLocalInvocationIndex}}, + {VKD3DSPR_THREADGROUPID, {VKD3D_TYPE_INT, 3, SpvBuiltInWorkgroupId}}, - {VKD3D_SIV_POSITION, ~0u, VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition}, - {VKD3D_SIV_VERTEX_ID, ~0u, VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex}, - {VKD3D_SIV_INSTANCE_ID, ~0u, VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, vkd3d_spirv_instance_id_fixup}, + {VKD3DSPR_GSINSTID, {VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}}, + {VKD3DSPR_OUTPOINTID, {VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}}, - {VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, ~0u, VKD3D_TYPE_INT, 1, SpvBuiltInLayer}, + {VKD3DSPR_TESSCOORD, {VKD3D_TYPE_FLOAT, 3, SpvBuiltInTessCoord}}, - {VKD3D_SIV_IS_FRONT_FACE, ~0u, VKD3D_TYPE_BOOL, 1, SpvBuiltInFrontFacing, vkd3d_spirv_front_facing_fixup}, + {VKD3DSPR_DEPTHOUT, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}}, }; static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(enum vkd3d_shader_register_type reg_type, @@ -2821,15 +2831,16 @@ static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(enum vkd3d_shad { unsigned int i; - for (i = 0; i < ARRAY_SIZE(vkd3d_spirv_builtin_table); ++i) + for (i = 0; i < ARRAY_SIZE(vkd3d_system_value_builtins); ++i) { - const struct vkd3d_spirv_builtin* current = &vkd3d_spirv_builtin_table[i]; - - if (current->sysval == VKD3D_SIV_NONE && current->reg_type == reg_type) - return current; + if (vkd3d_system_value_builtins[i].sysval == sysval) + return &vkd3d_system_value_builtins[i].builtin; + } - if (current->reg_type == ~0u && current->sysval == sysval) - return current; + for (i = 0; i < ARRAY_SIZE(vkd3d_register_builtins); ++i) + { + if (vkd3d_register_builtins[i].reg_type == reg_type) + return &vkd3d_register_builtins[i].builtin; } if (sysval != VKD3D_SIV_NONE -- 2.16.4

2 1

[PATCH] ntoskrnl.exe: add stub for IoUnregisterPlugPlayNotification
by Louis Lenders 26 Jun '18

26 Jun '18

Fr https://bugs.winehq.org/show_bug.cgi?id=45378 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e4c1c3530b..c8f9173738 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2763,6 +2763,15 @@ NTSTATUS WINAPI IoRegisterPlugPlayNotification(IO_NOTIFICATION_EVENT_CATEGORY ca return STATUS_SUCCESS; } +/***************************************************** + * IoUnregisterPlugPlayNotification (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoUnregisterPlugPlayNotification(PVOID notification) +{ + FIXME("stub: %p\n", notification); + return STATUS_SUCCESS; +} + /***************************************************** * IoCsqInitialize (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4129542cdc..64597c41df 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -472,7 +472,7 @@ @ stub IoThreadToProcess @ stdcall IoUnregisterFileSystem(ptr) @ stub IoUnregisterFsRegistrationChange -@ stub IoUnregisterPlugPlayNotification +@ stdcall IoUnregisterPlugPlayNotification(ptr) @ stdcall IoUnregisterShutdownNotification(ptr) @ stub IoUpdateShareAccess @ stub IoValidateDeviceIoControlAccess -- 2.17.1

1 0

[PATCH] icinfo: vsnprintfW takes characters as buffer size not bytes
by Marcus Meissner 26 Jun '18

26 Jun '18

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- programs/icinfo/icinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index bfbef6b69b..601ec8c8b3 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -26,14 +26,14 @@ static int mywprintf(const WCHAR *format, ...) { static char output_bufA[65536]; - static WCHAR output_bufW[sizeof(output_bufA) / sizeof(WCHAR)]; + static WCHAR output_bufW[sizeof(output_bufA)]; va_list parms; DWORD nOut; BOOL res = FALSE; HANDLE hout = GetStdHandle(STD_OUTPUT_HANDLE); va_start(parms, format); - vsnprintfW(output_bufW, sizeof(output_bufW), format, parms); + vsnprintfW(output_bufW, sizeof(output_bufW)/sizeof(output_bufW[0]), format, parms); va_end(parms); /* Try to write as unicode whenever we think it's a console */ -- 2.17.1

1 0

[PATCH] shlwapi: SHGetIniStringW buffer size is in characters
by Marcus Meissner 26 Jun '18

26 Jun '18

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/shlwapi/tests/ordinal.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index f192849cd4..db59e625f8 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2724,8 +2724,8 @@ static void test_SHGetIniString(void) if(0){ /* these crash on Windows */ pSHGetIniStringW(NULL, NULL, NULL, 0, NULL); - pSHGetIniStringW(NULL, AKeyW, out, sizeof(out), pathW); - pSHGetIniStringW(TestAppW, AKeyW, NULL, sizeof(out), pathW); + pSHGetIniStringW(NULL, AKeyW, out, ARRAY_SIZE(out), pathW); + pSHGetIniStringW(TestAppW, AKeyW, NULL, ARRAY_SIZE(out), pathW); } ret = pSHGetIniStringW(TestAppW, AKeyW, out, 0, pathW); @@ -2734,21 +2734,21 @@ static void test_SHGetIniString(void) /* valid arguments */ out[0] = 0; SetLastError(0xdeadbeef); - ret = pSHGetIniStringW(TestAppW, NULL, out, sizeof(out), pathW); + ret = pSHGetIniStringW(TestAppW, NULL, out, ARRAY_SIZE(out), pathW); ok(ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); ok(!lstrcmpW(out, AKeyW), "Expected %s, got: %s, %d\n", wine_dbgstr_w(AKeyW), wine_dbgstr_w(out), GetLastError()); - ret = pSHGetIniStringW(TestAppW, AKeyW, out, sizeof(out), pathW); + ret = pSHGetIniStringW(TestAppW, AKeyW, out, ARRAY_SIZE(out), pathW); ok(ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret); ok(!strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); - ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, sizeof(out), pathW); + ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, ARRAY_SIZE(out), pathW); ok(ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); ok(!strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); out[0] = 1; - ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, sizeof(out), pathW); + ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, ARRAY_SIZE(out), pathW); ok(ret == 0, "SHGetIniStringW should have given 0, instead: %d\n", ret); ok(*out == 0, "Expected L\"\", got: %s\n", wine_dbgstr_w(out)); -- 2.17.1

1 0

[PATCH] psapi: GetProcessImageFileName gets character count as argument
by Marcus Meissner 26 Jun '18

26 Jun '18

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/psapi/tests/psapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index ec74716651..13205b3b8f 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -645,7 +645,7 @@ static void test_GetProcessImageFileName(void) } SetLastError(0xdeadbeef); - pGetProcessImageFileNameW(NULL, szImgPathW, sizeof(szImgPathW)); + pGetProcessImageFileNameW(NULL, szImgPathW, ARRAY_SIZE(szImgPathW)); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); /* no information about correct buffer size returned: */ -- 2.17.1

1 0

[PATCH 1/5] devenum: Merge factory.c into devenum_main.c.
by Zebediah Figura 26 Jun '18

26 Jun '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/Makefile.in | 1 - dlls/devenum/devenum_main.c | 74 ++++++++++++++++++++++- dlls/devenum/devenum_private.h | 10 --- dlls/devenum/factory.c | 134 ----------------------------------------- 4 files changed, 72 insertions(+), 147 deletions(-) delete mode 100644 dlls/devenum/factory.c diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index ae138b6..d1407a9 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -5,7 +5,6 @@ DELAYIMPORTS = msvfw32 C_SRCS = \ createdevenum.c \ devenum_main.c \ - factory.c \ mediacatenum.c \ parsedisplayname.c diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index cb4b454..7bfc593 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -1,5 +1,5 @@ /* - * exported dll functions for devenum.dll + * Device Enumeration * * Copyright (C) 2002 John K. Hohm * Copyright (C) 2002 Robert Shearman @@ -56,6 +56,76 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) return TRUE; } +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID iid, void **obj) +{ + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(iid), obj); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *obj = iface; + return S_OK; + } + + *obj = NULL; + WARN("no interface for %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + DEVENUM_LockModule(); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + DEVENUM_UnlockModule(); + return 1; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, + IUnknown *outer, REFIID iid, void **obj) +{ + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(iid), obj); + + if (!obj) return E_POINTER; + + if (outer) return CLASS_E_NOAGGREGATION; + + if (IsEqualGUID(&IID_ICreateDevEnum, iid)) + { + *obj = &DEVENUM_CreateDevEnum; + return S_OK; + } + if (IsEqualGUID(&IID_IParseDisplayName, iid)) + { + *obj = &DEVENUM_ParseDisplayName; + return S_OK; + } + + return CLASS_E_CLASSNOTAVAILABLE; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL lock) +{ + if (lock) + DEVENUM_LockModule(); + else + DEVENUM_UnlockModule(); + return S_OK; +} + +static const IClassFactoryVtbl ClassFactory_vtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory devenum_cf = { &ClassFactory_vtbl }; + /*********************************************************************** * DllGetClassObject (DEVENUM.@) */ @@ -69,7 +139,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) * Oh well - works just fine as it is */ if (IsEqualGUID(rclsid, &CLSID_SystemDeviceEnum) || IsEqualGUID(rclsid, &CLSID_CDeviceMoniker)) - return IClassFactory_QueryInterface(&DEVENUM_ClassFactory.IClassFactory_iface, iid, ppv); + return IClassFactory_QueryInterface(&devenum_cf, iid, ppv); FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index df0080d..ea4e017 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -51,15 +51,6 @@ extern LONG dll_refs DECLSPEC_HIDDEN; static inline void DEVENUM_LockModule(void) { InterlockedIncrement(&dll_refs); } static inline void DEVENUM_UnlockModule(void) { InterlockedDecrement(&dll_refs); } - -/********************************************************************** - * ClassFactory declaration for devenum.dll - */ -typedef struct -{ - IClassFactory IClassFactory_iface; -} ClassFactoryImpl; - enum device_type { DEVICE_FILTER, @@ -84,7 +75,6 @@ typedef struct MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) DECLSPEC_HIDDEN; HRESULT create_EnumMoniker(REFCLSID class, IEnumMoniker **enum_mon) DECLSPEC_HIDDEN; -extern ClassFactoryImpl DEVENUM_ClassFactory DECLSPEC_HIDDEN; extern ICreateDevEnum DEVENUM_CreateDevEnum DECLSPEC_HIDDEN; extern IParseDisplayName DEVENUM_ParseDisplayName DECLSPEC_HIDDEN; diff --git a/dlls/devenum/factory.c b/dlls/devenum/factory.c deleted file mode 100644 index c808fa5..0000000 --- a/dlls/devenum/factory.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * ClassFactory implementation for DEVENUM.dll - * - * Copyright (C) 2002 John K. Hohm - * Copyright (C) 2002 Robert Shearman - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "devenum_private.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(devenum); - -/********************************************************************** - * DEVENUM_IClassFactory_QueryInterface (also IUnknown) - */ -static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, - void **ppvObj) -{ - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObj); - - if (ppvObj == NULL) return E_POINTER; - - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IClassFactory)) - { - *ppvObj = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - else if (IsEqualGUID(riid, &IID_IParseDisplayName)) - { - return IClassFactory_CreateInstance(iface, NULL, riid, ppvObj); - } - - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -/********************************************************************** - * DEVENUM_IClassFactory_AddRef (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IClassFactory_AddRef(IClassFactory *iface) -{ - TRACE("\n"); - - DEVENUM_LockModule(); - - return 2; /* non-heap based object */ -} - -/********************************************************************** - * DEVENUM_IClassFactory_Release (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IClassFactory_Release(IClassFactory *iface) -{ - TRACE("\n"); - - DEVENUM_UnlockModule(); - - return 1; /* non-heap based object */ -} - -/********************************************************************** - * DEVENUM_IClassFactory_CreateInstance - */ -static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance(IClassFactory *iface, - IUnknown *pUnkOuter, REFIID riid, void **ppvObj) -{ - TRACE("(%p)->(%p, %s, %p)\n", iface, pUnkOuter, debugstr_guid(riid), ppvObj); - - if (ppvObj == NULL) return E_POINTER; - - /* Don't support aggregation (Windows doesn't) */ - if (pUnkOuter != NULL) return CLASS_E_NOAGGREGATION; - - if (IsEqualGUID(&IID_ICreateDevEnum, riid)) - { - *ppvObj = &DEVENUM_CreateDevEnum; - return S_OK; - } - if (IsEqualGUID(&IID_IParseDisplayName, riid)) - { - *ppvObj = &DEVENUM_ParseDisplayName; - return S_OK; - } - - return CLASS_E_CLASSNOTAVAILABLE; -} - -/********************************************************************** - * DEVENUM_IClassFactory_LockServer - */ -static HRESULT WINAPI DEVENUM_IClassFactory_LockServer(IClassFactory *iface, BOOL fLock) -{ - TRACE("\n"); - - if (fLock) - DEVENUM_LockModule(); - else - DEVENUM_UnlockModule(); - return S_OK; -} - -/********************************************************************** - * IClassFactory_Vtbl - */ -static const IClassFactoryVtbl IClassFactory_Vtbl = -{ - DEVENUM_IClassFactory_QueryInterface, - DEVENUM_IClassFactory_AddRef, - DEVENUM_IClassFactory_Release, - DEVENUM_IClassFactory_CreateInstance, - DEVENUM_IClassFactory_LockServer -}; - -/********************************************************************** - * static ClassFactory instance - */ -ClassFactoryImpl DEVENUM_ClassFactory = { { &IClassFactory_Vtbl } }; -- 2.7.4

3 7

[PATCH v2 1/5] devenum: Merge factory.c into devenum_main.c.
by Zebediah Figura 26 Jun '18

26 Jun '18

1 4

[PATCH] kernel32: GetVolumePathNamesForVolumeNameW gets character as buffer size
by Marcus Meissner 26 Jun '18

26 Jun '18

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/kernel32/tests/volume.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index c47043d288..f673fd2917 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -983,7 +983,7 @@ static void test_GetVolumePathNamesForVolumeNameW(void) return; } - ret = pGetVolumeNameForVolumeMountPointW( drive_c, volume, sizeof(volume)/sizeof(volume[0]) ); + ret = pGetVolumeNameForVolumeMountPointW( drive_c, volume, ARRAY_SIZE(volume) ); ok(ret, "failed to get volume name %u\n", GetLastError()); SetLastError( 0xdeadbeef ); @@ -1005,16 +1005,16 @@ static void test_GetVolumePathNamesForVolumeNameW(void) ok(error == ERROR_MORE_DATA, "expected ERROR_MORE_DATA got %u\n", error); if (0) { /* crash */ - ret = pGetVolumePathNamesForVolumeNameW( volume, NULL, sizeof(buffer), NULL ); + ret = pGetVolumePathNamesForVolumeNameW( volume, NULL, ARRAY_SIZE(buffer), NULL ); ok(ret, "failed to get path names %u\n", GetLastError()); } - ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, sizeof(buffer), NULL ); + ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, ARRAY_SIZE(buffer), NULL ); ok(ret, "failed to get path names %u\n", GetLastError()); len = 0; memset( buffer, 0xff, sizeof(buffer) ); - ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, sizeof(buffer), &len ); + ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, ARRAY_SIZE(buffer), &len ); ok(ret, "failed to get path names %u\n", GetLastError()); ok(len == 5, "expected 5 got %u\n", len); ok(!buffer[4], "expected double null-terminated buffer\n"); @@ -1023,7 +1023,7 @@ static void test_GetVolumePathNamesForVolumeNameW(void) volume[1] = '?'; volume[lstrlenW( volume ) - 1] = 0; SetLastError( 0xdeadbeef ); - ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, sizeof(buffer), &len ); + ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, ARRAY_SIZE(buffer), &len ); error = GetLastError(); ok(!ret, "expected failure\n"); ok(error == ERROR_INVALID_NAME, "expected ERROR_INVALID_NAME got %u\n", error); @@ -1032,7 +1032,7 @@ static void test_GetVolumePathNamesForVolumeNameW(void) volume[0] = '\\'; volume[1] = 0; SetLastError( 0xdeadbeef ); - ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, sizeof(buffer), &len ); + ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, ARRAY_SIZE(buffer), &len ); error = GetLastError(); ok(!ret, "expected failure\n"); todo_wine ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error); @@ -1040,7 +1040,7 @@ static void test_GetVolumePathNamesForVolumeNameW(void) len = 0; lstrcpyW( volume, volume_null ); SetLastError( 0xdeadbeef ); - ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, sizeof(buffer), &len ); + ret = pGetVolumePathNamesForVolumeNameW( volume, buffer, ARRAY_SIZE(buffer), &len ); error = GetLastError(); ok(!ret, "expected failure\n"); ok(error == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND got %u\n", error); -- 2.17.1

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
59
Older →

Jump to page:

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 June 2018