ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Robert Shearman 2006-07-17 20:19:32 +01:00 committed by Alexandre Julliard
parent 2dc451e181
commit ad6b0dc281
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/oleaut32/tests/typelib.c
View File

@ -471,7 +471,9 @@ static void test_TypeInfo(void)
/* test invoking a method with a [restricted] keyword */ /* test invoking a method with a [restricted] keyword */
hr = ITypeInfo_Invoke(pTypeInfo, NULL, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); 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); ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr);
}
ITypeInfo_Release(pTypeInfo); ITypeInfo_Release(pTypeInfo);
ITypeLib_Release(pTypeLib); ITypeLib_Release(pTypeLib);

3
dlls/oleaut32/typelib.c
View File

@ -5224,8 +5224,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
* FUNCDESC for dispinterfaces and we want the real function description */ * FUNCDESC for dispinterfaces and we want the real function description */
for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next) for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next)
if ((memid == pFuncInfo->funcdesc.memid) && if ((memid == pFuncInfo->funcdesc.memid) &&
(wFlags & pFuncInfo->funcdesc.invkind) && (wFlags & pFuncInfo->funcdesc.invkind))
!(pFuncInfo->funcdesc.wFuncFlags & FUNCFLAG_FRESTRICTED))
break; break;
if (pFuncInfo) { if (pFuncInfo) {