March 2024 - Wine-commits - list.winehq.org

Zebediah Figura : vkd3d-shader/tpf: Do not write structs with no numeric fields into the RDEF.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 34e9c101e8e4bf5b7c451696069824ca28706128 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/34e9c101e8e4bf5b7c45169606982… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 13 18:51:26 2024 -0600 vkd3d-shader/tpf: Do not write structs with no numeric fields into the RDEF. --- libs/vkd3d-shader/tpf.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 7700a2d9..5bbfa4d1 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3474,8 +3474,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (var->is_uniform && var->buffer == cbuffer - && var->data_type->class != HLSL_CLASS_OBJECT) + if (var->is_uniform && var->buffer == cbuffer && var->data_type->reg_size[HLSL_REGSET_NUMERIC]) ++var_count; } @@ -3509,8 +3508,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (var->is_uniform && var->buffer == cbuffer - && var->data_type->class != HLSL_CLASS_OBJECT) + if (var->is_uniform && var->buffer == cbuffer && var->data_type->reg_size[HLSL_REGSET_NUMERIC]) { uint32_t flags = 0; @@ -3537,8 +3535,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) j = 0; LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (var->is_uniform && var->buffer == cbuffer - && var->data_type->class != HLSL_CLASS_OBJECT) + if (var->is_uniform && var->buffer == cbuffer && var->data_type->reg_size[HLSL_REGSET_NUMERIC]) { const unsigned int var_size = (profile->major_version >= 5 ? 10 : 6); size_t var_offset = vars_start + j * var_size * sizeof(uint32_t);

1 0

Zebediah Figura : vkd3d-shader/tpf: Explicitly write the class and base type for non-numeric types.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 5bf23cb2f5d196e507d85fad90add3a5f1a47083 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5bf23cb2f5d196e507d85fad90add… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 5 19:51:53 2024 -0600 vkd3d-shader/tpf: Explicitly write the class and base type for non-numeric types. Avoid relying on that information being stored in the hlsl_type. --- libs/vkd3d-shader/tpf.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 5bbfa4d1..ed67c9a3 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2994,8 +2994,6 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type) { switch (type->class) { - case HLSL_CLASS_ARRAY: - return sm4_class(type->e.array.type); case HLSL_CLASS_MATRIX: assert(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); if (type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR) @@ -3004,10 +3002,11 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type) return D3D_SVC_MATRIX_ROWS; case HLSL_CLASS_SCALAR: return D3D_SVC_SCALAR; - case HLSL_CLASS_STRUCT: - return D3D_SVC_STRUCT; case HLSL_CLASS_VECTOR: return D3D_SVC_VECTOR; + + case HLSL_CLASS_ARRAY: + case HLSL_CLASS_STRUCT: case HLSL_CLASS_OBJECT: break; } @@ -3029,8 +3028,6 @@ static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type) return D3D_SVT_INT; case HLSL_TYPE_UINT: return D3D_SVT_UINT; - case HLSL_TYPE_VOID: - return D3D_SVT_VOID; default: vkd3d_unreachable(); } @@ -3082,9 +3079,14 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b put_u32(buffer, field->type->bytecode_offset); put_u32(buffer, field->reg_offset[HLSL_REGSET_NUMERIC]); } + + type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(D3D_SVC_STRUCT, D3D_SVT_VOID)); + } + else + { + type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(sm4_class(array_type), sm4_base_type(array_type))); } - type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(sm4_class(type), sm4_base_type(type))); put_u32(buffer, vkd3d_make_u32(type->dimy, type->dimx)); put_u32(buffer, vkd3d_make_u32(array_size, field_count)); put_u32(buffer, fields_offset);

1 0

