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

widl: Clean up conformant struct handling. 

Make the writing of conformant structures take advantage of the new
type format string offset handling.
This commit is contained in:
Robert Shearman 2006-01-31 18:08:03 +01:00 committed by Alexandre Julliard
parent 5764d5518d
commit 1478ac85a9
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tools/widl/typegen.c
View File

@ -796,6 +796,7 @@ static size_t write_struct_tfs(FILE *file, const type_t *type,
size_t total_size;
const var_t *array;
size_t start_offset;
size_t array_offset;
switch (type->type)
{
@ -827,6 +828,13 @@ static size_t write_struct_tfs(FILE *file, const type_t *type,
error("structure size for parameter %s exceeds %d bytes by %d bytes\n",
name, USHRT_MAX, total_size - USHRT_MAX);
array = find_array_or_string_in_struct(type);
current_structure = type;
array_offset = write_array_tfs(file, array->attrs, array->type,
array->array, array->name,
typestring_offset);
current_structure = NULL;
start_offset = *typestring_offset;
WRITE_FCTYPE(file, FC_CSTRUCT, *typestring_offset);
/* alignment */
@ -834,19 +842,13 @@ static size_t write_struct_tfs(FILE *file, const type_t *type,
/* total size */
print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size);
*typestring_offset += 4;
/* FIXME: a fixed offset won't work when pointer layout is present */
print_file(file, 2, "NdrShort(0x3), /* 3 */\n");
print_file(file, 2, "NdrShort(0x%x), /* %d */\n",
array_offset - *typestring_offset,
array_offset - *typestring_offset);
*typestring_offset += 2;
print_file(file, 2, "FC_END,\n");
*typestring_offset += 1;
array = find_array_or_string_in_struct(type);
current_structure = type;
write_array_tfs(file, array->attrs, array->type,
array->array, array->name,
typestring_offset);
current_structure = NULL;
return start_offset;
case RPC_FC_CVSTRUCT:
total_size = type_memsize(type, 0, NULL);
@ -855,6 +857,18 @@ static size_t write_struct_tfs(FILE *file, const type_t *type,
error("structure size for parameter %s exceeds %d bytes by %d bytes\n",
name, USHRT_MAX, total_size - USHRT_MAX);
array = find_array_or_string_in_struct(type);
current_structure = type;
if (is_attr(array->attrs, ATTR_STRING))
array_offset = write_string_tfs(file, array->attrs, array->type,
array->array, array->name,
typestring_offset);
else
array_offset = write_array_tfs(file, array->attrs, array->type,
array->array, array->name,
typestring_offset);
current_structure = NULL;
start_offset = *typestring_offset;
WRITE_FCTYPE(file, FC_CVSTRUCT, *typestring_offset);
/* alignment */
@ -862,24 +876,13 @@ static size_t write_struct_tfs(FILE *file, const type_t *type,
/* total size */
print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size);
*typestring_offset += 4;
/* FIXME: a fixed offset won't work when pointer layout is present */
print_file(file, 2, "NdrShort(0x3), /* 3 */\n");
print_file(file, 2, "NdrShort(0x%x), /* %d */\n",
array_offset - *typestring_offset,
array_offset - *typestring_offset);
*typestring_offset += 2;
print_file(file, 2, "FC_END,\n");
*typestring_offset += 1;
array = find_array_or_string_in_struct(type);
current_structure = type;
if (is_attr(array->attrs, ATTR_STRING))
write_string_tfs(file, array->attrs, array->type,
array->array, array->name,
typestring_offset);
else
write_array_tfs(file, array->attrs, array->type,
array->array, array->name,
typestring_offset);
current_structure = NULL;
return start_offset;
default:
error("write_struct_tfs: Unimplemented for type 0x%x\n", type->type);