widl: Size of an encapsulated union doesn't include the tag.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

widl: Size of an encapsulated union doesn't include the tag.
947ff4ba · Zebediah Figura · Alexandre Julliard · c3ebd202 · 947ff4ba
Commit 947ff4ba authored Apr 10, 2018 by Zebediah Figura Committed by Alexandre Julliard Apr 12, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

typegen.c tools/widl/typegen.c +3 -2

No files found.
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -3248,6 +3248,7 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs,
    unsigned int nbranch = 0;
    type_t *deftype = NULL;
    short nodeftype = 0xffff;
+    unsigned int dummy;
    var_t *f;

    if (processed(type) &&
@@ -3256,10 +3257,10 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs,

    guard_rec(type);

-    size = type_memsize(type);
-
    fields = type_union_get_cases(type);

+    size = union_memsize(fields, &dummy);
+
    if (fields) LIST_FOR_EACH_ENTRY(f, fields, var_t, entry)
    {
        expr_list_t *cases = get_attrp(f->attrs, ATTR_CASE);