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.

oleaut32: Revert check for FUNCFLAG_FRESTRICTED in ITypeInfo::Invoke.
ad6b0dc2 · Robert Shearman · Alexandre Julliard · 2dc451e1 · ad6b0dc2 · ad6b0dc2
Commit ad6b0dc2 authored Jul 17, 2006 by Robert Shearman Committed by Alexandre Julliard Jul 18, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

typelib.c dlls/oleaut32/tests/typelib.c +2 -0

typelib.c dlls/oleaut32/typelib.c +1 -2

No files found.
--- 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);

--- 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) {