Rob Shearman : widl: Pass var attrs into write_no_repeat_pointer_descriptions and use them for the string check .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a8238dd1423bdf5d69fa63333ef6359ca439e614
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a8238dd1423bdf5d69fa63333e...

Author: Rob Shearman 
Date:   Thu Mar  5 08:23:54 2009 +0000

widl: Pass var attrs into write_no_repeat_pointer_descriptions and use them for the string check.

---

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

diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c
index 6782528..5896089 100644
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -1471,7 +1471,7 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff)
 }

static int write_no_repeat_pointer_descriptions(
-    FILE *file, type_t *type,
+    FILE *file, const attr_list_t *attrs, type_t *type,
     unsigned int *offset_in_memory, unsigned int *offset_in_buffer,
     unsigned int *typestring_offset)
 {
@@ -1493,7 +1493,7 @@ static int write_no_repeat_pointer_descriptions(

if (is_ptr(type))
         {
-            if (is_string_type(type->attrs, type))
+            if (is_string_type(attrs, type))
                 write_string_tfs(file, NULL, type, NULL, typestring_offset);
             else
                 write_pointer_tfs(file, type, typestring_offset);
@@ -1534,7 +1534,7 @@ static int write_no_repeat_pointer_descriptions(
                 *offset_in_buffer += padding;
             }
             written += write_no_repeat_pointer_descriptions(
-                file, v->type,
+                file, v->attrs, v->type,
                 offset_in_memory, offset_in_buffer, typestring_offset);
         }
     }
@@ -1852,7 +1852,7 @@ static void write_pointer_description(FILE *file, type_t *type,
         offset_in_memory = 0;
         offset_in_buffer = 0;
         write_no_repeat_pointer_descriptions(
-            file, type,
+            file, NULL, type,
             &offset_in_memory, &offset_in_buffer, typestring_offset);
     }