Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
80be9df3
Commit
80be9df3
authored
Apr 26, 2008
by
Rob Shearman
Committed by
Alexandre Julliard
Apr 28, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
widl: Add typedefs to typelibs which have the public or uuid attributes, not any other attribute.
parent
1d70c7ad
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
parser.y
tools/widl/parser.y
+4
-3
typelib.c
tools/widl/typelib.c
+1
-1
write_msft.c
tools/widl/write_msft.c
+2
-2
No files found.
tools/widl/parser.y
View file @
80be9df3
...
...
@@ -1676,8 +1676,7 @@ static type_t *reg_typedefs(type_t *type, declarator_list_t *decls, attr_list_t
/* We must generate names for tagless enum, struct or union.
Typedef-ing a tagless enum, struct or union means we want the typedef
to be included in a library whether it has other attributes or not,
hence the public attribute. */
to be included in a library hence the public attribute. */
if ((type->kind == TKIND_ENUM || type->kind == TKIND_RECORD
|| type->kind == TKIND_UNION) && ! type->name && ! parse_only)
{
...
...
@@ -1685,6 +1684,8 @@ static type_t *reg_typedefs(type_t *type, declarator_list_t *decls, attr_list_t
attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) );
type->name = gen_name();
}
else if (is_attr(attrs, ATTR_UUID) && !is_attr(attrs, ATTR_PUBLIC))
attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) );
LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry )
{
...
...
@@ -2650,7 +2651,7 @@ static statement_t *process_typedefs(declarator_list_t *decls)
if (! parse_only && do_header)
write_typedef(type);
if (in_typelib &&
type->attrs
)
if (in_typelib &&
is_attr(type->attrs, ATTR_PUBLIC)
)
add_typelib_entry(type);
type_list = &(*type_list)->next;
...
...
tools/widl/typelib.c
View file @
80be9df3
...
...
@@ -173,7 +173,7 @@ unsigned short get_type_vt(type_t *t)
if
(
vt
)
return
vt
;
}
if
(
t
->
kind
==
TKIND_ALIAS
&&
t
->
attrs
)
if
(
t
->
kind
==
TKIND_ALIAS
&&
is_attr
(
t
->
attrs
,
ATTR_PUBLIC
)
)
return
VT_USERDEFINED
;
switch
(
t
->
type
)
{
...
...
tools/widl/write_msft.c
View file @
80be9df3
...
...
@@ -962,8 +962,8 @@ static int encode_type(
{
int
typeinfo_offset
;
/* typedef'd types without
attributes
aren't included in the typelib */
while
(
type
->
typelib_idx
<
0
&&
type
->
kind
==
TKIND_ALIAS
&&
!
type
->
attrs
)
/* typedef'd types without
public attribute
aren't included in the typelib */
while
(
type
->
typelib_idx
<
0
&&
type
->
kind
==
TKIND_ALIAS
&&
!
is_attr
(
type
->
attrs
,
ATTR_PUBLIC
)
)
type
=
type
->
orig
;
chat
(
"encode_type: VT_USERDEFINED - type %p name = %s type->type %d idx %d
\n
"
,
type
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment