Dmitry Timoshkov : widl: Avoid generating negative offsets for conformant arrays of strings.

[Alexandre Julliard]

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

Author: Dmitry Timoshkov <dmitry(a)baikal.ru>
Date:   Wed Apr  2 18:37:37 2014 +0900

widl: Avoid generating negative offsets for conformant arrays of strings.

---

 tools/widl/typegen.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c
index 881f161..37222d1 100644
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -3581,12 +3581,26 @@ static unsigned int write_type_tfs(FILE *file, int indent,
     case TGT_POINTER:
     {
         enum type_context ref_context;
+        type_t *ref = type_pointer_get_ref(type);
+
         if (context == TYPE_CONTEXT_TOPLEVELPARAM)
             ref_context = TYPE_CONTEXT_PARAM;
         else if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS)
             ref_context = TYPE_CONTEXT_CONTAINER;
         else
             ref_context = context;
+
+        if (is_string_type(attrs, type) && is_conformant_array(ref))
+        {
+            if (context != TYPE_CONTEXT_CONTAINER_NO_POINTERS)
+                write_pointer_tfs(file, attrs, type, *typeformat_offset + 4, context, typeformat_offset);
+
+            offset = write_type_tfs(file, indent, attrs, ref, name, ref_context, typeformat_offset);
+            if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS)
+                return 0;
+            return offset;
+        }
+
         offset = write_type_tfs( file, indent, attrs, type_pointer_get_ref(type), name,
                                  ref_context, typeformat_offset);
         if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS)