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

widl: Use the pointer offset for arrays declared as pointer in the proc format strings of interpreted functions.

This commit is contained in:
Alexandre Julliard 2011-06-01 21:27:56 +02:00
parent 11416a20c9
commit 9128dea410
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/widl/typegen.c
View File

@ -887,7 +887,7 @@ int decl_indirect(const type_t *t)
static unsigned int write_procformatstring_type(FILE *file, int indent, static unsigned int write_procformatstring_type(FILE *file, int indent,
const type_t *type, const type_t *type,
const attr_list_t *attrs, const attr_list_t *attrs,
int is_return) int is_return, int is_interpreted)
{ {
unsigned int size; unsigned int size;
@ -924,6 +924,11 @@ static unsigned int write_procformatstring_type(FILE *file, int indent,
} }
else else
{ {
unsigned short offset = type->typestring_offset;
if (is_interpreted && is_array(type) && type_array_is_decl_as_ptr(type))
offset = type->details.array.ptr_tfsoff;
if (is_return) if (is_return)
print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n"); print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n");
else if (is_in && is_out) else if (is_in && is_out)
@ -935,8 +940,7 @@ static unsigned int write_procformatstring_type(FILE *file, int indent,
size = get_stack_size( type, attrs, NULL ); size = get_stack_size( type, attrs, NULL );
print_file(file, indent, "0x%02x,\n", size / pointer_size ); print_file(file, indent, "0x%02x,\n", size / pointer_size );
print_file(file, indent, "NdrFcShort(0x%x), /* type offset = %u */\n", print_file(file, indent, "NdrFcShort(0x%x), /* type offset = %u */\n", offset, offset);
type->typestring_offset, type->typestring_offset);
size = 4; /* includes param type prefix */ size = 4; /* includes param type prefix */
} }
return size; return size;
@ -1060,8 +1064,9 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i
const var_t *func, unsigned int *offset, const var_t *func, unsigned int *offset,
unsigned short num_proc ) unsigned short num_proc )
{ {
if (is_interpreted_func( iface, func )) int is_interpreted = is_interpreted_func( iface, func );
write_proc_func_header( file, indent, iface, func, offset, num_proc );
if (is_interpreted) write_proc_func_header( file, indent, iface, func, offset, num_proc );
/* emit argument data */ /* emit argument data */
if (type_get_function_args(func->type)) if (type_get_function_args(func->type))
@ -1070,7 +1075,8 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i
LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry )
{ {
print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name );
*offset += write_procformatstring_type(file, indent, var->type, var->attrs, FALSE); *offset += write_procformatstring_type(file, indent, var->type, var->attrs,
FALSE, is_interpreted);
} }
} }
@ -1085,7 +1091,8 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i
else else
{ {
print_file( file, 0, "/* %u (return value) */\n", *offset ); print_file( file, 0, "/* %u (return value) */\n", *offset );
*offset += write_procformatstring_type(file, indent, type_function_get_rettype(func->type), NULL, TRUE); *offset += write_procformatstring_type(file, indent, type_function_get_rettype(func->type),
NULL, TRUE, is_interpreted);
} }
} }
@ -3192,7 +3199,7 @@ static unsigned int write_type_tfs(FILE *file, int indent,
int ptr_type; int ptr_type;
ptr_type = get_pointer_fc(type, attrs, ptr_type = get_pointer_fc(type, attrs,
context == TYPE_CONTEXT_TOPLEVELPARAM); context == TYPE_CONTEXT_TOPLEVELPARAM);
if (ptr_type != RPC_FC_RP) if (ptr_type != RPC_FC_RP || type_array_is_decl_as_ptr(type))
{ {
unsigned int absoff = type->typestring_offset; unsigned int absoff = type->typestring_offset;
short reloff = absoff - (*typeformat_offset + 2); short reloff = absoff - (*typeformat_offset + 2);
@ -3202,9 +3209,10 @@ static unsigned int write_type_tfs(FILE *file, int indent,
string_of_type(ptr_type)); string_of_type(ptr_type));
print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n",
reloff, reloff, absoff); reloff, reloff, absoff);
update_tfsoff( type, off, file ); if (ptr_type != RPC_FC_RP) update_tfsoff( type, off, file );
*typeformat_offset += 4; *typeformat_offset += 4;
} }
type->details.array.ptr_tfsoff = off;
} }
return off; return off;
} }

1
tools/widl/widltypes.h
View File

@ -354,6 +354,7 @@ struct array_details
unsigned int dim; unsigned int dim;
unsigned char ptr_def_fc; unsigned char ptr_def_fc;
unsigned char declptr; /* if declared as a pointer */ unsigned char declptr; /* if declared as a pointer */
unsigned short ptr_tfsoff; /* offset of pointer definition for declptr */
}; };
struct coclass_details struct coclass_details