system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

oleaut32: Allow all property methods to have the same name.

Browse source
This commit is contained in:
Nikolay Sivov 2010-12-25 17:56:11 +03:00 committed by Alexandre Julliard
parent b6313c702e
commit 069b8e50eb
2 changed files with 80 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
dlls/oleaut32/tests/typelib.c
View file

@ -2929,6 +2929,75 @@ static void test_SetVarHelpContext(void)
DeleteFileA(filenameA);
}
static void test_SetFuncAndParamNames(void)
{
static OLECHAR nameW[] = {'n','a','m','e',0};
static OLECHAR prop[] = {'p','r','o','p',0};
static OLECHAR *propW[] = {prop};
CHAR filenameA[MAX_PATH];
WCHAR filenameW[MAX_PATH];
ICreateTypeLib2 *ctl;
ICreateTypeInfo *cti;
FUNCDESC funcdesc;
ELEMDESC edesc;
HRESULT hr;
GetTempFileNameA(".", "tlb", 0, filenameA);
MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filenameW, MAX_PATH);
hr = CreateTypeLib2(SYS_WIN32, filenameW, &ctl);
ok(hr == S_OK, "got %08x\n", hr);
hr = ICreateTypeLib2_CreateTypeInfo(ctl, nameW, TKIND_DISPATCH, &cti);
ok(hr == S_OK, "got %08x\n", hr);
/* get method */
memset(&funcdesc, 0, sizeof(FUNCDESC));
funcdesc.funckind = FUNC_DISPATCH;
funcdesc.callconv = CC_STDCALL;
funcdesc.elemdescFunc.tdesc.vt = VT_VOID;
funcdesc.wFuncFlags = FUNCFLAG_FBINDABLE;
/* put method */
memset(&edesc, 0, sizeof(edesc));
edesc.tdesc.vt = VT_BSTR;
U(edesc).idldesc.dwReserved = 0;
U(edesc).idldesc.wIDLFlags = IDLFLAG_FIN;
funcdesc.lprgelemdescParam = &edesc;
funcdesc.invkind = INVOKE_PROPERTYPUT;
funcdesc.cParams = 1;
hr = ICreateTypeInfo_AddFuncDesc(cti, 0, &funcdesc);
ok(hr == S_OK, "got 0x%08x\n", hr);
/* setter name */
hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 0, propW, 1);
ok(hr == S_OK, "got 0x%08x\n", hr);
/* putref method */
funcdesc.invkind = INVOKE_PROPERTYPUTREF;
hr = ICreateTypeInfo_AddFuncDesc(cti, 1, &funcdesc);
ok(hr == S_OK, "got 0x%08x\n", hr);
/* putref name */
hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 1, propW, 1);
ok(hr == S_OK, "got 0x%08x\n", hr);
funcdesc.invkind = INVOKE_PROPERTYGET;
funcdesc.cParams = 0;
hr = ICreateTypeInfo_AddFuncDesc(cti, 2, &funcdesc);
ok(hr == S_OK, "got 0x%08x\n", hr);
/* getter name */
hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 2, propW, 1);
ok(hr == S_OK, "got 0x%08x\n", hr);
ICreateTypeInfo_Release(cti);
ICreateTypeLib2_Release(ctl);
DeleteFileA(filenameA);
}
START_TEST(typelib)
{
const char *filename;
@ -2946,6 +3015,7 @@ START_TEST(typelib)
test_inheritance();
test_CreateTypeLib();
test_SetVarHelpContext();
test_SetFuncAndParamNames();
if ((filename = create_test_typelib(2)))
{

18
dlls/oleaut32/typelib2.c
View file

@ -2361,15 +2361,17 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames(
TRACE("function name %s\n", debugstr_w(names[0]));
len = ctl2_encode_name(This->typelib, names[0], &namedata);
for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) {
if(iter2->name!=-1 && !memcmp(namedata,
This->typelib->typelib_segment_data[MSFT_SEG_NAME]+iter2->name+8, len)) {
/* getters/setters can have a same name */
if (iter2->type == CyclicListFunc) {
INVOKEKIND inv1 = ctl2_get_invokekind(iter2);
INVOKEKIND inv2 = ctl2_get_invokekind(iter);
if (((inv1&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv2&INVOKE_PROPERTYGET)) ||
((inv2&(INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) && (inv1&INVOKE_PROPERTYGET)))
int cmp = memcmp(namedata, This->typelib->typelib_segment_data[MSFT_SEG_NAME]+iter2->name+8, len);
if (iter2->name != -1 && cmp == 0) {
if (iter2->type == CyclicListFunc) {
INVOKEKIND inv1 = ctl2_get_invokekind(iter);
INVOKEKIND inv2 = ctl2_get_invokekind(iter2);
/* it's allowed to have PUT, PUTREF and GET methods with the same name */
if ((inv1 != inv2) &&
(inv1 & (INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF|INVOKE_PROPERTYGET)) &&
(inv2 & (INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF|INVOKE_PROPERTYGET)))
continue;
}