Robert Shearman : widl: Fix the type offset for generated conformant string calls.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: e2ea2b5891077e9419437511605a8f5cf85eca2c
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=e2ea2b5891077e9419437511...

Author: Robert Shearman <rob(a)codeweavers.com>
Date:   Mon Apr  3 16:27:17 2006 +0100

widl: Fix the type offset for generated conformant string calls.

---

 tools/widl/typegen.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c
index a8ab982..96d42a1 100644
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -1591,11 +1591,11 @@ void write_remoting_arguments(FILE *file
                     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))