From 22b6b13efbc11c2264ffc0d7c21fbc1050272ceb Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 29 May 2019 00:24:05 -0500 Subject: [PATCH] widl: Use IsSimpleRef only for explicitly declared arrays. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47285 Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard (cherry picked from commit 02976b655a5d9ad8ee25dbfb2051acb5b7431381) Signed-off-by: Michael Stefaniuc --- tools/widl/typegen.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 27ba60fcf4e..4b956448a8e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1059,9 +1059,16 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned case TGT_UNION: case TGT_USER_TYPE: case TGT_RANGE: + *flags |= MustFree; + if (!is_in && is_out) server_size = type_memsize( ref ); + break; case TGT_ARRAY: - *flags |= IsSimpleRef | MustFree; - *typestring_offset = ref->typestring_offset; + *flags |= MustFree; + if (!type_array_is_decl_as_ptr(ref)) + { + *flags |= IsSimpleRef; + *typestring_offset = ref->typestring_offset; + } if (!is_in && is_out) server_size = type_memsize( ref ); break; case TGT_STRING: