Implement ldap_add* functions.

dlls/wldap32/Makefile.in

@@ -8,6 +8,7 @@ IMPORTS   = user32 kernel32
 EXTRALIBS = @LDAPLIBS@
 
 C_SRCS = \
+	add.c \
 	ber.c \
 	bind.c \
 	compare.c \

dlls/wldap32/add.c

+/*
+ * WLDAP32 - LDAP support for Wine
+ *
+ * Copyright 2005 Hans Leidekker
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "config.h"
+
+#include "wine/port.h"
+#include "wine/debug.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+
+#ifdef HAVE_LDAP_H
+#include <ldap.h>
+#else
+#define LDAP_NOT_SUPPORTED  0x5c
+#endif
+
+#include "winldap_private.h"
+#include "wldap32.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
+
+ULONG ldap_addA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[] )
+{
+    ULONG ret = LDAP_NOT_SUPPORTED;
+#ifdef HAVE_LDAP
+    WCHAR *dnW = NULL;
+    LDAPModW **attrsW = NULL;
+
+    ret = WLDAP32_LDAP_NO_MEMORY;
+
+    TRACE( "(%p, %s, %p)\n", ld, debugstr_a(dn), attrs );
+
+    if (!ld) return ~0UL;
+    if (!attrs) return LDAP_PROTOCOL_ERROR;
+
+    if (dn) {
+        dnW = strAtoW( dn );
+        if (!dnW) goto exit;
+    }
+
+    attrsW = modarrayAtoW( attrs );
+    if (!attrsW) goto exit;
+
+    ret = ldap_addW( ld, dnW, attrsW );
+
+exit:
+    strfreeW( dnW );
+    modarrayfreeW( attrsW );
+
+#endif
+    return ret;
+}
+
+ULONG ldap_addW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[] )
+{
+    ULONG ret = LDAP_NOT_SUPPORTED;
+#ifdef HAVE_LDAP
+    char *dnU = NULL;
+    LDAPMod **attrsU = NULL;
+ 
+    ret = WLDAP32_LDAP_NO_MEMORY;
+
+    TRACE( "(%p, %s, %p)\n", ld, debugstr_w(dn), attrs );
+
+    if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+    if (!attrs) return LDAP_PROTOCOL_ERROR;
+
+    if (dn) {
+        dnU = strWtoU( dn );
+        if (!dnU) goto exit;
+    }
+
+    attrsU = modarrayWtoU( attrs );
+    if (!attrsU) goto exit;
+
+    ret = ldap_add( ld, dn ? dnU : "", attrsU );
+
+exit:
+    strfreeU( dnU );
+    modarrayfreeU( attrsU );
+
+#endif
+    return ret;
+}
+
+ULONG ldap_add_extA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[],
+    PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message )
+{
+    ULONG ret = LDAP_NOT_SUPPORTED;
+#ifdef HAVE_LDAP
+    WCHAR *dnW = NULL;
+    LDAPModW **attrsW = NULL;
+    LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
+
+    ret = WLDAP32_LDAP_NO_MEMORY;
+
+    TRACE( "(%p, %s, %p, %p, %p, %p)\n", ld, debugstr_a(dn), attrs,
+           serverctrls, clientctrls, message );
+
+    if (!ld) return ~0UL;
+    if (!attrs) return LDAP_PROTOCOL_ERROR;
+
+    if (dn) {
+        dnW = strAtoW( dn );
+        if (!dnW) goto exit;
+    }
+
+    attrsW = modarrayAtoW( attrs );
+    if (!attrsW) goto exit;
+
+    if (serverctrls) {
+        serverctrlsW = controlarrayAtoW( serverctrls );
+        if (!serverctrlsW) goto exit;
+    }
+    if (clientctrls) {
+        clientctrlsW = controlarrayAtoW( clientctrls );
+        if (!clientctrlsW) goto exit;
+    }
+
+    ret = ldap_add_extW( ld, dnW, attrsW, serverctrlsW, clientctrlsW, message );
+
+exit:
+    strfreeW( dnW );
+    modarrayfreeW( attrsW );
+    controlarrayfreeW( serverctrlsW );
+    controlarrayfreeW( clientctrlsW );
+
+#endif
+    return ret;
+}
+
+ULONG ldap_add_extW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[],
+    PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message )
+{
+    ULONG ret = LDAP_NOT_SUPPORTED;
+#ifdef HAVE_LDAP
+    char *dnU = NULL;
+    LDAPMod **attrsU = NULL;
+    LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
+    int dummy;
+
+    ret = WLDAP32_LDAP_NO_MEMORY;
+
+    TRACE( "(%p, %s, %p, %p, %p, %p)\n", ld, debugstr_w(dn), attrs,
+           serverctrls, clientctrls, message );
+
+    if (!ld) return ~0UL;
+    if (!attrs) return LDAP_PROTOCOL_ERROR;
+
+    if (dn) {
+        dnU = strWtoU( dn );
+        if (!dnU) goto exit;
+    }
+
+    attrsU = modarrayWtoU( attrs );
+    if (!attrsU) goto exit;
+
+    if (serverctrls) {
+        serverctrlsU = controlarrayWtoU( serverctrls );
+        if (!serverctrlsU) goto exit;
+    }
+    if (clientctrls) {
+        clientctrlsU = controlarrayWtoU( clientctrls );
+        if (!clientctrlsU) goto exit;
+    }
+
+    ret = ldap_add_ext( ld, dn ? dnU : "", attrsU, serverctrlsU, clientctrlsU,
+                        message ? (int *)message : &dummy );
+
+exit:
+    strfreeU( dnU );
+    modarrayfreeU( attrsU );
+    controlarrayfreeU( serverctrlsU );
+    controlarrayfreeU( clientctrlsU );
+
+#endif
+    return ret;
+}
+
+ULONG ldap_add_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[],
+    PLDAPControlA *serverctrls, PLDAPControlA *clientctrls )
+{
+    ULONG ret = LDAP_NOT_SUPPORTED;
+#ifdef HAVE_LDAP
+    WCHAR *dnW = NULL;
+    LDAPModW **attrsW = NULL;
+    LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
+
+    ret = WLDAP32_LDAP_NO_MEMORY;
+
+    TRACE( "(%p, %s, %p, %p, %p)\n", ld, debugstr_a(dn), attrs,
+           serverctrls, clientctrls );
+
+    if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+    if (!attrs) return LDAP_PROTOCOL_ERROR;
+
+    if (dn) {
+        dnW = strAtoW( dn );
+        if (!dnW) goto exit;
+    }
+
+    attrsW = modarrayAtoW( attrs );
+    if (!attrsW) goto exit;
+
+    if (serverctrls) {
+        serverctrlsW = controlarrayAtoW( serverctrls );
+        if (!serverctrlsW) goto exit;
+    }
+    if (clientctrls) {
+        clientctrlsW = controlarrayAtoW( clientctrls );
+        if (!clientctrlsW) goto exit;
+    }
+
+    ret = ldap_add_ext_sW( ld, dnW, attrsW, serverctrlsW, clientctrlsW );
+
+exit:
+    strfreeW( dnW );
+    modarrayfreeW( attrsW );
+    controlarrayfreeW( serverctrlsW );
+    controlarrayfreeW( clientctrlsW );
+
+#endif
+    return ret;
+}
+
+ULONG ldap_add_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[],
+    PLDAPControlW *serverctrls, PLDAPControlW *clientctrls )
+{
+    ULONG ret = LDAP_NOT_SUPPORTED;
+#ifdef HAVE_LDAP
+    char *dnU = NULL;
+    LDAPMod **attrsU = NULL;
+    LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
+
+    ret = WLDAP32_LDAP_NO_MEMORY;
+
+    TRACE( "(%p, %s, %p, %p, %p)\n", ld, debugstr_w(dn), attrs,
+           serverctrls, clientctrls );
+
+    if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+    if (!attrs) return LDAP_PROTOCOL_ERROR;
+
+    if (dn) {
+        dnU = strWtoU( dn );
+        if (!dnU) goto exit;
+    }
+
+    attrsU = modarrayWtoU( attrs );
+    if (!attrsU) goto exit;
+
+    if (serverctrls) {
+        serverctrlsU = controlarrayWtoU( serverctrls );
+        if (!serverctrlsU) goto exit;
+    }
+    if (clientctrls) {
+        clientctrlsU = controlarrayWtoU( clientctrls );
+        if (!clientctrlsU) goto exit;
+    }
+
+    ret = ldap_add_ext_s( ld, dn ? dnU : "", attrsU, serverctrlsU, clientctrlsU );
+
+exit:
+    strfreeU( dnU );
+    modarrayfreeU( attrsU );
+    controlarrayfreeU( serverctrlsU );
+    controlarrayfreeU( clientctrlsU );
+
+#endif
+    return ret;
+}
+
+ULONG ldap_add_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[] )
+{
+    ULONG ret = LDAP_NOT_SUPPORTED;
+#ifdef HAVE_LDAP
+    WCHAR *dnW = NULL;
+    LDAPModW **attrsW = NULL;
+
+    ret = WLDAP32_LDAP_NO_MEMORY;
+
+    TRACE( "(%p, %s, %p)\n", ld, debugstr_a(dn), attrs );
+
+    if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+    if (!attrs) return LDAP_PROTOCOL_ERROR;
+
+    if (dn) {
+        dnW = strAtoW( dn );
+        if (!dnW) goto exit;
+    }
+
+    attrsW = modarrayAtoW( attrs );
+    if (!attrsW) goto exit;
+
+    ret = ldap_add_sW( ld, dnW, attrsW );
+
+exit:
+    strfreeW( dnW );
+    modarrayfreeW( attrsW );
+
+#endif
+    return ret;
+}
+
+ULONG ldap_add_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[] )
+{
+    ULONG ret = LDAP_NOT_SUPPORTED;
+#ifdef HAVE_LDAP
+    char *dnU = NULL;
+    LDAPMod **attrsU = NULL;
+
+    ret = WLDAP32_LDAP_NO_MEMORY;
+
+    TRACE( "(%p, %s, %p)\n", ld, debugstr_w(dn), attrs );
+
+    if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+    if (!attrs) return LDAP_PROTOCOL_ERROR;
+
+    if (dn) {
+        dnU = strWtoU( dn );
+        if (!dnU) goto exit;
+    }
+
+    attrsU = modarrayWtoU( attrs );
+    if (!attrsU) goto exit;
+
+    ret = ldap_add_s( ld, dn ? dnU : "", attrsU );
+
+exit:
+    strfreeU( dnU );
+    modarrayfreeU( attrsU );
+
+#endif
+    return ret;
+}

dlls/wldap32/wldap32.spec

@@ -15,6 +15,18 @@
 @ varargs ber_printf(ptr str)
 @ varargs ber_scanf(ptr str)
 @ cdecl ber_skip_tag(ptr ptr)
+@ cdecl ldap_add(ptr str ptr) ldap_addA
+@ cdecl ldap_addA(ptr str ptr)
+@ cdecl ldap_addW(ptr wstr ptr)
+@ cdecl ldap_add_ext(ptr str ptr ptr ptr ptr) ldap_add_extA
+@ cdecl ldap_add_extA(ptr str ptr ptr ptr ptr)
+@ cdecl ldap_add_extW(ptr wstr ptr ptr ptr ptr)
+@ cdecl ldap_add_ext_s(ptr str ptr ptr ptr) ldap_add_ext_sA
+@ cdecl ldap_add_ext_sA(ptr str ptr ptr ptr)
+@ cdecl ldap_add_ext_sW(ptr str ptr ptr ptr)
+@ cdecl ldap_add_s(ptr str ptr) ldap_add_sA
+@ cdecl ldap_add_sA(ptr str ptr)
+@ cdecl ldap_add_sW(ptr wstr ptr)
 @ cdecl ldap_bind(ptr str str long) ldap_bindA
 @ cdecl ldap_bindA(ptr str str long)
 @ cdecl ldap_bindW(ptr wstr wstr long)