From 3c7fddbcae460fabbbc46829387b22dcbd6dc8e6 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Mon, 20 Apr 2020 13:59:38 +0800 Subject: [PATCH] wldap32: Set count and result to 0 when returning LDAP_NO_RESULTS_RETURNED. Signed-off-by: Dmitry Timoshkov Signed-off-by: Alexandre Julliard --- 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 32e7e91fb2d..959567c2bfd 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 2915d9c02b7..c982be9e592 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 );