Rob Shearman : widl: Set current_structure when writing out structure members to

[Alexandre Julliard]

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

Author: Rob Shearman <rob(a)codeweavers.com>
Date:   Wed May 30 22:43:34 2007 +0100

widl: Set current_structure when writing out structure members to
ensure the conformance/variance calculation function can find the
necessary fields in the structures.

---

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

diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c
index 3af2524..dbbabbc 100644
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -1279,7 +1279,9 @@ static size_t write_struct_tfs(FILE *file, type_t *type,
         }
 
         /* member layout */
+        current_structure = type;
         write_struct_members(file, type, typestring_offset);
+        current_structure = NULL;
         return start_offset;
     case RPC_FC_CSTRUCT:
     case RPC_FC_CPSTRUCT:
@@ -1403,7 +1405,9 @@ static size_t write_struct_tfs(FILE *file, type_t *type,
         print_file(file, 2, "NdrFcShort(0x0),\t/* FIXME: pointer stuff */\n");
 
         *typestring_offset += 8;
+        current_structure = type;
         write_struct_members(file, type, typestring_offset);
+        current_structure = NULL;
 
         return start_offset;