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

widl: Output the necessary sizing information for other phases. 

Output the necessary sizing information for PHASE_BUFFERSIZE and
PHASE_FREE as well as PHASE_MARSHAL. Standardise this rule in a new
function.
This commit is contained in:
Robert Shearman 2006-03-31 12:47:08 +01:00 committed by Alexandre Julliard
parent 4a67201b70
commit 226c8f6b52
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/widl/typegen.c
View File

@ -1412,6 +1412,13 @@ static inline const char *function_from_phase(enum remoting_phase phase)
return NULL; return NULL;
} }
/* returns whether the MaxCount, Offset or ActualCount members need to be
* filled in for the specified phase */
static inline int is_size_needed_for_phase(enum remoting_phase phase)
{
return (phase != PHASE_UNMARSHAL);
}
void write_remoting_arguments(FILE *file, int indent, const func_t *func, void write_remoting_arguments(FILE *file, int indent, const func_t *func,
unsigned int *type_offset, enum pass pass, unsigned int *type_offset, enum pass pass,
enum remoting_phase phase) enum remoting_phase phase)
@ -1468,7 +1475,7 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func,
function_from_phase(phase), var->name, *type_offset); function_from_phase(phase), var->name, *type_offset);
else else
{ {
if (size_is && phase != PHASE_UNMARSHAL) if (size_is && is_size_needed_for_phase(phase))
{ {
print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)");
write_expr(file, size_is, 1); write_expr(file, size_is, 1);
@ -1512,7 +1519,7 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func,
array_type = "FixedArray"; array_type = "FixedArray";
else if (has_length && !has_size) else if (has_length && !has_size)
{ {
if (phase == PHASE_MARSHAL) if (is_size_needed_for_phase(phase))
{ {
print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */
print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)");
@ -1523,7 +1530,7 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func,
} }
else if (!has_length && has_size) else if (!has_length && has_size)
{ {
if (phase == PHASE_MARSHAL) if (is_size_needed_for_phase(phase))
{ {
print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)");
write_expr(file, size_is ? size_is : var->array, 1); write_expr(file, size_is ? size_is : var->array, 1);
@ -1533,7 +1540,7 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func,
} }
else else
{ {
if (phase == PHASE_MARSHAL) if (is_size_needed_for_phase(phase))
{ {
print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)");
write_expr(file, size_is ? size_is : var->array, 1); write_expr(file, size_is ? size_is : var->array, 1);