diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index c26c877efc4..a54dd5245a5 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -262,9 +262,9 @@ ULONG ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, return ret; } -int ldap_parse_vlv_controlA( WLDAP32_LDAP *ld, LDAPControlA **control, - unsigned long *targetpos, unsigned long *listcount, - struct WLDAP32_berval **context, int *errcode ) +INT ldap_parse_vlv_controlA( WLDAP32_LDAP *ld, PLDAPControlA *control, + PULONG targetpos, PULONG listcount, + struct WLDAP32_berval **context, PINT errcode ) { int ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP @@ -289,9 +289,9 @@ int ldap_parse_vlv_controlA( WLDAP32_LDAP *ld, LDAPControlA **control, return ret; } -int ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, LDAPControlW **control, - unsigned long *targetpos, unsigned long *listcount, - struct WLDAP32_berval **context, int *errcode ) +INT ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, + PULONG targetpos, PULONG listcount, + struct WLDAP32_berval **context, PINT errcode ) { int ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP diff --git a/include/winldap.h b/include/winldap.h index 53848070baf..f3493c5b8f8 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -480,8 +480,8 @@ ULONG ldap_free_controlsW(LDAPControlW**); PCHAR ldap_get_dnA(LDAP*,LDAPMessage*); PWCHAR ldap_get_dnW(LDAP*,LDAPMessage*); #define ldap_get_dn WINELIB_NAME_AW(ldap_get_dn) -ULONG ldap_get_next_page(LDAP*,PLDAPSearch,ULONG,ULONG*); -ULONG ldap_get_next_page_s(LDAP*,PLDAPSearch,struct l_timeval*,ULONG,ULONG*,LDAPMessage**); +ULONG ldap_get_next_page(PLDAP,PLDAPSearch,ULONG,ULONG*); +ULONG ldap_get_next_page_s(PLDAP,PLDAPSearch,struct l_timeval*,ULONG,ULONG*,LDAPMessage**); ULONG ldap_get_optionA(LDAP*,int,void*); ULONG ldap_get_optionW(LDAP*,int,void*); #define ldap_get_option WINELIB_NAME_AW(ldap_get_option) @@ -546,8 +546,8 @@ ULONG ldap_parse_resultW(LDAP*,LDAPMessage*,ULONG*,PWCHAR*,PWCHAR*,PWCHAR**,PLDA ULONG ldap_parse_sort_controlA(LDAP*,PLDAPControlA*,ULONG*,PCHAR*); ULONG ldap_parse_sort_controlW(LDAP*,PLDAPControlW*,ULONG*,PWCHAR*); #define ldap_parse_sort_control WINELIB_NAME_AW(ldap_parse_sort_control) -int ldap_parse_vlv_controlA(LDAP*,PLDAPControlA*,unsigned long*,unsigned long*,struct berval**,int*); -int ldap_parse_vlv_controlW(LDAP*,PLDAPControlW*,unsigned long*,unsigned long*,struct berval**,int*); +INT ldap_parse_vlv_controlA(PLDAP,PLDAPControlA*,PULONG,PULONG,PBERVAL*,PINT); +INT ldap_parse_vlv_controlW(PLDAP,PLDAPControlW*,PULONG,PULONG,PBERVAL*,PINT); #define ldap_parse_vlv_control WINELIB_NAME_AW(ldap_parse_vlv_control) void ldap_perror(LDAP*,const PCHAR); ULONG ldap_rename_extA(LDAP*,PCHAR,PCHAR,PCHAR,INT,PLDAPControlA*,PLDAPControlA*,ULONG*); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index c86761184cd..1498831467f 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5222,16 +5222,22 @@ LDAPModA *[] LDAPModW *[] PBERVAL * PCHAR * +PCHAR ** PCHAR[] +PINT PLDAP_VERSION_INFO PLDAPControlA PLDAPControlA * +PLDAPControlA ** PLDAPControlW PLDAPControlW * +PLDAPControlW ** +PLDAPSearch PLDAPSortKeyA * PLDAPSortKeyW * PULONG PWCHAR * +PWCHAR ** PWCHAR[] ULONG * WLDAP32_BerElement *