[PATCH 1/5] wldap32: Implement ldap_search_init_pageW.

[Dmitry Timoshkov]

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 dlls/wldap32/page.c            | 62 ++++++++++++++++++++++++++++++++--
 dlls/wldap32/winldap_private.h | 11 +++++-
 2 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c
index 7cf7d93245..27a8156e51 100644
--- a/dlls/wldap32/page.c
+++ b/dlls/wldap32/page.c
@@ -277,11 +277,67 @@ PLDAPSearch CDECL ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scop
     return NULL;
 }
 
-PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG scope,
+PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope,
     PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls,
     PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys )
 {
-    FIXME( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(dn),
-           scope, debugstr_w(filter), attrs, attrsonly );
+    LDAPSearch *search;
+    DWORD i, len;
+
+    TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n",
+           ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly,
+           serverctrls, clientctrls, timelimit, sizelimit, sortkeys );
+
+    search = heap_alloc_zero( sizeof(*search) );
+    if (!search)
+    {
+        ld->ld_errno = WLDAP32_LDAP_NO_MEMORY;
+        return NULL;
+    }
+
+    if (base)
+    {
+        search->base = strWtoU( base );
+        if (!search->base) goto fail;
+    }
+    if (filter)
+    {
+        search->filter = strWtoU( filter );
+        if (!search->filter) goto fail;
+    }
+    if (attrs)
+    {
+        search->attrs = strarrayWtoU( attrs );
+        if (!search->attrs) goto fail;
+    }
+
+    len = serverctrls ? controlarraylenW( serverctrls ) : 0;
+    search->serverctrls = heap_alloc( sizeof(LDAPControl *) * (len + 2) );
+    if (!search->serverctrls) goto fail;
+    search->serverctrls[0] = NULL; /* reserve 0 for page control */
+    for (i = 0; i < len; i++)
+    {
+        search->serverctrls[i + 1] = controlWtoU( serverctrls[i] );
+        if (!search->serverctrls[i + 1]) goto fail;
+    }
+    search->serverctrls[len + 1] = NULL;
+
+    if (clientctrls)
+    {
+        search->clientctrls = controlarrayWtoU( clientctrls );
+        if (!search->clientctrls) goto fail;
+    }
+
+    search->scope = scope;
+    search->attrsonly = attrsonly;
+    search->timeout.tv_sec = timelimit;
+    search->timeout.tv_usec = 0;
+    search->sizelimit = sizelimit;
+    search->cookie = NULL;
+
+    return search;
+
+fail:
+    ldap_search_abandon_page( ld, search );
     return NULL;
 }
diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h
index 30c12a909c..7145260aca 100644
--- a/dlls/wldap32/winldap_private.h
+++ b/dlls/wldap32/winldap_private.h
@@ -234,7 +234,16 @@ typedef struct WLDAP32_ldapvlvinfo
     VOID *ldvlv_extradata;
 } WLDAP32_LDAPVLVInfo, *WLDAP32_PLDAPVLVInfo;
 
-typedef struct ldapsearch LDAPSearch, *PLDAPSearch;
+typedef struct ldapsearch
+{
+    char *base, *filter, **attrs;
+    ULONG scope, attrsonly;
+    LDAPControl **serverctrls;
+    LDAPControl **clientctrls;
+    struct timeval timeout;
+    ULONG sizelimit;
+    struct berval *cookie;
+} LDAPSearch, *PLDAPSearch;
 
 typedef struct ldapsortkeyA
 {
-- 
2.25.2

[Alexandre Julliard]

Dmitry Timoshkov <dmitry(a)baikal.ru> writes:
> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
> ---
>  dlls/wldap32/page.c            | 62 ++++++++++++++++++++++++++++++++--
>  dlls/wldap32/winldap_private.h | 11 +++++-
>  2 files changed, 69 insertions(+), 4 deletions(-)

This breaks without LDAP:

In file included from ../../../wine/dlls/wldap32/add.c:33:
../../../wine/dlls/wldap32/winldap_private.h:241:5: error: unknown type name ‘LDAPControl’
../../../wine/dlls/wldap32/winldap_private.h:242:5: error: unknown type name ‘LDAPControl’
../../../wine/dlls/wldap32/winldap_private.h:243:20: error: field ‘timeout’ has incomplete type
make[1]: *** [Makefile:199: add.o] Error 1

-- 
Alexandre Julliard
julliard(a)winehq.org