From e2ea2b5891077e9419437511605a8f5cf85eca2c Mon Sep 17 00:00:00 2001 From: Robert Shearman Date: Mon, 3 Apr 2006 16:27:17 +0100 Subject: [PATCH] widl: Fix the type offset for generated conformant string calls. --- tools/widl/typegen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a8ab9829662..96d42a14642 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1591,11 +1591,11 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func, fprintf(file, ";\n"); } - /* FIXME: these can't both be correct */ if (phase == PHASE_FREE) print_phase_function(file, indent, "Pointer", phase, var->name, *type_offset); else - print_phase_function(file, indent, "ConformantString", phase, var->name, *type_offset); + print_phase_function(file, indent, "ConformantString", phase, var->name, + *type_offset + (has_size ? 4 : 2)); } } else if (is_array_type(var->attrs, var->ptr_level, var->array))