ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

widl: Fix FC_ALLOCED_ON_STACK for interpreted stubs. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-10-30 18:23:22 -05:00 committed by Alexandre Julliard
parent 481c408a02
commit 76a665a1c6
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tools/widl/typegen.c
View File

@ -2093,8 +2093,32 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs
out_attr = is_attr(attrs, ATTR_OUT); out_attr = is_attr(attrs, ATTR_OUT);
if (!in_attr && !out_attr) in_attr = 1; if (!in_attr && !out_attr) in_attr = 1;
if (out_attr && !in_attr && pointer_type == FC_RP) if (!is_interpreted_func(current_iface, current_func))
flags |= FC_ALLOCED_ON_STACK; {
if (out_attr && !in_attr && pointer_type == FC_RP)
flags |= FC_ALLOCED_ON_STACK;
}
else if (get_stub_mode() == MODE_Oif)
{
if (context == TYPE_CONTEXT_TOPLEVELPARAM && is_ptr(type) && pointer_type == FC_RP)
{
switch (typegen_detect_type(type_pointer_get_ref(type), NULL, TDT_ALL_TYPES))
{
case TGT_STRING:
case TGT_POINTER:
case TGT_CTXT_HANDLE:
case TGT_CTXT_HANDLE_POINTER:
flags |= FC_ALLOCED_ON_STACK;
break;
case TGT_IFACE_POINTER:
if (in_attr && out_attr)
flags |= FC_ALLOCED_ON_STACK;
break;
default:
break;
}
}
}
if (is_ptr(type)) if (is_ptr(type))
{ {
@ -2145,8 +2169,16 @@ static unsigned int write_simple_pointer(FILE *file, const attr_list_t *attrs,
else else
fc = get_basic_fc(ref); fc = get_basic_fc(ref);
if (out_attr && !in_attr && pointer_fc == FC_RP) if (!is_interpreted_func(current_iface, current_func))
flags |= FC_ALLOCED_ON_STACK; {
if (out_attr && !in_attr && pointer_fc == FC_RP)
flags |= FC_ALLOCED_ON_STACK;
}
else if (get_stub_mode() == MODE_Oif)
{
if (context == TYPE_CONTEXT_TOPLEVELPARAM && fc == FC_ENUM16 && pointer_fc == FC_RP)
flags |= FC_ALLOCED_ON_STACK;
}
print_file(file, 2, "0x%02x, 0x%x,\t/* %s %s[simple_pointer] */\n", print_file(file, 2, "0x%02x, 0x%x,\t/* %s %s[simple_pointer] */\n",
pointer_fc, flags, string_of_type(pointer_fc), pointer_fc, flags, string_of_type(pointer_fc),