Skip to content

W
wine-cw
Commit 41152b79 authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard
Browse files
Options

widl: Output the correct buffer size required for parameters whose sizes are…

widl: Output the correct buffer size required for parameters whose sizes are known at type-generation time. Replace code to calculate the size of RPC_FC_STRUCT types with fields_memsize since the memory size of these types will always be equal to the buffer size. Remove dead code in get_required_buffer_size.
parent 378ea704
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 69 deletions
tools/widl/typegen.c
View file @ 41152b79
......@@ -2508,19 +2508,8 @@ static unsigned int get_required_buffer_size_type(
return 0;
case RPC_FC_STRUCT:
case RPC_FC_PSTRUCT:
{
size_t size = 0;
const var_t *field;
if (!type->fields_or_args) return 0;
LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry )
{
unsigned int alignment;
size += get_required_buffer_size_type(field->type, field->name,
&alignment);
}
return size;
}
return fields_memsize(type->fields_or_args, alignment);
case RPC_FC_RP:
return
......@@ -2542,75 +2531,26 @@ static unsigned int get_required_buffer_size(const var_t *var, unsigned int *ali
{
int in_attr = is_attr(var->attrs, ATTR_IN);
int out_attr = is_attr(var->attrs, ATTR_OUT);
const type_t *t;
if (!in_attr && !out_attr)
in_attr = 1;
*alignment = 0;
for (t = var->type; is_ptr(t); t = t->ref)
if (is_attr(t->attrs, ATTR_CONTEXTHANDLE))
if ((pass == PASS_IN && in_attr) || (pass == PASS_OUT && out_attr) ||
pass == PASS_RETURN)
{
if (is_ptrchain_attr(var, ATTR_CONTEXTHANDLE))
{
*alignment = 4;
return 20;
}
if (pass == PASS_OUT)
{
if (out_attr && is_ptr(var->type))
{
type_t *type = var->type;
if (type->type == RPC_FC_STRUCT)
{
const var_t *field;
unsigned int size = 36;
if (!type->fields_or_args) return size;
LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry )
{
unsigned int align;
size += get_required_buffer_size_type(
field->type, field->name, &align);
}
return size;
}
}
return 0;
}
else
{
if ((!out_attr || in_attr) && !var->type->size_is
&& !is_attr(var->attrs, ATTR_STRING) && !var->type->declarray)
{
if (is_ptr(var->type))
{
type_t *type = var->type;
if (is_base_type(type->type))
{
return 25;
}
else if (type->type == RPC_FC_STRUCT)
{
unsigned int size = 36;
const var_t *field;
if (!type->fields_or_args) return size;
LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry )
{
unsigned int align;
size += get_required_buffer_size_type(
field->type, field->name, &align);
}
return size;
}
}
}
return get_required_buffer_size_type(var->type, var->name, alignment);
if (!is_string_type(var->attrs, var->type))
return get_required_buffer_size_type(var->type, var->name,
alignment);
}
return 0;
}
static unsigned int get_function_buffer_size( const func_t *func, enum pass pass )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment