mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 12:19:49 +00:00
OLE: fix invoking dispinterface functions
Fix invoking dispinterface functions by using the internal representation of the function, not the one returned to applications.
This commit is contained in:
parent
c73679e4eb
commit
bd8fefd66b
1 changed files with 11 additions and 8 deletions
|
@ -5185,25 +5185,29 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
|
|||
{
|
||||
ITypeInfoImpl *This = (ITypeInfoImpl *)iface;
|
||||
int i;
|
||||
unsigned int func_index, var_index;
|
||||
unsigned int var_index;
|
||||
TYPEKIND type_kind;
|
||||
HRESULT hres;
|
||||
const TLBFuncDesc *pFuncInfo;
|
||||
|
||||
TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p) partial stub!\n",
|
||||
This,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr
|
||||
);
|
||||
dump_DispParms(pDispParams);
|
||||
|
||||
hres = ITypeInfo2_GetFuncIndexOfMemId(iface, memid, dwFlags, &func_index);
|
||||
if (SUCCEEDED(hres)) {
|
||||
FUNCDESC *func_desc;
|
||||
/* we do this instead of using GetFuncDesc since it will return a fake
|
||||
* FUNCDESC for dispinterfaces and we want the real function description */
|
||||
for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next)
|
||||
if (memid == pFuncInfo->funcdesc.memid && (dwFlags & pFuncInfo->funcdesc.invkind))
|
||||
break;
|
||||
|
||||
if (pFuncInfo) {
|
||||
const FUNCDESC *func_desc = &pFuncInfo->funcdesc;
|
||||
|
||||
hres = ITypeInfo2_GetFuncDesc(iface, func_index, &func_desc);
|
||||
if(FAILED(hres)) return hres;
|
||||
if (TRACE_ON(ole))
|
||||
{
|
||||
TRACE("invoking:\n");
|
||||
dump_FUNCDESC(func_desc);
|
||||
dump_TLBFuncDesc(pFuncInfo);
|
||||
}
|
||||
|
||||
switch (func_desc->funckind) {
|
||||
|
@ -5376,7 +5380,6 @@ func_fail:
|
|||
break;
|
||||
}
|
||||
|
||||
ITypeInfo2_ReleaseFuncDesc(iface, func_desc);
|
||||
TRACE("-- 0x%08lx\n", hres);
|
||||
return hres;
|
||||
|
||||
|
|
Loading…
Reference in a new issue