|
? dlls/wldap32/tests
|
|
Index: dlls/wldap32/misc.c
|
|
===================================================================
|
|
RCS file: /home/wine/wine/dlls/wldap32/misc.c,v
|
|
retrieving revision 1.6
|
|
diff -u -p -r1.6 misc.c
|
|
--- ./dlls/wldap32/misc.c 30 Aug 2005 08:52:39 -0000 1.6
|
|
+++ ./dlls/wldap32/misc.c 31 Aug 2005 20:19:13 -0000
|
|
@@ -125,7 +125,8 @@ ULONG WLDAP32_ldap_count_references( WLD
|
|
return ret;
|
|
}
|
|
|
|
-PCHAR ldap_first_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, BerElement** ptr )
|
|
+PCHAR ldap_first_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
|
|
+ WLDAP32_BerElement** ptr )
|
|
{
|
|
PCHAR ret = NULL;
|
|
#ifdef HAVE_LDAP
|
|
@@ -143,7 +144,8 @@ PCHAR ldap_first_attributeA( WLDAP32_LDA
|
|
return ret;
|
|
}
|
|
|
|
-PWCHAR ldap_first_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, BerElement** ptr )
|
|
+PWCHAR ldap_first_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
|
|
+ WLDAP32_BerElement** ptr )
|
|
{
|
|
PWCHAR ret = NULL;
|
|
#ifdef HAVE_LDAP
|
|
@@ -211,7 +213,8 @@ ULONG WLDAP32_ldap_msgfree( WLDAP32_LDAP
|
|
return ret;
|
|
}
|
|
|
|
-PCHAR ldap_next_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, BerElement *ptr )
|
|
+PCHAR ldap_next_attributeA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
|
|
+ WLDAP32_BerElement *ptr )
|
|
{
|
|
PCHAR ret = NULL;
|
|
#ifdef HAVE_LDAP
|
|
@@ -229,7 +232,8 @@ PCHAR ldap_next_attributeA( WLDAP32_LDAP
|
|
return ret;
|
|
}
|
|
|
|
-PWCHAR ldap_next_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, BerElement *ptr )
|
|
+PWCHAR ldap_next_attributeW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry,
|
|
+ WLDAP32_BerElement *ptr )
|
|
{
|
|
PWCHAR ret = NULL;
|
|
#ifdef HAVE_LDAP
|
|
Index: dlls/wldap32/winldap_private.h
|
|
===================================================================
|
|
RCS file: /home/wine/wine/dlls/wldap32/winldap_private.h,v
|
|
retrieving revision 1.25
|
|
diff -u -p -r1.25 winldap_private.h
|
|
--- ./dlls/wldap32/winldap_private.h 30 Aug 2005 08:52:39 -0000 1.25
|
|
+++ ./dlls/wldap32/winldap_private.h 31 Aug 2005 20:19:13 -0000
|
|
@@ -43,6 +43,11 @@ typedef enum {
|
|
WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED = 0x61
|
|
} LDAP_RETCODE;
|
|
|
|
+typedef struct berelement
|
|
+{
|
|
+ PCHAR opaque;
|
|
+} WLDAP32_BerElement;
|
|
+
|
|
#define LDAP_OPT_THREAD_FN_PTRS 0x05
|
|
#define LDAP_OPT_REBIND_FN 0x06
|
|
#define LDAP_OPT_REBIND_ARG 0x07
|
|
@@ -286,8 +291,8 @@ ULONG ldap_extended_operation_sA(WLDAP32
|
|
PCHAR*,struct WLDAP32_berval**);
|
|
ULONG ldap_extended_operation_sW(WLDAP32_LDAP*,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*, PLDAPControlW*,
|
|
PWCHAR*,struct WLDAP32_berval**);
|
|
-PCHAR ldap_first_attributeA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,BerElement**);
|
|
-PWCHAR ldap_first_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,BerElement**);
|
|
+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*);
|
|
PCHAR ldap_get_dnA(WLDAP32_LDAP*,WLDAP32_LDAPMessage*);
|
|
@@ -319,8 +324,8 @@ ULONG ldap_modrdn2_sW(WLDAP32_LDAP*,PWCH
|
|
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*,BerElement*);
|
|
-PWCHAR ldap_next_attributeW(WLDAP32_LDAP*,WLDAP32_LDAPMessage*,BerElement*);
|
|
+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);
|