Dmitry Timoshkov : wldap32: Set count and result to 0 when returning LDAP_NO_RESULTS_RETURNED.
Alexandre Julliard
julliard at winehq.org
Mon Apr 20 15:48:19 CDT 2020
Module: wine
Branch: master
Commit: 3c7fddbcae460fabbbc46829387b22dcbd6dc8e6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c7fddbcae460fabbbc46829387b22dcbd6dc8e6
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Mon Apr 20 13:59:38 2020 +0800
wldap32: Set count and result to 0 when returning LDAP_NO_RESULTS_RETURNED.
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wldap32/page.c | 2 ++
dlls/wldap32/tests/parse.c | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c
index 32e7e91fb2..959567c2bf 100644
--- a/dlls/wldap32/page.c
+++ b/dlls/wldap32/page.c
@@ -185,6 +185,8 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search,
if (search->cookie && search->cookie->bv_len == 0)
{
/* end of paged results */
+ *count = 0;
+ *results = NULL;
return WLDAP32_LDAP_NO_RESULTS_RETURNED;
}
diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c
index 2915d9c02b..c982be9e59 100644
--- a/dlls/wldap32/tests/parse.c
+++ b/dlls/wldap32/tests/parse.c
@@ -264,9 +264,7 @@ static void test_ldap_paged_search(void)
res = (void *)0xdeadbeef;
ret = ldap_get_next_page_s( ld, search, NULL, 1, &count, &res );
ok( ret == LDAP_NO_RESULTS_RETURNED, "got 0x%x\n", ret );
-todo_wine
ok( !res, "expected res == NULL\n" );
-todo_wine
ok( count == 0, "got %u\n", count );
ldap_search_abandon_page( ld, search );
More information about the wine-cvs
mailing list