February 2021 - Wine-Devel - list.winehq.org

[PATCH vkd3d 5/5] vkd3d-shader: Introduce a helper to print d3d-asm unsigned integer literals.
by Henri Verbeet Feb. 17, 2021

Feb. 17, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 35e684b2..81943632 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -714,6 +714,12 @@ static void shader_print_int_literal(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(&compiler->buffer, "%s%d%s", prefix, i, suffix); } +static void shader_print_uint_literal(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, unsigned int i, const char *suffix) +{ + vkd3d_string_buffer_printf(&compiler->buffer, "%s%u%s", prefix, i, suffix); +} + static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) { @@ -723,7 +729,7 @@ static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_src_param(compiler, rel_addr); vkd3d_string_buffer_printf(&compiler->buffer, " + "); } - vkd3d_string_buffer_printf(&compiler->buffer, "%u]", offset); + shader_print_uint_literal(compiler, "", offset, "]"); } static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg) @@ -959,7 +965,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3D_DATA_RESOURCE: case VKD3D_DATA_SAMPLER: case VKD3D_DATA_UINT: - shader_addline(buffer, "%u", reg->u.immconst_uint[0]); + shader_print_uint_literal(compiler, "", reg->u.immconst_uint[0], ""); break; default: shader_addline(buffer, "<unhandled data type %#x>", reg->data_type); @@ -985,9 +991,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const case VKD3D_DATA_RESOURCE: case VKD3D_DATA_SAMPLER: case VKD3D_DATA_UINT: - shader_addline(buffer, "%u, %u, %u, %u", - reg->u.immconst_uint[0], reg->u.immconst_uint[1], - reg->u.immconst_uint[2], reg->u.immconst_uint[3]); + shader_print_uint_literal(compiler, "", reg->u.immconst_uint[0], ""); + shader_print_uint_literal(compiler, ", ", reg->u.immconst_uint[1], ""); + shader_print_uint_literal(compiler, ", ", reg->u.immconst_uint[2], ""); + shader_print_uint_literal(compiler, ", ", reg->u.immconst_uint[3], ""); break; default: shader_addline(buffer, "<unhandled data type %#x>", reg->data_type); @@ -1351,7 +1358,7 @@ static void shader_dump_instruction_flags(struct vkd3d_d3d_asm_compiler *compile static void shader_dump_register_space(struct vkd3d_d3d_asm_compiler *compiler, unsigned int register_space) { if (shader_ver_ge(&compiler->shader_version, 5, 1)) - vkd3d_string_buffer_printf(&compiler->buffer, ", space=%u", register_space); + shader_print_uint_literal(compiler, ", space=", register_space, ""); } static void shader_print_opcode(struct vkd3d_d3d_asm_compiler *compiler, enum vkd3d_shader_opcode opcode) @@ -1434,14 +1441,14 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_INDEX_RANGE: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.index_range.dst); - shader_addline(buffer, " %u", ins->declaration.index_range.register_count); + shader_print_uint_literal(compiler, " ", ins->declaration.index_range.register_count, ""); break; case VKD3DSIH_DCL_INDEXABLE_TEMP: vkd3d_string_buffer_printf(buffer, " %sx%u%s", compiler->colours.reg, ins->declaration.indexable_temp.register_idx, compiler->colours.reset); shader_print_subscript(compiler, ins->declaration.indexable_temp.register_size, NULL); - vkd3d_string_buffer_printf(buffer, ", %u", ins->declaration.indexable_temp.component_count); + shader_print_uint_literal(compiler, ", ", ins->declaration.indexable_temp.component_count, ""); break; case VKD3DSIH_DCL_INPUT_PS: @@ -1498,7 +1505,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_RESOURCE_STRUCTURED: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg); - shader_addline(buffer, ", %u", ins->declaration.structured_resource.byte_stride); + shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, ""); shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.register_space); break; @@ -1517,7 +1524,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: case VKD3DSIH_DCL_VERTICES_OUT: - vkd3d_string_buffer_printf(buffer, " %u", ins->declaration.count); + shader_print_uint_literal(compiler, " ", ins->declaration.count, ""); break; case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: @@ -1538,21 +1545,20 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_TGSM_RAW: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.tgsm_raw.reg); - shader_addline(buffer, ", %u", ins->declaration.tgsm_raw.byte_count); + shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_raw.byte_count, ""); break; case VKD3DSIH_DCL_TGSM_STRUCTURED: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.tgsm_structured.reg); - shader_addline(buffer, ", %u, %u", ins->declaration.tgsm_structured.byte_stride, - ins->declaration.tgsm_structured.structure_count); + shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_structured.byte_stride, ""); + shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_structured.structure_count, ""); break; case VKD3DSIH_DCL_THREAD_GROUP: - vkd3d_string_buffer_printf(buffer, " %u, %u, %u", - ins->declaration.thread_group_size.x, - ins->declaration.thread_group_size.y, - ins->declaration.thread_group_size.z); + shader_print_uint_literal(compiler, " ", ins->declaration.thread_group_size.x, ""); + shader_print_uint_literal(compiler, ", ", ins->declaration.thread_group_size.y, ""); + shader_print_uint_literal(compiler, ", ", ins->declaration.thread_group_size.z, ""); break; case VKD3DSIH_DCL_UAV_RAW: @@ -1566,7 +1572,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_uav_flags(compiler, ins->flags); shader_addline(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg); - shader_addline(buffer, ", %u", ins->declaration.structured_resource.byte_stride); + shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, ""); shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.register_space); break; -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Introduce a helper to print d3d-asm integer literals.
by Henri Verbeet Feb. 17, 2021

