ChangeSet ID: 21625 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@winehq.org 2005/12/02 07:15:16
Modified files: dlls/wldap32 : parse.c include : winldap.h tools/winapi : win32.api
Log message: Francois Gouget fgouget@free.fr Better stick to the PSDK types. Update win32.api.
Patch: http://cvs.winehq.org/patch.py?id=21625
Old revision New revision Changes Path 1.1 1.2 +6 -6 wine/dlls/wldap32/parse.c 1.6 1.7 +4 -4 wine/include/winldap.h 1.59 1.60 +6 -0 wine/tools/winapi/win32.api
Index: wine/dlls/wldap32/parse.c diff -u -p wine/dlls/wldap32/parse.c:1.1 wine/dlls/wldap32/parse.c:1.2 --- wine/dlls/wldap32/parse.c:1.1 2 Dec 2005 13:15:16 -0000 +++ wine/dlls/wldap32/parse.c 2 Dec 2005 13:15:16 -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: wine/include/winldap.h diff -u -p wine/include/winldap.h:1.6 wine/include/winldap.h:1.7 --- wine/include/winldap.h:1.6 2 Dec 2005 13:15:16 -0000 +++ wine/include/winldap.h 2 Dec 2005 13:15:16 -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: wine/tools/winapi/win32.api diff -u -p wine/tools/winapi/win32.api:1.59 wine/tools/winapi/win32.api:1.60 --- wine/tools/winapi/win32.api:1.59 2 Dec 2005 13:15:16 -0000 +++ wine/tools/winapi/win32.api 2 Dec 2005 13:15:16 -0000 @@ -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 *