September 2023 - Wine-commits

Francisco Casas : vkd3d-shader/tpf: Use vsir_register_init() in shader_sm1_parse_src_param().
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: vkd3d Branch: master Commit: 51aa5a45e977a4973f62bea11fca4b6b72abb332 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/51aa5a45e977a4973f62bea11fca4… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Sep 4 19:05:38 2023 -0300 vkd3d-shader/tpf: Use vsir_register_init() in shader_sm1_parse_src_param(). --- libs/vkd3d-shader/d3dbc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 0d2b8d24..4560f0e5 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -457,18 +457,14 @@ static uint32_t swizzle_from_sm1(uint32_t swizzle) static void shader_sm1_parse_src_param(uint32_t param, const struct vkd3d_shader_src_param *rel_addr, struct vkd3d_shader_src_param *src) { - src->reg.type = ((param & VKD3D_SM1_REGISTER_TYPE_MASK) >> VKD3D_SM1_REGISTER_TYPE_SHIFT) + enum vkd3d_shader_register_type reg_type = ((param & VKD3D_SM1_REGISTER_TYPE_MASK) >> VKD3D_SM1_REGISTER_TYPE_SHIFT) | ((param & VKD3D_SM1_REGISTER_TYPE_MASK2) >> VKD3D_SM1_REGISTER_TYPE_SHIFT2); + + vsir_register_init(&src->reg, reg_type, VKD3D_DATA_FLOAT, 1); src->reg.precision = VKD3D_SHADER_REGISTER_PRECISION_DEFAULT; src->reg.non_uniform = false; - src->reg.data_type = VKD3D_DATA_FLOAT; src->reg.idx[0].offset = param & VKD3D_SM1_REGISTER_NUMBER_MASK; src->reg.idx[0].rel_addr = rel_addr; - src->reg.idx[1].offset = ~0u; - src->reg.idx[1].rel_addr = NULL; - src->reg.idx[2].offset = ~0u; - src->reg.idx[2].rel_addr = NULL; - src->reg.idx_count = 1; src->swizzle = swizzle_from_sm1((param & VKD3D_SM1_SWIZZLE_MASK) >> VKD3D_SM1_SWIZZLE_SHIFT); src->modifiers = (param & VKD3D_SM1_SRC_MODIFIER_MASK) >> VKD3D_SM1_SRC_MODIFIER_SHIFT; }

1 0