Feb. 17, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b9fc34b5..35e684b2 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -708,6 +708,12 @@ static void shader_print_float_literal(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(&compiler->buffer, "%s%.8e%s", prefix, f, suffix); } +static void shader_print_int_literal(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, int i, const char *suffix) +{ + vkd3d_string_buffer_printf(&compiler->buffer, "%s%d%s", prefix, i, suffix); +} + static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) { @@ -948,7 +954,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_print_float_literal(compiler, "", reg->u.immconst_float[0], ""); break; case VKD3D_DATA_INT: - shader_addline(buffer, "%d", reg->u.immconst_uint[0]); + shader_print_int_literal(compiler, "", reg->u.immconst_uint[0], ""); break; case VKD3D_DATA_RESOURCE: case VKD3D_DATA_SAMPLER: @@ -971,9 +977,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_print_float_literal(compiler, ", ", reg->u.immconst_float[3], ""); break; case VKD3D_DATA_INT: - shader_addline(buffer, "%d, %d, %d, %d", - reg->u.immconst_uint[0], reg->u.immconst_uint[1], - reg->u.immconst_uint[2], reg->u.immconst_uint[3]); + shader_print_int_literal(compiler, "", reg->u.immconst_uint[0], ""); + shader_print_int_literal(compiler, ", ", reg->u.immconst_uint[1], ""); + shader_print_int_literal(compiler, ", ", reg->u.immconst_uint[2], ""); + shader_print_int_literal(compiler, ", ", reg->u.immconst_uint[3], ""); break; case VKD3D_DATA_RESOURCE: case VKD3D_DATA_SAMPLER: @@ -1574,10 +1581,12 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DEFI: - vkd3d_string_buffer_printf(buffer, " %si%u%s = %d, %d, %d, %d", - compiler->colours.reg, ins->dst[0].reg.idx[0].offset, compiler->colours.reset, - ins->src[0].reg.u.immconst_uint[0], ins->src[0].reg.u.immconst_uint[1], - ins->src[0].reg.u.immconst_uint[2], ins->src[0].reg.u.immconst_uint[3]); + vkd3d_string_buffer_printf(buffer, " %si%u%s", compiler->colours.reg, + ins->dst[0].reg.idx[0].offset, compiler->colours.reset); + shader_print_int_literal(compiler, " = ", ins->src[0].reg.u.immconst_uint[0], ""); + shader_print_int_literal(compiler, ", ", ins->src[0].reg.u.immconst_uint[1], ""); + shader_print_int_literal(compiler, ", ", ins->src[0].reg.u.immconst_uint[2], ""); + shader_print_int_literal(compiler, ", ", ins->src[0].reg.u.immconst_uint[3], ""); break; case VKD3DSIH_DEFB: @@ -1590,8 +1599,9 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_instruction_flags(compiler, ins); if (vkd3d_shader_instruction_has_texel_offset(ins)) { - shader_addline(buffer, "(%d,%d,%d)", - ins->texel_offset.u, ins->texel_offset.v, ins->texel_offset.w); + shader_print_int_literal(compiler, "(", ins->texel_offset.u, ""); + shader_print_int_literal(compiler, ",", ins->texel_offset.v, ""); + shader_print_int_literal(compiler, ",", ins->texel_offset.w, ")"); } if (ins->resource_type != VKD3D_SHADER_RESOURCE_NONE) -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Introduce a helper to print d3d-asm floating-point literals.
by Henri Verbeet Feb. 17, 2021

Feb. 17, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b5abe22c..b9fc34b5 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -702,6 +702,12 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler, static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_src_param *param); +static void shader_print_float_literal(struct vkd3d_d3d_asm_compiler *compiler, + const char *prefix, float f, const char *suffix) +{ + vkd3d_string_buffer_printf(&compiler->buffer, "%s%.8e%s", prefix, f, suffix); +} + static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) { @@ -939,7 +945,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const switch (reg->data_type) { case VKD3D_DATA_FLOAT: - shader_addline(buffer, "%.8e", reg->u.immconst_float[0]); + shader_print_float_literal(compiler, "", reg->u.immconst_float[0], ""); break; case VKD3D_DATA_INT: shader_addline(buffer, "%d", reg->u.immconst_uint[0]); @@ -959,9 +965,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const switch (reg->data_type) { case VKD3D_DATA_FLOAT: - shader_addline(buffer, "%.8e, %.8e, %.8e, %.8e", - reg->u.immconst_float[0], reg->u.immconst_float[1], - reg->u.immconst_float[2], reg->u.immconst_float[3]); + shader_print_float_literal(compiler, "", reg->u.immconst_float[0], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_float[1], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_float[2], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_float[3], ""); break; case VKD3D_DATA_INT: shader_addline(buffer, "%d, %d, %d, %d", @@ -1401,7 +1408,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: - vkd3d_string_buffer_printf(buffer, " %.8e", ins->declaration.max_tessellation_factor); + shader_print_float_literal(compiler, " ", ins->declaration.max_tessellation_factor, ""); break; case VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER: @@ -1557,11 +1564,13 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DEF: - vkd3d_string_buffer_printf(buffer, " %sc%u%s = %.8e, %.8e, %.8e, %.8e", - compiler->colours.reg, shader_get_float_offset(ins->dst[0].reg.type, - ins->dst[0].reg.idx[0].offset), compiler->colours.reset, - ins->src[0].reg.u.immconst_float[0], ins->src[0].reg.u.immconst_float[1], - ins->src[0].reg.u.immconst_float[2], ins->src[0].reg.u.immconst_float[3]); + vkd3d_string_buffer_printf(buffer, " %sc%u%s", compiler->colours.reg, + shader_get_float_offset(ins->dst[0].reg.type, ins->dst[0].reg.idx[0].offset), + compiler->colours.reset); + shader_print_float_literal(compiler, " = ", ins->src[0].reg.u.immconst_float[0], ""); + shader_print_float_literal(compiler, ", ", ins->src[0].reg.u.immconst_float[1], ""); + shader_print_float_literal(compiler, ", ", ins->src[0].reg.u.immconst_float[2], ""); + shader_print_float_literal(compiler, ", ", ins->src[0].reg.u.immconst_float[3], ""); break; case VKD3DSIH_DEFI: -- 2.11.0

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Introduce a helper to print d3d-asm subscripts.
by Henri Verbeet Feb. 17, 2021

Feb. 17, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 75 +++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index f8b79236..b5abe22c 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -702,6 +702,18 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler, static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_src_param *param); +static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, + unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) +{ + vkd3d_string_buffer_printf(&compiler->buffer, "["); + if (rel_addr) + { + shader_dump_src_param(compiler, rel_addr); + vkd3d_string_buffer_printf(&compiler->buffer, " + "); + } + vkd3d_string_buffer_printf(&compiler->buffer, "%u]", offset); +} + static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg) { struct vkd3d_string_buffer *buffer = &compiler->buffer; @@ -981,51 +993,28 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const { if (offset != ~0u) { - bool printbrackets = reg->idx[0].rel_addr - || reg->type == VKD3DSPR_INCONTROLPOINT - || reg->type == VKD3DSPR_IMMCONSTBUFFER - || ((compiler->shader_version.type == VKD3D_SHADER_TYPE_GEOMETRY - || compiler->shader_version.type == VKD3D_SHADER_TYPE_HULL) - && reg->type == VKD3DSPR_INPUT); - - if (printbrackets) - shader_addline(buffer, "%s[", compiler->colours.reset); - if (reg->idx[0].rel_addr) + if (reg->idx[0].rel_addr || reg->type == VKD3DSPR_IMMCONSTBUFFER + || reg->type == VKD3DSPR_INCONTROLPOINT || (reg->type == VKD3DSPR_INPUT + && (compiler->shader_version.type == VKD3D_SHADER_TYPE_GEOMETRY + || compiler->shader_version.type == VKD3D_SHADER_TYPE_HULL))) { - shader_dump_src_param(compiler, reg->idx[0].rel_addr); - shader_addline(buffer, " + "); + vkd3d_string_buffer_printf(buffer, "%s", compiler->colours.reset); + shader_print_subscript(compiler, offset, reg->idx[0].rel_addr); } - shader_addline(buffer, "%u", offset); - if (printbrackets) - shader_addline(buffer, "]"); else - shader_addline(buffer, "%s", compiler->colours.reset); + { + vkd3d_string_buffer_printf(buffer, "%u%s", offset, compiler->colours.reset); + } /* For CBs in sm < 5.1 we move the buffer offset from idx[1] to idx[2] * to normalise it with 5.1. * Here we should ignore it if it's a CB in sm < 5.1. */ if (reg->idx[1].offset != ~0u && (reg->type != VKD3DSPR_CONSTBUFFER || shader_ver_ge(&compiler->shader_version, 5, 1))) - { - shader_addline(buffer, "["); - if (reg->idx[1].rel_addr) - { - shader_dump_src_param(compiler, reg->idx[1].rel_addr); - shader_addline(buffer, " + "); - } - shader_addline(buffer, "%u]", reg->idx[1].offset); - } + shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr); if (reg->idx[2].offset != ~0u) - { - shader_addline(buffer, "["); - if (reg->idx[2].rel_addr) - { - shader_dump_src_param(compiler, reg->idx[2].rel_addr); - shader_addline(buffer, " + "); - } - shader_addline(buffer, "%u]", reg->idx[2].offset); - } + shader_print_subscript(compiler, reg->idx[2].offset, reg->idx[2].rel_addr); } else { @@ -1033,7 +1022,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const } if (reg->type == VKD3DSPR_FUNCTIONPOINTER) - shader_addline(buffer, "[%u]", reg->u.fp_body_idx); + shader_print_subscript(compiler, reg->u.fp_body_idx, NULL); } else { @@ -1392,7 +1381,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(buffer, " "); shader_dump_register(compiler, &ins->declaration.cb.src.reg); if (shader_ver_ge(&compiler->shader_version, 5, 1)) - shader_addline(buffer, "[%u]", ins->declaration.cb.size); + shader_print_subscript(compiler, ins->declaration.cb.size, NULL); shader_addline(buffer, ", %s", ins->flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); shader_dump_register_space(compiler, ins->declaration.cb.register_space); @@ -1435,10 +1424,10 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DCL_INDEXABLE_TEMP: - vkd3d_string_buffer_printf(buffer, " %sx%u%s[%u], %u", compiler->colours.reg, - ins->declaration.indexable_temp.register_idx, compiler->colours.reset, - ins->declaration.indexable_temp.register_size, - ins->declaration.indexable_temp.component_count); + vkd3d_string_buffer_printf(buffer, " %sx%u%s", compiler->colours.reg, + ins->declaration.indexable_temp.register_idx, compiler->colours.reset); + shader_print_subscript(compiler, ins->declaration.indexable_temp.register_size, NULL); + vkd3d_string_buffer_printf(buffer, ", %u", ins->declaration.indexable_temp.component_count); break; case VKD3DSIH_DCL_INPUT_PS: @@ -1480,8 +1469,10 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DCL_INTERFACE: - vkd3d_string_buffer_printf(buffer, " fp%u[%u][%u] = {...}", ins->declaration.fp.index, - ins->declaration.fp.array_size, ins->declaration.fp.body_count); + vkd3d_string_buffer_printf(buffer, " fp%u", ins->declaration.fp.index); + shader_print_subscript(compiler, ins->declaration.fp.array_size, NULL); + shader_print_subscript(compiler, ins->declaration.fp.body_count, NULL); + vkd3d_string_buffer_printf(buffer, " = {...}"); break; case VKD3DSIH_DCL_RESOURCE_RAW: -- 2.11.0

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Add some colour to d3d-asm register names.
by Henri Verbeet Feb. 17, 2021

Feb. 17, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index fb5370ad..f8b79236 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -304,6 +304,7 @@ struct vkd3d_d3d_asm_colours { const char *reset; const char *opcode; + const char *reg; }; struct vkd3d_d3d_asm_compiler @@ -709,6 +710,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"}; static const char * const misctype_reg_names[] = {"vPos", "vFace"}; + shader_addline(buffer, "%s", compiler->colours.reg); switch (reg->type) { case VKD3DSPR_TEMP: @@ -918,7 +920,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const if (reg->type == VKD3DSPR_IMMCONST) { - shader_addline(buffer, "("); + shader_addline(buffer, "%s(", compiler->colours.reset); switch (reg->immconst_type) { case VKD3D_IMMCONST_SCALAR: @@ -987,7 +989,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const && reg->type == VKD3DSPR_INPUT); if (printbrackets) - shader_addline(buffer, "["); + shader_addline(buffer, "%s[", compiler->colours.reset); if (reg->idx[0].rel_addr) { shader_dump_src_param(compiler, reg->idx[0].rel_addr); @@ -996,6 +998,8 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_addline(buffer, "%u", offset); if (printbrackets) shader_addline(buffer, "]"); + else + shader_addline(buffer, "%s", compiler->colours.reset); /* For CBs in sm < 5.1 we move the buffer offset from idx[1] to idx[2] * to normalise it with 5.1. @@ -1023,10 +1027,18 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_addline(buffer, "%u]", reg->idx[2].offset); } } + else + { + shader_addline(buffer, "%s", compiler->colours.reset); + } if (reg->type == VKD3DSPR_FUNCTIONPOINTER) shader_addline(buffer, "[%u]", reg->u.fp_body_idx); } + else + { + shader_addline(buffer, "%s", compiler->colours.reset); + } } static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, @@ -1423,8 +1435,8 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DCL_INDEXABLE_TEMP: - vkd3d_string_buffer_printf(buffer, " x%u[%u], %u", - ins->declaration.indexable_temp.register_idx, + vkd3d_string_buffer_printf(buffer, " %sx%u%s[%u], %u", compiler->colours.reg, + ins->declaration.indexable_temp.register_idx, compiler->colours.reset, ins->declaration.indexable_temp.register_size, ins->declaration.indexable_temp.component_count); break; @@ -1554,20 +1566,23 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DEF: - vkd3d_string_buffer_printf(buffer, " c%u = %.8e, %.8e, %.8e, %.8e", - shader_get_float_offset(ins->dst[0].reg.type, ins->dst[0].reg.idx[0].offset), + vkd3d_string_buffer_printf(buffer, " %sc%u%s = %.8e, %.8e, %.8e, %.8e", + compiler->colours.reg, shader_get_float_offset(ins->dst[0].reg.type, + ins->dst[0].reg.idx[0].offset), compiler->colours.reset, ins->src[0].reg.u.immconst_float[0], ins->src[0].reg.u.immconst_float[1], ins->src[0].reg.u.immconst_float[2], ins->src[0].reg.u.immconst_float[3]); break; case VKD3DSIH_DEFI: - vkd3d_string_buffer_printf(buffer, " i%u = %d, %d, %d, %d", ins->dst[0].reg.idx[0].offset, + vkd3d_string_buffer_printf(buffer, " %si%u%s = %d, %d, %d, %d", + compiler->colours.reg, ins->dst[0].reg.idx[0].offset, compiler->colours.reset, ins->src[0].reg.u.immconst_uint[0], ins->src[0].reg.u.immconst_uint[1], ins->src[0].reg.u.immconst_uint[2], ins->src[0].reg.u.immconst_uint[3]); break; case VKD3DSIH_DEFB: - vkd3d_string_buffer_printf(buffer, " b%u = %s", ins->dst[0].reg.idx[0].offset, + vkd3d_string_buffer_printf(buffer, " %sb%u%s = %s", compiler->colours.reg, + ins->dst[0].reg.idx[0].offset, compiler->colours.reset, ins->src[0].reg.u.immconst_uint[0] ? "true" : "false"); break; @@ -1627,11 +1642,13 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, { .reset = "", .opcode = "", + .reg = "", }; static const struct vkd3d_d3d_asm_colours colours = { .reset = "\x1b[m", .opcode = "\x1b[96;1m", + .reg = "\x1b[96m", }; formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT -- 2.11.0

1 0

[PATCH 1/2] dwrite: Fix character range to glyph range matching for user features.
by Nikolay Sivov Feb. 17, 2021

Feb. 17, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 125b7353031..39943c52c9a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4733,7 +4733,7 @@ static void opentype_layout_get_glyph_range_for_text(struct scriptshaping_contex if (end_char >= context->length - 1) *end_glyph = context->glyph_count - 1; else - *end_glyph = context->u.buffer.clustermap[end_char + 1] - 1; + *end_glyph = context->u.buffer.clustermap[end_char] - 1; } static void opentype_layout_set_glyph_masks(struct scriptshaping_context *context, const struct shaping_features *features) @@ -4754,6 +4754,9 @@ static void opentype_layout_set_glyph_masks(struct scriptshaping_context *contex if (start_char >= context->length) break; + if (!context->user_features.range_lengths[r]) + continue; + opentype_layout_get_glyph_range_for_text(context, start_char, start_char + context->user_features.range_lengths[r], &start_glyph, &end_glyph); start_char += context->user_features.range_lengths[r]; -- 2.30.0

1 1

[PATCH v2] msado15: Semi-implement _Connection Execute
by Alistair Leslie-Hughes Feb. 17, 2021

Feb. 17, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 72 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 63014d7e37e..500be033199 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -20,6 +20,7 @@ #include "windef.h" #include "winbase.h" #define COBJMACROS +#define DBINITCONSTANTS #include "initguid.h" #include "ocidl.h" #include "objbase.h" @@ -266,8 +267,75 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, LONG options, _Recordset **record_set ) { - FIXME( "%p, %s, %p, %08x, %p\n", iface, debugstr_w(command), records_affected, options, record_set ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + IOpenRowset *openrowset; + IDBCreateCommand *create_command = NULL; + ICommand *cmd = NULL; + ICommandText *comand_text = NULL; + DBROWCOUNT affected; + IUnknown *rowset = NULL; + _Recordset *recordset = NULL; + ADORecordsetConstruction *construct; + + FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); + + if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + hr = IUnknown_QueryInterface(connection->session, &IID_IOpenRowset, (void**)&openrowset); + if (FAILED(hr)) + return hr; + + hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + if (FAILED(hr)) + goto done; + + hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + if (FAILED(hr)) + goto done; + + hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + if (FAILED(hr)) + { + FIXME("Currently only ICommandText interface is support\n"); + goto done; + } + + hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, command); + if (FAILED(hr)) + goto done; + + hr = ICommandText_Execute(comand_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + if (FAILED(hr)) + goto done; + + hr = Recordset_create( (void**)&recordset); + if (FAILED(hr)) + goto done; + + hr = _Recordset_QueryInterface(recordset, &IID_ADORecordsetConstruction, (void**)&construct); + if (FAILED(hr)) + goto done; + + ADORecordsetConstruction_put_Rowset(construct, rowset); + ADORecordsetConstruction_Release(construct); + + if (records_affected) + { + V_VT(records_affected) = VT_I4; + V_I4(records_affected) = affected; + } + + _Recordset_put_CursorLocation(recordset, connection->location); + *record_set = recordset; + +done: + if (rowset) IUnknown_Release(rowset); + if (comand_text) ICommandText_Release(comand_text); + if (cmd) ICommand_Release(cmd); + if (create_command) IDBCreateCommand_Release(create_command); + if (openrowset) IOpenRowset_Release(openrowset); + return hr; } static HRESULT WINAPI connection_BeginTrans( _Connection *iface, LONG *transaction_level ) -- 2.30.0

2 1

[PATCH] msado15: Semi-implement _Connection Execute
by Alistair Leslie-Hughes Feb. 17, 2021

Feb. 17, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 73 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 63014d7e37e..8cc0cfb679a 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); +DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + struct connection; struct connection_point @@ -266,8 +268,75 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, LONG options, _Recordset **record_set ) { - FIXME( "%p, %s, %p, %08x, %p\n", iface, debugstr_w(command), records_affected, options, record_set ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + IOpenRowset *openrowset; + IDBCreateCommand *create_command = NULL; + ICommand *cmd = NULL; + ICommandText *comand_text = NULL; + DBROWCOUNT affected; + IUnknown *rowset = NULL; + _Recordset *recordset = NULL; + ADORecordsetConstruction *construct; + + FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); + + if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + hr = IUnknown_QueryInterface(connection->session, &IID_IOpenRowset, (void**)&openrowset); + if (FAILED(hr)) + return hr; + + hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + if (FAILED(hr)) + goto done; + + hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + if (FAILED(hr)) + goto done; + + hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + if (FAILED(hr)) + { + FIXME("Currently only ICommandText interface is support\n"); + goto done; + } + + hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, command); + if (FAILED(hr)) + goto done; + + hr = ICommandText_Execute(comand_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + if (FAILED(hr)) + goto done; + + hr = Recordset_create( (void**)&recordset); + if (FAILED(hr)) + goto done; + + hr = _Recordset_QueryInterface(recordset, &IID_ADORecordsetConstruction, (void**)&construct); + if (FAILED(hr)) + goto done; + + ADORecordsetConstruction_put_Rowset(construct, rowset); + ADORecordsetConstruction_Release(construct); + + if (records_affected) + { + V_VT(records_affected) = VT_I4; + V_I4(records_affected) = affected; + } + + _Recordset_put_CursorLocation(recordset, connection->location); + *record_set = recordset; + +done: + if (rowset) IUnknown_Release(rowset); + if (comand_text) ICommandText_Release(comand_text); + if (cmd) ICommand_Release(cmd); + if (create_command) IDBCreateCommand_Release(create_command); + if (openrowset) IOpenRowset_Release(openrowset); + return hr; } static HRESULT WINAPI connection_BeginTrans( _Connection *iface, LONG *transaction_level ) -- 2.30.0

2 1

[PATCH] iphlpapi: Use RtlIpv4AddressToStringA instead of inet_ntoa
by Alex Henrie Feb. 16, 2021

Feb. 16, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- There's no need to reinvent the wheel here; RtlIpv4AddressToStringA avoids the need for strcpy and is guaranteed to do nothing if the pointer to the output string is null. --- dlls/iphlpapi/ifenum.c | 20 -------------------- dlls/iphlpapi/ifenum.h | 5 ----- dlls/iphlpapi/iphlpapi_main.c | 14 +++++++------- 3 files changed, 7 insertions(+), 32 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index c3abdf0e536..288e04db7b8 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -35,14 +35,6 @@ #include <sys/socket.h> #endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif - -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif - #ifdef HAVE_NET_IF_H #include <net/if.h> #endif @@ -1106,15 +1098,3 @@ ULONG v6addressesFromIndex(IF_INDEX index, SOCKET_ADDRESS **addrs, ULONG *num_ad } #endif - -char *toIPAddressString(unsigned int addr, char string[16]) -{ - if (string) { - struct in_addr iAddr; - - iAddr.s_addr = addr; - /* extra-anal, just to make auditors happy */ - lstrcpynA(string, inet_ntoa(iAddr), 16); - } - return string; -} diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index c6bf9575759..558dff64cb6 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -109,11 +109,6 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) ULONG v6addressesFromIndex(IF_INDEX index, SOCKET_ADDRESS **addrs, ULONG *num_addrs, SOCKET_ADDRESS **masks) DECLSPEC_HIDDEN; -/* Converts the network-order bytes in addr to a printable string. Returns - * string. - */ -char *toIPAddressString(unsigned int addr, char string[16]) DECLSPEC_HIDDEN; - DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) DECLSPEC_HIDDEN; DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status) DECLSPEC_HIDDEN; diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index bd1fea02e19..09414d26dde 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -717,18 +717,18 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) for (i = 0; i < ipAddrTable->dwNumEntries; i++) { if (ipAddrTable->table[i].dwIndex == ptr->Index) { if (firstIPAddr) { - toIPAddressString(ipAddrTable->table[i].dwAddr, + RtlIpv4AddressToStringA((IN_ADDR *)&ipAddrTable->table[i].dwAddr, ptr->IpAddressList.IpAddress.String); - toIPAddressString(ipAddrTable->table[i].dwMask, + RtlIpv4AddressToStringA((IN_ADDR *)&ipAddrTable->table[i].dwMask, ptr->IpAddressList.IpMask.String); firstIPAddr = FALSE; } else { currentIPAddr->Next = nextIPAddr; currentIPAddr = nextIPAddr; - toIPAddressString(ipAddrTable->table[i].dwAddr, + RtlIpv4AddressToStringA((IN_ADDR *)&ipAddrTable->table[i].dwAddr, currentIPAddr->IpAddress.String); - toIPAddressString(ipAddrTable->table[i].dwMask, + RtlIpv4AddressToStringA((IN_ADDR *)&ipAddrTable->table[i].dwMask, currentIPAddr->IpMask.String); nextIPAddr++; } @@ -749,9 +749,9 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) && routeTable->table[i].u1.ForwardType == MIB_IPROUTE_TYPE_INDIRECT) { - toIPAddressString(routeTable->table[i].dwForwardNextHop, + RtlIpv4AddressToStringA((IN_ADDR *)&routeTable->table[i].dwForwardNextHop, ptr->GatewayList.IpAddress.String); - toIPAddressString(routeTable->table[i].dwForwardMask, + RtlIpv4AddressToStringA((IN_ADDR *)&routeTable->table[i].dwForwardMask, ptr->GatewayList.IpMask.String); } if (winsEnabled) { @@ -2224,7 +2224,7 @@ static DWORD get_dns_server_list(PIP_ADDR_STRING list, get_dns_servers( addr, num, TRUE ); for (i = 0, ptr = list; i < num; i++, ptr = ptr->Next) { - toIPAddressString(((struct sockaddr_in *)(addr + i))->sin_addr.s_addr, + RtlIpv4AddressToStringA((IN_ADDR *)&((struct sockaddr_in *)(addr + i))->sin_addr.s_addr, ptr->IpAddress.String); if (i == num - 1) ptr->Next = NULL; -- 2.30.1

1 0

[PATCH v2 1/5] advapi32/tests: Add a few tests for GetKernelObjectSecurity() parameter validation.
by Zebediah Figura Feb. 16, 2021

Feb. 16, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/security.c | 90 ++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f0b6c90390d..ce1c5500b2f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7930,6 +7930,95 @@ static void test_duplicate_token(void) CloseHandle(token); } +static void test_GetKernelObjectSecurity(void) +{ + /* Basic tests for parameter validation. */ + + SECURITY_DESCRIPTOR_CONTROL control; + DWORD size, ret_size, revision; + BOOL ret, present, defaulted; + PSECURITY_DESCRIPTOR sd; + PSID sid; + ACL *acl; + + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetKernelObjectSecurity(NULL, OWNER_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got error %u\n", GetLastError()); + ok(size == 0xdeadbeef, "got size %u\n", size); + + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, NULL, 0, NULL); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_NOACCESS, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); + ok(size > 0 && size != 0xdeadbeef, "got size 0\n"); + + sd = malloc(size + 1); + + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, sd, size - 1, &ret_size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); + ok(ret_size == size, "expected size %u, got %u\n", size, ret_size); + + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, sd, size + 1, &ret_size); + ok(ret, "expected success\n"); + ok(GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError()); + ok(ret_size == size, "expected size %u, got %u\n", size, ret_size); + + free(sd); + + /* Calling the function with flags not defined succeeds and yields an empty + * descriptor. */ + + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(GetCurrentProcess(), 0x100000, NULL, 0, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); + + sd = malloc(size); + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(GetCurrentProcess(), 0x100000, sd, size, &ret_size); + ok(ret, "expected success\n"); + ok(GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError()); + ok(ret_size == size, "expected size %u, got %u\n", size, ret_size); + + ret = GetSecurityDescriptorControl(sd, &control, &revision); + ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(control == SE_SELF_RELATIVE, "got control %#x\n", control); + ok(revision == SECURITY_DESCRIPTOR_REVISION1, "got revision %u\n", revision); + + ret = GetSecurityDescriptorOwner(sd, &sid, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + ok(!sid, "expected no owner SID\n"); + ok(!defaulted, "expected owner not defaulted\n"); + + ret = GetSecurityDescriptorGroup(sd, &sid, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + ok(!sid, "expected no group SID\n"); + ok(!defaulted, "expected group not defaulted\n"); + + ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(!present, "expeced no DACL present\n"); + /* the descriptor is defaulted only on Windows >= 7 */ + + ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + ok(!present, "expeced no SACL present\n"); + /* the descriptor is defaulted only on Windows >= 7 */ + + free(sd); +} + START_TEST(security) { init(); @@ -7996,6 +8085,7 @@ START_TEST(security) test_create_process_token(); test_pseudo_handle_security(); test_duplicate_token(); + test_GetKernelObjectSecurity(); /* Must be the last test, modifies process token */ test_token_security_descriptor(); -- 2.20.1

2 7