Zebediah Figura : vkd3d-shader/tpf: Write the component count as the column count for structs.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 7b8789528900c172251960f3795087bbd6d90916 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b8789528900c172251960f379508… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 13 18:52:29 2024 -0600 vkd3d-shader/tpf: Write the component count as the column count for structs. --- libs/vkd3d-shader/tpf.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index ed67c9a3..038a97d9 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3038,8 +3038,8 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b const struct hlsl_type *array_type = hlsl_get_multiarray_element_type(type); const char *name = array_type->name ? array_type->name : "<unnamed>"; const struct hlsl_profile_info *profile = ctx->profile; - unsigned int field_count = 0, array_size = 0; - size_t fields_offset = 0, name_offset = 0; + unsigned int array_size = 0; + size_t name_offset = 0; size_t i; if (type->bytecode_offset) @@ -3053,6 +3053,8 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b if (array_type->class == HLSL_CLASS_STRUCT) { + unsigned int field_count = 0; + size_t fields_offset = 0; for (i = 0; i < array_type->e.record.field_count; ++i) { @@ -3079,18 +3081,20 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b put_u32(buffer, field->type->bytecode_offset); put_u32(buffer, field->reg_offset[HLSL_REGSET_NUMERIC]); } - type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(D3D_SVC_STRUCT, D3D_SVT_VOID)); + put_u32(buffer, vkd3d_make_u32(1, hlsl_type_component_count(array_type))); + put_u32(buffer, vkd3d_make_u32(array_size, field_count)); + put_u32(buffer, fields_offset); } else { + assert(array_type->class <= HLSL_CLASS_LAST_NUMERIC); type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(sm4_class(array_type), sm4_base_type(array_type))); + put_u32(buffer, vkd3d_make_u32(array_type->dimy, array_type->dimx)); + put_u32(buffer, vkd3d_make_u32(array_size, 0)); + put_u32(buffer, 1); } - put_u32(buffer, vkd3d_make_u32(type->dimy, type->dimx)); - put_u32(buffer, vkd3d_make_u32(array_size, field_count)); - put_u32(buffer, fields_offset); - if (profile->major_version >= 5) { put_u32(buffer, 0); /* FIXME: unknown */

1 0

Zebediah Figura : vkd3d-shader/tpf: Set the user-packed flag for sm5.0 resources as well.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 2247288003ef62507f196fe1fc7659e2f5da9dd7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2247288003ef62507f196fe1fc765… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 13 18:53:01 2024 -0600 vkd3d-shader/tpf: Set the user-packed flag for sm5.0 resources as well. --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 038a97d9..4d065831 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3285,7 +3285,7 @@ static struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, un extern_resources[*count].name = name; extern_resources[*count].data_type = component_type; - extern_resources[*count].is_user_packed = false; + extern_resources[*count].is_user_packed = !!var->reg_reservation.reg_type; extern_resources[*count].regset = regset; extern_resources[*count].id = var->regs[regset].id + regset_offset;

1 0

Zebediah Figura : tests: Test constant and resource reflection via D3DReflect().
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 98b90dde787ec428843e945edee55190dfda64c1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98b90dde787ec428843e945edee55… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 6 19:20:08 2024 -0600 tests: Test constant and resource reflection via D3DReflect(). Ported from Wine. --- tests/hlsl_d3d12.c | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 290 insertions(+)

1 0

Zebediah Figura : tests: Add more tests for resource and struct RDEF contents.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: ddfa94fdca0c34e11f0ce7c22e2b72041f2d623e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ddfa94fdca0c34e11f0ce7c22e2b7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 13 18:53:38 2024 -0600 tests: Add more tests for resource and struct RDEF contents. --- tests/hlsl_d3d12.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 10 deletions(-) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 920bbe69..4d03efd5 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1370,7 +1370,7 @@ static void test_reflection(void) " float3x1 o;\n" " float4 p;\n" " float q;\n" - " struct r_name {float a;} r;\n" + " struct r_name {float a; float4 b;} r;\n" " column_major float3x1 t;\n" "};\n" "\n" @@ -1407,6 +1407,7 @@ static void test_reflection(void) static const D3D12_SHADER_TYPE_DESC r_field_types[] = { {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}, }; static const struct shader_variable globals_vars = @@ -1429,8 +1430,8 @@ static void test_reflection(void) {{"o", 176, 36, D3D_SVF_USED, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_MATRIX_ROWS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, {{"p", 224, 16, 0, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}, {{"q", 240, 4, 0, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}}, - {{"r", 256, 4, 0, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 1, 0, ARRAY_SIZE(r_field_types), 0, "r_name"}, r_field_types}, - {{"t", 260, 12, 0, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_MATRIX_COLUMNS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, + {{"r", 256, 32, 0, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 5, 0, ARRAY_SIZE(r_field_types), 0, "r_name"}, r_field_types}, + {{"t", 288, 12, 0, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_MATRIX_COLUMNS, D3D_SVT_FLOAT, 3, 1, 0, 0, 0, "float3x1"}}, }; static const struct shader_variable b5_vars = {{"u", 0, 16, D3D_SVF_USED, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}; @@ -1439,7 +1440,7 @@ static void test_reflection(void) { {{"$Globals", D3D_CT_CBUFFER, 1, 16}, &globals_vars}, {{"$Params", D3D_CT_CBUFFER, 1, 16}, &params_vars}, - {{"b1", D3D_CT_CBUFFER, ARRAY_SIZE(buffer_vars), 272}, buffer_vars}, + {{"b1", D3D_CT_CBUFFER, ARRAY_SIZE(buffer_vars), 304}, buffer_vars}, {{"b5", D3D_CT_CBUFFER, 1, 16}, &b5_vars}, }; @@ -1466,11 +1467,35 @@ static void test_reflection(void) " foo = bar + 2;\n" "};\n" "sampler2D g;\n" - "sampler b : register(s5);\n" + "sampler b : register(s7);\n" + "struct\n" + "{\n" + " float a;\n" + " Texture1D<int2> b;\n" + " float c;\n" + " Texture2D d;\n" + "} h : register(t7);\n" + "struct\n" + "{\n" + " float a;\n" + " Texture2D b;\n" + " SamplerState c;\n" + "} i;\n" + "struct\n" + "{\n" + " Texture2D b;\n" + " SamplerState c;\n" + "} j;\n" + "struct\n" + "{\n" + " Texture2D a;\n" + " Texture1DArray<float> b;\n" + " struct { SamplerState a; } c;\n" + "} k;\n" "float4 main(float2 pos : texcoord) : SV_TARGET\n" "{\n" " return a.Sample(b, pos) + a.Sample(c, pos) + a.Sample(d, pos) + tex2D(f, pos) + tex2D(e, pos)" - " + tex2D(g, pos);\n" + " + tex2D(g, pos) + h.b.Load(h.c).x + k.b.Sample(k.c.a, pos);\n" "}"; static const D3D12_SHADER_INPUT_BIND_DESC ps_bindings[] = @@ -1480,11 +1505,36 @@ static void test_reflection(void) {"e", D3D_SIT_SAMPLER, 2, 1}, {"f", D3D_SIT_SAMPLER, 3, 1}, {"g", D3D_SIT_SAMPLER, 4, 1}, - {"b", D3D_SIT_SAMPLER, 5, 1, D3D_SIF_USERPACKED}, + {"k.c.a", D3D_SIT_SAMPLER, 5, 1}, + {"b", D3D_SIT_SAMPLER, 7, 1, D3D_SIF_USERPACKED}, {"f", D3D_SIT_TEXTURE, 0, 1, D3D_SIF_TEXTURE_COMPONENTS, D3D_RETURN_TYPE_FLOAT, D3D_SRV_DIMENSION_TEXTURE2D, ~0u}, {"e", D3D_SIT_TEXTURE, 1, 1, D3D_SIF_TEXTURE_COMPONENTS, D3D_RETURN_TYPE_FLOAT, D3D_SRV_DIMENSION_TEXTURE2D, ~0u}, {"g", D3D_SIT_TEXTURE, 2, 1, D3D_SIF_TEXTURE_COMPONENTS, D3D_RETURN_TYPE_FLOAT, D3D_SRV_DIMENSION_TEXTURE2D, ~0u}, {"a", D3D_SIT_TEXTURE, 3, 1, D3D_SIF_TEXTURE_COMPONENTS, D3D_RETURN_TYPE_FLOAT, D3D_SRV_DIMENSION_TEXTURE2D, ~0u}, + {"k.b", D3D_SIT_TEXTURE, 5, 1, 0, D3D_RETURN_TYPE_FLOAT, D3D_SRV_DIMENSION_TEXTURE1DARRAY, ~0u}, + {"h.b", D3D_SIT_TEXTURE, 7, 1, D3D_SIF_USERPACKED | D3D_SIF_TEXTURE_COMPONENT_0, D3D_RETURN_TYPE_SINT, D3D_SRV_DIMENSION_TEXTURE1D, ~0u}, + {"$Globals", D3D_SIT_CBUFFER, 0, 1}, + }; + + static const D3D12_SHADER_TYPE_DESC ps_h_field_types[] = + { + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, + }; + + static const D3D12_SHADER_TYPE_DESC ps_i_field_types[] = + { + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, + }; + + static const struct shader_variable ps_globals_vars[] = + { + {{"h", 0, 8, D3D_SVF_USED, NULL, 7, 1, ~0u, 0}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 4, 0, ARRAY_SIZE(ps_h_field_types), 0, "<unnamed>"}, ps_h_field_types}, + {{"i", 16, 4, 0, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 3, 0, ARRAY_SIZE(ps_i_field_types), 0, "<unnamed>"}, ps_i_field_types}, + }; + static const struct shader_buffer ps_buffers[] = + { + {{"$Globals", D3D_CT_CBUFFER, ARRAY_SIZE(ps_globals_vars), 32}, ps_globals_vars}, }; static const struct @@ -1499,7 +1549,7 @@ static void test_reflection(void) tests[] = { {vs_source, "vs_5_0", vs_bindings, ARRAY_SIZE(vs_bindings), vs_buffers, ARRAY_SIZE(vs_buffers)}, - {ps_source, "ps_5_0", ps_bindings, ARRAY_SIZE(ps_bindings)}, + {ps_source, "ps_5_0", ps_bindings, ARRAY_SIZE(ps_bindings), ps_buffers, ARRAY_SIZE(ps_buffers)}, }; for (unsigned int t = 0; t < ARRAY_SIZE(tests); ++t) @@ -1555,8 +1605,9 @@ static void test_reflection(void) ok(!var_desc.DefaultValue, "Got default value %p.\n", var_desc.DefaultValue); todo ok(var_desc.StartTexture == expect->var_desc.StartTexture, "Got texture offset %u.\n", var_desc.StartTexture); - ok(var_desc.TextureSize == expect->var_desc.TextureSize, - "Got texture size %u.\n", var_desc.TextureSize); + todo_if (expect->var_desc.TextureSize) + ok(var_desc.TextureSize == expect->var_desc.TextureSize, + "Got texture size %u.\n", var_desc.TextureSize); todo ok(var_desc.StartSampler == expect->var_desc.StartSampler, "Got sampler offset %u.\n", var_desc.StartSampler); ok(var_desc.SamplerSize == expect->var_desc.SamplerSize,

1 0

Alexandre Julliard : widl: Don't skip a pointer level for pointers to pointers to strings.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: wine Branch: master Commit: 69849bd2ee7bd2f180f3a9199fccf2a2c76d9751 URL: https://gitlab.winehq.org/wine/wine/-/commit/69849bd2ee7bd2f180f3a9199fccf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 11:26:10 2024 +0100 widl: Don't skip a pointer level for pointers to pointers to strings. --- dlls/rpcrt4/tests/server.c | 12 ------------ tools/widl/typegen.c | 19 +++++-------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 09b2d351a1d..f92ed401a69 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -249,12 +249,8 @@ static void (__cdecl *test_I_RpcBindingInqLocalClientPID)(unsigned int protseq, /* type check statements generated in header file */ fnprintf *p_printf = printf; -static BOOL is_interp; - static void set_interp_interface(void) { - is_interp = TRUE; - #define X(name) name = interp_##name; SERVER_FUNCTIONS #undef X @@ -262,8 +258,6 @@ static void set_interp_interface(void) static void set_mixed_interface(void) { - is_interp = FALSE; - #define X(name) name = mixed_##name; SERVER_FUNCTIONS #undef X @@ -1396,11 +1390,9 @@ basic_tests(void) check_null(NULL); - if (!is_interp || sizeof(void*) != 8) { /* broken in widl for win64 */ str = get_filename(); ok(!strcmp(str, __FILE__), "get_filename() returned %s instead of %s\n", str, __FILE__); midl_user_free(str); - } x = echo_ranged_int(0,0,0); ok(x == 0, "echo_ranged_int() returned %d instead of 0\n", x); @@ -1678,7 +1670,6 @@ pointer_tests(void) ok(!strcmp(name.name, "Jeremy Wh"), "name didn't unmarshall properly, expected \"Jeremy Wh\", but got \"%s\"\n", name.name); free(name.name); - if (!is_interp) { /* broken in widl */ n = -1; names = NULL; get_names(&n, &names); @@ -1698,13 +1689,10 @@ pointer_tests(void) MIDL_user_free(namesw[0]); MIDL_user_free(namesw[1]); MIDL_user_free(namesw); - } } - if (!is_interp) { /* broken in widl */ pa2 = a; ok(sum_pcarr2(4, &pa2) == 10, "RPC sum_pcarr2\n"); - } s123 = get_s123(); ok(s123->f1 == 1 && s123->f2 == 2 && s123->f3 == 3, "RPC get_s123\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7abc9905069..14d8906173b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2944,7 +2944,10 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, elem_type = type_pointer_get_ref_type(type); if (type_get_type(elem_type) == TYPE_POINTER && is_array(type)) - return write_array_tfs(file, attrs, type, name, typestring_offset); + { + write_array_tfs(file, attrs, type, name, typestring_offset); + return start_offset; + } if (type_get_type(elem_type) != TYPE_BASIC) { @@ -3730,19 +3733,7 @@ static unsigned int write_type_tfs(FILE *file, const attr_list_t *attrs, else ref_context = context; - if (is_string_type(attrs, ref)) - { - if (context != TYPE_CONTEXT_CONTAINER_NO_POINTERS) - write_pointer_tfs(file, attrs, type, *typeformat_offset + 4, context, typeformat_offset); - - offset = write_type_tfs(file, attrs, ref, name, ref_context, typeformat_offset); - if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) - return 0; - return offset; - } - - offset = write_type_tfs( file, attrs, type_pointer_get_ref_type(type), name, - ref_context, typeformat_offset); + offset = write_type_tfs( file, attrs, ref, name, ref_context, typeformat_offset); if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) return 0; return write_pointer_tfs(file, attrs, type, offset, context, typeformat_offset);

1 0

Alexandre Julliard : include: Fix a parameter type in the IEnumTfUIElements interface.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: wine Branch: master Commit: 5e1da85068143bf727e0252230343b1636799716 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e1da85068143bf727e0252230343b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 21:57:27 2024 +0100 include: Fix a parameter type in the IEnumTfUIElements interface. Caught by midl. --- include/msctf.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msctf.idl b/include/msctf.idl index 6a9b36a670e..6b0c84bdd53 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -1817,7 +1817,7 @@ interface IEnumTfUIElements : IUnknown HRESULT Next( [in] ULONG count, [out, size_is(count), length_is(fetched)] ITfUIElement **element, - [out] ULONG fetched); + [out] ULONG *fetched); HRESULT Reset();

1 0

Alexandre Julliard : idl: Use IPSFactoryBuffer instead of a non-existent IFactoryBuffer.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: wine Branch: master Commit: 35cb600c433174267830c3309bb4d50f666f247b URL: https://gitlab.winehq.org/wine/wine/-/commit/35cb600c433174267830c3309bb4d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 22:18:59 2024 +0100 idl: Use IPSFactoryBuffer instead of a non-existent IFactoryBuffer. Caught by midl. --- dlls/actxprxy/actxprxy_activscp.idl | 2 +- dlls/actxprxy/actxprxy_comcat.idl | 2 +- dlls/actxprxy/actxprxy_docobj.idl | 2 +- dlls/actxprxy/actxprxy_hlink.idl | 2 +- dlls/actxprxy/actxprxy_htiface.idl | 2 +- dlls/actxprxy/actxprxy_htiframe.idl | 2 +- dlls/actxprxy/actxprxy_objsafe.idl | 2 +- dlls/actxprxy/actxprxy_ocmm.idl | 2 +- dlls/actxprxy/actxprxy_servprov.idl | 2 +- dlls/actxprxy/actxprxy_shldisp.idl | 2 +- dlls/actxprxy/actxprxy_shobjidl.idl | 2 +- dlls/actxprxy/actxprxy_urlhist.idl | 2 +- dlls/avifil32/avifil32.idl | 2 +- dlls/dispex/disp_ex.idl | 2 +- dlls/ia2comproxy/ia2_classes.idl | 2 +- dlls/ieproxy/ieproxy_ieautomation.idl | 2 +- dlls/ieproxy/ieproxy_perhist.idl | 2 +- dlls/msctfp/msctfp.idl | 2 +- dlls/msdaps/msdaps.idl | 2 +- dlls/msdaps/row_server.idl | 2 +- dlls/ole32/dcom.idl | 2 +- dlls/ole32/ole32_objidl.idl | 2 +- dlls/ole32/ole32_oleidl.idl | 2 +- dlls/ole32/ole32_unknwn.idl | 2 +- dlls/oleacc/oleacc_classes.idl | 2 +- dlls/oleaut32/oleaut32_oaidl.idl | 2 +- dlls/oleaut32/oleaut32_ocidl.idl | 2 +- dlls/qmgrprxy/qmgrprxy.idl | 2 +- dlls/quartz/quartz_strmif.idl | 2 +- dlls/sti/sti_wia.idl | 2 +- dlls/windowscodecs/windowscodecs_wincodec.idl | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-)

1 0

Paul Gofman : win32u: Avoid writing past allocated memory in peek_message().
by Alexandre Julliard 26 Mar '24

26 Mar '24

Module: wine Branch: master Commit: 054a95a817103b8536f1a096c080e030f7858633 URL: https://gitlab.winehq.org/wine/wine/-/commit/054a95a817103b8536f1a096c080e0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 22 21:07:20 2024 -0600 win32u: Avoid writing past allocated memory in peek_message(). --- dlls/win32u/message.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 2b416f39241..3a17c4689ff 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -469,9 +469,13 @@ static inline void push_string( struct packed_message *data, LPCWSTR str ) } /* make sure that there is space for 'size' bytes in buffer, growing it if needed */ -static inline void *get_buffer_space( void **buffer, size_t size, size_t prev_size ) +static inline void *get_buffer_space( void **buffer, size_t size, size_t *buffer_size ) { - if (prev_size < size) *buffer = malloc( size ); + if (*buffer_size < size) + { + *buffer = malloc( size ); + *buffer_size = size; + } return *buffer; } @@ -522,7 +526,7 @@ BOOL set_keyboard_auto_repeat( BOOL enable ) * Unpack a message received from another process. */ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, - void **buffer, size_t size ) + void **buffer, size_t size, size_t *buffer_size ) { size_t minsize = 0; union packed_structs *ps = *buffer; @@ -585,7 +589,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa break; case WM_GETTEXT: case WM_ASKCBFORMATNAME: - if (!get_buffer_space( buffer, (*wparam * sizeof(WCHAR)), size )) return FALSE; + if (!get_buffer_space( buffer, (*wparam * sizeof(WCHAR)), buffer_size )) return FALSE; break; case WM_WININICHANGE: if (!*lparam) return TRUE; @@ -726,17 +730,17 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa minsize = sizeof(SCROLLINFO); break; case SBM_GETSCROLLINFO: - if (!get_buffer_space( buffer, sizeof(SCROLLINFO), size )) return FALSE; + if (!get_buffer_space( buffer, sizeof(SCROLLINFO), buffer_size )) return FALSE; break; case SBM_GETSCROLLBARINFO: - if (!get_buffer_space( buffer, sizeof(SCROLLBARINFO), size )) return FALSE; + if (!get_buffer_space( buffer, sizeof(SCROLLBARINFO), buffer_size )) return FALSE; break; case EM_GETSEL: case SBM_GETRANGE: case CB_GETEDITSEL: if (*wparam || *lparam) { - if (!get_buffer_space( buffer, 2 * sizeof(DWORD), size )) return FALSE; + if (!get_buffer_space( buffer, 2 * sizeof(DWORD), buffer_size )) return FALSE; if (*wparam) *wparam = (WPARAM)*buffer; if (*lparam) *lparam = (LPARAM)((DWORD *)*buffer + 1); } @@ -744,7 +748,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa case EM_GETRECT: case LB_GETITEMRECT: case CB_GETDROPPEDCONTROLRECT: - if (!get_buffer_space( buffer, sizeof(RECT), size )) return FALSE; + if (!get_buffer_space( buffer, sizeof(RECT), buffer_size )) return FALSE; break; case EM_SETRECT: case EM_SETRECTNP: @@ -755,7 +759,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa WORD *len_ptr, len; if (size < sizeof(WORD)) return FALSE; len = *(WORD *)*buffer; - if (!get_buffer_space( buffer, (len + 1) * sizeof(WCHAR), size )) return FALSE; + if (!get_buffer_space( buffer, (len + 1) * sizeof(WCHAR), buffer_size )) return FALSE; len_ptr = *buffer; len_ptr[0] = len_ptr[1] = len; *lparam = (LPARAM)(len_ptr + 1); @@ -780,26 +784,24 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa break; case CB_GETLBTEXT: { - size_t prev_size = size; if (combobox_has_strings( hwnd )) size = (send_message( hwnd, CB_GETLBTEXTLEN, *wparam, 0 ) + 1) * sizeof(WCHAR); else size = sizeof(ULONG_PTR); - if (!get_buffer_space( buffer, size, prev_size )) return FALSE; + if (!get_buffer_space( buffer, size, buffer_size )) return FALSE; break; } case LB_GETTEXT: { - size_t prev_size = size; if (listbox_has_strings( hwnd )) size = (send_message( hwnd, LB_GETTEXTLEN, *wparam, 0 ) + 1) * sizeof(WCHAR); else size = sizeof(ULONG_PTR); - if (!get_buffer_space( buffer, size, prev_size )) return FALSE; + if (!get_buffer_space( buffer, size, buffer_size )) return FALSE; break; } case LB_GETSELITEMS: - if (!get_buffer_space( buffer, *wparam * sizeof(UINT), size )) return FALSE; + if (!get_buffer_space( buffer, *wparam * sizeof(UINT), buffer_size )) return FALSE; break; case WM_NEXTMENU: { @@ -814,7 +816,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa case WM_SIZING: case WM_MOVING: minsize = sizeof(RECT); - if (!get_buffer_space( buffer, sizeof(RECT), size )) return FALSE; + if (!get_buffer_space( buffer, sizeof(RECT), buffer_size )) return FALSE; break; case WM_MDICREATE: { @@ -880,7 +882,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa } case WM_MDIGETACTIVE: if (!*lparam) return TRUE; - if (!get_buffer_space( buffer, sizeof(BOOL), size )) return FALSE; + if (!get_buffer_space( buffer, sizeof(BOOL), buffer_size )) return FALSE; break; case WM_DEVICECHANGE: if (!(*wparam & 0x8000)) return TRUE; @@ -2788,7 +2790,7 @@ int peek_message( MSG *msg, const struct peek_message_filter *filter ) case MSG_NOTIFY: info.flags = ISMEX_NOTIFY; if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, - &info.msg.lParam, &buffer, size )) + &info.msg.lParam, &buffer, size, &buffer_size )) continue; break; case MSG_CALLBACK: @@ -2866,7 +2868,7 @@ int peek_message( MSG *msg, const struct peek_message_filter *filter ) case MSG_OTHER_PROCESS: info.flags = ISMEX_SEND; if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, - &info.msg.lParam, &buffer, size )) + &info.msg.lParam, &buffer, size, &buffer_size )) { /* ignore it */ reply_message( &info, 0, &info.msg );

1 0