From ad6b0dc281665738c9e3bec8389e8881a3fb2258 Mon Sep 17 00:00:00 2001 From: Robert Shearman Date: Mon, 17 Jul 2006 20:19:32 +0100 Subject: [PATCH] oleaut32: Revert check for FUNCFLAG_FRESTRICTED in ITypeInfo::Invoke. The change caused regressions in a number of applications and needs more study to see what the correct behaviour should be. --- dlls/oleaut32/tests/typelib.c | 2 ++ dlls/oleaut32/typelib.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index aa3fd005956..30fa9623aaa 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -471,7 +471,9 @@ static void test_TypeInfo(void) /* test invoking a method with a [restricted] keyword */ hr = ITypeInfo_Invoke(pTypeInfo, NULL, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + todo_wine { ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr); + } ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a2aaaab60a6..52aae920736 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5224,8 +5224,7 @@ 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) && - !(pFuncInfo->funcdesc.wFuncFlags & FUNCFLAG_FRESTRICTED)) + (wFlags & pFuncInfo->funcdesc.invkind)) break; if (pFuncInfo) {