Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
ae67aa8b
Commit
ae67aa8b
authored
Dec 09, 2019
by
Nikolay Sivov
Committed by
Alexandre Julliard
Dec 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32/typelib: No need to query self for supported interface.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a5bc81eb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
15 deletions
+5
-15
typelib.c
dlls/oleaut32/typelib.c
+5
-15
No files found.
dlls/oleaut32/typelib.c
View file @
ae67aa8b
...
...
@@ -11180,7 +11180,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeIdldesc(ICreateTypeInfo2 *iface,
static
HRESULT
WINAPI
ICreateTypeInfo2_fnLayOut
(
ICreateTypeInfo2
*
iface
)
{
ITypeInfoImpl
*
This
=
info_impl_from_ICreateTypeInfo2
(
iface
);
ITypeInfo
*
tinfo
;
ITypeInfo
2
*
tinfo
=
&
This
->
ITypeInfo2_iface
;
TLBFuncDesc
*
func_desc
;
UINT
user_vft
=
0
,
i
,
depth
=
0
;
HRESULT
hres
=
S_OK
;
...
...
@@ -11189,25 +11189,20 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface)
This
->
needs_layout
=
FALSE
;
hres
=
ICreateTypeInfo2_QueryInterface
(
iface
,
&
IID_ITypeInfo
,
(
LPVOID
*
)
&
tinfo
);
if
(
FAILED
(
hres
))
return
hres
;
if
(
This
->
typeattr
.
typekind
==
TKIND_INTERFACE
)
{
ITypeInfo
*
inh
;
TYPEATTR
*
attr
;
HREFTYPE
inh_href
;
hres
=
ITypeInfo_GetRefTypeOfImplType
(
tinfo
,
0
,
&
inh_href
);
hres
=
ITypeInfo
2
_GetRefTypeOfImplType
(
tinfo
,
0
,
&
inh_href
);
if
(
SUCCEEDED
(
hres
))
{
hres
=
ITypeInfo_GetRefTypeInfo
(
tinfo
,
inh_href
,
&
inh
);
hres
=
ITypeInfo
2
_GetRefTypeInfo
(
tinfo
,
inh_href
,
&
inh
);
if
(
SUCCEEDED
(
hres
))
{
hres
=
ITypeInfo_GetTypeAttr
(
inh
,
&
attr
);
if
(
FAILED
(
hres
))
{
ITypeInfo_Release
(
inh
);
ITypeInfo_Release
(
tinfo
);
return
hres
;
}
This
->
typeattr
.
cbSizeVft
=
attr
->
cbSizeVft
;
...
...
@@ -11231,17 +11226,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface)
}
else
if
(
hres
==
TYPE_E_ELEMENTNOTFOUND
)
{
This
->
typeattr
.
cbSizeVft
=
0
;
hres
=
S_OK
;
}
else
{
ITypeInfo_Release
(
tinfo
);
}
else
return
hres
;
}
}
else
if
(
hres
==
TYPE_E_ELEMENTNOTFOUND
)
{
This
->
typeattr
.
cbSizeVft
=
0
;
hres
=
S_OK
;
}
else
{
ITypeInfo_Release
(
tinfo
);
}
else
return
hres
;
}
}
else
if
(
This
->
typeattr
.
typekind
==
TKIND_DISPATCH
)
This
->
typeattr
.
cbSizeVft
=
7
*
This
->
pTypeLib
->
ptr_size
;
else
...
...
@@ -11316,7 +11307,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface)
}
}
ITypeInfo_Release
(
tinfo
);
return
hres
;
}
...
...
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