winldap.h: Better stick to the PSDK types

[Francois Gouget]

Changelog:

  * include/winldap.h
    dlls/wldap32/parse.c
    tools/winapi/win32.api

    Francois Gouget <fgouget at free.fr>
    Better stick to the PSDK types.
    Update win32.api.

-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
The nice thing about meditation is that it makes doing nothing quite respectable
                                   -- Paul Dean
-------------- next part --------------
Index: include/winldap.h
===================================================================
RCS file: /var/cvs/wine/include/winldap.h,v
retrieving revision 1.6
diff -u -p -r1.6 winldap.h
--- include/winldap.h	23 Nov 2005 19:26:15 -0000	1.6
+++ include/winldap.h	2 Dec 2005 08:46:23 -0000
@@ -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*,LDAPMessa
 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*);
Index: dlls/wldap32/parse.c
===================================================================
RCS file: /var/cvs/wine/dlls/wldap32/parse.c,v
retrieving revision 1.1
diff -u -p -r1.1 parse.c
--- dlls/wldap32/parse.c	1 Dec 2005 17:52:54 -0000	1.1
+++ dlls/wldap32/parse.c	2 Dec 2005 08:45:17 -0000
@@ -262,9 +262,9 @@ ULONG ldap_parse_sort_controlW( WLDAP32_
     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_LDA
     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
Index: tools/winapi/win32.api
===================================================================
RCS file: /var/cvs/wine/tools/winapi/win32.api,v
retrieving revision 1.59
diff -u -p -r1.59 win32.api
--- tools/winapi/win32.api	30 Nov 2005 12:01:04 -0000	1.59
+++ tools/winapi/win32.api	2 Dec 2005 09:38:05 -0000
@@ -5222,16 +5220,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 *