Piotr Caban : oleaut32: Add ICreateTypeInfo2::SetVarName implementation.
Alexandre Julliard
julliard at winehq.org
Thu Sep 5 13:28:18 CDT 2013
Module: wine
Branch: master
Commit: a2ea406eee40c74251d98d6f6a81b8fc349e02b5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ea406eee40c74251d98d6f6a81b8fc349e02b5
Author: Piotr Caban <piotr at codeweavers.com>
Date: Wed Sep 4 22:28:50 2013 +0200
oleaut32: Add ICreateTypeInfo2::SetVarName implementation.
---
dlls/oleaut32/tests/typelib.c | 16 ++++++++++++++--
dlls/oleaut32/typelib.c | 13 +++++++++++--
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c
index 8b91212..b873ac2 100644
--- a/dlls/oleaut32/tests/typelib.c
+++ b/dlls/oleaut32/tests/typelib.c
@@ -4287,13 +4287,14 @@ static void test_SetVarDocString(void)
static OLECHAR nameW[] = {'n','a','m','e',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};
CHAR filenameA[MAX_PATH];
WCHAR filenameW[MAX_PATH];
ICreateTypeLib2 *ctl;
ICreateTypeInfo *cti;
ITypeLib *tl;
ITypeInfo *ti;
- BSTR docstr;
+ BSTR namestr, docstr;
VARDESC desc, *pdesc;
HRESULT hr;
VARIANT v;
@@ -4324,6 +4325,15 @@ static void test_SetVarDocString(void)
hr = ICreateTypeInfo_AddVarDesc(cti, 0, &desc);
ok(hr == S_OK, "got %08x\n", hr);
+ hr = ICreateTypeInfo_SetVarName(cti, 0, NULL);
+ ok(hr == E_INVALIDARG, "got %08x\n", hr);
+
+ hr = ICreateTypeInfo_SetVarName(cti, 1, var_nameW);
+ ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr);
+
+ hr = ICreateTypeInfo_SetVarName(cti, 0, var_nameW);
+ ok(hr == S_OK, "got %08x\n", hr);
+
hr = ICreateTypeInfo_SetVarDocString(cti, 0, NULL);
ok(hr == E_INVALIDARG, "got %08x\n", hr);
@@ -4359,10 +4369,12 @@ static void test_SetVarDocString(void)
ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue));
ok(V_INT(U(pdesc)->lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(pdesc)->lpvarValue));
- hr = ITypeInfo_GetDocumentation(ti, pdesc->memid, NULL, &docstr, NULL, NULL);
+ hr = ITypeInfo_GetDocumentation(ti, pdesc->memid, &namestr, &docstr, NULL, NULL);
ok(hr == S_OK, "got %08x\n", hr);
+ ok(memcmp(namestr, var_nameW, sizeof(var_nameW)) == 0, "got wrong name: %s\n", wine_dbgstr_w(namestr));
ok(memcmp(docstr, doc2W, sizeof(doc2W)) == 0, "got wrong docstring: %s\n", wine_dbgstr_w(docstr));
+ SysFreeString(namestr);
SysFreeString(docstr);
ITypeInfo_ReleaseVarDesc(ti, pdesc);
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 4f55755..a27f5f4 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -10688,8 +10688,17 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName(ICreateTypeInfo2 *iface,
UINT index, LPOLESTR name)
{
ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface);
- FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(name));
- return E_NOTIMPL;
+
+ TRACE("%p %u %s\n", This, index, wine_dbgstr_w(name));
+
+ if(!name)
+ return E_INVALIDARG;
+
+ if(index >= This->cVars)
+ return TYPE_E_ELEMENTNOTFOUND;
+
+ This->vardescs[index].Name = TLB_append_str(&This->pTypeLib->name_list, name);
+ return S_OK;
}
static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeDescAlias(ICreateTypeInfo2 *iface,
More information about the wine-cvs
mailing list