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
fb5293f0
Commit
fb5293f0
authored
Oct 05, 2015
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Oct 06, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
widl: Do not create duplicate type info entries when tag and typedef names are the same.
Signed-off-by:
Dmitry Timoshkov
<
dmitry@baikal.ru
>
parent
d050343c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
9 deletions
+19
-9
winhttp.c
dlls/winhttp/tests/winhttp.c
+0
-1
write_msft.c
tools/widl/write_msft.c
+19
-8
No files found.
dlls/winhttp/tests/winhttp.c
View file @
fb5293f0
...
...
@@ -3780,7 +3780,6 @@ todo_wine
VariantInit
(
&
ret
);
hr
=
IWinHttpRequest_Invoke
(
request
,
DISPID_HTTPREQUEST_SETAUTOLOGONPOLICY
,
&
IID_NULL
,
0
,
DISPATCH_METHOD
,
&
params
,
&
ret
,
NULL
,
NULL
);
todo_wine
ok
(
hr
==
S_OK
,
"error %#x
\n
"
,
hr
);
IWinHttpRequest_Release
(
request
);
...
...
tools/widl/write_msft.c
View file @
fb5293f0
...
...
@@ -1836,7 +1836,7 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_
MSFT_TypeInfoBase
*
typeinfo
;
MSFT_GuidEntry
guidentry
;
chat
(
"create_msft_typeinfo: name %s kind %d
\n
"
,
name
,
kind
);
chat
(
"create_msft_typeinfo: name %s kind %d
index %d
\n
"
,
name
,
kind
,
typelib
->
typelib_header
.
nrtypeinfos
);
msft_typeinfo
=
xmalloc
(
sizeof
(
*
msft_typeinfo
));
memset
(
msft_typeinfo
,
0
,
sizeof
(
*
msft_typeinfo
)
);
...
...
@@ -2143,20 +2143,31 @@ static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration)
static
void
add_typedef_typeinfo
(
msft_typelib_t
*
typelib
,
type_t
*
tdef
)
{
msft_typeinfo_t
*
msft_typeinfo
;
int
alignment
;
msft_typeinfo_t
*
msft_typeinfo
=
NULL
;
int
alignment
,
datatype1
,
datatype2
,
size
;
type_t
*
type
;
if
(
-
1
<
tdef
->
typelib_idx
)
return
;
type
=
type_alias_get_aliasee
(
tdef
);
if
(
!
type
->
name
||
strcmp
(
tdef
->
name
,
type
->
name
)
!=
0
)
{
tdef
->
typelib_idx
=
typelib
->
typelib_header
.
nrtypeinfos
;
msft_typeinfo
=
create_msft_typeinfo
(
typelib
,
TKIND_ALIAS
,
tdef
->
name
,
tdef
->
attrs
);
encode_type
(
typelib
,
get_type_vt
(
type_alias_get_aliasee
(
tdef
)),
type_alias_get_aliasee
(
tdef
),
&
msft_typeinfo
->
typeinfo
->
datatype1
,
&
msft_typeinfo
->
typeinfo
->
size
,
&
alignment
,
&
msft_typeinfo
->
typeinfo
->
datatype2
);
}
encode_type
(
typelib
,
get_type_vt
(
type
),
type
,
&
datatype1
,
&
size
,
&
alignment
,
&
datatype2
);
if
(
msft_typeinfo
)
{
msft_typeinfo
->
typeinfo
->
datatype1
=
datatype1
;
msft_typeinfo
->
typeinfo
->
size
=
size
;
msft_typeinfo
->
typeinfo
->
datatype2
=
datatype2
;
msft_typeinfo
->
typeinfo
->
typekind
|=
(
alignment
<<
11
|
alignment
<<
6
);
}
}
static
void
add_coclass_typeinfo
(
msft_typelib_t
*
typelib
,
type_t
*
cls
)
...
...
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