Author: dchapyshev
Date: Sun Jan 11 13:02:16 2009
New Revision: 38706
URL:
http://svn.reactos.org/svn/reactos?rev=38706&view=rev
Log:
- Sync wldap32 with Wine head
Added:
trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc (with props)
Modified:
trunk/reactos/dll/win32/wldap32/add.c
trunk/reactos/dll/win32/wldap32/ber.c
trunk/reactos/dll/win32/wldap32/bind.c
trunk/reactos/dll/win32/wldap32/compare.c
trunk/reactos/dll/win32/wldap32/control.c
trunk/reactos/dll/win32/wldap32/delete.c
trunk/reactos/dll/win32/wldap32/error.c
trunk/reactos/dll/win32/wldap32/extended.c
trunk/reactos/dll/win32/wldap32/init.c
trunk/reactos/dll/win32/wldap32/misc.c
trunk/reactos/dll/win32/wldap32/modify.c
trunk/reactos/dll/win32/wldap32/modrdn.c
trunk/reactos/dll/win32/wldap32/option.c
trunk/reactos/dll/win32/wldap32/page.c
trunk/reactos/dll/win32/wldap32/parse.c
trunk/reactos/dll/win32/wldap32/rename.c
trunk/reactos/dll/win32/wldap32/search.c
trunk/reactos/dll/win32/wldap32/winldap_private.h
trunk/reactos/dll/win32/wldap32/wldap32.h
trunk/reactos/dll/win32/wldap32/wldap32.rc
trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc
Modified: trunk/reactos/dll/win32/wldap32/add.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/add.c?re…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/add.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/add.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -58,7 +58,7 @@
TRACE( "(%p, %s, %p)\n", ld, debugstr_a(dn), attrs );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (dn) {
dnW = strAtoW( dn );
@@ -127,7 +127,7 @@
if (ret == LDAP_SUCCESS)
ret = msg;
else
- ret = ~0UL;
+ ret = ~0u;
exit:
strfreeU( dnU );
@@ -244,8 +244,8 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_add_ext( ld, dn ? dnU : "", attrs ? attrsU : nullattrs,
serverctrlsU,
- clientctrlsU, message ? (int *)message : &dummy );
+ ret = map_error( ldap_add_ext( ld, dn ? dnU : "", attrs ? attrsU :
nullattrs, serverctrlsU,
+ clientctrlsU, message ? (int *)message : &dummy
));
exit:
strfreeU( dnU );
@@ -361,8 +361,8 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_add_ext_s( ld, dn ? dnU : "", attrs ? attrsU : nullattrs,
- serverctrlsU, clientctrlsU );
+ ret = map_error( ldap_add_ext_s( ld, dn ? dnU : "", attrs ? attrsU :
nullattrs,
+ serverctrlsU, clientctrlsU ));
exit:
strfreeU( dnU );
@@ -448,7 +448,7 @@
if (!attrsU) goto exit;
}
- ret = ldap_add_ext_s( ld, dn ? dnU : "", attrs ? attrsU : nullattrs, NULL,
NULL );
+ ret = map_error( ldap_add_ext_s( ld, dn ? dnU : "", attrs ? attrsU :
nullattrs, NULL, NULL ));
exit:
strfreeU( dnU );
Modified: trunk/reactos/dll/win32/wldap32/ber.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/ber.c?re…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/ber.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/ber.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -325,12 +325,12 @@
INT CDECL WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... )
{
#ifdef HAVE_LDAP
- va_list list;
+ __ms_va_list list;
int ret = 0;
char new_fmt[2];
new_fmt[1] = 0;
- va_start( list, fmt );
+ __ms_va_start( list, fmt );
while (*fmt)
{
new_fmt[0] = *fmt++;
@@ -391,7 +391,7 @@
}
if (ret == -1) break;
}
- va_end( list );
+ __ms_va_end( list );
return ret;
#else
return LBER_ERROR;
@@ -420,12 +420,12 @@
INT CDECL WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... )
{
#ifdef HAVE_LDAP
- va_list list;
+ __ms_va_list list;
int ret = 0;
char new_fmt[2];
new_fmt[1] = 0;
- va_start( list, fmt );
+ __ms_va_start( list, fmt );
while (*fmt)
{
new_fmt[0] = *fmt++;
@@ -491,7 +491,7 @@
}
if (ret == -1) break;
}
- va_end( list );
+ __ms_va_end( list );
return ret;
#else
return LBER_ERROR;
Modified: trunk/reactos/dll/win32/wldap32/bind.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/bind.c?r…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/bind.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/bind.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -53,7 +53,7 @@
TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_a(dn), cred, method );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (dn) {
dnW = strAtoW( dn );
@@ -104,7 +104,7 @@
TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), cred, method );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (method != LDAP_AUTH_SIMPLE) return WLDAP32_LDAP_PARAM_ERROR;
if (dn) {
@@ -124,7 +124,7 @@
if (ret == LDAP_SUCCESS)
ret = msg;
else
- ret = ~0UL;
+ ret = ~0u;
exit:
strfreeU( dnU );
@@ -211,7 +211,7 @@
pwd.bv_val = credU;
}
- ret = ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL );
+ ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL,
NULL ));
exit:
strfreeU( dnU );
@@ -328,8 +328,8 @@
credU.bv_len = cred->bv_len;
credU.bv_val = cred->bv_val;
- ret = ldap_sasl_bind( ld, dnU, mechanismU, &credU,
- serverctrlsU, clientctrlsU, message );
+ ret = map_error( ldap_sasl_bind( ld, dnU, mechanismU, &credU,
+ serverctrlsU, clientctrlsU, message ));
exit:
strfreeU( dnU );
@@ -448,8 +448,8 @@
credU.bv_len = cred->bv_len;
credU.bv_val = cred->bv_val;
- ret = ldap_sasl_bind_s( ld, dnU, mechanismU, &credU,
- serverctrlsU, clientctrlsU, (struct berval **)serverdata );
+ ret = map_error( ldap_sasl_bind_s( ld, dnU, mechanismU, &credU,
+ serverctrlsU, clientctrlsU, (struct berval
**)serverdata ));
exit:
strfreeU( dnU );
@@ -476,7 +476,7 @@
TRACE( "(%p, %s, %p)\n", ld, debugstr_a(dn), passwd );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (dn) {
dnW = strAtoW( dn );
@@ -526,7 +526,7 @@
TRACE( "(%p, %s, %p)\n", ld, debugstr_w(dn), passwd );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (dn) {
dnU = strWtoU( dn );
@@ -545,7 +545,7 @@
if (ret == LDAP_SUCCESS)
ret = msg;
else
- ret = ~0UL;
+ ret = ~0u;
exit:
strfreeU( dnU );
@@ -633,7 +633,7 @@
pwd.bv_val = passwdU;
}
- ret = ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL, NULL );
+ ret = map_error( ldap_sasl_bind_s( ld, dnU, LDAP_SASL_SIMPLE, &pwd, NULL, NULL,
NULL ));
exit:
strfreeU( dnU );
@@ -663,7 +663,7 @@
TRACE( "(%p)\n", ld );
if (ld)
- ret = ldap_unbind_ext( ld, NULL, NULL );
+ ret = map_error( ldap_unbind_ext( ld, NULL, NULL ));
else
ret = WLDAP32_LDAP_PARAM_ERROR;
@@ -691,7 +691,7 @@
TRACE( "(%p)\n", ld );
if (ld)
- ret = ldap_unbind_ext_s( ld, NULL, NULL );
+ ret = map_error( ldap_unbind_ext_s( ld, NULL, NULL ));
else
ret = WLDAP32_LDAP_PARAM_ERROR;
Modified: trunk/reactos/dll/win32/wldap32/compare.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/compare.…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/compare.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/compare.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -49,12 +49,12 @@
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *attrW = NULL, *valueW = NULL;
- ret = ~0UL;
+ ret = ~0u;
TRACE( "(%p, %s, %s, %s)\n", ld, debugstr_a(dn), debugstr_a(attr),
debugstr_a(value) );
- if (!ld || !attr) return ~0UL;
+ if (!ld || !attr) return ~0u;
if (dn) {
dnW = strAtoW( dn );
@@ -103,12 +103,12 @@
struct berval val = { 0, NULL };
int msg;
- ret = ~0UL;
+ ret = ~0u;
TRACE( "(%p, %s, %s, %s)\n", ld, debugstr_w(dn), debugstr_w(attr),
debugstr_w(value) );
- if (!ld || !attr) return ~0UL;
+ if (!ld || !attr) return ~0u;
if (dn) {
dnU = strWtoU( dn );
@@ -131,7 +131,7 @@
if (ret == LDAP_SUCCESS)
ret = msg;
else
- ret = ~0UL;
+ ret = ~0u;
exit:
strfreeU( dnU );
@@ -268,8 +268,8 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_compare_ext( ld, dn ? dnU : "", attrU, data ? (struct berval
*)data : &val,
- serverctrlsU, clientctrlsU, (int *)message );
+ ret = map_error( ldap_compare_ext( ld, dn ? dnU : "", attrU, data ? (struct
berval *)data : &val,
+ serverctrlsU, clientctrlsU, (int *)message ));
exit:
strfreeU( dnU );
@@ -404,9 +404,9 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU : "",
- data ? (struct berval *)data : &val,
- serverctrlsU, clientctrlsU );
+ ret = map_error( ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU :
"",
+ data ? (struct berval *)data : &val,
+ serverctrlsU, clientctrlsU ));
exit:
strfreeU( dnU );
@@ -506,7 +506,7 @@
val.bv_val = valueU;
}
- ret = ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU : "",
&val, NULL, NULL );
+ ret = map_error( ldap_compare_ext_s( ld, dn ? dnU : "", attr ? attrU :
"", &val, NULL, NULL ));
exit:
strfreeU( dnU );
Modified: trunk/reactos/dll/win32/wldap32/control.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/control.…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/control.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/control.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -189,7 +189,7 @@
sortkeyU = sortkeyarrayWtoU( sortkey );
if (!sortkeyU) return WLDAP32_LDAP_NO_MEMORY;
- ret = ldap_create_sort_control( ld, sortkeyU, critical, &controlU );
+ ret = map_error( ldap_create_sort_control( ld, sortkeyU, critical, &controlU ));
*control = controlUtoW( controlU );
if (!*control) ret = WLDAP32_LDAP_NO_MEMORY;
@@ -215,7 +215,7 @@
TRACE( "(%p, %p, 0x%02x, %p)\n", ld, info, critical, control );
- if (!ld || !control) return ~0UL;
+ if (!ld || !control) return ~0u;
ret = ldap_create_vlv_controlW( ld, info, critical, &controlW );
@@ -261,11 +261,11 @@
TRACE( "(%p, %p, 0x%02x, %p)\n", ld, info, critical, control );
- if (!ld || !control) return ~0UL;
-
- ret = ldap_create_vlv_control( ld, (LDAPVLVInfo *)info, &controlU );
-
- if (ret == LDAP_SUCCESS)
+ if (!ld || !control) return ~0u;
+
+ ret = map_error( ldap_create_vlv_control( ld, (LDAPVLVInfo *)info, &controlU ));
+
+ if (ret == WLDAP32_LDAP_SUCCESS)
{
*control = controlUtoW( controlU );
if (!*control) ret = WLDAP32_LDAP_NO_MEMORY;
Modified: trunk/reactos/dll/win32/wldap32/delete.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/delete.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/delete.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/delete.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -51,7 +51,7 @@
TRACE( "(%p, %s)\n", ld, debugstr_a(dn) );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (dn) {
dnW = strAtoW( dn );
@@ -92,7 +92,7 @@
TRACE( "(%p, %s)\n", ld, debugstr_w(dn) );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (dn) {
dnU = strWtoU( dn );
@@ -104,7 +104,7 @@
if (ret == LDAP_SUCCESS)
ret = msg;
else
- ret = ~0UL;
+ ret = ~0u;
strfreeU( dnU );
@@ -206,8 +206,8 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_delete_ext( ld, dn ? dnU : "", serverctrlsU, clientctrlsU,
- message ? (int *)message : &dummy );
+ ret = map_error( ldap_delete_ext( ld, dn ? dnU : "", serverctrlsU,
clientctrlsU,
+ message ? (int *)message : &dummy ));
exit:
strfreeU( dnU );
@@ -305,7 +305,7 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_delete_ext_s( ld, dn ? dnU : "", serverctrlsU, clientctrlsU );
+ ret = map_error( ldap_delete_ext_s( ld, dn ? dnU : "", serverctrlsU,
clientctrlsU ));
exit:
strfreeU( dnU );
@@ -371,7 +371,7 @@
if (!dnU) return WLDAP32_LDAP_NO_MEMORY;
}
- ret = ldap_delete_ext_s( ld, dn ? dnU : "", NULL, NULL );
+ ret = map_error( ldap_delete_ext_s( ld, dn ? dnU : "", NULL, NULL ));
strfreeU( dnU );
#endif
Modified: trunk/reactos/dll/win32/wldap32/error.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/error.c?…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/error.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/error.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -41,6 +41,32 @@
WINE_DEFAULT_DEBUG_CHANNEL(wldap32);
+ULONG map_error( int error )
+{
+ switch (error)
+ {
+#ifdef HAVE_LDAP_H
+ case LDAP_SERVER_DOWN: return WLDAP32_LDAP_SERVER_DOWN;
+ case LDAP_LOCAL_ERROR: return WLDAP32_LDAP_LOCAL_ERROR;
+ case LDAP_DECODING_ERROR: return WLDAP32_LDAP_DECODING_ERROR;
+ case LDAP_TIMEOUT: return WLDAP32_LDAP_TIMEOUT;
+ case LDAP_AUTH_UNKNOWN: return WLDAP32_LDAP_AUTH_UNKNOWN;
+ case LDAP_FILTER_ERROR: return WLDAP32_LDAP_FILTER_ERROR;
+ case LDAP_USER_CANCELLED: return WLDAP32_LDAP_USER_CANCELLED;
+ case LDAP_PARAM_ERROR: return WLDAP32_LDAP_PARAM_ERROR;
+ case LDAP_NO_MEMORY: return WLDAP32_LDAP_NO_MEMORY;
+ case LDAP_CONNECT_ERROR: return WLDAP32_LDAP_CONNECT_ERROR;
+ case LDAP_NOT_SUPPORTED: return WLDAP32_LDAP_NOT_SUPPORTED;
+ case LDAP_CONTROL_NOT_FOUND: return WLDAP32_LDAP_CONTROL_NOT_FOUND;
+ case LDAP_NO_RESULTS_RETURNED: return WLDAP32_LDAP_NO_RESULTS_RETURNED;
+ case LDAP_MORE_RESULTS_TO_RETURN: return WLDAP32_LDAP_MORE_RESULTS_TO_RETURN;
+ case LDAP_CLIENT_LOOP: return WLDAP32_LDAP_CLIENT_LOOP;
+ case LDAP_REFERRAL_LIMIT_EXCEEDED: return WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED;
+#endif
+ default: return error;
+ }
+}
+
/***********************************************************************
* ldap_err2stringA (WLDAP32.@)
*
@@ -135,14 +161,14 @@
TRACE( "(%p, %p, 0x%08x)\n", ld, res, free );
- if (!ld || !res) return ~0UL;
+ if (!ld || !res) return ~0u;
ret = ldap_parse_result( ld, res, &error, NULL, NULL, NULL, NULL, free );
if (ret == LDAP_SUCCESS)
ret = error;
else
- ret = ~0UL;
+ ret = ~0u;
#endif
return ret;
Modified: trunk/reactos/dll/win32/wldap32/extended.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/extended…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/extended.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/extended.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -160,8 +160,8 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_extended_operation( ld, oid ? oidU : "", (struct berval *)data,
- serverctrlsU, clientctrlsU, (int *)message );
+ ret = map_error( ldap_extended_operation( ld, oid ? oidU : "", (struct
berval *)data,
+ serverctrlsU, clientctrlsU, (int *)message
));
exit:
strfreeU( oidU );
@@ -277,8 +277,8 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_extended_operation_s( ld, oid ? oidU : "", (struct berval
*)data, serverctrlsU,
- clientctrlsU, &retoidU, (struct berval
**)retdata );
+ ret = map_error( ldap_extended_operation_s( ld, oid ? oidU : "", (struct
berval *)data, serverctrlsU,
+ clientctrlsU, &retoidU, (struct
berval **)retdata ));
if (retoid && retoidU) {
*retoid = strUtoW( retoidU );
Modified: trunk/reactos/dll/win32/wldap32/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/init.c?r…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/init.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/init.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -584,7 +584,7 @@
TRACE( "(%p, %p, %p, %p, %p)\n", ld, retval, result, serverctrls,
clientctrls );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (serverctrls) {
serverctrlsW = controlarrayAtoW( serverctrls );
@@ -635,7 +635,7 @@
TRACE( "(%p, %p, %p, %p, %p)\n", ld, retval, result, serverctrls,
clientctrls );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (serverctrls) {
serverctrlsU = controlarrayWtoU( serverctrls );
@@ -646,7 +646,7 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_start_tls_s( ld, serverctrlsU, clientctrlsU );
+ ret = map_error( ldap_start_tls_s( ld, serverctrlsU, clientctrlsU ));
exit:
controlarrayfreeU( serverctrlsU );
Modified: trunk/reactos/dll/win32/wldap32/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/misc.c?r…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/misc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/misc.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -59,8 +59,8 @@
TRACE( "(%p, 0x%08x)\n", ld, msgid );
- if (!ld) return ~0UL;
- ret = ldap_abandon_ext( ld, msgid, NULL, NULL );
+ if (!ld) return ~0u;
+ ret = map_error( ldap_abandon_ext( ld, msgid, NULL, NULL ));
#endif
return ret;
@@ -153,7 +153,7 @@
*
* RETURNS
* Success: The number of entries.
- * Failure: ~0UL
+ * Failure: ~0u
*/
ULONG CDECL WLDAP32_ldap_count_entries( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
{
@@ -162,7 +162,7 @@
TRACE( "(%p, %p)\n", ld, res );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
ret = ldap_count_entries( ld, res );
#endif
@@ -180,7 +180,7 @@
*
* RETURNS
* Success: The number of references.
- * Failure: ~0UL
+ * Failure: ~0u
*/
ULONG CDECL WLDAP32_ldap_count_references( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
{
@@ -596,7 +596,7 @@
* LDAP_RES_SEARCH_ENTRY
* LDAP_RES_SEARCH_RESULT
*
- * Failure: ~0UL
+ * Failure: ~0u
*
* This function returns 0 when the timeout has expired.
*
@@ -614,7 +614,7 @@
TRACE( "(%p, 0x%08x, 0x%08x, %p, %p)\n", ld, msgid, all, timeout, res );
- if (!ld || !res || msgid == ~0UL) return ~0UL;
+ if (!ld || !res || msgid == ~0u) return ~0u;
ret = ldap_result( ld, msgid, all, (struct timeval *)timeout, res );
#endif
Modified: trunk/reactos/dll/win32/wldap32/modify.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/modify.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/modify.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/modify.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -58,7 +58,7 @@
TRACE( "(%p, %s, %p)\n", ld, debugstr_a(dn), mods );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (dn) {
dnW = strAtoW( dn );
@@ -128,7 +128,7 @@
if (ret == LDAP_SUCCESS)
ret = msg;
else
- ret = ~0UL;
+ ret = ~0u;
exit:
strfreeU( dnU );
@@ -157,7 +157,7 @@
TRACE( "(%p, %s, %p, %p, %p, %p)\n", ld, debugstr_a(dn), mods,
serverctrls, clientctrls, message );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (dn) {
dnW = strAtoW( dn );
@@ -226,7 +226,7 @@
TRACE( "(%p, %s, %p, %p, %p, %p)\n", ld, debugstr_w(dn), mods,
serverctrls, clientctrls, message );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (dn) {
dnU = strWtoU( dn );
@@ -245,8 +245,8 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_modify_ext( ld, dn ? dnU : "", mods ? modsU : nullmods,
serverctrlsU,
- clientctrlsU, message ? (int *)message : &dummy );
+ ret = map_error( ldap_modify_ext( ld, dn ? dnU : "", mods ? modsU :
nullmods, serverctrlsU,
+ clientctrlsU, message ? (int *)message : &dummy
));
exit:
strfreeU( dnU );
@@ -362,8 +362,8 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_modify_ext_s( ld, dn ? dnU : "", mods ? modsU : nullmods,
- serverctrlsU, clientctrlsU );
+ ret = map_error( ldap_modify_ext_s( ld, dn ? dnU : "", mods ? modsU :
nullmods,
+ serverctrlsU, clientctrlsU ));
exit:
strfreeU( dnU );
@@ -449,7 +449,7 @@
if (!modsU) goto exit;
}
- ret = ldap_modify_ext_s( ld, dn ? dnU : "", mods ? modsU : nullmods, NULL,
NULL );
+ ret = map_error( ldap_modify_ext_s( ld, dn ? dnU : "", mods ? modsU :
nullmods, NULL, NULL ));
exit:
strfreeU( dnU );
Modified: trunk/reactos/dll/win32/wldap32/modrdn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/modrdn.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/modrdn.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/modrdn.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -53,7 +53,7 @@
TRACE( "(%p, %s, %s)\n", ld, debugstr_a(dn), debugstr_a(newdn) );
- if (!ld || !newdn) return ~0UL;
+ if (!ld || !newdn) return ~0u;
if (dn) {
dnW = strAtoW( dn );
@@ -103,7 +103,7 @@
TRACE( "(%p, %s, %s)\n", ld, debugstr_w(dn), debugstr_w(newdn) );
- if (!ld || !newdn) return ~0UL;
+ if (!ld || !newdn) return ~0u;
if (dn) {
dnU = strWtoU( dn );
@@ -118,7 +118,7 @@
if (ret == LDAP_SUCCESS)
ret = msg;
else
- ret = ~0UL;
+ ret = ~0u;
exit:
strfreeU( dnU );
@@ -143,7 +143,7 @@
TRACE( "(%p, %s, %p, 0x%02x)\n", ld, debugstr_a(dn), newdn, delete );
- if (!ld || !newdn) return ~0UL;
+ if (!ld || !newdn) return ~0u;
if (dn) {
dnW = strAtoW( dn );
@@ -194,7 +194,7 @@
TRACE( "(%p, %s, %p, 0x%02x)\n", ld, debugstr_w(dn), newdn, delete );
- if (!ld || !newdn) return ~0UL;
+ if (!ld || !newdn) return ~0u;
if (dn) {
dnU = strWtoU( dn );
@@ -209,7 +209,7 @@
if (ret == LDAP_SUCCESS)
ret = msg;
else
- ret = ~0UL;
+ ret = ~0u;
exit:
strfreeU( dnU );
@@ -289,7 +289,7 @@
newdnU = strWtoU( newdn );
if (!newdnU) goto exit;
- ret = ldap_rename_s( ld, dn ? dnU : "", newdnU, NULL, delete, NULL, NULL
);
+ ret = map_error( ldap_rename_s( ld, dn ? dnU : "", newdnU, NULL, delete,
NULL, NULL ));
exit:
strfreeU( dnU );
@@ -368,7 +368,7 @@
newdnU = strWtoU( newdn );
if (!newdnU) goto exit;
- ret = ldap_rename_s( ld, dn ? dnU : "", newdnU, NULL, 1, NULL, NULL );
+ ret = map_error( ldap_rename_s( ld, dn ? dnU : "", newdnU, NULL, 1, NULL,
NULL ));
exit:
strfreeU( dnU );
Modified: trunk/reactos/dll/win32/wldap32/option.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/option.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -206,7 +206,7 @@
if (!featureU.ldapaif_name) return WLDAP32_LDAP_NO_MEMORY;
- ret = ldap_get_option( ld, option, &featureU );
+ ret = map_error( ldap_get_option( ld, option, &featureU ));
featureW->ldapaif_version = featureU.ldapaif_version;
strfreeU( featureU.ldapaif_name );
@@ -220,7 +220,7 @@
memset( &infoU, 0, sizeof(LDAPAPIInfo) );
infoU.ldapai_info_version = infoW->ldapai_info_version;
- ret = ldap_get_option( ld, option, &infoU );
+ ret = map_error( ldap_get_option( ld, option, &infoU ));
infoW->ldapai_api_version = infoU.ldapai_api_version;
infoW->ldapai_protocol_version = infoU.ldapai_protocol_version;
@@ -253,7 +253,7 @@
case WLDAP32_LDAP_OPT_REFERRALS:
case WLDAP32_LDAP_OPT_SIZELIMIT:
case WLDAP32_LDAP_OPT_TIMELIMIT:
- return ldap_get_option( ld, option, value );
+ return map_error( ldap_get_option( ld, option, value ));
case WLDAP32_LDAP_OPT_CACHE_ENABLE:
case WLDAP32_LDAP_OPT_CACHE_FN_PTRS:
@@ -433,7 +433,7 @@
ctrlsU = controlarrayWtoU( (LDAPControlW **)value );
if (!ctrlsU) return WLDAP32_LDAP_NO_MEMORY;
- ret = ldap_set_option( ld, option, ctrlsU );
+ ret = map_error( ldap_set_option( ld, option, ctrlsU ));
controlarrayfreeU( ctrlsU );
return ret;
}
@@ -444,7 +444,7 @@
case WLDAP32_LDAP_OPT_REFERRALS:
case WLDAP32_LDAP_OPT_SIZELIMIT:
case WLDAP32_LDAP_OPT_TIMELIMIT:
- return ldap_set_option( ld, option, value );
+ return map_error( ldap_set_option( ld, option, value ));
case WLDAP32_LDAP_OPT_CACHE_ENABLE:
case WLDAP32_LDAP_OPT_CACHE_FN_PTRS:
Modified: trunk/reactos/dll/win32/wldap32/page.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/page.c?r…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/page.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/page.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -168,7 +168,7 @@
{
FIXME( "(%p, %p, 0x%08x, %p)\n", ld, search, pagesize, message );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
return WLDAP32_LDAP_NOT_SUPPORTED;
}
@@ -179,7 +179,7 @@
FIXME( "(%p, %p, %p, 0x%08x, %p, %p)\n", ld, search, timeout,
pagesize, count, results );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
return WLDAP32_LDAP_NOT_SUPPORTED;
}
@@ -269,7 +269,7 @@
{
FIXME( "(%p, %p)\n", ld, search );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
return WLDAP32_LDAP_SUCCESS;
}
Modified: trunk/reactos/dll/win32/wldap32/parse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/parse.c?…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -99,7 +99,7 @@
if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
if (!result) return WLDAP32_LDAP_NO_RESULTS_RETURNED;
- ret = ldap_parse_extended_result( ld, result, &oidU, (struct berval **)data, free
);
+ ret = map_error( ldap_parse_extended_result( ld, result, &oidU, (struct berval
**)data, free ) );
if (oid) {
*oid = strUtoW( oidU );
@@ -125,7 +125,7 @@
TRACE( "(%p, %p, %p)\n", ld, message, referrals );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
ret = ldap_parse_referenceW( ld, message, &referralsW );
@@ -162,9 +162,9 @@
TRACE( "(%p, %p, %p)\n", ld, message, referrals );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
- ret = ldap_parse_reference( ld, message, &referralsU, NULL, 0 );
+ ret = map_error( ldap_parse_reference( ld, message, &referralsU, NULL, 0 ));
*referrals = strarrayUtoW( referralsU );
ldap_memfree( referralsU );
@@ -184,25 +184,25 @@
{
ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
- WCHAR **matchedW = NULL, **errorW = NULL, **referralsW = NULL;
+ WCHAR *matchedW = NULL, *errorW = NULL, **referralsW = NULL;
LDAPControlW **serverctrlsW = NULL;
TRACE( "(%p, %p, %p, %p, %p, %p, %p, 0x%02x)\n", ld, result, retcode,
matched, error, referrals, serverctrls, free );
- if (!ld) return ~0UL;
-
- ret = ldap_parse_resultW( ld, result, retcode, matchedW, errorW,
+ if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+
+ ret = ldap_parse_resultW( ld, result, retcode, &matchedW, &errorW,
&referralsW, &serverctrlsW, free );
- matched = strarrayWtoA( matchedW );
- error = strarrayWtoA( errorW );
-
- *referrals = strarrayWtoA( referralsW );
- *serverctrls = controlarrayWtoA( serverctrlsW );
-
- ldap_value_freeW( matchedW );
- ldap_value_freeW( errorW );
+ if (matched) *matched = strWtoA( matchedW );
+ if (error) *error = strWtoA( errorW );
+
+ if (referrals) *referrals = strarrayWtoA( referralsW );
+ if (serverctrls) *serverctrls = controlarrayWtoA( serverctrlsW );
+
+ ldap_memfreeW( matchedW );
+ ldap_memfreeW( errorW );
ldap_value_freeW( referralsW );
ldap_controls_freeW( serverctrlsW );
@@ -241,26 +241,26 @@
{
ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
- char **matchedU = NULL, **errorU = NULL, **referralsU = NULL;
+ char *matchedU = NULL, *errorU = NULL, **referralsU = NULL;
LDAPControl **serverctrlsU = NULL;
TRACE( "(%p, %p, %p, %p, %p, %p, %p, 0x%02x)\n", ld, result, retcode,
matched, error, referrals, serverctrls, free );
- if (!ld) return ~0UL;
-
- ret = ldap_parse_result( ld, result, (int *)retcode, matchedU, errorU,
- &referralsU, &serverctrlsU, free );
-
- matched = strarrayUtoW( matchedU );
- error = strarrayUtoW( errorU );
-
- *referrals = strarrayUtoW( referralsU );
- *serverctrls = controlarrayUtoW( serverctrlsU );
+ if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+
+ ret = map_error( ldap_parse_result( ld, result, (int *)retcode, &matchedU,
&errorU,
+ &referralsU, &serverctrlsU, free ));
+
+ if (matched) *matched = strUtoW( matchedU );
+ if (error) *error = strUtoW( errorU );
+
+ if (referrals) *referrals = strarrayUtoW( referralsU );
+ if (serverctrls) *serverctrls = controlarrayUtoW( serverctrlsU );
ldap_memfree( matchedU );
ldap_memfree( errorU );
- ldap_memfree( referralsU );
+ strarrayfreeU( referralsU );
ldap_controls_free( serverctrlsU );
#endif
@@ -282,12 +282,11 @@
TRACE( "(%p, %p, %p, %p)\n", ld, control, result, attr );
- if (!ld) return ~0UL;
-
- if (control) {
- controlW = controlarrayAtoW( control );
- if (!controlW) return WLDAP32_LDAP_NO_MEMORY;
- }
+ if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+ if (!control) return WLDAP32_LDAP_CONTROL_NOT_FOUND;
+
+ controlW = controlarrayAtoW( control );
+ if (!controlW) return WLDAP32_LDAP_NO_MEMORY;
ret = ldap_parse_sort_controlW( ld, controlW, result, &attrW );
@@ -333,12 +332,11 @@
TRACE( "(%p, %p, %p, %p)\n", ld, control, result, attr );
- if (!ld) return ~0UL;
-
- if (control) {
- controlU = controlarrayWtoU( control );
- if (!controlU) return WLDAP32_LDAP_NO_MEMORY;
- }
+ if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+ if (!control) return WLDAP32_LDAP_CONTROL_NOT_FOUND;
+
+ controlU = controlarrayWtoU( control );
+ if (!controlU) return WLDAP32_LDAP_NO_MEMORY;
#ifdef HAVE_LDAP_PARSE_SORT_CONTROL
if (!(ret = ldap_parse_sort_control( ld, controlU, &res, &attrU )))
@@ -366,7 +364,7 @@
controlarrayfreeU( controlU );
#endif
- return ret;
+ return map_error( ret );
}
/***********************************************************************
@@ -385,7 +383,7 @@
TRACE( "(%p, %p, %p, %p, %p, %p)\n", ld, control, targetpos,
listcount, context, errcode );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (control) {
controlW = controlarrayAtoW( control );
@@ -439,12 +437,10 @@
TRACE( "(%p, %p, %p, %p, %p, %p)\n", ld, control, targetpos,
listcount, context, errcode );
- if (!ld) return ~0UL;
-
- if (control) {
- controlU = controlarrayWtoU( control );
- if (!controlU) return WLDAP32_LDAP_NO_MEMORY;
- }
+ if (!ld || !control) return ~0u;
+
+ controlU = controlarrayWtoU( control );
+ if (!controlU) return WLDAP32_LDAP_NO_MEMORY;
#ifdef HAVE_LDAP_PARSE_VLV_CONTROL
if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count,
@@ -474,5 +470,5 @@
controlarrayfreeU( controlU );
#endif
- return ret;
-}
+ return map_error( ret );
+}
Modified: trunk/reactos/dll/win32/wldap32/rename.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/rename.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/rename.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/rename.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -157,8 +157,8 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_rename( ld, dn ? dnU : "", newrdn ? newrdnU : "",
newparentU,
- delete, serverctrlsU, clientctrlsU, (int *)message );
+ ret = map_error( ldap_rename( ld, dn ? dnU : "", newrdn ? newrdnU :
"", newparentU,
+ delete, serverctrlsU, clientctrlsU, (int *)message ));
exit:
strfreeU( dnU );
@@ -283,8 +283,8 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_rename_s( ld, dn ? dnU : "", newrdn ? newrdnU : "",
newparentU,
- delete, serverctrlsU, clientctrlsU );
+ ret = map_error( ldap_rename_s( ld, dn ? dnU : "", newrdn ? newrdnU :
"", newparentU,
+ delete, serverctrlsU, clientctrlsU ));
exit:
strfreeU( dnU );
Modified: trunk/reactos/dll/win32/wldap32/search.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/search.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/search.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/search.c [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -55,7 +55,7 @@
TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_a(base),
scope, debugstr_a(filter), attrs, attrsonly );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (base) {
baseW = strAtoW( base );
@@ -97,7 +97,7 @@
*
* RETURNS
* Success: Message ID of the search operation.
- * Failure: ~0UL
+ * Failure: ~0u
*
* NOTES
* Call ldap_result with the message ID to get the result of
@@ -117,7 +117,7 @@
TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(base),
scope, debugstr_w(filter), attrs, attrsonly );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (base) {
baseU = strWtoU( base );
@@ -138,7 +138,7 @@
if (ret == LDAP_SUCCESS)
ret = msg;
else
- ret = ~0UL;
+ ret = ~0u;
exit:
strfreeU( baseU );
@@ -251,7 +251,7 @@
ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly,
serverctrls, clientctrls, timelimit, sizelimit, message );
- if (!ld) return ~0UL;
+ if (!ld) return ~0u;
if (base) {
baseU = strWtoU( base );
@@ -277,8 +277,8 @@
tv.tv_sec = timelimit;
tv.tv_usec = 0;
- ret = ldap_search_ext( ld, baseU, scope, filterU, attrsU, attrsonly,
- serverctrlsU, clientctrlsU, &tv, sizelimit, (int *)message
);
+ ret = map_error( ldap_search_ext( ld, baseU, scope, filterU, attrsU, attrsonly,
+ serverctrlsU, clientctrlsU, &tv, sizelimit,
(int *)message ));
exit:
strfreeU( baseU );
@@ -412,8 +412,9 @@
if (!clientctrlsU) goto exit;
}
- ret = ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly,
- serverctrlsU, clientctrlsU, (struct timeval *)timeout,
sizelimit, res );
+ ret = map_error( ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly,
+ serverctrlsU, clientctrlsU, (struct timeval
*)timeout,
+ sizelimit, res ));
exit:
strfreeU( baseU );
@@ -518,8 +519,8 @@
if (!attrsU) goto exit;
}
- ret = ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly,
- NULL, NULL, NULL, 0, res );
+ ret = map_error( ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly,
+ NULL, NULL, NULL, 0, res ));
exit:
strfreeU( baseU );
@@ -628,8 +629,8 @@
if (!attrsU) goto exit;
}
- ret = ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly,
- NULL, NULL, (struct timeval *)timeout, 0, res );
+ ret = map_error( ldap_search_ext_s( ld, baseU, scope, filterU, attrsU, attrsonly,
+ NULL, NULL, (struct timeval *)timeout, 0, res
));
exit:
strfreeU( baseU );
Modified: trunk/reactos/dll/win32/wldap32/winldap_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/winldap_…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/winldap_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/winldap_private.h [iso-8859-1] Sun Jan 11 13:02:16
2009
@@ -276,183 +276,183 @@
int ldapaif_version;
} LDAPAPIFeatureInfoW;
-WLDAP32_LDAP *cldap_openA(PCHAR,ULONG);
-WLDAP32_LDAP *cldap_openW(PWCHAR,ULONG);
-ULONG WLDAP32_ldap_abandon(WLDAP32_LDAP*,ULONG);
-ULONG ldap_addA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]);
-ULONG ldap_addW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]);
-ULONG
ldap_add_extA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*,ULONG*);
-ULONG
ldap_add_extW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*,ULONG*);
-ULONG ldap_add_ext_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*);
-ULONG ldap_add_ext_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*);
-ULONG ldap_add_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]);
-ULONG ldap_add_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]);
-ULONG ldap_bindA(WLDAP32_LDAP*,PCHAR,PCHAR,ULONG);
-ULONG ldap_bindW(WLDAP32_LDAP*,PWCHAR,PWCHAR,ULONG);
-ULONG ldap_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR,ULONG);
-ULONG ldap_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,ULONG);
-ULONG ldap_check_filterA(WLDAP32_LDAP*,PCHAR);
-ULONG ldap_check_filterW(WLDAP32_LDAP*,PWCHAR);
-ULONG ldap_cleanup(HANDLE);
-ULONG ldap_close_extended_op(WLDAP32_LDAP*,ULONG);
-ULONG ldap_compareA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR);
-ULONG ldap_compareW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR);
-ULONG ldap_compare_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct
WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*,ULONG*);
-ULONG ldap_compare_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct
WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*,ULONG*);
-ULONG ldap_compare_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct
WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*);
-ULONG ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct
WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*);
-ULONG ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR);
-ULONG ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR);
-ULONG ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*);
-WLDAP32_LDAP *ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-ULONG ldap_control_freeA(LDAPControlA*);
-ULONG ldap_control_freeW(LDAPControlW*);
-ULONG ldap_controls_freeA(LDAPControlA**);
-ULONG ldap_controls_freeW(LDAPControlW**);
-ULONG WLDAP32_ldap_count_entries(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-ULONG WLDAP32_ldap_count_references(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-ULONG ldap_count_valuesA(PCHAR*);
-ULONG ldap_count_valuesW(PWCHAR*);
-ULONG WLDAP32_ldap_count_values_len(PBERVAL*);
-ULONG ldap_create_page_controlA(WLDAP32_PLDAP,ULONG,struct
WLDAP32_berval*,UCHAR,PLDAPControlA*);
-ULONG ldap_create_page_controlW(WLDAP32_PLDAP,ULONG,struct
WLDAP32_berval*,UCHAR,PLDAPControlW*);
-ULONG ldap_create_sort_controlA(WLDAP32_PLDAP,PLDAPSortKeyA*,UCHAR,PLDAPControlA*);
-ULONG ldap_create_sort_controlW(WLDAP32_PLDAP,PLDAPSortKeyW*,UCHAR,PLDAPControlW*);
-INT ldap_create_vlv_controlA(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,UCHAR,LDAPControlA**);
-INT ldap_create_vlv_controlW(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,UCHAR,LDAPControlW**);
-ULONG ldap_deleteA(WLDAP32_LDAP*,PCHAR);
-ULONG ldap_deleteW(WLDAP32_LDAP*,PWCHAR);
-ULONG ldap_delete_extA(WLDAP32_LDAP*,PCHAR,PLDAPControlA*,PLDAPControlA*,ULONG*);
-ULONG ldap_delete_extW(WLDAP32_LDAP*,PWCHAR,PLDAPControlW*,PLDAPControlW*,ULONG*);
-ULONG ldap_delete_ext_sA(WLDAP32_LDAP*,PCHAR,PLDAPControlA*,PLDAPControlA*);
-ULONG ldap_delete_ext_sW(WLDAP32_LDAP*,PWCHAR,PLDAPControlW*,PLDAPControlW*);
-ULONG ldap_delete_sA(WLDAP32_LDAP*,PCHAR);
-ULONG ldap_delete_sW(WLDAP32_LDAP*,PWCHAR);
-PCHAR ldap_dn2ufnA(PCHAR);
-PWCHAR ldap_dn2ufnW(PWCHAR);
-ULONG ldap_encode_sort_controlA(WLDAP32_PLDAP,PLDAPSortKeyA*,PLDAPControlA,BOOLEAN);
-ULONG ldap_encode_sort_controlW(WLDAP32_PLDAP,PLDAPSortKeyW*,PLDAPControlW,BOOLEAN);
-PCHAR ldap_err2stringA(ULONG);
-PWCHAR ldap_err2stringW(ULONG);
-ULONG ldap_escape_filter_elementA(PCHAR,ULONG,PCHAR,ULONG);
-ULONG ldap_escape_filter_elementW(PCHAR,ULONG,PWCHAR,ULONG);
-PCHAR *ldap_explode_dnA(PCHAR,ULONG);
-PWCHAR *ldap_explode_dnW(PWCHAR,ULONG);
-ULONG ldap_extended_operationA(WLDAP32_LDAP*,PCHAR,struct
WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*,ULONG*);
-ULONG ldap_extended_operationW(WLDAP32_LDAP*,PWCHAR,struct
WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*,ULONG*);
-ULONG ldap_extended_operation_sA(WLDAP32_LDAP*,PCHAR,struct
WLDAP32_berval*,PLDAPControlA*, PLDAPControlA*,
+WLDAP32_LDAP CDECL *cldap_openA(PCHAR,ULONG);
+WLDAP32_LDAP CDECL *cldap_openW(PWCHAR,ULONG);
+ULONG CDECL WLDAP32_ldap_abandon(WLDAP32_LDAP*,ULONG);
+ULONG CDECL ldap_addA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]);
+ULONG CDECL ldap_addW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]);
+ULONG CDECL
ldap_add_extA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*,ULONG*);
+ULONG CDECL
ldap_add_extW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*,ULONG*);
+ULONG CDECL
ldap_add_ext_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*);
+ULONG CDECL
ldap_add_ext_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*);
+ULONG CDECL ldap_add_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]);
+ULONG CDECL ldap_add_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]);
+ULONG CDECL ldap_bindA(WLDAP32_LDAP*,PCHAR,PCHAR,ULONG);
+ULONG CDECL ldap_bindW(WLDAP32_LDAP*,PWCHAR,PWCHAR,ULONG);
+ULONG CDECL ldap_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR,ULONG);
+ULONG CDECL ldap_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,ULONG);
+ULONG CDECL ldap_check_filterA(WLDAP32_LDAP*,PCHAR);
+ULONG CDECL ldap_check_filterW(WLDAP32_LDAP*,PWCHAR);
+ULONG CDECL ldap_cleanup(HANDLE);
+ULONG CDECL ldap_close_extended_op(WLDAP32_LDAP*,ULONG);
+ULONG CDECL ldap_compareA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR);
+ULONG CDECL ldap_compareW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR);
+ULONG CDECL ldap_compare_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct
WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*,ULONG*);
+ULONG CDECL ldap_compare_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct
WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*,ULONG*);
+ULONG CDECL ldap_compare_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct
WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*);
+ULONG CDECL ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct
WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*);
+ULONG CDECL ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR);
+ULONG CDECL ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR);
+ULONG CDECL ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*);
+WLDAP32_LDAP CDECL *ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+ULONG CDECL ldap_control_freeA(LDAPControlA*);
+ULONG CDECL ldap_control_freeW(LDAPControlW*);
+ULONG CDECL ldap_controls_freeA(LDAPControlA**);
+ULONG CDECL ldap_controls_freeW(LDAPControlW**);
+ULONG CDECL WLDAP32_ldap_count_entries(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+ULONG CDECL WLDAP32_ldap_count_references(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+ULONG CDECL ldap_count_valuesA(PCHAR*);
+ULONG CDECL ldap_count_valuesW(PWCHAR*);
+ULONG CDECL WLDAP32_ldap_count_values_len(PBERVAL*);
+ULONG CDECL ldap_create_page_controlA(WLDAP32_PLDAP,ULONG,struct
WLDAP32_berval*,UCHAR,PLDAPControlA*);
+ULONG CDECL ldap_create_page_controlW(WLDAP32_PLDAP,ULONG,struct
WLDAP32_berval*,UCHAR,PLDAPControlW*);
+ULONG CDECL
ldap_create_sort_controlA(WLDAP32_PLDAP,PLDAPSortKeyA*,UCHAR,PLDAPControlA*);
+ULONG CDECL
ldap_create_sort_controlW(WLDAP32_PLDAP,PLDAPSortKeyW*,UCHAR,PLDAPControlW*);
+INT CDECL
ldap_create_vlv_controlA(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,UCHAR,LDAPControlA**);
+INT CDECL
ldap_create_vlv_controlW(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,UCHAR,LDAPControlW**);
+ULONG CDECL ldap_deleteA(WLDAP32_LDAP*,PCHAR);
+ULONG CDECL ldap_deleteW(WLDAP32_LDAP*,PWCHAR);
+ULONG CDECL ldap_delete_extA(WLDAP32_LDAP*,PCHAR,PLDAPControlA*,PLDAPControlA*,ULONG*);
+ULONG CDECL ldap_delete_extW(WLDAP32_LDAP*,PWCHAR,PLDAPControlW*,PLDAPControlW*,ULONG*);
+ULONG CDECL ldap_delete_ext_sA(WLDAP32_LDAP*,PCHAR,PLDAPControlA*,PLDAPControlA*);
+ULONG CDECL ldap_delete_ext_sW(WLDAP32_LDAP*,PWCHAR,PLDAPControlW*,PLDAPControlW*);
+ULONG CDECL ldap_delete_sA(WLDAP32_LDAP*,PCHAR);
+ULONG CDECL ldap_delete_sW(WLDAP32_LDAP*,PWCHAR);
+PCHAR CDECL ldap_dn2ufnA(PCHAR);
+PWCHAR CDECL ldap_dn2ufnW(PWCHAR);
+ULONG CDECL
ldap_encode_sort_controlA(WLDAP32_PLDAP,PLDAPSortKeyA*,PLDAPControlA,BOOLEAN);
+ULONG CDECL
ldap_encode_sort_controlW(WLDAP32_PLDAP,PLDAPSortKeyW*,PLDAPControlW,BOOLEAN);
+PCHAR CDECL ldap_err2stringA(ULONG);
+PWCHAR CDECL ldap_err2stringW(ULONG);
+ULONG CDECL ldap_escape_filter_elementA(PCHAR,ULONG,PCHAR,ULONG);
+ULONG CDECL ldap_escape_filter_elementW(PCHAR,ULONG,PWCHAR,ULONG);
+PCHAR CDECL *ldap_explode_dnA(PCHAR,ULONG);
+PWCHAR CDECL *ldap_explode_dnW(PWCHAR,ULONG);
+ULONG CDECL ldap_extended_operationA(WLDAP32_LDAP*,PCHAR,struct
WLDAP32_berval*,PLDAPControlA*,PLDAPControlA*,ULONG*);
+ULONG CDECL ldap_extended_operationW(WLDAP32_LDAP*,PWCHAR,struct
WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*,ULONG*);
+ULONG CDECL ldap_extended_operation_sA(WLDAP32_LDAP*,PCHAR,struct
WLDAP32_berval*,PLDAPControlA*, PLDAPControlA*,
PCHAR*,struct WLDAP32_berval**);
-ULONG ldap_extended_operation_sW(WLDAP32_LDAP*,PWCHAR,struct
WLDAP32_berval*,PLDAPControlW*, PLDAPControlW*,
+ULONG CDECL ldap_extended_operation_sW(WLDAP32_LDAP*,PWCHAR,struct
WLDAP32_berval*,PLDAPControlW*, PLDAPControlW*,
PWCHAR*,struct WLDAP32_berval**);
-PCHAR ldap_first_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**);
-PWCHAR ldap_first_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**);
-WLDAP32_LDAPMessage *WLDAP32_ldap_first_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-WLDAP32_LDAPMessage *WLDAP32_ldap_first_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-ULONG ldap_free_controlsA(LDAPControlA**);
-ULONG ldap_free_controlsW(LDAPControlW**);
-PCHAR ldap_get_dnA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-PWCHAR ldap_get_dnW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-ULONG ldap_get_next_page(WLDAP32_LDAP*,PLDAPSearch,ULONG,ULONG*);
-ULONG ldap_get_next_page_s(WLDAP32_LDAP*,PLDAPSearch,struct
l_timeval*,ULONG,ULONG*,WLDAP32_LDAPMessage**);
-ULONG ldap_get_optionA(WLDAP32_LDAP*,int,void*);
-ULONG ldap_get_optionW(WLDAP32_LDAP*,int,void*);
-ULONG ldap_get_paged_count(WLDAP32_LDAP*,PLDAPSearch,ULONG*,WLDAP32_LDAPMessage*);
-PCHAR *ldap_get_valuesA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR);
-PWCHAR *ldap_get_valuesW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR);
-PBERVAL *ldap_get_values_lenA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR);
-PBERVAL *ldap_get_values_lenW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR);
-WLDAP32_LDAP *ldap_initA(const PCHAR,ULONG);
-WLDAP32_LDAP *ldap_initW(const PWCHAR,ULONG);
-void ldap_memfreeA(PCHAR);
-void ldap_memfreeW(PWCHAR);
-ULONG ldap_modifyA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]);
-ULONG ldap_modifyW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]);
-ULONG
ldap_modify_extA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*,ULONG*);
-ULONG
ldap_modify_extW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*,ULONG*);
-ULONG ldap_modify_ext_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*);
-ULONG
ldap_modify_ext_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*);
-ULONG ldap_modify_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]);
-ULONG ldap_modify_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]);
-ULONG ldap_modrdnA(WLDAP32_LDAP*,PCHAR,PCHAR);
-ULONG ldap_modrdnW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
-ULONG ldap_modrdn2A(WLDAP32_LDAP*,PCHAR,PCHAR,INT);
-ULONG ldap_modrdn2W(WLDAP32_LDAP*,PWCHAR,PWCHAR,INT);
-ULONG ldap_modrdn2_sA(WLDAP32_LDAP*,PCHAR,PCHAR,INT);
-ULONG ldap_modrdn2_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,INT);
-ULONG ldap_modrdn_sA(WLDAP32_LDAP*,PCHAR,PCHAR);
-ULONG ldap_modrdn_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
-ULONG WLDAP32_ldap_msgfree(WLDAP32_LDAPMessage*);
-PCHAR ldap_next_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*);
-PWCHAR ldap_next_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*);
-WLDAP32_LDAPMessage *WLDAP32_ldap_next_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-WLDAP32_LDAPMessage *WLDAP32_ldap_next_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
-WLDAP32_LDAP *ldap_openA(PCHAR,ULONG);
-WLDAP32_LDAP *ldap_openW(PWCHAR,ULONG);
-ULONG ldap_parse_extended_resultA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR*,struct
WLDAP32_berval**,BOOLEAN);
-ULONG ldap_parse_extended_resultW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR*,struct
WLDAP32_berval**,BOOLEAN);
-ULONG ldap_parse_page_controlA(WLDAP32_LDAP*,PLDAPControlA*,ULONG*,struct
WLDAP32_berval**);
-ULONG ldap_parse_page_controlW(WLDAP32_LDAP*,PLDAPControlW*,ULONG*,struct
WLDAP32_berval**);
-ULONG ldap_parse_referenceA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR**);
-ULONG ldap_parse_referenceW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR**);
-ULONG
ldap_parse_resultA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG*,PCHAR*,PCHAR*,PCHAR**,PLDAPControlA**,BOOLEAN);
-ULONG
ldap_parse_resultW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG*,PWCHAR*,PWCHAR*,PWCHAR**,PLDAPControlW**,BOOLEAN);
-ULONG ldap_parse_sort_controlA(WLDAP32_LDAP*,PLDAPControlA*,ULONG*,PCHAR*);
-ULONG ldap_parse_sort_controlW(WLDAP32_LDAP*,PLDAPControlW*,ULONG*,PWCHAR*);
-int ldap_parse_vlv_controlA(WLDAP32_LDAP*,LDAPControlA**,ULONG*,ULONG*,struct
WLDAP32_berval**,INT*);
-int ldap_parse_vlv_controlW(WLDAP32_LDAP*,LDAPControlW**,ULONG*,ULONG*,struct
WLDAP32_berval**,INT*);
-void WLDAP32_ldap_perror(WLDAP32_LDAP*,const PCHAR);
-ULONG
ldap_rename_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,INT,PLDAPControlA*,PLDAPControlA*,ULONG*);
-ULONG
ldap_rename_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,INT,PLDAPControlW*,PLDAPControlW*,ULONG*);
-ULONG
ldap_rename_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,INT,PLDAPControlA*,PLDAPControlA*);
-ULONG
ldap_rename_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,INT,PLDAPControlW*,PLDAPControlW*);
-ULONG WLDAP32_ldap_result(WLDAP32_LDAP*,ULONG,ULONG,struct
l_timeval*,WLDAP32_LDAPMessage**);
-ULONG WLDAP32_ldap_result2error(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG);
-ULONG ldap_sasl_bindA(WLDAP32_LDAP*,const PCHAR,const PCHAR,const
BERVAL*,PLDAPControlA*,PLDAPControlA*,int*);
-ULONG ldap_sasl_bindW(WLDAP32_LDAP*,const PWCHAR,const PWCHAR,const
BERVAL*,PLDAPControlW*,PLDAPControlW*,int*);
-ULONG ldap_sasl_bind_sA(WLDAP32_LDAP*,const PCHAR,const PCHAR,const
BERVAL*,PLDAPControlA*,PLDAPControlA*,PBERVAL*);
-ULONG ldap_sasl_bind_sW(WLDAP32_LDAP*,const PWCHAR,const PWCHAR,const
BERVAL*,PLDAPControlW*,PLDAPControlW*,PBERVAL*);
-ULONG ldap_search_abandon_page(WLDAP32_PLDAP,PLDAPSearch);
-ULONG ldap_searchA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG);
-ULONG ldap_searchW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG);
-ULONG ldap_search_extA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPControlA*,
+PCHAR CDECL
ldap_first_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**);
+PWCHAR CDECL
ldap_first_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement**);
+WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_first_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAPMessage CDECL
*WLDAP32_ldap_first_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+ULONG CDECL ldap_free_controlsA(LDAPControlA**);
+ULONG CDECL ldap_free_controlsW(LDAPControlW**);
+PCHAR CDECL ldap_get_dnA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+PWCHAR CDECL ldap_get_dnW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+ULONG CDECL ldap_get_next_page(WLDAP32_LDAP*,PLDAPSearch,ULONG,ULONG*);
+ULONG CDECL ldap_get_next_page_s(WLDAP32_LDAP*,PLDAPSearch,struct
l_timeval*,ULONG,ULONG*,WLDAP32_LDAPMessage**);
+ULONG CDECL ldap_get_optionA(WLDAP32_LDAP*,int,void*);
+ULONG CDECL ldap_get_optionW(WLDAP32_LDAP*,int,void*);
+ULONG CDECL ldap_get_paged_count(WLDAP32_LDAP*,PLDAPSearch,ULONG*,WLDAP32_LDAPMessage*);
+PCHAR CDECL *ldap_get_valuesA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR);
+PWCHAR CDECL *ldap_get_valuesW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR);
+PBERVAL CDECL *ldap_get_values_lenA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR);
+PBERVAL CDECL *ldap_get_values_lenW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR);
+WLDAP32_LDAP CDECL *ldap_initA(const PCHAR,ULONG);
+WLDAP32_LDAP CDECL *ldap_initW(const PWCHAR,ULONG);
+void CDECL ldap_memfreeA(PCHAR);
+void CDECL ldap_memfreeW(PWCHAR);
+ULONG CDECL ldap_modifyA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]);
+ULONG CDECL ldap_modifyW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]);
+ULONG CDECL
ldap_modify_extA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*,ULONG*);
+ULONG CDECL
ldap_modify_extW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*,ULONG*);
+ULONG CDECL
ldap_modify_ext_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*);
+ULONG CDECL
ldap_modify_ext_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*);
+ULONG CDECL ldap_modify_sA(WLDAP32_LDAP*,PCHAR,LDAPModA*[]);
+ULONG CDECL ldap_modify_sW(WLDAP32_LDAP*,PWCHAR,LDAPModW*[]);
+ULONG CDECL ldap_modrdnA(WLDAP32_LDAP*,PCHAR,PCHAR);
+ULONG CDECL ldap_modrdnW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
+ULONG CDECL ldap_modrdn2A(WLDAP32_LDAP*,PCHAR,PCHAR,INT);
+ULONG CDECL ldap_modrdn2W(WLDAP32_LDAP*,PWCHAR,PWCHAR,INT);
+ULONG CDECL ldap_modrdn2_sA(WLDAP32_LDAP*,PCHAR,PCHAR,INT);
+ULONG CDECL ldap_modrdn2_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,INT);
+ULONG CDECL ldap_modrdn_sA(WLDAP32_LDAP*,PCHAR,PCHAR);
+ULONG CDECL ldap_modrdn_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
+ULONG CDECL WLDAP32_ldap_msgfree(WLDAP32_LDAPMessage*);
+PCHAR CDECL
ldap_next_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*);
+PWCHAR CDECL
ldap_next_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,WLDAP32_BerElement*);
+WLDAP32_LDAPMessage CDECL *WLDAP32_ldap_next_entry(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAPMessage CDECL
*WLDAP32_ldap_next_reference(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
+WLDAP32_LDAP CDECL *ldap_openA(PCHAR,ULONG);
+WLDAP32_LDAP CDECL *ldap_openW(PWCHAR,ULONG);
+ULONG CDECL ldap_parse_extended_resultA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR*,struct
WLDAP32_berval**,BOOLEAN);
+ULONG CDECL ldap_parse_extended_resultW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR*,struct
WLDAP32_berval**,BOOLEAN);
+ULONG CDECL ldap_parse_page_controlA(WLDAP32_LDAP*,PLDAPControlA*,ULONG*,struct
WLDAP32_berval**);
+ULONG CDECL ldap_parse_page_controlW(WLDAP32_LDAP*,PLDAPControlW*,ULONG*,struct
WLDAP32_berval**);
+ULONG CDECL ldap_parse_referenceA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PCHAR**);
+ULONG CDECL ldap_parse_referenceW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,PWCHAR**);
+ULONG CDECL
ldap_parse_resultA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG*,PCHAR*,PCHAR*,PCHAR**,PLDAPControlA**,BOOLEAN);
+ULONG CDECL
ldap_parse_resultW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG*,PWCHAR*,PWCHAR*,PWCHAR**,PLDAPControlW**,BOOLEAN);
+ULONG CDECL ldap_parse_sort_controlA(WLDAP32_LDAP*,PLDAPControlA*,ULONG*,PCHAR*);
+ULONG CDECL ldap_parse_sort_controlW(WLDAP32_LDAP*,PLDAPControlW*,ULONG*,PWCHAR*);
+int CDECL ldap_parse_vlv_controlA(WLDAP32_LDAP*,LDAPControlA**,ULONG*,ULONG*,struct
WLDAP32_berval**,INT*);
+int CDECL ldap_parse_vlv_controlW(WLDAP32_LDAP*,LDAPControlW**,ULONG*,ULONG*,struct
WLDAP32_berval**,INT*);
+void CDECL WLDAP32_ldap_perror(WLDAP32_LDAP*,const PCHAR);
+ULONG CDECL
ldap_rename_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,INT,PLDAPControlA*,PLDAPControlA*,ULONG*);
+ULONG CDECL
ldap_rename_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,INT,PLDAPControlW*,PLDAPControlW*,ULONG*);
+ULONG CDECL
ldap_rename_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,INT,PLDAPControlA*,PLDAPControlA*);
+ULONG CDECL
ldap_rename_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,INT,PLDAPControlW*,PLDAPControlW*);
+ULONG CDECL WLDAP32_ldap_result(WLDAP32_LDAP*,ULONG,ULONG,struct
l_timeval*,WLDAP32_LDAPMessage**);
+ULONG CDECL WLDAP32_ldap_result2error(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,ULONG);
+ULONG CDECL ldap_sasl_bindA(WLDAP32_LDAP*,const PCHAR,const PCHAR,const
BERVAL*,PLDAPControlA*,PLDAPControlA*,int*);
+ULONG CDECL ldap_sasl_bindW(WLDAP32_LDAP*,const PWCHAR,const PWCHAR,const
BERVAL*,PLDAPControlW*,PLDAPControlW*,int*);
+ULONG CDECL ldap_sasl_bind_sA(WLDAP32_LDAP*,const PCHAR,const PCHAR,const
BERVAL*,PLDAPControlA*,PLDAPControlA*,PBERVAL*);
+ULONG CDECL ldap_sasl_bind_sW(WLDAP32_LDAP*,const PWCHAR,const PWCHAR,const
BERVAL*,PLDAPControlW*,PLDAPControlW*,PBERVAL*);
+ULONG CDECL ldap_search_abandon_page(WLDAP32_PLDAP,PLDAPSearch);
+ULONG CDECL ldap_searchA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG);
+ULONG CDECL ldap_searchW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG);
+ULONG CDECL
ldap_search_extA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPControlA*,
PLDAPControlA*,ULONG,ULONG,ULONG*);
-ULONG ldap_search_extW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,
+ULONG CDECL
ldap_search_extW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,
PLDAPControlW*,ULONG,ULONG,ULONG*);
-ULONG ldap_search_ext_sA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPControlA*,
+ULONG CDECL
ldap_search_ext_sA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPControlA*,
PLDAPControlA*,struct l_timeval*,ULONG,WLDAP32_LDAPMessage**);
-ULONG
ldap_search_ext_sW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,
+ULONG CDECL
ldap_search_ext_sW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,
PLDAPControlW*,struct l_timeval*,ULONG,WLDAP32_LDAPMessage**);
-PLDAPSearch
ldap_search_init_pageA(WLDAP32_PLDAP,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPControlA*,
+PLDAPSearch CDECL
ldap_search_init_pageA(WLDAP32_PLDAP,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,PLDAPControlA*,
PLDAPControlA*,ULONG,ULONG,PLDAPSortKeyA*);
-PLDAPSearch
ldap_search_init_pageW(WLDAP32_PLDAP,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,
+PLDAPSearch CDECL
ldap_search_init_pageW(WLDAP32_PLDAP,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,
PLDAPControlW*,ULONG,ULONG, PLDAPSortKeyW*);
-ULONG
ldap_search_sA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,WLDAP32_LDAPMessage**);
-ULONG
ldap_search_sW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,WLDAP32_LDAPMessage**);
-ULONG ldap_search_stA(WLDAP32_LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG,
+ULONG CDECL
ldap_search_sA(WLDAP32_LDAP*,PCHAR,ULONG,PCHAR,PCHAR[],ULONG,WLDAP32_LDAPMessage**);
+ULONG CDECL
ldap_search_sW(WLDAP32_LDAP*,PWCHAR,ULONG,PWCHAR,PWCHAR[],ULONG,WLDAP32_LDAPMessage**);
+ULONG CDECL ldap_search_stA(WLDAP32_LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG,
struct l_timeval*,WLDAP32_LDAPMessage**);
-ULONG ldap_search_stW(WLDAP32_LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG,
+ULONG CDECL ldap_search_stW(WLDAP32_LDAP*,const PWCHAR,ULONG,const
PWCHAR,PWCHAR[],ULONG,
struct l_timeval*,WLDAP32_LDAPMessage**);
-ULONG ldap_set_optionA(WLDAP32_LDAP*,int,void*);
-ULONG ldap_set_optionW(WLDAP32_LDAP*,int,void*);
-ULONG ldap_simple_bindA(WLDAP32_LDAP*,PCHAR,PCHAR);
-ULONG ldap_simple_bindW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
-ULONG ldap_simple_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR);
-ULONG ldap_simple_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
-WLDAP32_LDAP *ldap_sslinitA(PCHAR,ULONG,int);
-WLDAP32_LDAP *ldap_sslinitW(PWCHAR,ULONG,int);
-ULONG
ldap_start_tls_sA(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlA*,PLDAPControlA*);
-ULONG
ldap_start_tls_sW(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlW*,PLDAPControlW*);
-ULONG ldap_startup(PLDAP_VERSION_INFO,HANDLE*);
-BOOLEAN ldap_stop_tls_s(WLDAP32_PLDAP);
-ULONG ldap_ufn2dnA(PCHAR,PCHAR*);
-ULONG ldap_ufn2dnW(PWCHAR,PWCHAR*);
-ULONG WLDAP32_ldap_unbind(WLDAP32_LDAP*);
-ULONG WLDAP32_ldap_unbind_s(WLDAP32_LDAP*);
-ULONG ldap_value_freeA(PCHAR*);
-ULONG ldap_value_freeW(PWCHAR*);
-ULONG WLDAP32_ldap_value_free_len(struct WLDAP32_berval**);
-
-ULONG LdapGetLastError(void);
-ULONG LdapMapErrorToWin32(ULONG);
-int LdapUnicodeToUTF8(LPCWSTR,int,LPSTR,int);
-int LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int);
+ULONG CDECL ldap_set_optionA(WLDAP32_LDAP*,int,void*);
+ULONG CDECL ldap_set_optionW(WLDAP32_LDAP*,int,void*);
+ULONG CDECL ldap_simple_bindA(WLDAP32_LDAP*,PCHAR,PCHAR);
+ULONG CDECL ldap_simple_bindW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
+ULONG CDECL ldap_simple_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR);
+ULONG CDECL ldap_simple_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR);
+WLDAP32_LDAP CDECL *ldap_sslinitA(PCHAR,ULONG,int);
+WLDAP32_LDAP CDECL *ldap_sslinitW(PWCHAR,ULONG,int);
+ULONG CDECL
ldap_start_tls_sA(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlA*,PLDAPControlA*);
+ULONG CDECL
ldap_start_tls_sW(WLDAP32_PLDAP,PULONG,WLDAP32_LDAPMessage**,PLDAPControlW*,PLDAPControlW*);
+ULONG CDECL ldap_startup(PLDAP_VERSION_INFO,HANDLE*);
+BOOLEAN CDECL ldap_stop_tls_s(WLDAP32_PLDAP);
+ULONG CDECL ldap_ufn2dnA(PCHAR,PCHAR*);
+ULONG CDECL ldap_ufn2dnW(PWCHAR,PWCHAR*);
+ULONG CDECL WLDAP32_ldap_unbind(WLDAP32_LDAP*);
+ULONG CDECL WLDAP32_ldap_unbind_s(WLDAP32_LDAP*);
+ULONG CDECL ldap_value_freeA(PCHAR*);
+ULONG CDECL ldap_value_freeW(PWCHAR*);
+ULONG CDECL WLDAP32_ldap_value_free_len(struct WLDAP32_berval**);
+
+ULONG CDECL LdapGetLastError(void);
+ULONG CDECL LdapMapErrorToWin32(ULONG);
+int CDECL LdapUnicodeToUTF8(LPCWSTR,int,LPSTR,int);
+int CDECL LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int);
Modified: trunk/reactos/dll/win32/wldap32/wldap32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/wldap32.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/wldap32.h [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+ULONG map_error( int );
+
/* A set of helper functions to convert LDAP data structures
* to and from ansi (A), wide character (W) and utf8 (U) encodings.
*/
Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -31,6 +31,7 @@
#include "wldap32_Nl.rc"
#include "wldap32_No.rc"
#include "wldap32_Pl.rc"
+#include "wldap32_Pt.rc"
#include "wldap32_Ru.rc"
#include "wldap32_Sv.rc"
#include "wldap32_Tr.rc"
Modified: trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
{
Added: trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc (added)
+++ trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc [iso-8859-1] Sun Jan 11 13:02:16 2009
@@ -1,0 +1,123 @@
+/*
+ * Portuguese resources for WLDAP32
+ *
+ * Copyright 2008 Ricardo Filipe
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+{
+ 0 "Sucesso"
+ 1 "Erro de operações"
+ 2 "Erro de protocolo"
+ 3 "Tempo limite excedido"
+ 4 "Tamanho limite excedido"
+ 5 "Comparar Falso"
+ 6 "Comparar Verdadeiro"
+ 7 "Método de autenticação não suportado"
+ 8 "Autenticação forte necessária"
+ 9 "Referência (v2)"
+ 10 "Referência"
+ 11 "Limite de administração excedido"
+ 12 "Extensão Crítica indisponível"
+ 13 "Confidencialidade necessária"
+ 14 ""
+ 15 ""
+ 16 "Atributo não encontrado"
+ 17 "Tipo indefinido"
+ 18 "Atribuição imprópria"
+ 19 "Violação de restrições"
+ 20 "Valor ou atributo existente"
+ 21 "Sintaxe Inválida"
+ 22 ""
+ 23 ""
+ 24 ""
+ 25 ""
+ 26 ""
+ 27 ""
+ 28 ""
+ 29 ""
+ 30 ""
+ 31 ""
+ 32 "Objecto não encontrado"
+ 33 "Problema de abreviatura"
+ 34 "Sintaxe DN inválida"
+ 35 "É folha"
+ 36 "Problema na referência da abreviatura"
+ 37 ""
+ 38 ""
+ 39 ""
+ 40 ""
+ 41 ""
+ 42 ""
+ 43 ""
+ 44 ""
+ 45 ""
+ 46 ""
+ 47 ""
+ 48 "Autenticação imprópria"
+ 49 "Credenciais Inválidas"
+ 50 "Direitos insuficientes"
+ 51 "Ocupado"
+ 52 "Indisponível"
+ 53 "Indisposto a realizar"
+ 54 "Ciclo detectado"
+ 55 ""
+ 56 ""
+ 57 ""
+ 58 ""
+ 59 ""
+ 60 "Falta de controlo de ordenação"
+ 61 "Erro de limite de índice"
+ 62 ""
+ 63 ""
+ 64 "Violação de Nome"
+ 65 "Violação da Classe de Objecto"
+ 66 "Não permitido em não-folha"
+ 67 "Não permitido em RDN"
+ 68 "Já existe"
+ 69 "Sem modificações de Classe de Objecto"
+ 70 "Resultados muito grandes"
+ 71 "Afecta múltiplos DSAs"
+ 72 ""
+ 73 ""
+ 74 ""
+ 75 ""
+ 76 ""
+ 77 ""
+ 78 ""
+ 79 ""
+ 80 "Outro"
+ 81 "Servidor em baixo"
+ 82 "Erro Local"
+ 83 "Erro de Codificação"
+ 84 "Erro de Descodificação"
+ 85 "Tempo excedido"
+ 86 "Autenticação desconhecida"
+ 87 "Erro de filtro"
+ 88 "Cancelado pelo utilizador"
+ 89 "Erro de parâmetro"
+ 90 "Sem memória"
+ 91 "Não consegue ligar ao servidor LDAP"
+ 92 "Operação não suportada por esta versão do protocolo LDAP"
+ 93 "O controlo especificado não foi encontrado na mensagem"
+ 94 "Nenhum resultado presente na mensagem"
+ 95 "Mais resultados devolvidos"
+ 96 "Ciclo enquanto resolve referências"
+ 97 "Limite de salto de referências excedido"
+}
Propchange: trunk/reactos/dll/win32/wldap32/wldap32_Pt.rc
------------------------------------------------------------------------------
svn:eol-style = native