April 2024 - Wine-Commits - list.winehq.org

Rémi Bernon : mfreadwrite/reader: Use MFTEnumEx to enumerate stream transforms.
by Alexandre Julliard April 2, 2024

April 2, 2024

Module: wine Branch: master Commit: 17fd8c8e11eabae136be25879b8748fed57b85fc URL: https://gitlab.winehq.org/wine/wine/-/commit/17fd8c8e11eabae136be25879b8748… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 27 14:55:31 2024 +0100 mfreadwrite/reader: Use MFTEnumEx to enumerate stream transforms. --- dlls/mfreadwrite/reader.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index b77b5f9c538..2baa3810ee0 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1926,7 +1926,8 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL { MFT_REGISTER_TYPE_INFO in_type, out_type; struct transform_entry *entry; - GUID *classes, category; + IMFActivate **activates; + GUID category; IMFTransform *transform; UINT i, count; HRESULT hr; @@ -1960,7 +1961,7 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL } count = 0; - if (SUCCEEDED(hr = MFTEnum(category, 0, &in_type, allow_processor ? NULL : &out_type, NULL, &classes, &count))) + if (SUCCEEDED(hr = MFTEnumEx(category, 0, &in_type, allow_processor ? NULL : &out_type, &activates, &count))) { if (!count) { @@ -1972,8 +1973,8 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL { IMFMediaType *media_type; - if (FAILED(hr = CoCreateInstance(&classes[i], NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&transform))) - break; + if (FAILED(IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform))) + continue; if (SUCCEEDED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0)) && SUCCEEDED(hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type))) { @@ -1995,17 +1996,20 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL { entry->transform = transform; *out = entry; - return S_OK; + break; } } IMFTransform_Release(transform); } - CoTaskMemFree(classes); + for (i = 0; i < count; ++i) + IMFActivate_Release(activates[i]); + CoTaskMemFree(activates); } - free(entry); + if (FAILED(hr)) + free(entry); return hr; }

1 0

Rémi Bernon : mfreadwrite/tests: Test the source reader stream change events.
by Alexandre Julliard April 2, 2024

April 2, 2024

Module: wine Branch: master Commit: ed5031ebd8315cadf13b58d2250e0f882c8c8e88 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed5031ebd8315cadf13b58d2250e0f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 25 19:40:04 2024 +0100 mfreadwrite/tests: Test the source reader stream change events. --- dlls/mfreadwrite/tests/mfplat.c | 524 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 524 insertions(+)

1 0

Rémi Bernon : mfreadwrite/reader: Make the GetTransformForStream category parameter optional.
by Alexandre Julliard April 2, 2024

April 2, 2024

