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
dd70c0ae
Commit
dd70c0ae
authored
Oct 02, 2006
by
Robert Shearman
Committed by
Alexandre Julliard
Oct 02, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Fix ITypeInfo::GetFuncDesc to return the correct information for dual dispinterfaces.
parent
65ca6a2f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
55 additions
and
1 deletion
+55
-1
typelib.c
dlls/oleaut32/typelib.c
+55
-1
No files found.
dlls/oleaut32/typelib.c
View file @
dd70c0ae
...
...
@@ -4547,6 +4547,51 @@ HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const F
return
E_INVALIDARG
;
}
/* internal function to make the inherited interfaces' methods appear
* part of the interface */
static
HRESULT
ITypeInfoImpl_GetInternalDispatchFuncDesc
(
ITypeInfo
*
iface
,
UINT
index
,
const
FUNCDESC
**
ppFuncDesc
,
UINT
*
funcs
)
{
ITypeInfoImpl
*
This
=
(
ITypeInfoImpl
*
)
iface
;
HRESULT
hr
;
UINT
i
;
UINT
implemented_funcs
=
0
;
if
(
funcs
)
*
funcs
=
0
;
for
(
i
=
0
;
i
<
This
->
TypeAttr
.
cImplTypes
;
i
++
)
{
HREFTYPE
href
;
ITypeInfo
*
pSubTypeInfo
;
UINT
sub_funcs
;
hr
=
ITypeInfo_GetRefTypeOfImplType
(
iface
,
i
,
&
href
);
if
(
FAILED
(
hr
))
return
hr
;
hr
=
ITypeInfo_GetRefTypeInfo
(
iface
,
href
,
&
pSubTypeInfo
);
if
(
FAILED
(
hr
))
return
hr
;
hr
=
ITypeInfoImpl_GetInternalDispatchFuncDesc
(
pSubTypeInfo
,
index
,
ppFuncDesc
,
&
sub_funcs
);
implemented_funcs
+=
sub_funcs
;
ITypeInfo_Release
(
pSubTypeInfo
);
if
(
SUCCEEDED
(
hr
))
return
hr
;
}
if
(
funcs
)
*
funcs
=
implemented_funcs
+
This
->
TypeAttr
.
cFuncs
;
if
(
index
<
implemented_funcs
)
return
E_INVALIDARG
;
return
ITypeInfoImpl_GetInternalFuncDesc
(
iface
,
index
-
implemented_funcs
,
ppFuncDesc
);
}
/* ITypeInfo::GetFuncDesc
*
* Retrieves the FUNCDESC structure that contains information about a
...
...
@@ -4562,9 +4607,18 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index,
TRACE
(
"(%p) index %d
\n
"
,
This
,
index
);
hr
=
ITypeInfoImpl_GetInternalFuncDesc
((
ITypeInfo
*
)
iface
,
index
,
&
internal_funcdesc
);
if
((
This
->
TypeAttr
.
typekind
==
TKIND_DISPATCH
)
&&
(
This
->
TypeAttr
.
wTypeFlags
&
TYPEFLAG_FDUAL
))
hr
=
ITypeInfoImpl_GetInternalDispatchFuncDesc
((
ITypeInfo
*
)
iface
,
index
,
&
internal_funcdesc
,
NULL
);
else
hr
=
ITypeInfoImpl_GetInternalFuncDesc
((
ITypeInfo
*
)
iface
,
index
,
&
internal_funcdesc
);
if
(
FAILED
(
hr
))
{
WARN
(
"description for function %d not found
\n
"
,
index
);
return
hr
;
}
return
TLB_AllocAndInitFuncDesc
(
internal_funcdesc
,
...
...
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