- Wine-Commits - list.winehq.org

Billy Laws : ntdll: Allocate wow64 environment block within the 32-bit address space.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: wine Branch: master Commit: 79fb59e21ed9da33b2dccdfca3f001ef54723555 URL: https://gitlab.winehq.org/wine/wine/-/commit/79fb59e21ed9da33b2dccdfca3f001… Author: Billy Laws <blaws05(a)gmail.com> Date: Wed Apr 17 18:27:56 2024 +0000 ntdll: Allocate wow64 environment block within the 32-bit address space. --- dlls/ntdll/unix/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ad9ab0dc220..b15db0ec23c 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1815,7 +1815,7 @@ static void *build_wow64_parameters( const RTL_USER_PROCESS_PARAMETERS *params ) + ((params->RuntimeInfo.MaximumLength + 1) & ~1) + params->EnvironmentSize); - status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&wow64_params, 0, &size, + status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&wow64_params, limit_2g - 1, &size, MEM_COMMIT, PAGE_READWRITE ); assert( !status );

1 0

Biswapriyo Nath : include: Avoid a C++ keyword.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: wine Branch: master Commit: 469a4837bc00954c6c90a632658785eaacd961f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/469a4837bc00954c6c90a632658785… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sun May 5 04:53:03 2024 +0000 include: Avoid a C++ keyword. This fixes the following C++ compiler error mfmediaengine.h:1216:18: error: expected ',' or '...' before 'protected' 1216 | BOOL *protected) = 0; | ^~~~~~~~~ --- include/mfmediaengine.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index 6547ef87462..27b6bbcd7d7 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -305,7 +305,7 @@ interface IMFMediaEngineEx : IMFMediaEngine HRESULT GetStreamSelection([in] DWORD stream_index, [out] BOOL *enabled); HRESULT SetStreamSelection([in] DWORD stream_index, [in] BOOL enabled); HRESULT ApplyStreamSelections(); - HRESULT IsProtected([out] BOOL *protected); + HRESULT IsProtected([out] BOOL *is_protected); HRESULT InsertVideoEffect([in] IUnknown *effect, [in] BOOL is_optional); HRESULT InsertAudioEffect([in] IUnknown *effect, [in] BOOL is_optional); HRESULT RemoveAllEffects();

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement the WAVE_OP_* instructions.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: cfcc789b42ea707ed701cbcb0600be6156cfbbb1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cfcc789b42ea707ed701cbcb0600b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 21:35:27 2024 +1000 vkd3d-shader/spirv: Implement the WAVE_OP_* instructions. --- libs/vkd3d-shader/spirv.c | 26 +++++++++++++++++++++++++- tests/hlsl/wave-ops-float.shader_test | 12 ++++++------ tests/hlsl/wave-ops-int.shader_test | 4 ++-- tests/hlsl/wave-ops-uint.shader_test | 6 +++--- tests/hlsl/wave-reconvergence.shader_test | 4 ++-- 5 files changed, 38 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 60c08be2..7ac9f3cd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9826,6 +9826,22 @@ static SpvOp map_wave_alu_op(enum vkd3d_shader_opcode handler_idx, bool is_float return SpvOpGroupNonUniformBitwiseOr; case VKD3DSIH_WAVE_ACTIVE_BIT_XOR: return SpvOpGroupNonUniformBitwiseXor; + case VKD3DSIH_WAVE_OP_ADD: + return is_float ? SpvOpGroupNonUniformFAdd : SpvOpGroupNonUniformIAdd; + case VKD3DSIH_WAVE_OP_IMAX: + return SpvOpGroupNonUniformSMax; + case VKD3DSIH_WAVE_OP_IMIN: + return SpvOpGroupNonUniformSMin; + case VKD3DSIH_WAVE_OP_MAX: + return SpvOpGroupNonUniformFMax; + case VKD3DSIH_WAVE_OP_MIN: + return SpvOpGroupNonUniformFMin; + case VKD3DSIH_WAVE_OP_MUL: + return is_float ? SpvOpGroupNonUniformFMul : SpvOpGroupNonUniformIMul; + case VKD3DSIH_WAVE_OP_UMAX: + return SpvOpGroupNonUniformUMax; + case VKD3DSIH_WAVE_OP_UMIN: + return SpvOpGroupNonUniformUMin; default: vkd3d_unreachable(); } @@ -9849,7 +9865,7 @@ static void spirv_compiler_emit_wave_alu_op(struct spirv_compiler *compiler, vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniformArithmetic); val_id = vkd3d_spirv_build_op_tr3(builder, &builder->function_stream, op, type_id, vkd3d_spirv_get_op_scope_subgroup(builder), - SpvGroupOperationReduce, + (instruction->flags & VKD3DSI_WAVE_PREFIX) ? SpvGroupOperationExclusiveScan : SpvGroupOperationReduce, val_id); spirv_compiler_emit_store_dst(compiler, dst, val_id); @@ -10210,6 +10226,14 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_WAVE_ACTIVE_BIT_AND: case VKD3DSIH_WAVE_ACTIVE_BIT_OR: case VKD3DSIH_WAVE_ACTIVE_BIT_XOR: + case VKD3DSIH_WAVE_OP_ADD: + case VKD3DSIH_WAVE_OP_IMAX: + case VKD3DSIH_WAVE_OP_IMIN: + case VKD3DSIH_WAVE_OP_MAX: + case VKD3DSIH_WAVE_OP_MIN: + case VKD3DSIH_WAVE_OP_MUL: + case VKD3DSIH_WAVE_OP_UMAX: + case VKD3DSIH_WAVE_OP_UMIN: spirv_compiler_emit_wave_alu_op(compiler, instruction); break; case VKD3DSIH_DCL: diff --git a/tests/hlsl/wave-ops-float.shader_test b/tests/hlsl/wave-ops-float.shader_test index 2c402db1..60774fa8 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -133,7 +133,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (14.0, 4.5, 16.5, 10.0) probe uav 1 (1) rgba (14.0, 4.5, 16.5, 10.0) probe uav 1 (2) rgba (14.0, 4.5, 16.5, 10.0) @@ -151,7 +151,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (150.0625, 1.5, 288.0, 39.0625) probe uav 1 (1) rgba (150.0625, 1.5, 288.0, 39.0625) probe uav 1 (2) rgba (150.0625, 1.5, 288.0, 39.0625) @@ -169,7 +169,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (3.5, 1.0, 4.0, 2.5) probe uav 1 (1) rgba (3.5, 1.0, 4.0, 2.5) probe uav 1 (2) rgba (3.5, 1.0, 4.0, 2.5) @@ -187,7 +187,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (3.5, 1.5, 4.5, 2.5) probe uav 1 (1) rgba (3.5, 1.5, 4.5, 2.5) probe uav 1 (2) rgba (3.5, 1.5, 4.5, 2.5) @@ -205,7 +205,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (0.0, 0.0, 0.0, 0.0) probe uav 1 (1) rgba (3.5, 1.0, 4.0, 2.5) probe uav 1 (2) rgba (7.0, 2.0, 8.0, 5.0) @@ -223,7 +223,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (1.0, 1.0, 1.0, 1.0) probe uav 1 (1) rgba (3.5, 1.0, 4.0, 2.5) probe uav 1 (2) rgba (12.25, 1.0, 16.0, 6.25) diff --git a/tests/hlsl/wave-ops-int.shader_test b/tests/hlsl/wave-ops-int.shader_test index 5c9a365f..bc6976ba 100644 --- a/tests/hlsl/wave-ops-int.shader_test +++ b/tests/hlsl/wave-ops-int.shader_test @@ -31,7 +31,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgbai (-3, 1, -4, 2) probe uav 1 (1) rgbai (-3, 1, -4, 2) probe uav 1 (2) rgbai (-3, 1, -4, 2) @@ -49,7 +49,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgbai (3, 5, -1, 2) probe uav 1 (1) rgbai (3, 5, -1, 2) probe uav 1 (2) rgbai (3, 5, -1, 2) diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index cb502e86..c16adab4 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -101,7 +101,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (8) probe uav 1 (1) rui (8) probe uav 1 (2) rui (8) @@ -214,7 +214,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (41) probe uav 1 (1) rui (41) probe uav 1 (2) rui (41) @@ -298,7 +298,7 @@ void main(uint id : SV_GroupIndex) [test] uniform 0 uint4 1 5 0 0 -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (29) probe uav 1 (1) rui (29) probe uav 1 (2) rui (29) diff --git a/tests/hlsl/wave-reconvergence.shader_test b/tests/hlsl/wave-reconvergence.shader_test index 66698da8..0a1da3ee 100644 --- a/tests/hlsl/wave-reconvergence.shader_test +++ b/tests/hlsl/wave-reconvergence.shader_test @@ -56,7 +56,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 2 (0) rui (0xf01) probe uav 2 (1) rui (0x503) probe uav 2 (2) rui (0x511) @@ -124,7 +124,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 2 (0) rui (0x701) probe uav 2 (1) rui (0x503) probe uav 2 (2) rui (0x511)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic WaveActiveBit.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: af208135f372632efaad63c463a7a403cde51db5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af208135f372632efaad63c463a7a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 21:10:24 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveActiveBit. --- libs/vkd3d-shader/d3d_asm.c | 3 ++ libs/vkd3d-shader/dxil.c | 49 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++ 3 files changed, 55 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 0e182506..4961fcf5 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -329,6 +329,9 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_UTOU ] = "utou", [VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL ] = "wave_active_all_equal", [VKD3DSIH_WAVE_ACTIVE_BALLOT ] = "wave_active_ballot", + [VKD3DSIH_WAVE_ACTIVE_BIT_AND ] = "wave_active_bit_and", + [VKD3DSIH_WAVE_ACTIVE_BIT_OR ] = "wave_active_bit_or", + [VKD3DSIH_WAVE_ACTIVE_BIT_XOR ] = "wave_active_bit_xor", [VKD3DSIH_WAVE_ALL_TRUE ] = "wave_all_true", [VKD3DSIH_WAVE_ANY_TRUE ] = "wave_any_true", [VKD3DSIH_XOR ] = "xor", diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 048281ee..622c1ee8 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -433,6 +433,7 @@ enum dx_intrinsic_opcode DX_WAVE_ALL_TRUE = 114, DX_WAVE_ACTIVE_ALL_EQUAL = 115, DX_WAVE_ACTIVE_BALLOT = 116, + DX_WAVE_ACTIVE_BIT = 120, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, DX_RAW_BUFFER_LOAD = 139, @@ -534,6 +535,13 @@ enum dxil_sync_flags SYNC_GROUP_SHARED_MEMORY = 0x8, }; +enum dxil_wave_bit_op_kind +{ + WAVE_BIT_OP_AND = 0, + WAVE_BIT_OP_OR = 1, + WAVE_BIT_OP_XOR = 2, +}; + struct sm6_pointer_info { const struct sm6_type *type; @@ -5925,6 +5933,46 @@ static void sm6_parser_emit_dx_wave_active_ballot(struct sm6_parser *sm6, enum d instruction_dst_param_init_ssa_vector(ins, VKD3D_VEC4_SIZE, sm6); } +static enum vkd3d_shader_opcode sm6_dx_map_wave_bit_op(enum dxil_wave_bit_op_kind op, + struct sm6_parser *sm6) +{ + switch (op) + { + case WAVE_BIT_OP_AND: + return VKD3DSIH_WAVE_ACTIVE_BIT_AND; + case WAVE_BIT_OP_OR: + return VKD3DSIH_WAVE_ACTIVE_BIT_OR; + case WAVE_BIT_OP_XOR: + return VKD3DSIH_WAVE_ACTIVE_BIT_XOR; + default: + FIXME("Unhandled wave bit op %u.\n", op); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_UNHANDLED_INTRINSIC, + "Wave bit operation %u is unhandled.\n", op); + return VKD3DSIH_INVALID; + } +} + +static void sm6_parser_emit_dx_wave_active_bit(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_param; + enum dxil_wave_bit_op_kind wave_op; + enum vkd3d_shader_opcode opcode; + + wave_op = sm6_value_get_constant_uint(operands[1]); + + if ((opcode = sm6_dx_map_wave_bit_op(wave_op, sm6)) == VKD3DSIH_INVALID) + return; + vsir_instruction_init(ins, &sm6->p.location, opcode); + + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; + src_param_init_from_value(src_param, operands[0]); + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static void sm6_parser_emit_dx_wave_builtin(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -6068,6 +6116,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_WAVE_ACTIVE_ALL_EQUAL ] = {"1", "n", sm6_parser_emit_dx_unary}, [DX_WAVE_ACTIVE_BALLOT ] = {"V", "1", sm6_parser_emit_dx_wave_active_ballot}, + [DX_WAVE_ACTIVE_BIT ] = {"m", "Rc", sm6_parser_emit_dx_wave_active_bit}, [DX_WAVE_ALL_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_ANY_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 14d27c11..7747a422 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -529,6 +529,9 @@ enum vkd3d_shader_opcode VKD3DSIH_UTOU, VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL, VKD3DSIH_WAVE_ACTIVE_BALLOT, + VKD3DSIH_WAVE_ACTIVE_BIT_AND, + VKD3DSIH_WAVE_ACTIVE_BIT_OR, + VKD3DSIH_WAVE_ACTIVE_BIT_XOR, VKD3DSIH_WAVE_ALL_TRUE, VKD3DSIH_WAVE_ANY_TRUE, VKD3DSIH_XOR,

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsics WaveActiveOp and WavePrefixOp.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: c71751edc901ae0a59b244823de2761149ca8a25 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c71751edc901ae0a59b244823de27… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 21:28:21 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsics WaveActiveOp and WavePrefixOp. --- libs/vkd3d-shader/d3d_asm.c | 19 ++++++++++ libs/vkd3d-shader/dxil.c | 63 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 9 +++++ 3 files changed, 91 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 4961fcf5..f2ad39f2 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -334,6 +334,14 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_WAVE_ACTIVE_BIT_XOR ] = "wave_active_bit_xor", [VKD3DSIH_WAVE_ALL_TRUE ] = "wave_all_true", [VKD3DSIH_WAVE_ANY_TRUE ] = "wave_any_true", + [VKD3DSIH_WAVE_OP_ADD ] = "wave_op_add", + [VKD3DSIH_WAVE_OP_IMAX ] = "wave_op_imax", + [VKD3DSIH_WAVE_OP_IMIN ] = "wave_op_imin", + [VKD3DSIH_WAVE_OP_MAX ] = "wave_op_max", + [VKD3DSIH_WAVE_OP_MIN ] = "wave_op_min", + [VKD3DSIH_WAVE_OP_MUL ] = "wave_op_mul", + [VKD3DSIH_WAVE_OP_UMAX ] = "wave_op_umax", + [VKD3DSIH_WAVE_OP_UMIN ] = "wave_op_umin", [VKD3DSIH_XOR ] = "xor", }; @@ -1844,6 +1852,17 @@ static void shader_dump_instruction_flags(struct vkd3d_d3d_asm_compiler *compile vkd3d_string_buffer_printf(buffer, "p"); break; + case VKD3DSIH_WAVE_OP_ADD: + case VKD3DSIH_WAVE_OP_IMAX: + case VKD3DSIH_WAVE_OP_IMIN: + case VKD3DSIH_WAVE_OP_MAX: + case VKD3DSIH_WAVE_OP_MIN: + case VKD3DSIH_WAVE_OP_MUL: + case VKD3DSIH_WAVE_OP_UMAX: + case VKD3DSIH_WAVE_OP_UMIN: + vkd3d_string_buffer_printf(&compiler->buffer, (ins->flags & VKD3DSI_WAVE_PREFIX) ? "_prefix" : "_active"); + break; + case VKD3DSIH_ISHL: case VKD3DSIH_ISHR: case VKD3DSIH_USHR: diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 622c1ee8..b5e54e6a 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -433,7 +433,9 @@ enum dx_intrinsic_opcode DX_WAVE_ALL_TRUE = 114, DX_WAVE_ACTIVE_ALL_EQUAL = 115, DX_WAVE_ACTIVE_BALLOT = 116, + DX_WAVE_ACTIVE_OP = 119, DX_WAVE_ACTIVE_BIT = 120, + DX_WAVE_PREFIX_OP = 121, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, DX_RAW_BUFFER_LOAD = 139, @@ -542,6 +544,14 @@ enum dxil_wave_bit_op_kind WAVE_BIT_OP_XOR = 2, }; +enum dxil_wave_op_kind +{ + WAVE_OP_ADD = 0, + WAVE_OP_MUL = 1, + WAVE_OP_MIN = 2, + WAVE_OP_MAX = 3, +}; + struct sm6_pointer_info { const struct sm6_type *type; @@ -5973,6 +5983,57 @@ static void sm6_parser_emit_dx_wave_active_bit(struct sm6_parser *sm6, enum dx_i instruction_dst_param_init_ssa_scalar(ins, sm6); } +static enum vkd3d_shader_opcode sm6_dx_map_wave_op(enum dxil_wave_op_kind op, bool is_signed, bool is_float, + struct sm6_parser *sm6) +{ + switch (op) + { + case WAVE_OP_ADD: + return VKD3DSIH_WAVE_OP_ADD; + case WAVE_OP_MUL: + return VKD3DSIH_WAVE_OP_MUL; + case WAVE_OP_MIN: + if (is_float) + return VKD3DSIH_WAVE_OP_MIN; + return is_signed ? VKD3DSIH_WAVE_OP_IMIN : VKD3DSIH_WAVE_OP_UMIN; + case WAVE_OP_MAX: + if (is_float) + return VKD3DSIH_WAVE_OP_MAX; + return is_signed ? VKD3DSIH_WAVE_OP_IMAX : VKD3DSIH_WAVE_OP_UMAX; + default: + FIXME("Unhandled wave op %u.\n", op); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_UNHANDLED_INTRINSIC, + "Wave operation %u is unhandled.\n", op); + return VKD3DSIH_INVALID; + } +} + +static void sm6_parser_emit_dx_wave_op(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_param; + enum vkd3d_shader_opcode opcode; + enum dxil_wave_op_kind wave_op; + bool is_signed; + + wave_op = sm6_value_get_constant_uint(operands[1]); + is_signed = !sm6_value_get_constant_uint(operands[2]); + opcode = sm6_dx_map_wave_op(wave_op, is_signed, sm6_type_is_floating_point(operands[0]->type), sm6); + + if (opcode == VKD3DSIH_INVALID) + return; + + vsir_instruction_init(ins, &sm6->p.location, opcode); + ins->flags = (op == DX_WAVE_PREFIX_OP) ? VKD3DSI_WAVE_PREFIX : 0; + + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; + src_param_init_from_value(src_param, operands[0]); + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static void sm6_parser_emit_dx_wave_builtin(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -6117,10 +6178,12 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_WAVE_ACTIVE_ALL_EQUAL ] = {"1", "n", sm6_parser_emit_dx_unary}, [DX_WAVE_ACTIVE_BALLOT ] = {"V", "1", sm6_parser_emit_dx_wave_active_ballot}, [DX_WAVE_ACTIVE_BIT ] = {"m", "Rc", sm6_parser_emit_dx_wave_active_bit}, + [DX_WAVE_ACTIVE_OP ] = {"n", "Rcc", sm6_parser_emit_dx_wave_op}, [DX_WAVE_ALL_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_ANY_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, [DX_WAVE_GET_LANE_INDEX ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, + [DX_WAVE_PREFIX_OP ] = {"n", "Rcc", sm6_parser_emit_dx_wave_op}, }; static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struct sm6_value *value, char info_type, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 7747a422..a40c4eb1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -534,6 +534,14 @@ enum vkd3d_shader_opcode VKD3DSIH_WAVE_ACTIVE_BIT_XOR, VKD3DSIH_WAVE_ALL_TRUE, VKD3DSIH_WAVE_ANY_TRUE, + VKD3DSIH_WAVE_OP_ADD, + VKD3DSIH_WAVE_OP_IMAX, + VKD3DSIH_WAVE_OP_IMIN, + VKD3DSIH_WAVE_OP_MAX, + VKD3DSIH_WAVE_OP_MIN, + VKD3DSIH_WAVE_OP_MUL, + VKD3DSIH_WAVE_OP_UMAX, + VKD3DSIH_WAVE_OP_UMIN, VKD3DSIH_XOR, VKD3DSIH_INVALID, @@ -797,6 +805,7 @@ enum vkd3d_tessellator_domain #define VKD3DSI_SAMPLE_INFO_UINT 0x1 #define VKD3DSI_SAMPLER_COMPARISON_MODE 0x1 #define VKD3DSI_SHIFT_UNMASKED 0x1 +#define VKD3DSI_WAVE_PREFIX 0x1 #define VKD3DSI_PRECISE_X 0x100 #define VKD3DSI_PRECISE_Y 0x200

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic WaveActiveBallot.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 174a692a17427884ab23423d3b26e36b112d0e20 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/174a692a17427884ab23423d3b26e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 20:57:43 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic WaveActiveBallot. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/dxil.c | 19 +++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 21 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index b2f329cd..0e182506 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -328,6 +328,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_UTOF ] = "utof", [VKD3DSIH_UTOU ] = "utou", [VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL ] = "wave_active_all_equal", + [VKD3DSIH_WAVE_ACTIVE_BALLOT ] = "wave_active_ballot", [VKD3DSIH_WAVE_ALL_TRUE ] = "wave_all_true", [VKD3DSIH_WAVE_ANY_TRUE ] = "wave_any_true", [VKD3DSIH_XOR ] = "xor", diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index e636ad91..048281ee 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -432,6 +432,7 @@ enum dx_intrinsic_opcode DX_WAVE_ANY_TRUE = 113, DX_WAVE_ALL_TRUE = 114, DX_WAVE_ACTIVE_ALL_EQUAL = 115, + DX_WAVE_ACTIVE_BALLOT = 116, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, DX_RAW_BUFFER_LOAD = 139, @@ -5910,6 +5911,20 @@ static void sm6_parser_emit_dx_texture_store(struct sm6_parser *sm6, enum dx_int dst_param_init_with_mask(dst_param, write_mask); } +static void sm6_parser_emit_dx_wave_active_ballot(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_param; + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_WAVE_ACTIVE_BALLOT); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; + src_param_init_from_value(src_param, operands[0]); + + instruction_dst_param_init_ssa_vector(ins, VKD3D_VEC4_SIZE, sm6); +} + static void sm6_parser_emit_dx_wave_builtin(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -5954,6 +5969,7 @@ struct sm6_dx_opcode_info H -> handle D -> Dimensions S -> splitdouble + V -> 4 x i32 v -> void o -> overloaded R -> matches the return type @@ -6051,6 +6067,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_UMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_WAVE_ACTIVE_ALL_EQUAL ] = {"1", "n", sm6_parser_emit_dx_unary}, + [DX_WAVE_ACTIVE_BALLOT ] = {"V", "1", sm6_parser_emit_dx_wave_active_ballot}, [DX_WAVE_ALL_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_ANY_TRUE ] = {"1", "1", sm6_parser_emit_dx_unary}, [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, @@ -6102,6 +6119,8 @@ static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struc return sm6_type_is_struct(type) && !strcmp(type->u.struc->name, "dx.types.Dimensions"); case 'S': return sm6_type_is_struct(type) && !strcmp(type->u.struc->name, "dx.types.splitdouble"); + case 'V': + return sm6_type_is_struct(type) && !strcmp(type->u.struc->name, "dx.types.fouri32"); case 'v': return !type; case 'o': diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 04344586..14d27c11 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -528,6 +528,7 @@ enum vkd3d_shader_opcode VKD3DSIH_UTOF, VKD3DSIH_UTOU, VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL, + VKD3DSIH_WAVE_ACTIVE_BALLOT, VKD3DSIH_WAVE_ALL_TRUE, VKD3DSIH_WAVE_ANY_TRUE, VKD3DSIH_XOR,

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement the WAVE_ACTIVE_BIT_* instructions.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: fef5760af061b3d3536911681005938e99b34ae8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fef5760af061b3d35369116810059… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 21:14:22 2024 +1000 vkd3d-shader/spirv: Implement the WAVE_ACTIVE_BIT_* instructions. --- libs/vkd3d-shader/spirv.c | 44 ++++++++++++++++++++++++++++++++++++ tests/hlsl/wave-ops-uint.shader_test | 6 ++--- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7dc8feea..60c08be2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9816,6 +9816,45 @@ static void spirv_compiler_emit_wave_active_ballot(struct spirv_compiler *compil spirv_compiler_emit_store_dst(compiler, dst, val_id); } +static SpvOp map_wave_alu_op(enum vkd3d_shader_opcode handler_idx, bool is_float) +{ + switch (handler_idx) + { + case VKD3DSIH_WAVE_ACTIVE_BIT_AND: + return SpvOpGroupNonUniformBitwiseAnd; + case VKD3DSIH_WAVE_ACTIVE_BIT_OR: + return SpvOpGroupNonUniformBitwiseOr; + case VKD3DSIH_WAVE_ACTIVE_BIT_XOR: + return SpvOpGroupNonUniformBitwiseXor; + default: + vkd3d_unreachable(); + } +} + +static void spirv_compiler_emit_wave_alu_op(struct spirv_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, val_id; + SpvOp op; + + op = map_wave_alu_op(instruction->handler_idx, data_type_is_floating_point(src->reg.data_type)); + + type_id = vkd3d_spirv_get_type_id_for_data_type(builder, dst->reg.data_type, + vsir_write_mask_component_count(dst->write_mask)); + val_id = spirv_compiler_emit_load_src(compiler, &src[0], dst->write_mask); + + vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniformArithmetic); + val_id = vkd3d_spirv_build_op_tr3(builder, &builder->function_stream, op, type_id, + vkd3d_spirv_get_op_scope_subgroup(builder), + SpvGroupOperationReduce, + val_id); + + spirv_compiler_emit_store_dst(compiler, dst, val_id); +} + /* This function is called after declarations are processed. */ static void spirv_compiler_emit_main_prolog(struct spirv_compiler *compiler) { @@ -10168,6 +10207,11 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_WAVE_ACTIVE_BALLOT: spirv_compiler_emit_wave_active_ballot(compiler, instruction); break; + case VKD3DSIH_WAVE_ACTIVE_BIT_AND: + case VKD3DSIH_WAVE_ACTIVE_BIT_OR: + case VKD3DSIH_WAVE_ACTIVE_BIT_XOR: + spirv_compiler_emit_wave_alu_op(compiler, instruction); + break; case VKD3DSIH_DCL: case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index cf2daebd..cb502e86 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -232,7 +232,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (8) probe uav 1 (1) rui (8) probe uav 1 (2) rui (8) @@ -250,7 +250,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (15) probe uav 1 (1) rui (15) probe uav 1 (2) rui (15) @@ -268,7 +268,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (5) probe uav 1 (1) rui (5) probe uav 1 (2) rui (5)

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement the WAVE_ACTIVE_BALLOT instruction.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 1c49b3a77938b909f398df7a6ed10e91bc0979eb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1c49b3a77938b909f398df7a6ed10… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 21:00:56 2024 +1000 vkd3d-shader/spirv: Implement the WAVE_ACTIVE_BALLOT instruction. --- libs/vkd3d-shader/spirv.c | 26 ++++++++++++++++++++++++++ tests/hlsl/wave-ops-float.shader_test | 2 +- tests/hlsl/wave-ops-uint.shader_test | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d50288c0..7dc8feea 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1752,6 +1752,14 @@ static uint32_t vkd3d_spirv_get_op_scope_subgroup(struct vkd3d_spirv_builder *bu return vkd3d_spirv_build_once(builder, &builder->scope_subgroup_id, vkd3d_spirv_build_op_scope_subgroup); } +static uint32_t vkd3d_spirv_build_op_group_nonuniform_ballot(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t val_id) +{ + vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniformBallot); + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, SpvOpGroupNonUniformBallot, + result_type, vkd3d_spirv_get_op_scope_subgroup(builder), val_id); +} + static uint32_t vkd3d_spirv_build_op_glsl_std450_tr1(struct vkd3d_spirv_builder *builder, enum GLSLstd450 op, uint32_t result_type, uint32_t operand) { @@ -9793,6 +9801,21 @@ static void spirv_compiler_emit_wave_bool_op(struct spirv_compiler *compiler, spirv_compiler_emit_store_dst(compiler, dst, val_id); } +static void spirv_compiler_emit_wave_active_ballot(struct spirv_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, val_id; + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, VKD3D_VEC4_SIZE); + val_id = spirv_compiler_emit_load_src(compiler, src, VKD3DSP_WRITEMASK_0); + val_id = vkd3d_spirv_build_op_group_nonuniform_ballot(builder, type_id, val_id); + + spirv_compiler_emit_store_dst(compiler, dst, val_id); +} + /* This function is called after declarations are processed. */ static void spirv_compiler_emit_main_prolog(struct spirv_compiler *compiler) { @@ -10142,6 +10165,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_WAVE_ANY_TRUE: spirv_compiler_emit_wave_bool_op(compiler, instruction); break; + case VKD3DSIH_WAVE_ACTIVE_BALLOT: + spirv_compiler_emit_wave_active_ballot(compiler, instruction); + break; case VKD3DSIH_DCL: case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: diff --git a/tests/hlsl/wave-ops-float.shader_test b/tests/hlsl/wave-ops-float.shader_test index b0fdcb6c..2c402db1 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -81,7 +81,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgbaui (0xb, 0, 0, 0) diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index 666cf4d3..cf2daebd 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -120,7 +120,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (5) probe uav 1 (1) rui (5) probe uav 1 (2) rui (5)

1 0

Alexandre Julliard : winedump: Dump typelib resources in structured format.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: wine Branch: master Commit: e86e6a6f48df5c09f12ca24f0f60d816b29cbb25 URL: https://gitlab.winehq.org/wine/wine/-/commit/e86e6a6f48df5c09f12ca24f0f60d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 5 12:22:30 2024 +0200 winedump: Dump typelib resources in structured format. --- tools/winedump/pe.c | 4 +- tools/winedump/tlb.c | 118 ++++++++++++++++++++++++++-------------------- tools/winedump/winedump.h | 2 + 3 files changed, 72 insertions(+), 52 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 455fa683388..22260e5249b 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -3103,7 +3103,9 @@ static void dump_dir_resource(void) if (e1->NameIsString) { string = (const IMAGE_RESOURCE_DIR_STRING_U*)((const char *)root + e1->NameOffset); - if (!cmp_resource_name( string, "WINE_REGISTRY" )) + if (!cmp_resource_name( string, "TYPELIB" )) + tlb_dump_resource( (void *)RVA( data->OffsetToData, data->Size ), data->Size, " | " ); + else if (!cmp_resource_name( string, "WINE_REGISTRY" )) dump_text_data( RVA( data->OffsetToData, data->Size ), data->Size, " | " ); else dump_data( RVA( data->OffsetToData, data->Size ), data->Size, " " ); diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index e2ad4eb51f0..3c795162f0e 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -140,6 +140,8 @@ static int msft_typeinfo_impltypes[1000]; static int msft_typeinfo_elemcnt[1000]; static int msft_typeinfo_cnt = 0; +const char *dump_prefix = ""; + static const char * const tkind[TKIND_MAX] = { "TKIND_ENUM", "TKIND_RECORD", "TKIND_MODULE", "TKIND_INTERFACE", "TKIND_DISPATCH", "TKIND_COCLASS", @@ -178,6 +180,7 @@ static int tlb_read_byte(void) static void print_offset(void) { int i; + printf("%s", dump_prefix); for(i=0; i<indent; i++) printf(" "); } @@ -302,47 +305,21 @@ static void print_ctl2(const char *name) printf("\n"); } -static int tlb_isprint(unsigned char c) -{ - return c >= 32; -} - static void dump_binary(int size) { const unsigned char *ptr; - int i, j; + char *prefix; + int i; if (!size) return; - ptr = tlb_read(size); if (!ptr) return; - print_offset(); - printf("%08x: ", offset - size); - - for (i = 0; i < size; i++) - { - printf("%02x%c", ptr[i], (i % 16 == 7) ? '-' : ' '); - if ((i % 16) == 15) - { - printf( " " ); - for (j = 0; j < 16; j++) - printf("%c", tlb_isprint(ptr[i-15+j]) ? ptr[i-15+j] : '.'); - if (i < size-1) - { - printf("\n"); - print_offset(); - printf("%08x: ", offset - size + i + 1); - } - } - } - if (i % 16) - { - printf("%*s ", 3 * (16-(i%16)), ""); - for (j = 0; j < i % 16; j++) - printf("%c", tlb_isprint(ptr[i-(i%16)+j]) ? ptr[i-(i%16)+j] : '.'); - } - printf("\n"); + prefix = malloc( strlen(dump_prefix) + 4 * indent + 1 ); + strcpy( prefix, dump_prefix ); + for (i = 0; i < indent; i++) strcat( prefix, " " ); + dump_data_offset( ptr, size, offset, prefix ); + free( prefix ); } static int dump_msft_varflags(void) @@ -444,9 +421,7 @@ static void dump_msft_typeinfobase(void) static BOOL dump_msft_typeinfobases(seg_t *seg) { - int i; - - for(i = 0; offset < seg->offset+seg->length; i++) + while (offset < seg->offset+seg->length) dump_msft_typeinfobase(); assert(offset == seg->offset+seg->length); @@ -686,11 +661,12 @@ static BOOL dump_msft_arraydescs(seg_t *seg) static BOOL dump_msft_custdata(seg_t *seg) { unsigned short vt; - unsigned i, n; + unsigned n; print_begin_block("CustData"); - for(i=0; offset < seg->offset+seg->length; i++) { + while (offset < seg->offset+seg->length) + { print_offset(); vt = tlb_read_short(); @@ -1235,26 +1211,32 @@ static void dump_sltg_index(int count) { int i; + print_offset(); printf("index:\n"); + print_offset(); print_string0(); printf("\n"); + print_offset(); print_string0(); printf("\n"); for (i = 0; i < count - 2; i++) { + print_offset(); print_string0(); printf("\n"); } - + print_offset(); printf("\n"); } static void dump_sltg_pad(int size_of_pad) { + print_offset(); printf("pad:\n"); dump_binary(size_of_pad); + print_offset(); printf("\n"); } @@ -1877,19 +1859,14 @@ static void dump_type(int len, const char *hlp_strings) } else { - printf("skipping %#x bytes\n", extra); dump_binary(extra); } if (offset < member_offset + sizeof(struct sltg_member_header) + mem->extra) { - print_offset(); - printf("skipping %d bytes\n", member_offset + (int)sizeof(struct sltg_member_header) + mem->extra - offset); dump_binary(member_offset + sizeof(struct sltg_member_header) + mem->extra - offset); } - print_offset(); - printf("dumped %d (%#x) bytes\n", offset - typeinfo_start_offset, offset - typeinfo_start_offset); len -= offset - typeinfo_start_offset; print_offset(); printf("sltg_tail %d (%#x) bytes:\n", len, len); @@ -2005,34 +1982,40 @@ static void sltg_dump(void) libblk_start = offset; dump_sltg_library_block(); - printf("skipping 0x40 bytes\n"); + print_offset(); dump_binary(0x40); + print_offset(); printf("\n"); typeinfo_cnt = print_short_dec("typeinfo count"); + print_offset(); printf("\n"); for (i = 0; i < typeinfo_cnt; i++) dump_sltg_other_typeinfo(i, hlp_strings); len = print_hex("offset from start of library block to name table"); + print_offset(); printf("%#x + %#x = %#x\n", libblk_start, len, libblk_start + len); len = (libblk_start + len) - offset; + print_offset(); printf("skipping %#x bytes (encoded/compressed helpstrings)\n", len); + print_offset(); printf("max string length: %#x, strings length %#x\n", *(short *)hlp_strings, *(int *)(hlp_strings + 2)); dump_binary(len); + print_offset(); printf("\n"); len = print_short_hex("name table jump"); if (len == 0xffff) { - printf("skipping 0x000a bytes\n"); dump_binary(0x000a); + print_offset(); printf("\n"); } else if (len == 0x0200) { - printf("skipping 0x002a bytes\n"); dump_binary(0x002a); + print_offset(); printf("\n"); } else @@ -2041,20 +2024,24 @@ static void sltg_dump(void) assert(0); } - printf("skipping 0x200 bytes\n"); dump_binary(0x200); + print_offset(); printf("\n"); name_table_size = print_hex("name table size"); name_table_start = offset; - printf("name table offset = %#x\n\n", offset); + print_offset(); + printf("name table offset = %#x\n", offset); + print_offset(); + printf("\n"); while (offset < name_table_start + name_table_size) { int aligned_len; dump_binary(8); + print_offset(); print_string0(); printf("\n"); @@ -2064,18 +2051,21 @@ static void sltg_dump(void) dump_binary(aligned_len - len); else dump_binary(len & 1); + print_offset(); printf("\n"); } print_hex("01ffff01"); len = print_hex("length"); - printf("skipping %#x bytes\n", len); dump_binary(len); + print_offset(); printf("\n"); len = (libblk_start + libblk_len) - offset; + print_offset(); printf("skipping libblk remainder %#x bytes\n", len); dump_binary(len); + print_offset(); printf("\n"); /* FIXME: msodumper/olestream.py parses this block differently @@ -2087,24 +2077,30 @@ static void sltg_dump(void) print_hex("unknown"); printf("\n"); */ + print_offset(); printf("skipping 12 bytes\n"); dump_binary(12); + print_offset(); printf("\n"); print_guid("uuid"); + print_offset(); printf("\n"); /* 0x0008,"TYPELIB",0 */ dump_binary(12); + print_offset(); printf("\n"); + print_offset(); printf("skipping 12 bytes\n"); dump_binary(12); + print_offset(); printf("\n"); + print_offset(); printf("skipping remainder 0x10 bytes\n"); dump_binary(0x10); - printf("\n"); } void tlb_dump(void) @@ -2116,6 +2112,26 @@ void tlb_dump(void) sltg_dump(); } +void tlb_dump_resource( void *ptr, size_t size, const char *prefix ) +{ + void *prev_dump_base = dump_base; + size_t prev_dump_total_len = dump_total_len; + const DWORD *sig; + + dump_base = ptr; + dump_total_len = size; + dump_prefix = prefix; + + sig = PRD(0, sizeof(DWORD)); + if (*sig == MSFT_MAGIC) + msft_dump(); + else + sltg_dump(); + + dump_base = prev_dump_base; + dump_total_len = prev_dump_total_len; +} + enum FileSig get_kind_tlb(void) { const DWORD *sig = PRD(0, sizeof(DWORD)); diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 673312b120c..d15eacf2971 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -271,6 +271,8 @@ void nls_dump(void); enum FileSig get_kind_reg(void); void reg_dump(void); +extern void tlb_dump_resource( void *ptr, size_t size, const char *prefix ); + BOOL codeview_dump_symbols(const void* root, unsigned long start, unsigned long size); BOOL codeview_dump_types_from_offsets(const void* table, const DWORD* offsets, unsigned num_types); BOOL codeview_dump_types_from_block(const void* table, unsigned long len);

1 0

Alexandre Julliard : winedump: Dump registry scripts resources as text.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: wine Branch: master Commit: 3c2d6128fef6a8b6f7d4f2a682e777b3e4425bf0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c2d6128fef6a8b6f7d4f2a682e777… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 5 12:19:16 2024 +0200 winedump: Dump registry scripts resources as text. --- tools/winedump/pe.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 8ff0a955c99..455fa683388 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -3025,7 +3025,7 @@ static void dump_version_data( const void *ptr, unsigned int size, const char *p } /* dump data for a HTML/MANIFEST resource */ -static void dump_xml_data( const void *ptr, unsigned int size, const char *prefix ) +static void dump_text_data( const void *ptr, unsigned int size, const char *prefix ) { const char *p = ptr, *end = p + size; @@ -3038,6 +3038,18 @@ static void dump_xml_data( const void *ptr, unsigned int size, const char *prefi } } +static int cmp_resource_name( const IMAGE_RESOURCE_DIR_STRING_U *str_res, const char *str ) +{ + unsigned int i; + + for (i = 0; i < str_res->Length; i++) + { + int res = str_res->NameString[i] - (WCHAR)str[i]; + if (res || !str[i]) return res; + } + return -(WCHAR)str[i]; +} + static void dump_dir_resource(void) { const IMAGE_RESOURCE_DIRECTORY *root = get_dir(IMAGE_FILE_RESOURCE_DIRECTORY); @@ -3090,7 +3102,11 @@ static void dump_dir_resource(void) data = (const IMAGE_RESOURCE_DATA_ENTRY *)((const char *)root + e3->OffsetToData); if (e1->NameIsString) { - dump_data( RVA( data->OffsetToData, data->Size ), data->Size, " " ); + string = (const IMAGE_RESOURCE_DIR_STRING_U*)((const char *)root + e1->NameOffset); + if (!cmp_resource_name( string, "WINE_REGISTRY" )) + dump_text_data( RVA( data->OffsetToData, data->Size ), data->Size, " | " ); + else + dump_data( RVA( data->OffsetToData, data->Size ), data->Size, " " ); } else switch(e1->Id) { @@ -3105,7 +3121,7 @@ static void dump_dir_resource(void) break; case 23: /* RT_HTML */ case 24: /* RT_MANIFEST */ - dump_xml_data( RVA( data->OffsetToData, data->Size ), data->Size, " | " ); + dump_text_data( RVA( data->OffsetToData, data->Size ), data->Size, " | " ); break; default: dump_data( RVA( data->OffsetToData, data->Size ), data->Size, " " );

1 0