Module: wine Branch: master Commit: b5f7ce42638156769d16a114aa173825cb068be2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5f7ce42638156769d16a114aa1738… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 27 14:58:49 2024 +0100 mfreadwrite/reader: Make the GetTransformForStream category parameter optional. --- dlls/mfreadwrite/reader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 2baa3810ee0..252e0c1f51c 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2512,6 +2512,9 @@ static HRESULT WINAPI src_reader_GetTransformForStream(IMFSourceReaderEx *iface, TRACE("%p, %#lx, %#lx, %p, %p.\n", iface, stream_index, transform_index, category, transform); + if (!transform) + return E_POINTER; + EnterCriticalSection(&reader->cs); if (stream_index == MF_SOURCE_READER_FIRST_VIDEO_STREAM) @@ -2525,7 +2528,8 @@ static HRESULT WINAPI src_reader_GetTransformForStream(IMFSourceReaderEx *iface, hr = MF_E_INVALIDINDEX; else { - *category = entry->category; + if (category) + *category = entry->category; *transform = entry->transform; IMFTransform_AddRef(*transform); hr = S_OK;

1 0

Rémi Bernon : mfreadwrite/reader: Avoid accessing an invalid stream index.
by Alexandre Julliard April 2, 2024

April 2, 2024

Module: wine Branch: master Commit: e3510c6bdb85273fb186d97377b5cb46644c36c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3510c6bdb85273fb186d97377b5cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 27 11:02:24 2024 +0100 mfreadwrite/reader: Avoid accessing an invalid stream index. Fixes d6c9ac94d2fc92d86639e74699ef470b1d8a9861. --- dlls/mfreadwrite/reader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 252e0c1f51c..873eac959f1 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2365,7 +2365,6 @@ static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReaderEx *iface, D REFIID riid, void **object) { struct source_reader *reader = impl_from_IMFSourceReaderEx(iface); - struct media_stream *stream = &reader->streams[index]; IUnknown *obj = NULL; HRESULT hr = S_OK; @@ -2386,7 +2385,7 @@ static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReaderEx *iface, D if (index >= reader->stream_count) hr = MF_E_INVALIDSTREAMNUMBER; - else if (!(obj = (IUnknown *)stream->transform_service)) + else if (!(obj = (IUnknown *)reader->streams[index].transform_service)) hr = E_NOINTERFACE; break; }

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic MakeDouble.
by Alexandre Julliard April 2, 2024

April 2, 2024

Module: vkd3d Branch: master Commit: 2909a5aaccab01610de322b5af57eac2b710d507 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2909a5aaccab01610de322b5af57e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Mar 19 00:22:51 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic MakeDouble. --- libs/vkd3d-shader/dxil.c | 28 ++++++++++++++++++++++++++++ tests/hlsl/cast-64-bit.shader_test | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0787ee13..c2c12aec 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -410,6 +410,7 @@ enum dx_intrinsic_opcode DX_GROUP_ID = 94, DX_THREAD_ID_IN_GROUP = 95, DX_FLATTENED_THREAD_ID_IN_GROUP = 96, + DX_MAKE_DOUBLE = 101, DX_SPLIT_DOUBLE = 102, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, @@ -2372,6 +2373,12 @@ static void src_param_init_scalar(struct vkd3d_shader_src_param *param, unsigned param->modifiers = VKD3DSPSM_NONE; } +static void src_param_init_vector(struct vkd3d_shader_src_param *param, unsigned int component_count) +{ + param->swizzle = VKD3D_SHADER_NO_SWIZZLE & ((1ull << VKD3D_SHADER_SWIZZLE_SHIFT(component_count)) - 1); + param->modifiers = VKD3DSPSM_NONE; +} + static void src_param_init_from_value(struct vkd3d_shader_src_param *param, const struct sm6_value *src) { src_param_init(param); @@ -4699,6 +4706,26 @@ static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, enum dx_intrin instruction_dst_param_init_ssa_scalar(ins, sm6); } +static void sm6_parser_emit_dx_make_double(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_src_param *src_params; + struct vkd3d_shader_instruction *ins; + struct vkd3d_shader_register reg; + + if (!sm6_parser_emit_composite_construct(sm6, &operands[0], 2, state, &reg)) + return; + + ins = state->ins; + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); + if (!(src_params = instruction_src_params_alloc(ins, 1, sm6))) + return; + src_params[0].reg = reg; + src_param_init_vector(&src_params[0], 2); + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static void sm6_parser_emit_dx_raw_buffer_load(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -5356,6 +5383,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_LEGACY_F32TOF16 ] = {"i", "f", sm6_parser_emit_dx_unary}, [DX_LOAD_INPUT ] = {"o", "ii8i", sm6_parser_emit_dx_load_input}, [DX_LOG ] = {"g", "R", sm6_parser_emit_dx_unary}, + [DX_MAKE_DOUBLE ] = {"d", "ii", sm6_parser_emit_dx_make_double}, [DX_RAW_BUFFER_LOAD ] = {"o", "Hii8i", sm6_parser_emit_dx_raw_buffer_load}, [DX_RAW_BUFFER_STORE ] = {"v", "Hiioooocc", sm6_parser_emit_dx_raw_buffer_store}, [DX_ROUND_NE ] = {"g", "R", sm6_parser_emit_dx_unary}, diff --git a/tests/hlsl/cast-64-bit.shader_test b/tests/hlsl/cast-64-bit.shader_test index 41a1af4d..f488570e 100644 --- a/tests/hlsl/cast-64-bit.shader_test +++ b/tests/hlsl/cast-64-bit.shader_test @@ -48,7 +48,7 @@ float4 main() : sv_target [test] uniform 0 uint4 0xc000000 0x40020000 0x80000000 0xc04be000 -todo draw quad +todo(sm<6) draw quad probe all rgba (2.25, -55.75001526, 0.0, 0.0) 1 @@ -63,7 +63,7 @@ float4 main() : sv_target [test] uniform 0 uint4 0x80000000 0xc04be000 0 0 -todo draw quad +todo(sm<6) draw quad probe all rgba (-55.75001526, 0.0, 0.0, 0.0) 1

1 0

Conor McCarthy : tests/hlsl: Add tests for asdouble().
by Alexandre Julliard April 2, 2024

April 2, 2024

Module: vkd3d Branch: master Commit: cf6e518f1e68d9ef89c40f7138d357b529cec56d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cf6e518f1e68d9ef89c40f7138d35… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Mar 19 00:21:27 2024 +1000 tests/hlsl: Add tests for asdouble(). --- tests/hlsl/cast-64-bit.shader_test | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tests/hlsl/cast-64-bit.shader_test b/tests/hlsl/cast-64-bit.shader_test index 1e33d811..41a1af4d 100644 --- a/tests/hlsl/cast-64-bit.shader_test +++ b/tests/hlsl/cast-64-bit.shader_test @@ -36,6 +36,37 @@ todo(sm<6) draw quad probe all rgbaui (0, 0xc0120000, 0x80000000, 0x40210000) +[pixel shader todo] +uniform uint4 u; + +float4 main() : sv_target +{ + // Low bits, high bits + double2 d = asdouble(u.xz, u.yw); + return float4(d, 0, 0); +} + +[test] +uniform 0 uint4 0xc000000 0x40020000 0x80000000 0xc04be000 +todo draw quad +probe all rgba (2.25, -55.75001526, 0.0, 0.0) 1 + + +[pixel shader todo] +uniform uint2 u; + +float4 main() : sv_target +{ + double d = asdouble(u.x, u.y); + return float4(d, 0, 0, 0); +} + +[test] +uniform 0 uint4 0x80000000 0xc04be000 0 0 +todo draw quad +probe all rgba (-55.75001526, 0.0, 0.0, 0.0) 1 + + [require] shader model >= 6.0 int64

1 0

Alexandre Julliard : widl: Use the correct type for non-encapsulated union discriminants.
by Alexandre Julliard April 2, 2024

April 2, 2024

Module: wine Branch: master Commit: 4f8958eb56bb302b20f1c34b7aef9f65f7954ce1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f8958eb56bb302b20f1c34b7aef9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 15:34:32 2024 +0200 widl: Use the correct type for non-encapsulated union discriminants. --- tools/widl/typegen.c | 97 ++++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0b2caea8a19..a714ff8df71 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1621,6 +1621,41 @@ static int write_base_type(FILE *file, const type_t *type, unsigned int *typestr return 1; } +static unsigned char get_correlation_type( const type_t *correlation_var ) +{ + unsigned char fc; + + switch (type_get_type(correlation_var)) + { + case TYPE_BASIC: + fc = get_basic_fc(correlation_var); + switch (fc) + { + case FC_SMALL: + case FC_USMALL: + case FC_SHORT: + case FC_USHORT: + case FC_LONG: + case FC_ULONG: + return fc; + case FC_CHAR: + return FC_SMALL; + case FC_BYTE: + return FC_USMALL; + case FC_WCHAR: + return FC_SHORT; + } + break; + case TYPE_ENUM: + return (get_enum_fc(correlation_var) == FC_ENUM32) ? FC_LONG : FC_SHORT; + case TYPE_POINTER: + return (pointer_size == 8) ? FC_HYPER : FC_LONG; + default: + break; + } + return 0; +} + /* write conformance / variance descriptor */ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, unsigned int baseoff, const type_t *type, @@ -1714,7 +1749,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, if (subexpr->type == EXPR_IDENTIFIER) { const type_t *correlation_variable = NULL; - unsigned char param_type = 0; + unsigned char param_type; unsigned int offset = 0; const var_t *var; struct expr_loc expr_loc; @@ -1760,51 +1795,8 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, offset -= baseoff; - if (type_get_type(correlation_variable) == TYPE_BASIC) - { - switch (get_basic_fc(correlation_variable)) - { - case FC_CHAR: - case FC_SMALL: - param_type = FC_SMALL; - break; - case FC_BYTE: - case FC_USMALL: - param_type = FC_USMALL; - break; - case FC_WCHAR: - case FC_SHORT: - param_type = FC_SHORT; - break; - case FC_USHORT: - param_type = FC_USHORT; - break; - case FC_LONG: - param_type = FC_LONG; - break; - case FC_ULONG: - param_type = FC_ULONG; - break; - default: - error("write_conf_or_var_desc: conformance variable type not supported 0x%x\n", - get_basic_fc(correlation_variable)); - } - } - else if (type_get_type(correlation_variable) == TYPE_ENUM) - { - if (get_enum_fc(correlation_variable) == FC_ENUM32) - param_type = FC_LONG; - else - param_type = FC_SHORT; - } - else if (type_get_type(correlation_variable) == TYPE_POINTER) - { - if (pointer_size == 8) - param_type = FC_HYPER; - else - param_type = FC_LONG; - } - else + param_type = get_correlation_type( correlation_variable ); + if (!param_type) { error("write_conf_or_var_desc: non-arithmetic type used as correlation variable %s\n", subexpr->u.sval); @@ -2505,13 +2497,20 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) { short reloff; unsigned int absoff = ft->typestring_offset; + unsigned char fc; + const expr_t *switch_is = get_attrp(f->attrs, ATTR_SWITCHIS); + struct expr_loc expr_loc = { .v = f }; + + fc = get_correlation_type( expr_resolve_type( &expr_loc, current_structure, switch_is )); + if (!fc) fc = FC_LONG; + if (is_attr(ft->attrs, ATTR_SWITCHTYPE)) absoff += 8; /* we already have a corr descr, skip it */ print_file(file, 0, "/* %d */\n", *tfsoff); print_file(file, 2, "0x%x,\t/* FC_NON_ENCAPSULATED_UNION */\n", FC_NON_ENCAPSULATED_UNION); - print_file(file, 2, "0x%x,\t/* FIXME: always FC_LONG */\n", FC_LONG); - *tfsoff += 2 + write_conf_or_var_desc(file, current_structure, offset, ft, - get_attrp(f->attrs, ATTR_SWITCHIS), 0); + print_file(file, 2, "0x%x,\t/* %s */\n", fc, string_of_type(fc)); + + *tfsoff += 2 + write_conf_or_var_desc(file, current_structure, offset, ft, switch_is, 0); reloff = absoff - *tfsoff; print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", (unsigned short)reloff, reloff, absoff);

1 0

Alexandre Julliard : widl: Output more correct /robust flags.
by Alexandre Julliard April 2, 2024

April 2, 2024

Module: wine Branch: master Commit: 66bec1943485b39b793c5b10f81c4decf3568434 URL: https://gitlab.winehq.org/wine/wine/-/commit/66bec1943485b39b793c5b10f81c4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 14:23:12 2024 +0200 widl: Output more correct /robust flags. --- tools/widl/typegen.c | 54 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index df25cdb6901..0b2caea8a19 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -44,6 +44,7 @@ static const type_t *current_structure; static const var_t *current_func; +static const var_t *current_arg; static const type_t *current_iface; static struct list expr_eval_routines = LIST_INIT(expr_eval_routines); @@ -79,6 +80,12 @@ static const unsigned short IsSimpleRef = 0x0100; /* static const unsigned short IsDontCallFreeInst = 0x0200; */ /* static const unsigned short SaveForAsyncFinish = 0x0400; */ +/* robust flags in correlation descriptors */ +static const unsigned short RobustEarly = 0x0001; +/* static const unsigned short RobustSplit = 0x0002; */ +static const unsigned short RobustIsIIdIs = 0x0004; +/* static const unsigned short RobustDontCheck = 0x0008; */ + static unsigned int field_memsize(const type_t *type, unsigned int *offset); static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align); static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type, @@ -1617,16 +1624,16 @@ static int write_base_type(FILE *file, const type_t *type, unsigned int *typestr /* write conformance / variance descriptor */ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, unsigned int baseoff, const type_t *type, - const expr_t *expr) + const expr_t *expr, unsigned short robust_flags) { unsigned char operator_type = 0; unsigned char conftype = FC_NORMAL_CONFORMANCE; - unsigned short robust_flags = 0; const char *conftype_string = "field"; const expr_t *subexpr; const type_t *iface = NULL; const char *name; + robust_flags |= RobustEarly; if (!expr) { print_file(file, 2, "NdrFcLong(0xffffffff),\t/* -1 */\n"); @@ -1726,6 +1733,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, break; } offset += get_stack_size( var, NULL ); + if (var == current_arg) robust_flags &= ~RobustEarly; } } else @@ -1840,6 +1848,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, eval->expr = expr; list_add_tail (&expr_eval_routines, &eval->entry); } + robust_flags &= ~RobustEarly; if (callback_offset > USHRT_MAX) error("Maximum number of callback routines reached\n"); @@ -2502,7 +2511,7 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) print_file(file, 2, "0x%x,\t/* FC_NON_ENCAPSULATED_UNION */\n", FC_NON_ENCAPSULATED_UNION); print_file(file, 2, "0x%x,\t/* FIXME: always FC_LONG */\n", FC_LONG); *tfsoff += 2 + write_conf_or_var_desc(file, current_structure, offset, ft, - get_attrp(f->attrs, ATTR_SWITCHIS)); + get_attrp(f->attrs, ATTR_SWITCHIS), 0); reloff = absoff - *tfsoff; print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", (unsigned short)reloff, reloff, absoff); @@ -2991,7 +3000,7 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, (!type_array_is_decl_as_ptr(type) && current_structure ? type_memsize(current_structure) : 0), - type, type_array_get_conformance(type)); + type, type_array_get_conformance(type), 0); update_tfsoff(type, start_offset, file); return start_offset; @@ -3057,7 +3066,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t if (is_conformant_array(type)) *typestring_offset += write_conf_or_var_desc(file, current_structure, baseoff, - type, size_is); + type, size_is, 0); if (fc == FC_SMVARRAY || fc == FC_LGVARRAY) { @@ -3081,8 +3090,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t if (length_is) *typestring_offset - += write_conf_or_var_desc(file, current_structure, baseoff, - type, length_is); + += write_conf_or_var_desc(file, current_structure, baseoff, type, length_is, 0); if (type_has_pointers(type_array_get_element_type(type)) && (type_array_is_decl_as_ptr(type) || !current_structure)) @@ -3103,12 +3111,8 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t unsigned int dim = size_is ? 0 : type_array_get_dim(type); print_file(file, 2, "NdrFcShort(0x%hx),\t/* %u */\n", (unsigned short)dim, dim); *typestring_offset += 2; - *typestring_offset - += write_conf_or_var_desc(file, current_structure, baseoff, - type, size_is); - *typestring_offset - += write_conf_or_var_desc(file, current_structure, baseoff, - type, length_is); + *typestring_offset += write_conf_or_var_desc(file, current_structure, baseoff, type, size_is, 0); + *typestring_offset += write_conf_or_var_desc(file, current_structure, baseoff, type, length_is, 0); write_array_element_type(file, is_string_type(attrs, type) ? attrs : NULL, type, TRUE, typestring_offset); write_end(file, typestring_offset); @@ -3474,7 +3478,7 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, print_file(file, 2, "0x%x,\t/* Switch type= %s */\n", fc, string_of_type(fc)); *tfsoff += 2; - *tfsoff += write_conf_or_var_desc(file, current_structure, 0, st, switch_is ); + *tfsoff += write_conf_or_var_desc(file, current_structure, 0, st, switch_is, 0); print_file(file, 2, "NdrFcShort(0x2),\t/* Offset= 2 (%u) */\n", *tfsoff + 2); *tfsoff += 2; print_file(file, 0, "/* %u */\n", *tfsoff); @@ -3543,8 +3547,8 @@ static unsigned int write_ip_tfs(FILE *file, const attr_list_t *attrs, type_t *t { print_file(file, 2, "0x2f, /* FC_IP */\n"); print_file(file, 2, "0x5c, /* FC_PAD */\n"); - *typeformat_offset - += write_conf_or_var_desc(file, current_structure, 0, type, iid) + 2; + *typeformat_offset += 2 + write_conf_or_var_desc(file, current_structure, 0, + type, iid, RobustIsIIdIs); } else { @@ -3755,24 +3759,28 @@ static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned in { case STMT_DECLARATION: { - const var_t *func = stmt->u.var; + const var_t *func; + const var_list_t *args; if(stmt->u.var->declspec.stgclass != STG_NONE || type_get_type_detect_alias(stmt->u.var->declspec.type) != TYPE_FUNCTION) continue; - current_func = func; + current_func = func = stmt->u.var; if (is_local(func->attrs)) continue; - var = type_function_get_retval(func->declspec.type); + current_arg = var = type_function_get_retval(func->declspec.type); if (!is_void(var->declspec.type)) var->typestring_offset = write_type_tfs( file, var->attrs, var->declspec.type, func->name, TYPE_CONTEXT_RETVAL, offset); - if (type_function_get_args(func->declspec.type)) - LIST_FOR_EACH_ENTRY( var, type_function_get_args(func->declspec.type), var_t, entry ) - var->typestring_offset = write_type_tfs( file, var->attrs, var->declspec.type, var->name, - TYPE_CONTEXT_TOPLEVELPARAM, offset ); + args = type_function_get_args(func->declspec.type); + if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry ) + { + current_arg = var; + var->typestring_offset = write_type_tfs( file, var->attrs, var->declspec.type, var->name, + TYPE_CONTEXT_TOPLEVELPARAM, offset ); + } break; }

1 0

Alexandre Julliard : widl: Add /robust flags in correlation descriptors.
by Alexandre Julliard April 2, 2024

April 2, 2024

Module: wine Branch: master Commit: 4d8ee6bb18f42e125ffd51a28348687e55b56776 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d8ee6bb18f42e125ffd51a2834868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 20:47:03 2024 +0200 widl: Add /robust flags in correlation descriptors. --- dlls/rpcrt4/ndr_marshall.c | 11 +++-------- dlls/rpcrt4/ndr_typelib.c | 12 +++++++----- tools/widl/client.c | 4 ++++ tools/widl/server.c | 5 +++++ tools/widl/typegen.c | 21 ++++++++++++--------- 5 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 5ed6b6364ec..c68eb0ee57e 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -7259,15 +7259,13 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, */ void WINAPI NdrCorrelationInitialize(PMIDL_STUB_MESSAGE pStubMsg, void *pMemory, ULONG CacheSize, ULONG Flags) { - static int once; - - if (!once++) - FIXME("(%p, %p, %ld, 0x%lx): semi-stub\n", pStubMsg, pMemory, CacheSize, Flags); + TRACE("(%p, %p, %ld, 0x%lx)\n", pStubMsg, pMemory, CacheSize, Flags); if (pStubMsg->CorrDespIncrement == 0) pStubMsg->CorrDespIncrement = 2; /* size of the normal (non-range) /robust payload */ pStubMsg->fHasNewCorrDesc = TRUE; + pStubMsg->pCorrInfo = pMemory; } /*********************************************************************** @@ -7300,8 +7298,5 @@ void WINAPI NdrCorrelationPass(PMIDL_STUB_MESSAGE pStubMsg) */ void WINAPI NdrCorrelationFree(PMIDL_STUB_MESSAGE pStubMsg) { - static int once; - - if (!once++) - FIXME("(%p): stub\n", pStubMsg); + /* FIXME: free memory */ } diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 352f71fa68b..76046973fa8 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -640,7 +640,9 @@ static size_t write_array_tfs(ITypeInfo *typeinfo, unsigned char *str, { WRITE_SHORT(str, *len, size); WRITE_INT(str, *len, 0xffffffff); /* conformance */ + WRITE_SHORT(str, *len, 0); WRITE_INT(str, *len, 0xffffffff); /* variance */ + WRITE_SHORT(str, *len, 0); } else { @@ -1099,18 +1101,18 @@ static void write_proc_func_header(ITypeInfo *typeinfo, FUNCDESC *desc, WRITE_SHORT(proc, *proclen, 0); /* constant_client_buffer_size */ WRITE_SHORT(proc, *proclen, 0); /* constant_server_buffer_size */ -#ifdef __x86_64__ WRITE_CHAR (proc, *proclen, 0x47); /* HasExtensions | HasReturn | ClientMustSize | ServerMustSize */ -#else - WRITE_CHAR (proc, *proclen, 0x07); /* HasReturn | ClientMustSize | ServerMustSize */ -#endif WRITE_CHAR (proc, *proclen, desc->cParams + 1); /* incl. return value */ #ifdef __x86_64__ WRITE_CHAR (proc, *proclen, 10); /* extension size */ - WRITE_CHAR (proc, *proclen, 0); /* INTERPRETER_OPT_FLAGS2 */ +#else + WRITE_CHAR (proc, *proclen, 8); /* extension size */ +#endif + WRITE_CHAR (proc, *proclen, 1); /* HasNewCorrDesc */ WRITE_SHORT(proc, *proclen, 0); /* ClientCorrHint */ WRITE_SHORT(proc, *proclen, 0); /* ServerCorrHint */ WRITE_SHORT(proc, *proclen, 0); /* NotifyIndex */ +#ifdef __x86_64__ for (param_idx = 0; param_idx < desc->cParams && param_idx < 3; param_idx++) { basetype = get_basetype(typeinfo, &desc->lprgelemdescParam[param_idx].tdesc); diff --git a/tools/widl/client.c b/tools/widl/client.c index b73ce917dc3..795e3ba2104 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -106,6 +106,7 @@ static void write_function_stub( const type_t *iface, const var_t *func, if (has_full_pointer) write_full_pointer_free(client, indent, func); + if (interpreted_mode) print_client("NdrCorrelationFree(&__frame->_StubMsg);\n"); print_client("NdrFreeBuffer(&__frame->_StubMsg);\n"); if (explicit_fc == FC_BIND_GENERIC) @@ -134,6 +135,7 @@ static void write_function_stub( const type_t *iface, const var_t *func, write_type_decl(client, &retval->declspec, retval->name); fprintf(client, ";\n"); } + if (interpreted_mode) print_client("ULONG _NdrCorrCache[256];\n"); print_client("RPC_MESSAGE _RpcMessage;\n"); if (handle_var) @@ -213,6 +215,8 @@ static void write_function_stub( const type_t *iface, const var_t *func, } break; } + if (interpreted_mode) + print_client( "NdrCorrelationInitialize(&__frame->_StubMsg, _NdrCorrCache, sizeof(_NdrCorrCache), 0);\n" ); write_remoting_arguments(client, indent, func, "", PASS_IN, PHASE_BUFFERSIZE); diff --git a/tools/widl/server.c b/tools/widl/server.c index 9ad7c27e002..8bc179f1438 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -69,6 +69,8 @@ static void write_function_stub(const type_t *iface, const var_t *func, unsigned print_server("static void __finally_%s_%s(", iface->name, get_name(func)); fprintf(server," struct __frame_%s_%s *__frame )\n{\n", iface->name, get_name(func)); + if (interpreted_mode) print_server("NdrCorrelationFree(&__frame->_StubMsg);\n"); + indent++; write_remoting_arguments(server, indent, func, "__frame->", PASS_OUT, PHASE_FREE); @@ -87,6 +89,7 @@ static void write_function_stub(const type_t *iface, const var_t *func, unsigned fprintf(server, "{\n"); indent++; print_server("struct __frame_%s_%s __f, * const __frame = &__f;\n", iface->name, get_name(func)); + if (interpreted_mode) print_server("ULONG _NdrCorrCache[256];\n"); if (has_out_arg_or_return(func)) print_server("RPC_STATUS _Status;\n"); fprintf(server, "\n"); @@ -113,6 +116,8 @@ static void write_function_stub(const type_t *iface, const var_t *func, unsigned print_server("RpcTryExcept\n"); print_server("{\n"); indent++; + if (interpreted_mode) + print_server("NdrCorrelationInitialize(&__frame->_StubMsg, _NdrCorrCache, sizeof(_NdrCorrCache), 0);\n" ); if (has_full_pointer) write_full_pointer_init(server, indent, func, TRUE); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f4f8c593aba..df25cdb6901 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1342,7 +1342,7 @@ static void write_proc_func_interp( FILE *file, int indent, const type_t *iface, const var_t *handle_var = get_func_handle_var( iface, func, &explicit_fc, &implicit_fc ); unsigned char oi_flags = Oi_HAS_RPCFLAGS | Oi_USE_NEW_INIT_ROUTINES; unsigned char oi2_flags = get_func_oi2_flags( func ); - unsigned char ext_flags = 0; + unsigned char ext_flags = 0x01; /* HasNewCorrDesc */ unsigned int rpc_flags = get_rpc_flags( func->attrs ); unsigned int nb_args = 0; unsigned int stack_size = 0; @@ -1621,6 +1621,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, { unsigned char operator_type = 0; unsigned char conftype = FC_NORMAL_CONFORMANCE; + unsigned short robust_flags = 0; const char *conftype_string = "field"; const expr_t *subexpr; const type_t *iface = NULL; @@ -1629,7 +1630,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, if (!expr) { print_file(file, 2, "NdrFcLong(0xffffffff),\t/* -1 */\n"); - return 4; + goto done; } if (expr->is_const) @@ -1643,8 +1644,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, FC_CONSTANT_CONFORMANCE, expr->cval); print_file(file, 2, "0x%x,\n", expr->cval >> 16); print_file(file, 2, "NdrFcShort(0x%hx),\n", (unsigned short)expr->cval); - - return 4; + goto done; } if (!cont_type) /* top-level conformance */ @@ -1854,7 +1854,10 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, print_file(file, 2, "0x0,\n" ); print_file(file, 2, "NdrFcShort(0x0),\n" ); } - return 4; +done: + if (!interpreted_mode) return 4; + print_file(file, 2, "NdrFcShort(0x%hx),\n", robust_flags); + return 6; } /* return size and start offset of a data field based on current offset */ @@ -2495,15 +2498,15 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) unsigned int absoff = ft->typestring_offset; if (is_attr(ft->attrs, ATTR_SWITCHTYPE)) absoff += 8; /* we already have a corr descr, skip it */ - reloff = absoff - (*tfsoff + 6); print_file(file, 0, "/* %d */\n", *tfsoff); print_file(file, 2, "0x%x,\t/* FC_NON_ENCAPSULATED_UNION */\n", FC_NON_ENCAPSULATED_UNION); print_file(file, 2, "0x%x,\t/* FIXME: always FC_LONG */\n", FC_LONG); - write_conf_or_var_desc(file, current_structure, offset, ft, - get_attrp(f->attrs, ATTR_SWITCHIS)); + *tfsoff += 2 + write_conf_or_var_desc(file, current_structure, offset, ft, + get_attrp(f->attrs, ATTR_SWITCHIS)); + reloff = absoff - *tfsoff; print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", (unsigned short)reloff, reloff, absoff); - *tfsoff += 8; + *tfsoff += 2; } offset += size; }

1 0

Alexandre Julliard : widl: Always use new-style format strings in interpreted mode.
by Alexandre Julliard April 2, 2024

April 2, 2024

Module: wine Branch: master Commit: 896b4f05ea5e9f0f204164387a983d6572240c49 URL: https://gitlab.winehq.org/wine/wine/-/commit/896b4f05ea5e9f0f204164387a983d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 20:42:41 2024 +0200 widl: Always use new-style format strings in interpreted mode. --- tools/widl/client.c | 9 ++- tools/widl/proxy.c | 23 ++++--- tools/widl/server.c | 4 +- tools/widl/typegen.c | 166 ++++++++++++++++++--------------------------------- tools/widl/widl.c | 19 ++---- tools/widl/widl.h | 8 +-- 6 files changed, 82 insertions(+), 147 deletions(-)

1 0