Skip to content

W
wine-winehq
Commit baef9a7e authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

oleaut32: Don't invoke a function that has the restricted attribute or is part…

oleaut32: Don't invoke a function that has the restricted attribute or is part of an interface that's marked as restricted.
parent 941aeade
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/oleaut32/typelib.c
View file @ baef9a7e
......@@ -6017,13 +6017,13 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
unsigned int var_index;
TYPEKIND type_kind;
HRESULT hres;
const TLBFuncDesc *pFuncInfo = This->funclist;
const TLBFuncDesc *pFuncInfo;
TRACE("(%p)(%p,id=%d,flags=0x%08x,%p,%p,%p,%p)\n",
This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr
);
if( pFuncInfo->funcdesc.wFuncFlags == FUNCFLAG_FRESTRICTED )
if( This->TypeAttr.wTypeFlags & TYPEFLAG_FRESTRICTED )
return DISP_E_MEMBERNOTFOUND;
if (!pDispParams)
......@@ -6045,7 +6045,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
* FUNCDESC for dispinterfaces and we want the real function description */
for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next)
if ((memid == pFuncInfo->funcdesc.memid) &&
(wFlags & pFuncInfo->funcdesc.invkind))
(wFlags & pFuncInfo->funcdesc.invkind) &&
(pFuncInfo->funcdesc.wFuncFlags & FUNCFLAG_FRESTRICTED) == 0)
break;
if (pFuncInfo) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment