Commit 57f3d503 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard

adsldp: Fix IDirectorySearch::GetColumn() behaviour for not found case.

parent 21959bf0
......@@ -1434,7 +1434,11 @@ exit:
}
values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name);
if (!values) return ERROR_DS_NO_ATTRIBUTE_OR_VALUE;
if (!values)
{
memset(col, 0, sizeof(*col));
return E_ADS_COLUMN_NOT_SET;
}
count = ldap_count_values_len(values);
......
......@@ -417,6 +417,18 @@ todo_wine
ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr);
}
hr = IDirectorySearch_GetFirstRow(ds, sh);
ok(hr == S_OK, "got %#x\n", hr);
memset(&col, 0x55, sizeof(col));
hr = IDirectorySearch_GetColumn(ds, sh, (WCHAR *)L"deadbeef", &col);
ok(hr == E_ADS_COLUMN_NOT_SET, "got %#x\n", hr);
ok(!col.pszAttrName, "got %p\n", col.pszAttrName);
ok(col.dwADsType == ADSTYPE_INVALID || broken(col.dwADsType != ADSTYPE_INVALID) /* XP */, "got %d\n", col.dwADsType);
ok(!col.pADsValues, "got %p\n", col.pADsValues);
ok(!col.dwNumValues, "got %u\n", col.dwNumValues);
ok(!col.hReserved, "got %p\n", col.hReserved);
hr = IDirectorySearch_CloseSearchHandle(ds, sh);
ok(hr == S_OK, "got %#x\n", hr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment