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

adsldp: Improve IDirectorySearch::GetNextRow() end of entries detection logic. 

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-26 15:09:20 +08:00 committed by Alexandre Julliard
parent 7758d7a11c
commit d2ab8296d4
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/adsldp/adsldp.c
View File

@ -1211,11 +1211,9 @@ static HRESULT WINAPI search_GetFirstRow(IDirectorySearch *iface, ADS_SEARCH_HAN
if (!res) return E_ADS_BAD_PARAMETER;
ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res);
ldap_ctx->pos = 0;
ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res);
ldap_ctx->entry = NULL;
return ldap_ctx->entry ? S_OK : S_ADS_NOMORE_ROWS;
return IDirectorySearch_GetNextRow(iface, res);
}
static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res)
@ -1233,6 +1231,10 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND
{
ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res);
ldap_ctx->pos = 0;
if (ldap_ctx->pos >= ldap_ctx->count)
return S_ADS_NOMORE_ROWS;
ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res);
}
else
@ -1241,10 +1243,14 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND
return S_ADS_NOMORE_ROWS;
ldap_ctx->entry = ldap_next_entry(ldap->ld, ldap_ctx->res);
ldap_ctx->pos++;
}
return ldap_ctx->entry ? S_OK : S_ADS_NOMORE_ROWS;
if (!ldap_ctx->entry)
return S_ADS_NOMORE_ROWS;
ldap_ctx->pos++;
return S_OK;
}
static HRESULT WINAPI search_GetPreviousRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res)