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

oleaut32: Don't execute a function in ITypeInfo::Invoke if it has the FUNCFLAG_FRESTRICTED flag. 

Add some more tests for ITypeInfo::Invoke.
This commit is contained in:
Robert Shearman 2006-07-14 00:03:18 +01:00 committed by Alexandre Julliard
parent ebea92739c
commit 31f640274f
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,17 +425,20 @@ static void test_TypeInfo(void)
ITypeLib *pTypeLib; ITypeLib *pTypeLib;
ITypeInfo *pTypeInfo; ITypeInfo *pTypeInfo;
HRESULT hr; HRESULT hr;
static WCHAR szBogus[] = { 'b','o','g','u','s',0 }; static WCHAR wszBogus[] = { 'b','o','g','u','s',0 };
OLECHAR* bogus = szBogus; static WCHAR wszGetTypeInfo[] = { 'G','e','t','T','y','p','e','I','n','f','o',0 };
static WCHAR wszClone[] = {'C','l','o','n','e',0};
OLECHAR* bogus = wszBogus;
OLECHAR* pwszGetTypeInfo = wszGetTypeInfo;
OLECHAR* pwszClone = wszClone;
DISPID dispidMember; DISPID dispidMember;
DISPPARAMS dispparams; DISPPARAMS dispparams;
hr = LoadTypeLib(wszStdOle2, &pTypeLib); hr = LoadTypeLib(wszStdOle2, &pTypeLib);
ok_ole_success(hr, LoadTypeLib); ok_ole_success(hr, LoadTypeLib);
hr = ITypeLib_GetTypeInfo(pTypeLib, 1, &pTypeInfo); hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IFont, &pTypeInfo);
ok_ole_success(hr, ITypeLib_GetTypeInfo); ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid);
ITypeLib_Release(pTypeLib);
/* test nonexistent method name */ /* test nonexistent method name */
hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &bogus, 1, &dispidMember); hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &bogus, 1, &dispidMember);
@ -448,10 +451,30 @@ static void test_TypeInfo(void)
dispparams.cArgs = 0; dispparams.cArgs = 0;
dispparams.rgdispidNamedArgs = NULL; dispparams.rgdispidNamedArgs = NULL;
dispparams.rgvarg = NULL; dispparams.rgvarg = NULL;
hr = ITypeInfo_Invoke(pTypeInfo, NULL, 0xdeadbeef, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, 0xdeadbeef, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
ok(hr == DISP_E_MEMBERNOTFOUND, "ITypeInfo_Invoke should have returned DISP_E_MEMBERNOTFOUND instead of 0x%08lx\n", hr);
hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &pwszClone, 1, &dispidMember);
ok_ole_success(hr, ITypeInfo_GetIDsOfNames);
/* test correct memberid, but wrong flags */
hr = ITypeInfo_Invoke(pTypeInfo, (void *)0xdeadbeef, dispidMember, DISPATCH_PROPERTYGET, &dispparams, NULL, NULL, NULL);
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);
hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IDispatch, &pTypeInfo);
ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid);
hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &pwszGetTypeInfo, 1, &dispidMember);
ok_ole_success(hr, ITypeInfo_GetIDsOfNames);
/* test invoking a method with a [restricted] keyword */
hr = ITypeInfo_Invoke(pTypeInfo, NULL, dispidMember, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
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);
} }
START_TEST(typelib) START_TEST(typelib)

4
dlls/oleaut32/typelib.c
View File

@ -5223,7 +5223,9 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
/* we do this instead of using GetFuncDesc since it will return a fake /* we do this instead of using GetFuncDesc since it will return a fake
* 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 && (wFlags & pFuncInfo->funcdesc.invkind)) if ((memid == pFuncInfo->funcdesc.memid) &&
(wFlags & pFuncInfo->funcdesc.invkind) &&
!(pFuncInfo->funcdesc.wFuncFlags & FUNCFLAG_FRESTRICTED))
break; break;
if (pFuncInfo) { if (pFuncInfo) {