marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adsldp: Implement IDirectorySearch::GetNextColumnName(). 

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Dmitry Timoshkov 2020-03-26 15:09:39 +08:00 committed by Alexandre Julliard
parent d2ab8296d4
commit 3adc9c5b21
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/adsldp/adsldp.c
View File

@ -399,6 +399,7 @@ typedef struct
struct ldap_search_context
{
LDAPMessage *res, *entry;
BerElement *ber;
ULONG count, pos;
};
@ -1249,6 +1250,7 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND
return S_ADS_NOMORE_ROWS;
ldap_ctx->pos++;
ldap_ctx->ber = NULL;
return S_OK;
}
@ -1259,10 +1261,33 @@ static HRESULT WINAPI search_GetPreviousRow(IDirectorySearch *iface, ADS_SEARCH_
return E_NOTIMPL;
}
static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, LPWSTR *names)
static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, LPWSTR *name)
{
FIXME("%p,%p,%p: stub\n", iface, res, names);
return E_NOTIMPL;
LDAP_namespace *ldap = impl_from_IDirectorySearch(iface);
struct ldap_search_context *ldap_ctx = res;
WCHAR *attr;
TRACE("%p,%p,%p\n", iface, res, name);
if (!ldap->ld) return E_NOTIMPL;
if (!name || !ldap_ctx || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER;
if (!ldap_ctx->ber)
attr = ldap_first_attributeW(ldap->ld, ldap_ctx->entry, &ldap_ctx->ber);
else
attr = ldap_next_attributeW(ldap->ld, ldap_ctx->entry, ldap_ctx->ber);
if (attr)
{
TRACE("=> %s\n", debugstr_w(attr));
*name = AllocADsStr(attr);
ldap_memfreeW(attr);
return *name ? S_OK : E_OUTOFMEMORY;
}
*name = NULL;
return S_ADS_NOMORE_COLUMNS;
}
static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDLE res,

2
include/adshlp.h
View File

@ -28,7 +28,9 @@ HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR*,DWORD,VARIANT*);
HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT*,ULONG,VARIANT*,ULONG*);
HRESULT WINAPI ADsGetObject(LPCWSTR,REFIID,VOID**);
HRESULT WINAPI ADsOpenObject(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,REFIID,VOID**);
LPWSTR WINAPI AllocADsStr(LPWSTR);
BOOL WINAPI FreeADsMem(LPVOID);
BOOL WINAPI FreeADsStr(LPWSTR);
#ifdef __cplusplus
}