From: Hans Leidekker hans@codeweavers.com
--- dlls/wldap32/ber.c | 30 +++++++++--------- dlls/wldap32/bind.c | 4 +-- dlls/wldap32/error.c | 4 +-- dlls/wldap32/init.c | 2 +- dlls/wldap32/misc.c | 18 +++++------ dlls/wldap32/page.c | 20 ++++++------ dlls/wldap32/value.c | 4 +-- dlls/wldap32/winldap_private.h | 19 +++++++++++ dlls/wldap32/wldap32.spec | 58 +++++++++++++++++----------------- 9 files changed, 89 insertions(+), 70 deletions(-)
diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 82ab6116455..0d8f0dfe010 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -34,9 +34,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ber_alloc_t (WLDAP32.@) */ -BerElement * CDECL ber_alloc_t( int options ) +WLDAP32_BerElement * CDECL WLDAP32_ber_alloc_t( int options ) { - BerElement *ret; + WLDAP32_BerElement *ret; struct ber_alloc_t_params params;
if (!(ret = malloc( sizeof(*ret) ))) return NULL; @@ -53,7 +53,7 @@ BerElement * CDECL ber_alloc_t( int options ) /*********************************************************************** * ber_bvdup (WLDAP32.@) */ -BERVAL * CDECL ber_bvdup( BERVAL *berval ) +BERVAL * CDECL WLDAP32_ber_bvdup( BERVAL *berval ) { return bervalWtoW( berval ); } @@ -61,7 +61,7 @@ BERVAL * CDECL ber_bvdup( BERVAL *berval ) /*********************************************************************** * ber_bvecfree (WLDAP32.@) */ -void CDECL ber_bvecfree( BERVAL **berval ) +void CDECL WLDAP32_ber_bvecfree( BERVAL **berval ) { bvarrayfreeW( berval ); } @@ -69,7 +69,7 @@ void CDECL ber_bvecfree( BERVAL **berval ) /*********************************************************************** * ber_bvfree (WLDAP32.@) */ -void CDECL ber_bvfree( BERVAL *berval ) +void CDECL WLDAP32_ber_bvfree( BERVAL *berval ) { free( berval ); } @@ -77,7 +77,7 @@ void CDECL ber_bvfree( BERVAL *berval ) /*********************************************************************** * ber_first_element (WLDAP32.@) */ -ULONG CDECL ber_first_element( BerElement *ber, ULONG *len, char **opaque ) +ULONG CDECL WLDAP32_ber_first_element( WLDAP32_BerElement *ber, ULONG *len, char **opaque ) { struct ber_first_element_params params = { BER(ber), (unsigned int *)len, opaque }; return LDAP_CALL( ber_first_element, ¶ms ); @@ -86,7 +86,7 @@ ULONG CDECL ber_first_element( BerElement *ber, ULONG *len, char **opaque ) /*********************************************************************** * ber_flatten (WLDAP32.@) */ -int CDECL ber_flatten( BerElement *ber, BERVAL **berval ) +int CDECL WLDAP32_ber_flatten( WLDAP32_BerElement *ber, BERVAL **berval ) { struct bervalU *bervalU; struct berval *bervalW; @@ -104,7 +104,7 @@ int CDECL ber_flatten( BerElement *ber, BERVAL **berval ) /*********************************************************************** * ber_free (WLDAP32.@) */ -void CDECL ber_free( BerElement *ber, int freebuf ) +void CDECL WLDAP32_ber_free( WLDAP32_BerElement *ber, int freebuf ) { struct ber_free_params params = { BER(ber), freebuf }; LDAP_CALL( ber_free, ¶ms ); @@ -114,10 +114,10 @@ void CDECL ber_free( BerElement *ber, int freebuf ) /*********************************************************************** * ber_init (WLDAP32.@) */ -BerElement * CDECL ber_init( BERVAL *berval ) +WLDAP32_BerElement * CDECL WLDAP32_ber_init( BERVAL *berval ) { struct bervalU *bervalU; - BerElement *ret; + WLDAP32_BerElement *ret; struct ber_init_params params;
if (!(ret = malloc( sizeof(*ret) ))) return NULL; @@ -140,7 +140,7 @@ BerElement * CDECL ber_init( BERVAL *berval ) /*********************************************************************** * ber_next_element (WLDAP32.@) */ -ULONG CDECL ber_next_element( BerElement *ber, ULONG *len, char *opaque ) +ULONG CDECL WLDAP32_ber_next_element( WLDAP32_BerElement *ber, ULONG *len, char *opaque ) { struct ber_next_element_params params = { BER(ber), (unsigned int *)len, opaque }; return LDAP_CALL( ber_next_element, ¶ms ); @@ -149,7 +149,7 @@ ULONG CDECL ber_next_element( BerElement *ber, ULONG *len, char *opaque ) /*********************************************************************** * ber_peek_tag (WLDAP32.@) */ -ULONG CDECL ber_peek_tag( BerElement *ber, ULONG *len ) +ULONG CDECL WLDAP32_ber_peek_tag( WLDAP32_BerElement *ber, ULONG *len ) { struct ber_peek_tag_params params = { BER(ber), (unsigned int *)len }; return LDAP_CALL( ber_peek_tag, ¶ms ); @@ -158,7 +158,7 @@ ULONG CDECL ber_peek_tag( BerElement *ber, ULONG *len ) /*********************************************************************** * ber_skip_tag (WLDAP32.@) */ -ULONG CDECL ber_skip_tag( BerElement *ber, ULONG *len ) +ULONG CDECL WLDAP32_ber_skip_tag( WLDAP32_BerElement *ber, ULONG *len ) { struct ber_skip_tag_params params = { BER(ber), (unsigned int *)len }; return LDAP_CALL( ber_skip_tag, ¶ms ); @@ -167,7 +167,7 @@ ULONG CDECL ber_skip_tag( BerElement *ber, ULONG *len ) /*********************************************************************** * ber_printf (WLDAP32.@) */ -int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) +int WINAPIV WLDAP32_ber_printf( WLDAP32_BerElement *ber, char *fmt, ... ) { va_list list; int ret = 0; @@ -244,7 +244,7 @@ int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) /*********************************************************************** * ber_scanf (WLDAP32.@) */ -ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) +ULONG WINAPIV WLDAP32_ber_scanf( WLDAP32_BerElement *ber, char *fmt, ... ) { va_list list; int ret = 0; diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index beb7626b8b1..1fe2bc23fda 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -461,7 +461,7 @@ exit: /*********************************************************************** * ldap_unbind (WLDAP32.@) */ -ULONG CDECL ldap_unbind( LDAP *ld ) +ULONG CDECL WLDAP32_ldap_unbind( LDAP *ld ) { ULONG ret;
@@ -483,7 +483,7 @@ ULONG CDECL ldap_unbind( LDAP *ld ) /*********************************************************************** * ldap_unbind_s (WLDAP32.@) */ -ULONG CDECL ldap_unbind_s( LDAP *ld ) +ULONG CDECL WLDAP32_ldap_unbind_s( LDAP *ld ) { ULONG ret;
diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c index c2c7a6d9979..2b3d0166eb5 100644 --- a/dlls/wldap32/error.c +++ b/dlls/wldap32/error.c @@ -95,7 +95,7 @@ WCHAR * CDECL ldap_err2stringW( ULONG err ) /*********************************************************************** * ldap_perror (WLDAP32.@) */ -void CDECL ldap_perror( LDAP *ld, const PCHAR msg ) +void CDECL WLDAP32_ldap_perror( LDAP *ld, const PCHAR msg ) { TRACE( "(%p, %s)\n", ld, debugstr_a(msg) ); } @@ -103,7 +103,7 @@ void CDECL ldap_perror( LDAP *ld, const PCHAR msg ) /*********************************************************************** * ldap_result2error (WLDAP32.@) */ -ULONG CDECL ldap_result2error( LDAP *ld, LDAPMessage *res, ULONG free ) +ULONG CDECL WLDAP32_ldap_result2error( LDAP *ld, LDAPMessage *res, ULONG free ) { int error;
diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index c128039bf5c..88fa55b77f7 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -252,7 +252,7 @@ exit: /*********************************************************************** * ldap_connect (WLDAP32.@) */ -ULONG CDECL ldap_connect( LDAP *ld, struct l_timeval *timeout ) +ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout ) { TRACE( "(%p, %p)\n", ld, timeout );
diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index 135d79a6d58..c8dcf614683 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_abandon (WLDAP32.@) */ -ULONG CDECL ldap_abandon( LDAP *ld, ULONG msgid ) +ULONG CDECL WLDAP32_ldap_abandon( LDAP *ld, ULONG msgid ) { TRACE( "(%p, %#lx)\n", ld, msgid );
@@ -98,7 +98,7 @@ LDAP * CDECL ldap_conn_from_msg( LDAP *ld, LDAPMessage *res ) /*********************************************************************** * ldap_count_entries (WLDAP32.@) */ -ULONG CDECL ldap_count_entries( LDAP *ld, LDAPMessage *res ) +ULONG CDECL WLDAP32_ldap_count_entries( LDAP *ld, LDAPMessage *res ) { TRACE( "(%p, %p)\n", ld, res );
@@ -113,7 +113,7 @@ ULONG CDECL ldap_count_entries( LDAP *ld, LDAPMessage *res ) /*********************************************************************** * ldap_count_references (WLDAP32.@) */ -ULONG CDECL ldap_count_references( LDAP *ld, LDAPMessage *res ) +ULONG CDECL WLDAP32_ldap_count_references( LDAP *ld, LDAPMessage *res ) { TRACE( "(%p, %p)\n", ld, res );
@@ -248,7 +248,7 @@ WCHAR * CDECL ldap_first_attributeW( LDAP *ld, LDAPMessage *entry, BerElement ** /*********************************************************************** * ldap_first_entry (WLDAP32.@) */ -LDAPMessage * CDECL ldap_first_entry( LDAP *ld, LDAPMessage *res ) +LDAPMessage * CDECL WLDAP32_ldap_first_entry( LDAP *ld, LDAPMessage *res ) { void *msgU;
@@ -269,7 +269,7 @@ LDAPMessage * CDECL ldap_first_entry( LDAP *ld, LDAPMessage *res ) /*********************************************************************** * ldap_first_reference (WLDAP32.@) */ -LDAPMessage * CDECL ldap_first_reference( LDAP *ld, LDAPMessage *res ) +LDAPMessage * CDECL WLDAP32_ldap_first_reference( LDAP *ld, LDAPMessage *res ) { void *msgU;
@@ -308,7 +308,7 @@ void CDECL ldap_memfreeW( WCHAR *block ) /*********************************************************************** * ldap_msgfree (WLDAP32.@) */ -ULONG CDECL ldap_msgfree( LDAPMessage *res ) +ULONG CDECL WLDAP32_ldap_msgfree( LDAPMessage *res ) { LDAPMessage *entry, *list = res;
@@ -374,7 +374,7 @@ WCHAR * CDECL ldap_next_attributeW( LDAP *ld, LDAPMessage *entry, BerElement *pt /*********************************************************************** * ldap_next_entry (WLDAP32.@) */ -LDAPMessage * CDECL ldap_next_entry( LDAP *ld, LDAPMessage *entry ) +LDAPMessage * CDECL WLDAP32_ldap_next_entry( LDAP *ld, LDAPMessage *entry ) { LDAPMessage *msg = NULL; void *msgU; @@ -402,7 +402,7 @@ LDAPMessage * CDECL ldap_next_entry( LDAP *ld, LDAPMessage *entry ) /*********************************************************************** * ldap_next_reference (WLDAP32.@) */ -LDAPMessage * CDECL ldap_next_reference( LDAP *ld, LDAPMessage *entry ) +LDAPMessage * CDECL WLDAP32_ldap_next_reference( LDAP *ld, LDAPMessage *entry ) { LDAPMessage *msg = NULL; void *msgU; @@ -429,7 +429,7 @@ LDAPMessage * CDECL ldap_next_reference( LDAP *ld, LDAPMessage *entry ) /*********************************************************************** * ldap_result (WLDAP32.@) */ -ULONG CDECL ldap_result( LDAP *ld, ULONG msgid, ULONG all, struct l_timeval *timeout, LDAPMessage **res ) +ULONG CDECL WLDAP32_ldap_result( LDAP *ld, ULONG msgid, ULONG all, struct l_timeval *timeout, LDAPMessage **res ) { LDAPMessage *msg; struct timevalU timeval; diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index fab2b83366a..fd574eca2e7 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -60,22 +60,22 @@ ULONG CDECL ldap_create_page_controlA( LDAP *ld, ULONG pagesize, struct berval * static ULONG create_page_control( ULONG pagesize, struct berval *cookie, UCHAR critical, LDAPControlW **control ) { LDAPControlW *ctrl; - BerElement *ber; + WLDAP32_BerElement *ber; struct berval *berval, *vec[2]; int ret, len; char *val;
- if (!(ber = ber_alloc_t( LBER_USE_DER ))) return LDAP_NO_MEMORY; + if (!(ber = WLDAP32_ber_alloc_t( LBER_USE_DER ))) return LDAP_NO_MEMORY;
vec[1] = NULL; if (cookie) vec[0] = cookie; else vec[0] = &null_cookieW; - len = ber_printf( ber, (char *)"{iV}", pagesize, vec ); + len = WLDAP32_ber_printf( ber, (char *)"{iV}", pagesize, vec );
- ret = ber_flatten( ber, &berval ); - ber_free( ber, 1 ); + ret = WLDAP32_ber_flatten( ber, &berval ); + WLDAP32_ber_free( ber, 1 );
if (len == LBER_ERROR) return LDAP_ENCODING_ERROR; if (ret == -1) return LDAP_NO_MEMORY; @@ -85,7 +85,7 @@ static ULONG create_page_control( ULONG pagesize, struct berval *cookie, UCHAR c
len = berval->bv_len; memcpy( val, berval->bv_val, len ); - ber_bvfree( berval ); + WLDAP32_ber_bvfree( berval );
if (!(ctrl = malloc( sizeof(*ctrl) ))) { @@ -218,7 +218,7 @@ ULONG CDECL ldap_parse_page_controlW( LDAP *ld, LDAPControlW **ctrls, ULONG *ret { ULONG ret, count; LDAPControlW *control = NULL; - BerElement *ber; + WLDAP32_BerElement *ber; struct berval *cookie = NULL; int tag; ULONG i; @@ -234,9 +234,9 @@ ULONG CDECL ldap_parse_page_controlW( LDAP *ld, LDAPControlW **ctrls, ULONG *ret } if (!control) return LDAP_CONTROL_NOT_FOUND;
- if (!(ber = ber_init( &control->ldctl_value ))) return LDAP_NO_MEMORY; + if (!(ber = WLDAP32_ber_init( &control->ldctl_value ))) return LDAP_NO_MEMORY;
- tag = ber_scanf( ber, (char *)"{iO}", &count, &cookie ); + tag = WLDAP32_ber_scanf( ber, (char *)"{iO}", &count, &cookie ); if (tag == LBER_ERROR) ret = LDAP_DECODING_ERROR; else { @@ -245,7 +245,7 @@ ULONG CDECL ldap_parse_page_controlW( LDAP *ld, LDAPControlW **ctrls, ULONG *ret ret = LDAP_SUCCESS; }
- ber_free( ber, 1 ); + WLDAP32_ber_free( ber, 1 ); return ret; }
diff --git a/dlls/wldap32/value.c b/dlls/wldap32/value.c index a825b57da8d..3d2149a41d3 100644 --- a/dlls/wldap32/value.c +++ b/dlls/wldap32/value.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_count_values_len (WLDAP32.@) */ -ULONG CDECL ldap_count_values_len( struct berval **values ) +ULONG CDECL WLDAP32_ldap_count_values_len( struct berval **values ) { ULONG ret = 0; struct berval **ptr = values; @@ -213,7 +213,7 @@ struct berval ** CDECL ldap_get_values_lenW( LDAP *ld, LDAPMessage *message, WCH /*********************************************************************** * ldap_value_free_len (WLDAP32.@) */ -ULONG CDECL ldap_value_free_len( struct berval **values ) +ULONG CDECL WLDAP32_ldap_value_free_len( struct berval **values ) { TRACE( "(%p)\n", values );
diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index b8b6daf5a50..c2b47dcda50 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -24,6 +24,11 @@ #include "winnls.h" #include "libldap.h"
+typedef struct WLDAP32_berelement +{ + char *opaque; +} WLDAP32_BerElement; + typedef struct ldapsearch { WCHAR *dn; @@ -43,6 +48,20 @@ typedef struct ldapsearch #define MSG(entry) (entry->Request) #define BER(ber) (ber->opaque)
+WLDAP32_BerElement * CDECL WLDAP32_ber_alloc_t( int ); +BERVAL * CDECL WLDAP32_ber_bvdup( BERVAL * ); +void CDECL WLDAP32_ber_bvecfree( BERVAL ** ); +void CDECL WLDAP32_ber_bvfree( BERVAL * ); +ULONG CDECL WLDAP32_ber_first_element( WLDAP32_BerElement *, ULONG *, char ** ); +int CDECL WLDAP32_ber_flatten( WLDAP32_BerElement *, BERVAL ** ); +void CDECL WLDAP32_ber_free( WLDAP32_BerElement *, int ); +WLDAP32_BerElement * CDECL WLDAP32_ber_init( BERVAL * ); +ULONG CDECL WLDAP32_ber_next_element( WLDAP32_BerElement *, ULONG *, char * ); +ULONG CDECL WLDAP32_ber_peek_tag( WLDAP32_BerElement *, ULONG * ); +ULONG CDECL WLDAP32_ber_skip_tag( WLDAP32_BerElement *, ULONG * ); +int WINAPIV WLDAP32_ber_printf( WLDAP32_BerElement *, char *, ... ); +ULONG WINAPIV WLDAP32_ber_scanf( WLDAP32_BerElement *, char *, ... ); + ULONG map_error( int ) DECLSPEC_HIDDEN;
static inline char *strdupU( const char *src ) diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec index 63271615eb8..33e630dea87 100644 --- a/dlls/wldap32/wldap32.spec +++ b/dlls/wldap32/wldap32.spec @@ -1,20 +1,20 @@ - 10 cdecl ldap_abandon(ptr long) + 10 cdecl ldap_abandon(ptr long) WLDAP32_ldap_abandon 11 cdecl ldap_add(ptr str ptr) ldap_addA 12 cdecl ldap_get_optionW(ptr long ptr) - 13 cdecl ldap_unbind(ptr) + 13 cdecl ldap_unbind(ptr) WLDAP32_ldap_unbind 14 cdecl ldap_set_optionW(ptr long ptr) 16 cdecl LdapGetLastError() 17 cdecl cldap_open(str long) cldap_openA 18 cdecl LdapMapErrorToWin32(long) 19 cdecl ldap_compare(ptr str str str) ldap_compareA 20 cdecl ldap_delete(ptr str) ldap_deleteA - 21 cdecl ldap_result2error(ptr ptr long) + 21 cdecl ldap_result2error(ptr ptr long) WLDAP32_ldap_result2error 22 cdecl ldap_err2string(long) ldap_err2stringA 23 cdecl ldap_modify(ptr str ptr) ldap_modifyA 24 cdecl ldap_modrdn(ptr str ptr) ldap_modrdnA 25 cdecl ldap_open(str long) ldap_openA - 26 cdecl ldap_first_entry(ptr ptr) - 27 cdecl ldap_next_entry(ptr ptr) + 26 cdecl ldap_first_entry(ptr ptr) WLDAP32_ldap_first_entry + 27 cdecl ldap_next_entry(ptr ptr) WLDAP32_ldap_next_entry 28 cdecl cldap_openW(wstr long) 29 cdecl LdapUTF8ToUnicode(str long ptr long) 30 cdecl ldap_get_dn(ptr ptr) ldap_get_dnA @@ -23,17 +23,17 @@ 33 cdecl ldap_next_attribute(ptr ptr ptr) ldap_next_attributeA 34 cdecl ldap_get_values(ptr ptr str) ldap_get_valuesA 35 cdecl ldap_get_values_len(ptr ptr str) ldap_get_values_lenA - 36 cdecl ldap_count_entries(ptr ptr) + 36 cdecl ldap_count_entries(ptr ptr) WLDAP32_ldap_count_entries 37 cdecl ldap_count_values(ptr) ldap_count_valuesA 38 cdecl ldap_value_free(ptr) ldap_value_freeA 39 cdecl ldap_explode_dn(str long) ldap_explode_dnA - 40 cdecl ldap_result(ptr long long ptr ptr) - 41 cdecl ldap_msgfree(ptr) + 40 cdecl ldap_result(ptr long long ptr ptr) WLDAP32_ldap_result + 41 cdecl ldap_msgfree(ptr) WLDAP32_ldap_msgfree 42 cdecl ldap_addW(ptr wstr ptr) 43 cdecl ldap_search(ptr str long str ptr long) ldap_searchA 44 cdecl ldap_add_s(ptr str ptr) ldap_add_sA 45 cdecl ldap_bind_s(ptr str str long) ldap_bind_sA - 46 cdecl ldap_unbind_s(ptr) + 46 cdecl ldap_unbind_s(ptr) WLDAP32_ldap_unbind_s 47 cdecl ldap_delete_s(ptr str) ldap_delete_sA 48 cdecl ldap_modify_s(ptr str ptr) ldap_modify_sA 49 cdecl ldap_modrdn_s(ptr str ptr) ldap_modrdn_sA @@ -41,7 +41,7 @@ 51 cdecl ldap_search_st(ptr str long str ptr long ptr ptr) ldap_search_stA 52 cdecl ldap_compare_s(ptr str str str) ldap_compare_sA 53 cdecl LdapUnicodeToUTF8(wstr long ptr long) - 54 cdecl ber_bvfree(ptr) + 54 cdecl ber_bvfree(ptr) WLDAP32_ber_bvfree 55 cdecl cldap_openA(str long) 56 cdecl ldap_addA(ptr str ptr) 57 cdecl ldap_add_ext(ptr str ptr ptr ptr ptr) ldap_add_extA @@ -64,25 +64,25 @@ 74 cdecl ldap_close_extended_op(ptr long) 75 cdecl ldap_compareA(ptr str str str) 76 cdecl ldap_compareW(ptr wstr wstr wstr) - 77 cdecl ldap_count_values_len(ptr) + 77 cdecl ldap_count_values_len(ptr) WLDAP32_ldap_count_values_len 78 cdecl ldap_compare_ext(ptr str str str ptr ptr ptr ptr) ldap_compare_extA - 79 cdecl ldap_value_free_len(ptr) + 79 cdecl ldap_value_free_len(ptr) WLDAP32_ldap_value_free_len 80 cdecl ldap_compare_extA(ptr str str str ptr ptr ptr ptr) 81 cdecl ldap_compare_extW(ptr wstr wstr wstr ptr ptr ptr ptr) - 82 cdecl ldap_perror(ptr ptr) + 82 cdecl ldap_perror(ptr ptr) WLDAP32_ldap_perror 83 cdecl ldap_compare_ext_s(ptr str str str ptr ptr ptr) ldap_compare_ext_sA 84 cdecl ldap_compare_ext_sA(ptr str str str ptr ptr ptr) 85 cdecl ldap_compare_ext_sW(ptr wstr wstr wstr ptr ptr ptr) 86 cdecl ldap_compare_sA(ptr str str str) 87 cdecl ldap_compare_sW(ptr wstr wstr wstr) - 88 cdecl ldap_connect(ptr ptr) + 88 cdecl ldap_connect(ptr ptr) WLDAP32_ldap_connect 89 cdecl ldap_control_free(ptr) ldap_control_freeA 90 cdecl ldap_control_freeA(ptr) 91 cdecl ldap_control_freeW(ptr) 92 cdecl ldap_controls_free(ptr) ldap_controls_freeA 93 cdecl ldap_controls_freeA(ptr) 94 cdecl ldap_controls_freeW(ptr) - 95 cdecl ldap_count_references(ptr ptr) + 95 cdecl ldap_count_references(ptr ptr) WLDAP32_ldap_count_references 96 cdecl ldap_count_valuesA(ptr) 97 cdecl ldap_count_valuesW(ptr) 98 cdecl ldap_create_page_control(ptr long ptr long ptr) ldap_create_page_controlA @@ -115,7 +115,7 @@ 125 cdecl ldap_extended_operationW(ptr wstr ptr ptr ptr ptr) 126 cdecl ldap_first_attributeA(ptr ptr ptr) 127 cdecl ldap_first_attributeW(ptr ptr ptr) -128 cdecl ldap_first_reference(ptr ptr) +128 cdecl ldap_first_reference(ptr ptr) WLDAP32_ldap_first_reference 129 cdecl ldap_free_controls(ptr) ldap_free_controlsA 130 cdecl ldap_free_controlsA(ptr) 131 cdecl ldap_free_controlsW(ptr) @@ -155,7 +155,7 @@ 165 cdecl ldap_modrdn_sW(ptr wstr ptr) 166 cdecl ldap_next_attributeA(ptr ptr ptr) 167 cdecl ldap_next_attributeW(ptr ptr ptr) -168 cdecl ldap_next_reference(ptr ptr) +168 cdecl ldap_next_reference(ptr ptr) WLDAP32_ldap_next_reference 169 cdecl ldap_openA(str long) 170 cdecl ldap_openW(wstr long) 171 cdecl ldap_parse_page_control(ptr ptr ptr ptr) ldap_parse_page_controlA @@ -215,18 +215,18 @@ 230 cdecl ldap_check_filterA(ptr str) 231 cdecl ldap_check_filterW(ptr wstr) 232 cdecl ldap_dn2ufnA(str) -300 cdecl ber_init(ptr) -301 cdecl ber_free(ptr long) -302 cdecl ber_bvecfree(ptr) -303 cdecl ber_bvdup(ptr) -304 cdecl ber_alloc_t(long) -305 cdecl ber_skip_tag(ptr ptr) -306 cdecl ber_peek_tag(ptr ptr) -307 cdecl ber_first_element(ptr ptr ptr) -308 cdecl ber_next_element(ptr ptr ptr) -309 cdecl ber_flatten(ptr ptr) -310 varargs ber_printf(ptr str) -311 varargs ber_scanf(ptr str) +300 cdecl ber_init(ptr) WLDAP32_ber_init +301 cdecl ber_free(ptr long) WLDAP32_ber_free +302 cdecl ber_bvecfree(ptr) WLDAP32_ber_bvecfree +303 cdecl ber_bvdup(ptr) WLDAP32_ber_bvdup +304 cdecl ber_alloc_t(long) WLDAP32_ber_alloc_t +305 cdecl ber_skip_tag(ptr ptr) WLDAP32_ber_skip_tag +306 cdecl ber_peek_tag(ptr ptr) WLDAP32_ber_peek_tag +307 cdecl ber_first_element(ptr ptr ptr) WLDAP32_ber_first_element +308 cdecl ber_next_element(ptr ptr ptr) WLDAP32_ber_next_element +309 cdecl ber_flatten(ptr ptr) WLDAP32_ber_flatten +310 varargs ber_printf(ptr str) WLDAP32_ber_printf +311 varargs ber_scanf(ptr str) WLDAP32_ber_scanf 312 cdecl ldap_conn_from_msg(ptr ptr) 313 cdecl ldap_sasl_bindW(ptr wstr wstr ptr ptr ptr ptr) 314 cdecl ldap_sasl_bind_sW(ptr wstr wstr ptr ptr ptr ptr)