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

adsldp: Add support for multi-valued attributes to IADs::Get(). 

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Dmitry Timoshkov 2020-03-23 21:14:53 +08:00 committed by Alexandre Julliard
parent afeb8edd9d
commit fa4820c203
1 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dlls/adsldp/adsldp.c
View File

@ -569,7 +569,7 @@ static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop)
{
if (!wcsicmp(name, ldap->attrs[i].name))
{
ULONG count = ldap_count_valuesW(ldap->attrs[i].values);
LONG count = ldap_count_valuesW(ldap->attrs[i].values);
if (!count)
{
V_BSTR(prop) = NULL;
@ -578,12 +578,45 @@ static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop)
}
if (count > 1)
FIXME("attr %s has %u values\n", debugstr_w(ldap->attrs[i].name), count);
{
SAFEARRAY *sa;
VARIANT item;
LONG idx;
V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]);
if (!V_BSTR(prop)) return E_OUTOFMEMORY;
V_VT(prop) = VT_BSTR;
return S_OK;
TRACE("attr %s has %u values\n", debugstr_w(ldap->attrs[i].name), count);
sa = SafeArrayCreateVector(VT_VARIANT, 0, count);
if (!sa) return E_OUTOFMEMORY;
for (idx = 0; idx < count; idx++)
{
V_VT(&item) = VT_BSTR;
V_BSTR(&item) = SysAllocString(ldap->attrs[i].values[idx]);
if (!V_BSTR(&item))
{
hr = E_OUTOFMEMORY;
goto fail;
}
hr = SafeArrayPutElement(sa, &idx, &item);
SysFreeString(V_BSTR(&item));
if (hr != S_OK) goto fail;
}
V_VT(prop) = VT_ARRAY | VT_VARIANT;
V_ARRAY(prop) = sa;
return S_OK;
fail:
SafeArrayDestroy(sa);
return hr;
}
else
{
V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]);
if (!V_BSTR(prop)) return E_OUTOFMEMORY;
V_VT(prop) = VT_BSTR;
return S_OK;
}
}
}