Francisco Casas : vkd3d-shader/tpf: Use vsir_register_init() in shader_sm1_parse_dst_param().
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: vkd3d Branch: master Commit: dc35125d73f4a903f45e445e3d7d029d3516542c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dc35125d73f4a903f45e445e3d7d0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Sep 4 19:13:24 2023 -0300 vkd3d-shader/tpf: Use vsir_register_init() in shader_sm1_parse_dst_param(). --- libs/vkd3d-shader/d3dbc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 4560f0e5..68e53da8 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -472,18 +472,14 @@ static void shader_sm1_parse_src_param(uint32_t param, const struct vkd3d_shader static void shader_sm1_parse_dst_param(uint32_t param, const struct vkd3d_shader_src_param *rel_addr, struct vkd3d_shader_dst_param *dst) { - dst->reg.type = ((param & VKD3D_SM1_REGISTER_TYPE_MASK) >> VKD3D_SM1_REGISTER_TYPE_SHIFT) + enum vkd3d_shader_register_type reg_type = ((param & VKD3D_SM1_REGISTER_TYPE_MASK) >> VKD3D_SM1_REGISTER_TYPE_SHIFT) | ((param & VKD3D_SM1_REGISTER_TYPE_MASK2) >> VKD3D_SM1_REGISTER_TYPE_SHIFT2); + + vsir_register_init(&dst->reg, reg_type, VKD3D_DATA_FLOAT, 1); dst->reg.precision = VKD3D_SHADER_REGISTER_PRECISION_DEFAULT; dst->reg.non_uniform = false; - dst->reg.data_type = VKD3D_DATA_FLOAT; dst->reg.idx[0].offset = param & VKD3D_SM1_REGISTER_NUMBER_MASK; dst->reg.idx[0].rel_addr = rel_addr; - dst->reg.idx[1].offset = ~0u; - dst->reg.idx[1].rel_addr = NULL; - dst->reg.idx[2].offset = ~0u; - dst->reg.idx[2].rel_addr = NULL; - dst->reg.idx_count = 1; dst->write_mask = (param & VKD3D_SM1_WRITEMASK_MASK) >> VKD3D_SM1_WRITEMASK_SHIFT; dst->modifiers = (param & VKD3D_SM1_DST_MODIFIER_MASK) >> VKD3D_SM1_DST_MODIFIER_SHIFT; dst->shift = (param & VKD3D_SM1_DSTSHIFT_MASK) >> VKD3D_SM1_DSTSHIFT_SHIFT;

1 0

Francisco Casas : vkd3d-shader: Turn vkd3d_shader_register.immconst_type into vkd3d_shader_register.dimension.
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: vkd3d Branch: master Commit: e904660497d6b55e4148ce1ca0aa50214178d370 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e904660497d6b55e4148ce1ca0aa5… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Aug 14 13:21:41 2023 -0400 vkd3d-shader: Turn vkd3d_shader_register.immconst_type into vkd3d_shader_register.dimension. --- libs/vkd3d-shader/d3d_asm.c | 16 ++++++++-------- libs/vkd3d-shader/d3dbc.c | 12 ++++++------ libs/vkd3d-shader/dxil.c | 4 ++-- libs/vkd3d-shader/ir.c | 6 +++--- libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/tpf.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 9 +++++---- 7 files changed, 28 insertions(+), 27 deletions(-)

1 0

Francisco Casas : vkd3d-shader/tpf: Parse register dimension for all register types.
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: vkd3d Branch: master Commit: 33f47c5ae92ddbdca56332fa404b5169290e288d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/33f47c5ae92ddbdca56332fa404b5… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 15 17:39:37 2023 -0400 vkd3d-shader/tpf: Parse register dimension for all register types. --- libs/vkd3d-shader/tpf.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 77ec60c5..6a9438b9 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -519,6 +519,22 @@ enum vkd3d_sm4_dimension VKD3D_SM4_DIMENSION_VEC4 = 0x2, }; +static enum vsir_dimension vsir_dimension_from_sm4_dimension(enum vkd3d_sm4_dimension dim) +{ + switch (dim) + { + case VKD3D_SM4_DIMENSION_NONE: + return VSIR_DIMENSION_NONE; + case VKD3D_SM4_DIMENSION_SCALAR: + return VSIR_DIMENSION_SCALAR; + case VKD3D_SM4_DIMENSION_VEC4: + return VSIR_DIMENSION_VEC4; + default: + FIXME("Unknown SM4 dimension %#x.\n", dim); + return VSIR_DIMENSION_NONE; + } +} + enum vkd3d_sm4_resource_type { VKD3D_SM4_RESOURCE_BUFFER = 0x1, @@ -1718,6 +1734,7 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui enum vkd3d_sm4_register_type register_type; enum vkd3d_sm4_extended_operand_type type; enum vkd3d_sm4_register_modifier m; + enum vkd3d_sm4_dimension sm4_dimension; uint32_t token, order, extended; if (*ptr >= end) @@ -1849,15 +1866,16 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui return false; } + sm4_dimension = (token & VKD3D_SM4_DIMENSION_MASK) >> VKD3D_SM4_DIMENSION_SHIFT; + param->dimension = vsir_dimension_from_sm4_dimension(sm4_dimension); + if (register_type == VKD3D_SM4_RT_IMMCONST || register_type == VKD3D_SM4_RT_IMMCONST64) { - enum vkd3d_sm4_dimension dimension = (token & VKD3D_SM4_DIMENSION_MASK) >> VKD3D_SM4_DIMENSION_SHIFT; unsigned int dword_count; - switch (dimension) + switch (param->dimension) { - case VKD3D_SM4_DIMENSION_SCALAR: - param->dimension = VSIR_DIMENSION_SCALAR; + case VSIR_DIMENSION_SCALAR: dword_count = 1 + (register_type == VKD3D_SM4_RT_IMMCONST64); if (end - *ptr < dword_count) { @@ -1868,8 +1886,7 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui *ptr += dword_count; break; - case VKD3D_SM4_DIMENSION_VEC4: - param->dimension = VSIR_DIMENSION_VEC4; + case VSIR_DIMENSION_VEC4: if (end - *ptr < VKD3D_VEC4_SIZE) { WARN("Invalid ptr %p, end %p.\n", *ptr, end); @@ -1880,7 +1897,7 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui break; default: - FIXME("Unhandled dimension %#x.\n", dimension); + FIXME("Unhandled dimension %#x.\n", param->dimension); break; } }

1 0

Francisco Casas : vkd3d-shader/d3dbc: Initialize register dimension for all register types.
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: vkd3d Branch: master Commit: 74d79c7e45fad3b27e2384330709cdcb4d8008e7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/74d79c7e45fad3b27e2384330709c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 29 15:58:28 2023 -0400 vkd3d-shader/d3dbc: Initialize register dimension for all register types. --- libs/vkd3d-shader/d3dbc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index b7d2a440..598b7518 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -465,6 +465,12 @@ static void shader_sm1_parse_src_param(uint32_t param, const struct vkd3d_shader src->reg.non_uniform = false; src->reg.idx[0].offset = param & VKD3D_SM1_REGISTER_NUMBER_MASK; src->reg.idx[0].rel_addr = rel_addr; + if (src->reg.type == VKD3DSPR_SAMPLER) + src->reg.dimension = VSIR_DIMENSION_NONE; + else if (src->reg.type == VKD3DSPR_DEPTHOUT) + src->reg.dimension = VSIR_DIMENSION_SCALAR; + else + src->reg.dimension = VSIR_DIMENSION_VEC4; src->swizzle = swizzle_from_sm1((param & VKD3D_SM1_SWIZZLE_MASK) >> VKD3D_SM1_SWIZZLE_SHIFT); src->modifiers = (param & VKD3D_SM1_SRC_MODIFIER_MASK) >> VKD3D_SM1_SRC_MODIFIER_SHIFT; } @@ -480,6 +486,12 @@ static void shader_sm1_parse_dst_param(uint32_t param, const struct vkd3d_shader dst->reg.non_uniform = false; dst->reg.idx[0].offset = param & VKD3D_SM1_REGISTER_NUMBER_MASK; dst->reg.idx[0].rel_addr = rel_addr; + if (dst->reg.type == VKD3DSPR_SAMPLER) + dst->reg.dimension = VSIR_DIMENSION_NONE; + else if (dst->reg.type == VKD3DSPR_DEPTHOUT) + dst->reg.dimension = VSIR_DIMENSION_SCALAR; + else + dst->reg.dimension = VSIR_DIMENSION_VEC4; dst->write_mask = (param & VKD3D_SM1_WRITEMASK_MASK) >> VKD3D_SM1_WRITEMASK_SHIFT; dst->modifiers = (param & VKD3D_SM1_DST_MODIFIER_MASK) >> VKD3D_SM1_DST_MODIFIER_SHIFT; dst->shift = (param & VKD3D_SM1_DSTSHIFT_MASK) >> VKD3D_SM1_DSTSHIFT_SHIFT;

1 0

Francisco Casas : vkd3d-shader: Rename shader_register_init() to vsir_register_init().
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: vkd3d Branch: master Commit: 5d6899888d17a011d66e6d408086b0f704affe4d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5d6899888d17a011d66e6d408086b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 29 13:20:44 2023 -0400 vkd3d-shader: Rename shader_register_init() to vsir_register_init(). --- libs/vkd3d-shader/dxil.c | 6 +++--- libs/vkd3d-shader/ir.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index e3a04f26..8ce54edc 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1590,7 +1590,7 @@ static struct vkd3d_shader_dst_param *instruction_dst_params_alloc(struct vkd3d_ static void register_init_with_id(struct vkd3d_shader_register *reg, enum vkd3d_shader_register_type reg_type, enum vkd3d_data_type data_type, unsigned int id) { - shader_register_init(reg, reg_type, data_type, 1); + vsir_register_init(reg, reg_type, data_type, 1); reg->idx[0].offset = id; } @@ -2119,7 +2119,7 @@ static void dst_param_io_init(struct vkd3d_shader_dst_param *param, param->shift = 0; /* DXIL types do not have signedness. Load signed elements as unsigned. */ component_type = e->component_type == VKD3D_SHADER_COMPONENT_INT ? VKD3D_SHADER_COMPONENT_UINT : e->component_type; - shader_register_init(&param->reg, reg_type, vkd3d_data_type_from_component_type(component_type), 0); + vsir_register_init(&param->reg, reg_type, vkd3d_data_type_from_component_type(component_type), 0); } static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shader_signature *s, @@ -2396,7 +2396,7 @@ static void sm6_parser_emit_unhandled(struct sm6_parser *sm6, struct vkd3d_shade return; type = sm6_type_get_scalar_type(dst->type, 0); - shader_register_init(&dst->u.reg, VKD3DSPR_UNDEF, vkd3d_data_type_from_sm6_type(type), 0); + vsir_register_init(&dst->u.reg, VKD3DSPR_UNDEF, vkd3d_data_type_from_sm6_type(type), 0); /* dst->is_undefined is not set here because it flags only explicitly undefined values. */ } diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index fd09b70e..0073a2c7 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -296,7 +296,7 @@ static enum vkd3d_result flattener_flatten_phases(struct hull_flattener *normali return VKD3D_OK; } -void shader_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_register_type reg_type, +void vsir_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_register_type reg_type, enum vkd3d_data_type data_type, unsigned int idx_count) { reg->type = reg_type; @@ -372,7 +372,7 @@ static struct vkd3d_shader_src_param *instruction_array_create_outpointid_param( if (!(rel_addr = shader_src_param_allocator_get(&instructions->src_params, 1))) return NULL; - shader_register_init(&rel_addr->reg, VKD3DSPR_OUTPOINTID, VKD3D_DATA_UINT, 0); + vsir_register_init(&rel_addr->reg, VKD3DSPR_OUTPOINTID, VKD3D_DATA_UINT, 0); rel_addr->swizzle = 0; rel_addr->modifiers = 0; @@ -402,7 +402,7 @@ static void shader_dst_param_io_init(struct vkd3d_shader_dst_param *param, const param->write_mask = e->mask; param->modifiers = 0; param->shift = 0; - shader_register_init(&param->reg, reg_type, vkd3d_data_type_from_component_type(e->component_type), idx_count); + vsir_register_init(&param->reg, reg_type, vkd3d_data_type_from_component_type(e->component_type), idx_count); } static enum vkd3d_result control_point_normaliser_emit_hs_input(struct control_point_normaliser *normaliser, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6bc5f6d1..80e0bc2b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -751,7 +751,7 @@ struct vkd3d_shader_register } u; }; -void shader_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_register_type reg_type, +void vsir_register_init(struct vkd3d_shader_register *reg, enum vkd3d_shader_register_type reg_type, enum vkd3d_data_type data_type, unsigned int idx_count); struct vkd3d_shader_dst_param

1 0

Eric Pouech : winedump: Improve dumping DEBUG directory entries in PE images.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: 81c8c73de299c0d61d1fff8ad9b88a9deb5b9479 URL: https://gitlab.winehq.org/wine/wine/-/commit/81c8c73de299c0d61d1fff8ad9b88a… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Sep 25 17:48:44 2023 +0200 winedump: Improve dumping DEBUG directory entries in PE images. - always add a data dump for unknown structures - add some bits about POGO and REPRO entries - protect against too small structures Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- include/wine/mscvpdb.h | 10 ++++++++ tools/winedump/pe.c | 63 +++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 62 insertions(+), 11 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 29dd83e73b9..3502e0faed0 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2820,3 +2820,13 @@ typedef struct OMFSourceModule unsigned short cSeg; unsigned int baseSrcFile[1]; } OMFSourceModule; + + +/* undocumented. IMAGE_DEBUG_TYPE_REPRO directory entry */ +typedef struct +{ + unsigned flags; /* only seen 0x20 */ + GUID guid; /* guid used in CODEVIEW debug entry */ + unsigned unk[3]; /* unknown, potentially hash of some internal parts of image */ + unsigned debug_timestamp; /* used in all DEBUG entries as timestamp (including this one) */ +} IMAGE_DEBUG_REPRO; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f361e1d86bd..3defdcd664b 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -2169,17 +2169,58 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) dump_frame_pointer_omission(idd->PointerToRawData, idd->SizeOfData); break; case IMAGE_DEBUG_TYPE_MISC: - { - const IMAGE_DEBUG_MISC* misc = PRD(idd->PointerToRawData, idd->SizeOfData); - if (!misc) {printf("Can't get misc debug information\n"); break;} - printf(" DataType: %u (%s)\n", - (UINT)misc->DataType, (misc->DataType == IMAGE_DEBUG_MISC_EXENAME) ? "Exe name" : "Unknown"); - printf(" Length: %u\n", (UINT)misc->Length); - printf(" Unicode: %s\n", misc->Unicode ? "Yes" : "No"); - printf(" Data: %s\n", misc->Data); - } - break; - default: break; + { + const IMAGE_DEBUG_MISC* misc = PRD(idd->PointerToRawData, idd->SizeOfData); + if (!misc || idd->SizeOfData < sizeof(*misc)) {printf("Can't get MISC debug information\n"); break;} + printf(" DataType: %u (%s)\n", + (UINT)misc->DataType, (misc->DataType == IMAGE_DEBUG_MISC_EXENAME) ? "Exe name" : "Unknown"); + printf(" Length: %u\n", (UINT)misc->Length); + printf(" Unicode: %s\n", misc->Unicode ? "Yes" : "No"); + printf(" Data: %s\n", misc->Data); + } + break; + case IMAGE_DEBUG_TYPE_POGO: + { + const unsigned* data = PRD(idd->PointerToRawData, idd->SizeOfData); + const unsigned* end = (const unsigned*)((const unsigned char*)data + idd->SizeOfData); + unsigned idx = 0; + + if (!data || idd->SizeOfData < sizeof(unsigned)) {printf("Can't get PODO debug information\n"); break;} + printf(" Header: %08x\n", *(const unsigned*)data); + data++; + printf(" Index Name Offset Size\n"); + while (data + 2 < end) + { + const char* ptr; + ptrdiff_t s; + + if (!(ptr = memchr(&data[2], '\0', (const char*)end - (const char*)&data[2]))) break; + printf(" %-5u %-16s %08x %08x\n", idx, (const char*)&data[2], data[0], data[1]); + s = ptr - (const char*)&data[2] + 1; + data += 2 + ((s + sizeof(unsigned) - 1) / sizeof(unsigned)); + idx++; + } + } + break; + case IMAGE_DEBUG_TYPE_REPRO: + { + const IMAGE_DEBUG_REPRO* repro = PRD(idd->PointerToRawData, idd->SizeOfData); + if (!repro || idd->SizeOfData < sizeof(*repro)) {printf("Can't get REPRO debug information\n"); break;} + printf(" Flags: %08X\n", repro->flags); + printf(" Guid: %s\n", get_guid_str(&repro->guid)); + printf(" _unk0: %08X %u\n", repro->unk[0], repro->unk[0]); + printf(" _unk1: %08X %u\n", repro->unk[1], repro->unk[1]); + printf(" _unk2: %08X %u\n", repro->unk[2], repro->unk[2]); + printf(" Timestamp: %08X\n", repro->debug_timestamp); + } + break; + default: + { + const unsigned char* data = PRD(idd->PointerToRawData, idd->SizeOfData); + if (!data) {printf("Can't get debug information for %s\n", str); break;} + dump_data(data, idd->SizeOfData, " "); + } + break; } printf("\n"); }

1 0

Alexandre Julliard : ntdll: Consistently use the IMAGE_FIRST_SECTION helper macro.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: db3af1b238c3fe5f1fa7566787eb2afe292e0277 URL: https://gitlab.winehq.org/wine/wine/-/commit/db3af1b238c3fe5f1fa7566787eb2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 13:00:43 2023 +0200 ntdll: Consistently use the IMAGE_FIRST_SECTION helper macro. --- dlls/ntdll/loader.c | 9 +++------ dlls/ntdll/tests/virtual.c | 3 +-- dlls/ntdll/unix/loader.c | 4 ++-- dlls/ntdll/unix/virtual.c | 10 +++++----- include/winnt.h | 3 +-- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 67104e63286..5b2f9bdce0d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2059,8 +2059,7 @@ static NTSTATUS perform_relocations( void *module, IMAGE_NT_HEADERS *nt, SIZE_T if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) return STATUS_INVALID_IMAGE_FORMAT; - sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + - nt->FileHeader.SizeOfOptionalHeader); + sec = IMAGE_FIRST_SECTION( nt ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) { void *addr = get_rva( module, sec[i].VirtualAddress ); @@ -2216,8 +2215,8 @@ static BOOL convert_to_pe64( HMODULE module, const SECTION_IMAGE_INFORMATION *in IMAGE_OPTIONAL_HEADER32 hdr32 = { IMAGE_NT_OPTIONAL_HDR32_MAGIC }; IMAGE_OPTIONAL_HEADER64 hdr64 = { IMAGE_NT_OPTIONAL_HDR64_MAGIC }; IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); + IMAGE_SECTION_HEADER *sec = IMAGE_FIRST_SECTION( nt ); SIZE_T hdr_size = min( sizeof(hdr32), nt->FileHeader.SizeOfOptionalHeader ); - IMAGE_SECTION_HEADER *sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + hdr_size); SIZE_T size = min( nt->OptionalHeader.SizeOfHeaders, nt->OptionalHeader.SizeOfImage ); void *addr = module; ULONG i, old_prot; @@ -4361,10 +4360,8 @@ PIMAGE_SECTION_HEADER WINAPI RtlImageRvaToSection( const IMAGE_NT_HEADERS *nt, HMODULE module, DWORD rva ) { int i; - const IMAGE_SECTION_HEADER *sec; + const IMAGE_SECTION_HEADER *sec = IMAGE_FIRST_SECTION( nt ); - sec = (const IMAGE_SECTION_HEADER*)((const char*)&nt->OptionalHeader + - nt->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) { if ((sec->VirtualAddress <= rva) && (sec->VirtualAddress + sec->SizeOfRawData > rva)) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 609d702a359..a9dec1b5a8a 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -2053,8 +2053,7 @@ static void perform_relocations( void *module, INT_PTR delta ) nt = RtlImageNtHeader( module ); relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; if (!relocs->VirtualAddress || !relocs->Size) return; - sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + - nt->FileHeader.SizeOfOptionalHeader); + sec = IMAGE_FIRST_SECTION( nt ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) { void *addr = (char *)module + sec[i].VirtualAddress; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 38aaf778ff5..7bf3ca22566 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1125,7 +1125,7 @@ static void relocate_ntdll( void *module ) if (!(rel = get_module_data_dir( module, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) return; - sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + sec = IMAGE_FIRST_SECTION( nt ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) { void *addr = get_rva( module, sec[i].VirtualAddress ); @@ -1991,7 +1991,7 @@ static void load_apiset_dll(void) if (!status) { nt = get_rva( ptr, ((IMAGE_DOS_HEADER *)ptr)->e_lfanew ); - sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + sec = IMAGE_FIRST_SECTION( nt ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) { diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 078fe1c30a9..94e68edab77 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2608,7 +2608,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena int i; off_t pos; struct stat st; - char *header_end, *header_start; + char *header_end; char *ptr = view->base; SIZE_T header_size, total_size = view->size; @@ -2626,12 +2626,12 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena header_end = ptr + ROUND_SIZE( 0, header_size ); memset( ptr + header_size, 0, header_end - (ptr + header_size) ); if ((char *)(nt + 1) > header_end) return status; - header_start = (char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader; if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( sections )) return status; - if (header_start + sizeof(*sections) * nt->FileHeader.NumberOfSections > header_end) return status; + sec = IMAGE_FIRST_SECTION( nt ); + if ((char *)(sec + nt->FileHeader.NumberOfSections) > header_end) return status; /* Some applications (e.g. the Steam version of Borderlands) map over the top of the section headers, * copying the headers into local memory is necessary to properly load such applications. */ - memcpy(sections, header_start, sizeof(*sections) * nt->FileHeader.NumberOfSections); + memcpy(sections, sec, sizeof(*sections) * nt->FileHeader.NumberOfSections); sec = sections; imports = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_IMPORT; @@ -3297,7 +3297,7 @@ NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_nam /* The PE header is always read-only, no write, no execute. */ set_page_vprot( base, page_size, VPROT_COMMITTED | VPROT_READ ); - sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + sec = IMAGE_FIRST_SECTION( nt ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) { BYTE flags = VPROT_COMMITTED; diff --git a/include/winnt.h b/include/winnt.h index d4137a64aea..df0c3282f8c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2927,8 +2927,7 @@ typedef struct _IMAGE_SECTION_HEADER { #define IMAGE_SIZEOF_SECTION_HEADER 40 #define IMAGE_FIRST_SECTION(ntheader) \ - ((PIMAGE_SECTION_HEADER)(ULONG_PTR)((const BYTE *)&((const IMAGE_NT_HEADERS *)(ntheader))->OptionalHeader + \ - ((const IMAGE_NT_HEADERS *)(ntheader))->FileHeader.SizeOfOptionalHeader)) + ((PIMAGE_SECTION_HEADER)((ULONG_PTR)&(ntheader)->OptionalHeader + (ntheader)->FileHeader.SizeOfOptionalHeader)) /* These defines are for the Characteristics bitfield. */ /* #define IMAGE_SCN_TYPE_REG 0x00000000 - Reserved */

1 0

Alexandre Julliard : dbghelp: Consistently use the IMAGE_FIRST_SECTION helper macro.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: 0ee4bec912bd18719b750ba52264f8821bd12173 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ee4bec912bd18719b750ba52264f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 13:01:13 2023 +0200 dbghelp: Consistently use the IMAGE_FIRST_SECTION helper macro. --- dlls/dbghelp/pe_module.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 6c07bf5826a..fc3542b4db5 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -282,8 +282,7 @@ BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt) } fmap->u.pe.builtin = !memcmp((const IMAGE_DOS_HEADER*)mapping + 1, builtin_signature, sizeof(builtin_signature)); - section = (IMAGE_SECTION_HEADER*) - ((char*)&nthdr->OptionalHeader + nthdr->FileHeader.SizeOfOptionalHeader); + section = IMAGE_FIRST_SECTION( nthdr ); fmap->u.pe.sect = HeapAlloc(GetProcessHeap(), 0, nthdr->FileHeader.NumberOfSections * sizeof(fmap->u.pe.sect[0])); if (!fmap->u.pe.sect) goto error; @@ -630,9 +629,8 @@ static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* mod } else { - const IMAGE_SECTION_HEADER *sectp = (const IMAGE_SECTION_HEADER*)((const char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); /* Debug info is embedded into PE module */ - ret = pe_load_debug_directory(pcs, module, mapping, sectp, + ret = pe_load_debug_directory(pcs, module, mapping, IMAGE_FIRST_SECTION( nth ), nth->FileHeader.NumberOfSections, dbg, nDbg); } done: @@ -668,10 +666,8 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* #if 0 /* FIXME: we'd better store addresses linked to sections rather than absolute values */ - IMAGE_SECTION_HEADER* section; + IMAGE_SECTION_HEADER *section = IMAGE_FIRST_SECTION( nth ); /* Add start of sections */ - section = (IMAGE_SECTION_HEADER*) - ((char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++) { symt_new_public(module, NULL, section->Name, FALSE,

1 0

Alexandre Julliard : imagehlp: Use the IMAGE_FIRST_SECTION helper macro.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: 60f0c1b30faedddec51b483e89d4e36252cc12b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/60f0c1b30faedddec51b483e89d4e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 13:01:32 2023 +0200 imagehlp: Use the IMAGE_FIRST_SECTION helper macro. --- dlls/imagehlp/access.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index d9e3731dc02..a15b99f13c2 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -188,9 +188,7 @@ BOOL WINAPI MapAndLoad(PCSTR pszImageName, PCSTR pszDllPath, PLOADED_IMAGE pLoad pLoadedImage->hFile = hFile; pLoadedImage->MappedAddress = mapping; pLoadedImage->FileHeader = pNtHeader; - pLoadedImage->Sections = (PIMAGE_SECTION_HEADER) - ((LPBYTE) &pNtHeader->OptionalHeader + - pNtHeader->FileHeader.SizeOfOptionalHeader); + pLoadedImage->Sections = IMAGE_FIRST_SECTION(pNtHeader); pLoadedImage->NumberOfSections = pNtHeader->FileHeader.NumberOfSections; pLoadedImage->SizeOfImage = GetFileSize(hFile, NULL); pLoadedImage->Characteristics = pNtHeader->FileHeader.Characteristics;

1 0