mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against dc23cca322a93915465a1ea3ca6f360106cd2018
This commit is contained in:
parent
67035d62f7
commit
523d4ac996
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "4c6aa8b2fa1678c39aa5a89d9b26cfc4002e744e"
|
||||
echo "dc23cca322a93915465a1ea3ca6f360106cd2018"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
@ -423,7 +423,7 @@ index 00000000..c4ddaed9
|
||||
+ if (is_attr(type_entry->type->attrs, ATTR_PUBLIC))
|
||||
+ add_typedef_typeinfo(typelib, type_entry->type);
|
||||
+ else
|
||||
+ add_type_typeinfo(typelib, type_alias_get_aliasee(type_entry->type));
|
||||
+ add_type_typeinfo(typelib, type_alias_get_aliasee_type(type_entry->type));
|
||||
+ }
|
||||
+ break;
|
||||
+ }
|
||||
|
@ -244,7 +244,7 @@ index 7421899ed56..bffd94569a8 100644
|
||||
+ short href;
|
||||
+
|
||||
+ while (type->typelib_idx < 0 && type_is_alias(type))
|
||||
+ type = type_alias_get_aliasee(type);
|
||||
+ type = type_alias_get_aliasee_type(type);
|
||||
+
|
||||
+ chat("write_var_desc: VT_USERDEFINED, type %p, name %s, real type %d, href %d\n",
|
||||
+ type, type->name, type_get_type(type), type->typelib_idx);
|
||||
|
@ -148,7 +148,7 @@ index 7a6967c7f39..2ba5a3c25b0 100644
|
||||
- if (is_attr(type_entry->type->attrs, ATTR_PUBLIC))
|
||||
- add_typedef_typeinfo(typelib, type_entry->type);
|
||||
- else
|
||||
- add_type_typeinfo(typelib, type_alias_get_aliasee(type_entry->type));
|
||||
- add_type_typeinfo(typelib, type_alias_get_aliasee_type(type_entry->type));
|
||||
+ /* in old style typelibs all types are public */
|
||||
+ add_type_typeinfo(typelib, type_entry->type);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user