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

widl: Call Pointer function for freeing non-conformant strings and for all phases for returned non-conformant strings, as is done for conformant strings. 

Also call Pointer functions for any string that isn't a reference pointer.
This commit is contained in:
Rob Shearman 2009-02-14 18:11:35 +00:00 committed by Alexandre Julliard
parent 8f87eddd39
commit 04484a4013
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/widl/typegen.c
View File

@ -3146,14 +3146,19 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const
} }
else if (is_string_type(var->attrs, var->type)) else if (is_string_type(var->attrs, var->type))
{ {
if (is_array(type) && !is_conformant_array(type)) if (phase == PHASE_FREE || pass == PASS_RETURN ||
print_phase_function(file, indent, "NonConformantString", local_var_prefix, pointer_type != RPC_FC_RP)
phase, var, start_offset); {
unsigned int ptr_start_offset = (start_offset - (is_conformant_array(type) ? 4 : 2));
print_phase_function(file, indent, "Pointer", local_var_prefix,
phase, var, ptr_start_offset);
}
else else
{ {
if (phase == PHASE_FREE || pass == PASS_RETURN || pointer_type == RPC_FC_UP) if (is_array(type) && !is_conformant_array(type))
print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, print_phase_function(file, indent, "NonConformantString",
start_offset - (is_conformant_array(type) ? 4 : 2)); local_var_prefix, phase, var,
start_offset);
else else
print_phase_function(file, indent, "ConformantString", local_var_prefix, print_phase_function(file, indent, "ConformantString", local_var_prefix,
phase, var, start_offset); phase, var, start_offset);