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

oleaut32: Implement ICreateTypeInfo::SetFuncDocString.

This commit is contained in:
Andrew Eikum 2013-09-19 11:10:05 -05:00 committed by Alexandre Julliard
parent f9447f92ef
commit 7f47beb7d8
2 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4325,9 +4325,10 @@ static void test_SetFuncAndParamNames(void)
DeleteFileA(filenameA);
}
static void test_SetVarDocString(void)
static void test_SetDocString(void)
{
static OLECHAR nameW[] = {'n','a','m','e',0};
static OLECHAR name2W[] = {'n','a','m','e','2',0};
static OLECHAR doc1W[] = {'d','o','c','1',0};
static OLECHAR doc2W[] = {'d','o','c','2',0};
static OLECHAR var_nameW[] = {'v','a','r','n','a','m','e',0};
@ -4339,6 +4340,7 @@ static void test_SetVarDocString(void)
ITypeInfo *ti;
BSTR namestr, docstr;
VARDESC desc, *pdesc;
FUNCDESC funcdesc, *pfuncdesc;
HRESULT hr;
VARIANT v;
@ -4393,6 +4395,29 @@ static void test_SetVarDocString(void)
ICreateTypeInfo_Release(cti);
hr = ICreateTypeLib2_CreateTypeInfo(ctl, name2W, TKIND_INTERFACE, &cti);
ok(hr == S_OK, "got %08x\n", hr);
hr = ICreateTypeInfo_SetFuncDocString(cti, 0, doc1W);
ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr);
hr = ICreateTypeInfo_SetFuncDocString(cti, 0, NULL);
ok(hr == E_INVALIDARG, "got %08x\n", hr);
memset(&funcdesc, 0, sizeof(funcdesc));
funcdesc.memid = MEMBERID_NIL;
funcdesc.funckind = FUNC_PUREVIRTUAL;
funcdesc.invkind = INVOKE_FUNC;
funcdesc.callconv = CC_STDCALL;
hr = ICreateTypeInfo_AddFuncDesc(cti, 0, &funcdesc);
ok(hr == S_OK, "got %08x\n", hr);
hr = ICreateTypeInfo_SetFuncDocString(cti, 0, doc1W);
ok(hr == S_OK, "got %08x\n", hr);
ICreateTypeInfo_Release(cti);
hr = ICreateTypeLib2_SaveAllChanges(ctl);
ok(hr == S_OK, "got: %08x\n", hr);
@ -4422,6 +4447,27 @@ static void test_SetVarDocString(void)
ITypeInfo_ReleaseVarDesc(ti, pdesc);
ITypeInfo_Release(ti);
hr = ITypeLib_GetTypeInfo(tl, 1, &ti);
ok(hr == S_OK, "got %08x\n", hr);
hr = ITypeInfo_GetFuncDesc(ti, 0, &pfuncdesc);
ok(hr == S_OK, "got %08x\n", hr);
ok(pfuncdesc->memid == 0x60000000, "got wrong memid: %x\n", pfuncdesc->memid);
ok(pfuncdesc->funckind == FUNC_PUREVIRTUAL, "got wrong funckind: %x\n", pfuncdesc->funckind);
ok(pfuncdesc->invkind == INVOKE_FUNC, "got wrong invkind: %x\n", pfuncdesc->invkind);
ok(pfuncdesc->callconv == CC_STDCALL, "got wrong callconv: %x\n", pfuncdesc->callconv);
hr = ITypeInfo_GetDocumentation(ti, pfuncdesc->memid, &namestr, &docstr, NULL, NULL);
ok(hr == S_OK, "got %08x\n", hr);
ok(namestr == NULL, "got wrong name: %s\n", wine_dbgstr_w(namestr));
ok(memcmp(docstr, doc1W, sizeof(doc1W)) == 0, "got wrong docstring: %s\n", wine_dbgstr_w(docstr));
SysFreeString(docstr);
ITypeInfo_ReleaseFuncDesc(ti, pfuncdesc);
ITypeInfo_Release(ti);
ITypeLib_Release(tl);
DeleteFileA(filenameA);
@ -5001,7 +5047,7 @@ START_TEST(typelib)
test_inheritance();
test_SetVarHelpContext();
test_SetFuncAndParamNames();
test_SetVarDocString();
test_SetDocString();
test_FindName();
if ((filename = create_test_typelib(2)))

15
dlls/oleaut32/typelib.c
View File

@ -10722,8 +10722,19 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncDocString(ICreateTypeInfo2 *ifac
UINT index, LPOLESTR docString)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(docString));
return E_NOTIMPL;
TLBFuncDesc *func_desc = &This->funcdescs[index];
TRACE("%p %u %s\n", This, index, wine_dbgstr_w(docString));
if(!docString)
return E_INVALIDARG;
if(index >= This->cFuncs)
return TYPE_E_ELEMENTNOTFOUND;
func_desc->HelpString = TLB_append_str(&This->pTypeLib->string_list, docString);
return S_OK;
}
static HRESULT WINAPI ICreateTypeInfo2_fnSetVarDocString(ICreateTypeInfo2 *iface,