Zebediah Figura : widl: Handle encapsulated unions in type libraries.
Alexandre Julliard
julliard at winehq.org
Wed Aug 21 14:39:33 CDT 2019
Module: wine
Branch: master
Commit: 4f4763ab6b81effe05705eb65c9761814a1402bc
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f4763ab6b81effe05705eb65c9761814a1402bc
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Aug 21 11:18:07 2019 -0500
widl: Handle encapsulated unions in type libraries.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tools/widl/write_msft.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c
index 420404a..5d5fd89 100644
--- a/tools/widl/write_msft.c
+++ b/tools/widl/write_msft.c
@@ -976,6 +976,7 @@ static int encode_type(
switch (type_get_type(type))
{
case TYPE_STRUCT:
+ case TYPE_ENCAPSULATED_UNION:
add_structure_typeinfo(typelib, type);
break;
case TYPE_INTERFACE:
@@ -2119,6 +2120,7 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface)
static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure)
{
+ var_list_t *fields;
int idx = 0;
var_t *cur;
msft_typeinfo_t *msft_typeinfo;
@@ -2130,9 +2132,16 @@ static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure)
msft_typeinfo = create_msft_typeinfo(typelib, TKIND_RECORD, structure->name, structure->attrs);
msft_typeinfo->typeinfo->size = 0;
- if (type_struct_get_fields(structure))
- LIST_FOR_EACH_ENTRY( cur, type_struct_get_fields(structure), var_t, entry )
+ if (type_get_type(structure) == TYPE_STRUCT)
+ fields = type_struct_get_fields(structure);
+ else
+ fields = type_encapsulated_union_get_fields(structure);
+
+ if (fields)
+ {
+ LIST_FOR_EACH_ENTRY( cur, fields, var_t, entry )
add_var_desc(msft_typeinfo, idx++, cur);
+ }
}
static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration)
@@ -2320,6 +2329,7 @@ static void add_type_typeinfo(msft_typelib_t *typelib, type_t *type)
add_interface_typeinfo(typelib, type);
break;
case TYPE_STRUCT:
+ case TYPE_ENCAPSULATED_UNION:
add_structure_typeinfo(typelib, type);
break;
case TYPE_ENUM:
More information about the wine-cvs
mailing list